@osovv/vv-opencode 1.1.6 → 1.2.1

package/dist/plugins/web-tools/providers/spider.js

@@ -0,0 +1,104 @@
+// FILE: src/plugins/web-tools/providers/spider.ts
+// VERSION: 1.0.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Call the Spider.cloud Scrape API for one exact URL and serve binary targets through the shared direct media loader.
+//   SCOPE: Bearer auth, mapped return_format, array envelope validation, status and duration metadata, provider error mapping, and media-first dispatch.
+//   DEPENDS: [src/plugins/web-tools/http.ts, src/plugins/web-tools/config.ts, src/plugins/web-tools/media-loader.ts, src/plugins/web-tools/providers/exa.ts, @opencode-ai/plugin]
+//   LINKS: [M-WEB-SPIDER, M-WEB-HTTP, M-WEB-MEDIA-LOADER, M-WEB-FETCH-SERVICE]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   SpiderOutcome - Text or media outcome of a Spider scrape.
+//   scrapeSpider - Serve media targets directly, otherwise scrape one URL through Spider.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [v1.0.0 - Initial Spider Scrape adapter.]
+// END_CHANGE_SUMMARY
+import { DEFAULT_TEXT_MAX_BYTES, requestBounded, } from "../http.js";
+import { loadMediaAttachment, WebMediaError } from "../media-loader.js";
+import { mapHttpErrorToProviderError, WebProviderError } from "./exa.js";
+const SPIDER_SCRAPE_URL = "https://api.spider.cloud/scrape";
+const SPIDER_RETURN_FORMAT = { markdown: "markdown", text: "text", html: "raw" };
+// START_BLOCK_HELPERS
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseSpiderResponse(bytes) {
+    let parsed;
+    try {
+        parsed = JSON.parse(new TextDecoder().decode(bytes));
+    }
+    catch {
+        throw new WebProviderError("spider", "BAD_RESPONSE", "malformed JSON response from spider");
+    }
+    if (!Array.isArray(parsed) || parsed.length === 0) {
+        throw new WebProviderError("spider", "BAD_RESPONSE", "unexpected spider response envelope");
+    }
+    const entry = parsed[0];
+    if (!isPlainObject(entry)) {
+        throw new WebProviderError("spider", "BAD_RESPONSE", "unexpected spider response envelope");
+    }
+    const status = typeof entry.status === "number" ? entry.status : undefined;
+    const duration = typeof entry.duration === "number" ? entry.duration : undefined;
+    const metadata = {
+        ...(status !== undefined ? { status } : {}),
+        ...(duration !== undefined ? { durationMs: duration } : {}),
+    };
+    if (entry.error) {
+        const detail = typeof entry.error === "string" ? entry.error : "scrape failed";
+        throw new WebProviderError("spider", "PROVIDER_ERROR", `spider error: ${detail}`, status);
+    }
+    const content = typeof entry.content === "string" ? entry.content : undefined;
+    if (content === undefined) {
+        throw new WebProviderError("spider", "BAD_RESPONSE", "spider response missing content");
+    }
+    return { kind: "text", content, metadata };
+}
+// END_BLOCK_HELPERS
+// START_CONTRACT: scrapeSpider
+//   PURPOSE: Serve image and PDF targets through the shared media loader; scrape textual targets through Spider.
+//   INPUTS: { input: url, format, credential, abort, timeoutMs; fetchImpl: injectable fetch }
+//   OUTPUTS: { SpiderOutcome - text or media with provider metadata }
+//   SIDE_EFFECTS: performs network I/O through fetchImpl; never logs the credential
+//   LINKS: M-WEB-FETCH-SERVICE
+// END_CONTRACT: scrapeSpider
+export async function scrapeSpider(input, fetchImpl) {
+    try {
+        const attachment = await loadMediaAttachment({ url: input.url, abort: input.abort, timeoutMs: input.timeoutMs }, fetchImpl);
+        return { kind: "media", attachment, metadata: {} };
+    }
+    catch (error) {
+        if (!(error instanceof WebMediaError)) {
+            throw error;
+        }
+    }
+    const body = JSON.stringify({
+        url: input.url,
+        return_format: [SPIDER_RETURN_FORMAT[input.format]],
+    });
+    let response;
+    try {
+        response = await requestBounded({
+            url: SPIDER_SCRAPE_URL,
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${input.credential.value}`,
+                "content-type": "application/json",
+                accept: "application/json",
+            },
+            body,
+            timeoutMs: input.timeoutMs,
+            maxBytes: DEFAULT_TEXT_MAX_BYTES,
+            abort: input.abort,
+        }, fetchImpl);
+    }
+    catch (error) {
+        mapHttpErrorToProviderError(error, "spider");
+        throw error;
+    }
+    return parseSpiderResponse(response.bytes);
+}
+//# sourceMappingURL=spider.js.map

package/dist/plugins/web-tools/providers/spider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spider.js","sourceRoot":"","sources":["../../../../src/plugins/web-tools/providers/spider.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,iBAAiB;AACjB,wBAAwB;AACxB,iIAAiI;AACjI,yJAAyJ;AACzJ,kLAAkL;AAClL,+EAA+E;AAC/E,kBAAkB;AAClB,sBAAsB;AACtB,sBAAsB;AACtB,EAAE;AACF,mBAAmB;AACnB,8DAA8D;AAC9D,0FAA0F;AAC1F,iBAAiB;AACjB,EAAE;AACF,uBAAuB;AACvB,2DAA2D;AAC3D,qBAAqB;AAIrB,OAAO,EACL,sBAAsB,EACtB,cAAc,GAGf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEzE,MAAM,iBAAiB,GAAG,iCAAiC,CAAC;AAE5D,MAAM,oBAAoB,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAW,CAAC;AAc1F,sBAAsB;AACtB,SAAS,aAAa,CAAC,KAAc;IACnC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAiB;IAC5C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,qCAAqC,CAAC,CAAC;IAC9F,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,qCAAqC,CAAC,CAAC;IAC9F,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,qCAAqC,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3E,MAAM,QAAQ,GAAG,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACjF,MAAM,QAAQ,GAAG;QACf,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5D,CAAC;IAEF,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC;QAC/E,MAAM,IAAI,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,IAAI,gBAAgB,CAAC,QAAQ,EAAE,cAAc,EAAE,iCAAiC,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;AAC7C,CAAC;AACD,oBAAoB;AAEpB,+BAA+B;AAC/B,iHAAiH;AACjH,8FAA8F;AAC9F,sEAAsE;AACtE,oFAAoF;AACpF,+BAA+B;AAC/B,6BAA6B;AAC7B,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,KAMC,EACD,SAAqB;IAErB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAC1C,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,EAClE,SAAS,CACV,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,aAAa,CAAC,EAAE,CAAC;YACtC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC1B,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,aAAa,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACpD,CAAC,CAAC;IAEH,IAAI,QAA6B,CAAC;IAClC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,cAAc,CAC7B;YACE,GAAG,EAAE,iBAAiB;YACtB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE;gBACjD,cAAc,EAAE,kBAAkB;gBAClC,MAAM,EAAE,kBAAkB;aAC3B;YACD,IAAI;YACJ,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,QAAQ,EAAE,sBAAsB;YAChC,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,EACD,SAAS,CACV,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC7C,MAAM,KAAK,CAAC;IACd,CAAC;IAED,OAAO,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC7C,CAAC"}

package/dist/plugins/web-tools/providers/zai.d.ts

@@ -0,0 +1,33 @@
+import type { ToolAttachment } from "@opencode-ai/plugin";
+import type { VvocWebRegion } from "../../../lib/vvoc-config.js";
+import type { WebProviderCredential } from "../config.js";
+import { type FetchLike } from "../http.js";
+import { type WebSearchInput, type WebSearchResult } from "./exa.js";
+type FetchFormat = "markdown" | "text" | "html";
+export type ZaiReaderOutcome = {
+    kind: "text";
+    content: string;
+    metadata: {
+        status: number;
+        requestId?: string;
+        model?: string;
+        created?: number;
+        title?: string;
+    };
+} | {
+    kind: "media";
+    attachment: ToolAttachment;
+    metadata: Record<string, never>;
+};
+export declare function searchZai(input: WebSearchInput & {
+    region: VvocWebRegion;
+}, fetchImpl?: FetchLike): Promise<WebSearchResult[]>;
+export declare function fetchZai(input: {
+    url: string;
+    format: FetchFormat;
+    region: VvocWebRegion;
+    credential: WebProviderCredential;
+    abort: AbortSignal;
+    timeoutMs: number;
+}, fetchImpl?: FetchLike): Promise<ZaiReaderOutcome>;
+export {};

package/dist/plugins/web-tools/providers/zai.js

@@ -0,0 +1,181 @@
+// FILE: src/plugins/web-tools/providers/zai.ts
+// VERSION: 1.0.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Call the documented Z.AI international or Zhipu China Tool API directly for provider-neutral web search and reader extraction.
+//   SCOPE: Explicit region endpoint selection, bearer-authenticated search and reader requests, response normalization, direct media-first fetch dispatch, and provider error mapping without MCP behavior.
+//   DEPENDS: [src/plugins/web-tools/config.ts, src/plugins/web-tools/http.ts, src/plugins/web-tools/media-loader.ts, src/plugins/web-tools/providers/exa.ts, @opencode-ai/plugin]
+//   LINKS: [M-WEB-ZAI, M-WEB-HTTP, M-WEB-MEDIA-LOADER, M-WEB-SEARCH-SERVICE, M-WEB-FETCH-SERVICE]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   ZaiReaderOutcome - Text or direct media result returned by the Z.AI fetch adapter.
+//   searchZai - Execute one direct regional Z.AI or Zhipu web search request.
+//   fetchZai - Return supported media directly or read textual content through the regional reader endpoint.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [C-ZAI-DIRECT-WEB-PROVIDERS - Added direct international and China search and reader Tool API integration.]
+// END_CHANGE_SUMMARY
+import { DEFAULT_TEXT_MAX_BYTES, requestBounded, } from "../http.js";
+import { loadMediaAttachment, WebMediaError } from "../media-loader.js";
+import { mapHttpErrorToProviderError, WebProviderError, } from "./exa.js";
+const REGION_CONFIG = {
+    international: {
+        searchUrl: "https://api.z.ai/api/paas/v4/web_search",
+        readerUrl: "https://api.z.ai/api/paas/v4/reader",
+        searchEngine: "search-prime",
+    },
+    china: {
+        searchUrl: "https://open.bigmodel.cn/api/paas/v4/web_search",
+        readerUrl: "https://open.bigmodel.cn/api/paas/v4/reader",
+        searchEngine: "search_pro",
+    },
+};
+const ZAI_FRESHNESS = {
+    day: "oneDay",
+    week: "oneWeek",
+    month: "oneMonth",
+    year: "oneYear",
+};
+// START_BLOCK_RESPONSE_HELPERS
+function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function decodeJson(bytes, operation) {
+    try {
+        return JSON.parse(new TextDecoder().decode(bytes));
+    }
+    catch {
+        throw new WebProviderError("zai", "BAD_RESPONSE", `malformed JSON response from zai ${operation}`);
+    }
+}
+function normalizeSearchResult(item) {
+    if (!isPlainObject(item) || typeof item.link !== "string" || item.link.length === 0) {
+        return undefined;
+    }
+    const title = typeof item.title === "string" && item.title.length > 0 ? item.title : item.link;
+    const snippet = typeof item.content === "string" && item.content.length > 0 ? item.content : undefined;
+    const publishedAt = typeof item.publish_date === "string" && item.publish_date.length > 0
+        ? item.publish_date
+        : undefined;
+    return {
+        title,
+        url: item.link,
+        ...(snippet ? { snippet } : {}),
+        ...(publishedAt ? { publishedAt } : {}),
+    };
+}
+function parseSearchResponse(bytes) {
+    const parsed = decodeJson(bytes, "search");
+    if (!isPlainObject(parsed) || !Array.isArray(parsed.search_result)) {
+        throw new WebProviderError("zai", "BAD_RESPONSE", "unexpected zai search response envelope");
+    }
+    return parsed.search_result
+        .map(normalizeSearchResult)
+        .filter((result) => result !== undefined);
+}
+function parseReaderResponse(response) {
+    const parsed = decodeJson(response.bytes, "reader");
+    const envelope = isPlainObject(parsed) ? parsed : undefined;
+    const readerResult = envelope?.reader_result;
+    if (!isPlainObject(readerResult) || typeof readerResult.content !== "string") {
+        throw new WebProviderError("zai", "BAD_RESPONSE", "unexpected zai reader response envelope");
+    }
+    return {
+        kind: "text",
+        content: readerResult.content,
+        metadata: {
+            status: response.status,
+            ...(typeof envelope?.request_id === "string" ? { requestId: envelope.request_id } : {}),
+            ...(typeof envelope?.model === "string" ? { model: envelope.model } : {}),
+            ...(typeof envelope?.created === "number" ? { created: envelope.created } : {}),
+            ...(typeof readerResult.title === "string" ? { title: readerResult.title } : {}),
+        },
+    };
+}
+// END_BLOCK_RESPONSE_HELPERS
+// START_CONTRACT: searchZai
+//   PURPOSE: Search through the documented direct Z.AI or Zhipu Tool API for one explicit region.
+//   INPUTS: { input: provider-neutral search input plus region; fetchImpl: injectable fetch }
+//   OUTPUTS: { WebSearchResult[] - normalized provider-ranked results }
+//   SIDE_EFFECTS: performs one bounded authenticated HTTP request; never logs credentials
+//   LINKS: M-WEB-SEARCH-SERVICE
+// END_CONTRACT: searchZai
+export async function searchZai(input, fetchImpl) {
+    const regional = REGION_CONFIG[input.region];
+    const body = JSON.stringify({
+        search_engine: regional.searchEngine,
+        search_query: input.query,
+        count: input.count,
+        ...(input.freshness ? { search_recency_filter: ZAI_FRESHNESS[input.freshness] } : {}),
+    });
+    let response;
+    try {
+        response = await requestBounded({
+            url: regional.searchUrl,
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${input.credential.value}`,
+                "content-type": "application/json",
+                accept: "application/json",
+            },
+            body,
+            timeoutMs: input.timeoutMs,
+            maxBytes: DEFAULT_TEXT_MAX_BYTES,
+            abort: input.abort,
+        }, fetchImpl);
+    }
+    catch (error) {
+        mapHttpErrorToProviderError(error, "zai");
+        throw error;
+    }
+    return parseSearchResponse(response.bytes);
+}
+// START_CONTRACT: fetchZai
+//   PURPOSE: Return supported direct media attachments or read textual content through the documented regional reader Tool API.
+//   INPUTS: { input: url, format, region, credential, abort, timeoutMs; fetchImpl: injectable fetch }
+//   OUTPUTS: { ZaiReaderOutcome - direct media or normalized reader text and metadata }
+//   SIDE_EFFECTS: performs bounded network I/O; textual targets use a direct media probe before the reader API
+//   LINKS: M-WEB-FETCH-SERVICE, M-WEB-MEDIA-LOADER
+// END_CONTRACT: fetchZai
+export async function fetchZai(input, fetchImpl) {
+    try {
+        const attachment = await loadMediaAttachment({ url: input.url, abort: input.abort, timeoutMs: input.timeoutMs }, fetchImpl);
+        return { kind: "media", attachment, metadata: {} };
+    }
+    catch (error) {
+        if (!(error instanceof WebMediaError)) {
+            throw error;
+        }
+    }
+    const regional = REGION_CONFIG[input.region];
+    const body = JSON.stringify({
+        url: input.url,
+        timeout: input.timeoutMs / 1000,
+        return_format: input.format,
+    });
+    let response;
+    try {
+        response = await requestBounded({
+            url: regional.readerUrl,
+            method: "POST",
+            headers: {
+                Authorization: `Bearer ${input.credential.value}`,
+                "content-type": "application/json",
+                accept: "application/json",
+            },
+            body,
+            timeoutMs: input.timeoutMs,
+            maxBytes: DEFAULT_TEXT_MAX_BYTES,
+            abort: input.abort,
+        }, fetchImpl);
+    }
+    catch (error) {
+        mapHttpErrorToProviderError(error, "zai");
+        throw error;
+    }
+    return parseReaderResponse(response);
+}
+//# sourceMappingURL=zai.js.map

package/dist/plugins/web-tools/providers/zai.js.map

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

package/dist/plugins/web-tools/search-service.d.ts

@@ -0,0 +1,18 @@
+import { type ToolDefinition } from "@opencode-ai/plugin";
+import type { ResolvedWebSearchConfig } from "./config.js";
+import { type WebSearchResult } from "./providers/exa.js";
+/**
+ * Render ranked results as Markdown: numbered entries with [title](url),
+ * an indented snippet line when present, and an italic publishedAt line when present.
+ * Empty results render a short no-results notice.
+ */
+export declare function renderSearchMarkdown(results: WebSearchResult[]): string;
+/**
+ * Create the web_search tool bound to the resolved search configuration.
+ * execute asks permission key web_search with patterns [query], validates the credential
+ * at execution time, dispatches to exa, brave, or direct zai, and returns a ToolResult with
+ * title, Markdown output, and metadata { provider, region?, resultCount, credentialSource }.
+ * Missing credentials raise an actionable error naming the environment variable
+ * and the web.search.apiKey config field without printing any value.
+ */
+export declare function createWebSearchTool(resolved: ResolvedWebSearchConfig): ToolDefinition;

package/dist/plugins/web-tools/search-service.js

@@ -0,0 +1,110 @@
+// FILE: src/plugins/web-tools/search-service.ts
+// VERSION: 1.0.0
+// START_MODULE_CONTRACT
+//   PURPOSE: Build the provider-neutral web_search tool: input validation, permission request, provider dispatch, and ranked Markdown rendering.
+//   SCOPE: web_search ToolDefinition factory and Markdown rendering; delegates transport to the Exa, Brave, and direct Z.AI adapters.
+//   DEPENDS: [@opencode-ai/plugin, src/plugins/web-tools/config.ts, src/plugins/web-tools/http.ts, src/plugins/web-tools/providers/exa.ts, src/plugins/web-tools/providers/brave.ts, src/plugins/web-tools/providers/zai.ts]
+//   LINKS: [M-WEB-SEARCH-SERVICE, M-WEB-EXA, M-WEB-BRAVE, M-WEB-ZAI, M-WEB-HTTP, M-PLUGIN-WEB-TOOLS]
+//   ROLE: RUNTIME
+//   MAP_MODE: EXPORTS
+// END_MODULE_CONTRACT
+//
+// START_MODULE_MAP
+//   renderSearchMarkdown - Render ranked search results as Markdown.
+//   createWebSearchTool - Create the web_search ToolDefinition bound to a resolved search config.
+// END_MODULE_MAP
+//
+// START_CHANGE_SUMMARY
+//   LAST_CHANGE: [C-ZAI-DIRECT-WEB-PROVIDERS - Routed canonical web_search calls through the explicit-region direct Z.AI adapter.]
+//   LAST_CHANGE: [v1.0.0 - Initial web_search tool service.]
+// END_CHANGE_SUMMARY
+import { tool } from "@opencode-ai/plugin";
+import { DEFAULT_REQUEST_TIMEOUT_MS } from "./http.js";
+import { searchBrave } from "./providers/brave.js";
+import { searchExa, WebProviderError } from "./providers/exa.js";
+import { searchZai } from "./providers/zai.js";
+const z = tool.schema;
+/**
+ * Render ranked results as Markdown: numbered entries with [title](url),
+ * an indented snippet line when present, and an italic publishedAt line when present.
+ * Empty results render a short no-results notice.
+ */
+export function renderSearchMarkdown(results) {
+    if (results.length === 0) {
+        return "No results found.";
+    }
+    return results
+        .map((result, index) => {
+        const lines = [`${index + 1}. [${result.title}](${result.url})`];
+        if (result.snippet) {
+            lines.push(`   ${result.snippet}`);
+        }
+        if (result.publishedAt) {
+            lines.push(`   _${result.publishedAt}_`);
+        }
+        return lines.join("\n");
+    })
+        .join("\n");
+}
+/**
+ * Create the web_search tool bound to the resolved search configuration.
+ * execute asks permission key web_search with patterns [query], validates the credential
+ * at execution time, dispatches to exa, brave, or direct zai, and returns a ToolResult with
+ * title, Markdown output, and metadata { provider, region?, resultCount, credentialSource }.
+ * Missing credentials raise an actionable error naming the environment variable
+ * and the web.search.apiKey config field without printing any value.
+ */
+export function createWebSearchTool(resolved) {
+    return tool({
+        description: "Search the web using the configured provider and return ranked results as Markdown. Use for discovering information; returns titles, URLs, snippets, and dates.",
+        args: {
+            query: z.string().min(1).describe("The search query."),
+            count: z
+                .number()
+                .int()
+                .min(1)
+                .max(20)
+                .default(8)
+                .describe("Number of results, 1 through 20, default 8."),
+            freshness: z
+                .enum(["day", "week", "month", "year"])
+                .optional()
+                .describe("Optional time window restricting results."),
+        },
+        async execute(args, context) {
+            await context.ask({
+                permission: "web_search",
+                patterns: [args.query],
+                always: [],
+                metadata: { provider: resolved.provider },
+            });
+            if (!resolved.credential) {
+                throw new WebProviderError(resolved.provider, "MISSING_CREDENTIAL", `missing credential for ${resolved.provider}: set ${resolved.envVar} or ${resolved.configField}`);
+            }
+            const searchInput = {
+                query: args.query,
+                count: args.count,
+                freshness: args.freshness,
+                credential: resolved.credential,
+                abort: context.abort,
+                timeoutMs: DEFAULT_REQUEST_TIMEOUT_MS,
+            };
+            const results = resolved.provider === "brave"
+                ? await searchBrave(searchInput)
+                : resolved.provider === "zai"
+                    ? await searchZai({ ...searchInput, region: resolved.region })
+                    : await searchExa(searchInput);
+            return {
+                title: `web_search: ${args.query}`,
+                output: renderSearchMarkdown(results),
+                metadata: {
+                    provider: resolved.provider,
+                    ...(resolved.provider === "zai" ? { region: resolved.region } : {}),
+                    resultCount: results.length,
+                    credentialSource: resolved.credential.source,
+                },
+            };
+        },
+    });
+}
+//# sourceMappingURL=search-service.js.map

package/dist/plugins/web-tools/search-service.js.map

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

package/dist/plugins/workflow/index.js

@@ -1,5 +1,5 @@
 // FILE: src/plugins/workflow/index.ts
-// VERSION: 0.3.0
+// VERSION: 0.5.1
 // START_MODULE_CONTRACT
 //   PURPOSE: Register workflow tools and enforcement while injecting only startup-profile-compatible vv-controller guidance.
 //   SCOPE: work_item_open/list/close registration, tracked launch validation, result normalization and repair, round aggregation with bounded excerpts, implementation round limits, persistence, and profile-selected chat.message guidance.
@@ -14,6 +14,8 @@
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
+//   LAST_CHANGE: [v0.5.1 - Fixed session.deleted cleanup to read the session id from properties.info.id (per the SDK event shape), drop the in-memory store, and remove a duplicate directory deletion.]
+//   LAST_CHANGE: [v0.5.0 - Reverted in-flight reviewer launches on failed tracked results (invalid output, parse/repair failure, missing work item, apply failure) so work items are no longer stranded in REVIEWER_ALREADY_IN_FLIGHT.]
 //   LAST_CHANGE: [v0.4.1 - Propagated bounded tracked-result excerpts through protocol errors, state-application errors, hard stops, and persisted work-item state.]
 //   LAST_CHANGE: [v0.4.0 - Read plugin toggles from the shared startup vvoc config snapshot.]
 //   LAST_CHANGE: [v0.3.0 - Integrated explicit work-item intent, reviewer in-flight tracking, and collect-all review-round result aggregation.]
@@ -31,7 +33,7 @@
 import { tool } from "@opencode-ai/plugin";
 import { attemptTrackedResultRepair, isTrackedResultRepairEligible, unwrapResumableTaskResult, } from "./repair.js";
 import { parseResultBlock, parseWorkItemHeader, TRACKED_SUBAGENT_NAMES, } from "./protocol.js";
-import { applyTrackedResult, createWorkflowResultExcerpt, beginTrackedLaunch, createWorkItemStore, getReviewRound, getWorkItem, } from "./state.js";
+import { applyTrackedResult, createWorkflowResultExcerpt, beginTrackedLaunch, createWorkItemStore, getReviewRound, getWorkItem, revertReviewerLaunch, } from "./state.js";
 import { getAllowedNextAgents, getAttemptedImplementationRound, shouldBlockRound, } from "./transitions.js";
 import { createWorkItemCloseTool, createWorkItemListTool, createWorkItemOpenTool, } from "./tooling.js";
 import workflowSystemInstructionTemplate from "./system-instruction.md?raw";
@@ -189,7 +191,6 @@ function createHardStopMessage(options) {
         "Inspect work_item_list before retrying.",
     ].join("\n");
 }
-// START_BLOCK_PLUGIN_ENTRY
 export const WorkflowPlugin = async ({ client, directory }) => {
     const vvoc = await loadVvocConfig({ cwd: directory });
     if (!isVvocPluginEnabled(vvoc.config, "workflow"))
@@ -220,6 +221,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
         }
     }
     // END_BLOCK_PERSISTENCE_SETUP
+    // START_BLOCK_PLUGIN_ENTRY
     // Tool wrappers still need a store reference for description/args shape
     // but execute handlers resolve the right store per-call
     const dummyStore = createWorkItemStore();
@@ -416,6 +418,18 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                 });
                 throw new Error(`RESULT_PROTOCOL_ERROR: ${header.error.message}`);
             }
+            // Revert an in-flight reviewer launch on any failure below so the work
+            // item is not permanently stranded in REVIEWER_ALREADY_IN_FLIGHT. No-op
+            // for implementer launches (they carry no in-flight reviewer slot).
+            const revertLaunch = () => {
+                const store = getOrCreateStore(input.sessionID);
+                revertReviewerLaunch(store, {
+                    sessionId: input.sessionID,
+                    workItemId: header.value,
+                    agent: subagentType,
+                });
+                snapshotSession(input.sessionID);
+            };
             if (typeof output.output !== "string") {
                 await client.app.log({
                     body: {
@@ -429,6 +443,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                         },
                     },
                 });
+                revertLaunch();
                 throw new Error("RESULT_PROTOCOL_ERROR: tracked task output must be a string");
             }
             const unwrapped = unwrapResumableTaskResult(output.output);
@@ -493,6 +508,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                         },
                     },
                 });
+                revertLaunch();
                 throw new Error([
                     `RESULT_PROTOCOL_ERROR: ${parsed.error.message}`,
                     formatResultExcerptForError(protocolFailureExcerpt),
@@ -532,6 +548,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                         },
                     },
                 });
+                revertLaunch();
                 throw new Error([
                     `RESULT_PROTOCOL_ERROR: no open work item ${parsed.value.workItemId} exists in this session`,
                     formatResultExcerptForError(resultExcerpt),
@@ -557,6 +574,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                         },
                     },
                 });
+                revertLaunch();
                 throw new Error([
                     `RESULT_PROTOCOL_ERROR: ${applied.message}`,
                     formatResultExcerptForError(resultExcerpt),
@@ -599,7 +617,8 @@ export const WorkflowPlugin = async ({ client, directory }) => {
         event: async (input) => {
             const eventType = input.event.type;
             const properties = input.event.properties ?? {};
-            const eventSessionId = properties.sessionID;
+            const info = properties.info;
+            const eventSessionId = properties.sessionID ?? info?.id;
             if (!eventSessionId)
                 return;
             // Hydration happens in tool.execute.before — not here,
@@ -609,7 +628,7 @@ export const WorkflowPlugin = async ({ client, directory }) => {
                 return;
             }
             if (eventType === "session.deleted") {
-                await deleteWorkflowSessionDir(eventSessionId);
+                stores.delete(eventSessionId);
                 await deleteWorkflowSessionDir(eventSessionId);
                 await client.app.log({
                     body: {