opencode-websearch-deepseek 0.3.1 → 0.3.2

package/dist/index.d.ts

@@ -131,7 +131,7 @@ export interface WebsearchContext {
  * variables, then the credential OpenCode stores for the `deepseek` provider
  * (configured via `opencode auth login`).
  */
-export declare function resolveApiKey(ctx: WebsearchContext, options?: WebsearchOptions): Promise<string | undefined>;
+export declare function resolveApiKey(ctx: WebsearchContext, options?: WebsearchOptions, signal?: AbortSignal): Promise<string | undefined>;
 /**
  * Resolve the `max_uses` value for the search tool declaration.
  * Falls back to {@link DEFAULT_MAX_USES} for missing or invalid input.

package/dist/index.js

@@ -56,7 +56,7 @@ function readString(value) {
  * variables, then the credential OpenCode stores for the `deepseek` provider
  * (configured via `opencode auth login`).
  */
-export async function resolveApiKey(ctx, options) {
+export async function resolveApiKey(ctx, options, signal) {
     const fromOptions = readString(options?.apiKey);
     if (fromOptions)
         return fromOptions;
@@ -67,13 +67,15 @@ export async function resolveApiKey(ctx, options) {
     if (!integration)
         return undefined;
     try {
-        const connection = await integration.connection.active("deepseek");
+        const connection = await withAbort(integration.connection.active("deepseek"), signal);
         if (!connection)
             return undefined;
-        const credential = await integration.connection.resolve(connection);
+        const credential = await withAbort(integration.connection.resolve(connection), signal);
         return readString(credential?.key);
     }
     catch (error) {
+        if (signal?.aborted)
+            throwCancellation(signal, error);
         // A genuine integration failure is not "no key": surface it with context.
         throw new Error("Failed to read the DeepSeek credential from OpenCode", { cause: error });
     }
@@ -93,21 +95,52 @@ function throwCancellation(signal, fallback) {
     if (reason instanceof Error)
         throw reason;
     if (typeof reason === "object" && reason !== null) {
-        // Preserve AbortError-like objects (DOMException has a message); wrap the rest.
-        const candidate = reason;
-        if (candidate.name === "AbortError" && typeof candidate.message === "string")
-            throw reason;
+        // Preserve AbortError-like objects (DOMException has a message); wrap the
+        // rest. Guard the property reads: a hostile reason may throw from a getter.
+        try {
+            const candidate = reason;
+            if (candidate.name === "AbortError" && typeof candidate.message === "string" && candidate.message) {
+                throw reason;
+            }
+        }
+        catch (error) {
+            if (error === reason)
+                throw error;
+        }
         throw new Error("The web search was aborted", { cause: reason });
     }
+    if (typeof reason === "string" && reason.trim())
+        throw new Error(reason.trim());
     if (reason !== undefined && reason !== null) {
-        const text = String(reason).trim();
-        if (text)
-            throw new Error(text);
+        // Non-string primitives (e.g. 0) are not useful messages; keep them as cause.
+        throw new Error("The web search was aborted", { cause: reason });
     }
     if (fallback instanceof Error)
         throw fallback;
     throw new Error("The web search was aborted");
 }
+/** Reject with the signal's reason if `signal` aborts before `promise` settles. */
+function withAbort(promise, signal) {
+    if (!signal)
+        return promise;
+    if (signal.aborted) {
+        // The passed promise is already created; swallow its later rejection so it
+        // does not surface as an unhandled rejection.
+        promise.catch(() => { });
+        return Promise.reject(signal.reason ?? new Error("The web search was aborted"));
+    }
+    return new Promise((resolve, reject) => {
+        const onAbort = () => reject(signal.reason ?? new Error("The web search was aborted"));
+        signal.addEventListener("abort", onAbort, { once: true });
+        promise.then((value) => {
+            signal.removeEventListener("abort", onAbort);
+            resolve(value);
+        }, (error) => {
+            signal.removeEventListener("abort", onAbort);
+            reject(error);
+        });
+    });
+}
 /**
  * Validate a `max_uses` value: a positive safe integer, given as a number or a
  * plain-integer string. Returns `undefined` when unset or invalid.
@@ -243,6 +276,8 @@ export function toResults(answer, sources = []) {
     const valid = (Array.isArray(sources) ? sources : []).filter((source) => typeof source?.url === "string" && source.url.length > 0);
     const results = [];
     if (answer) {
+        // The synthesized answer reuses the first source's URL so it links to a
+        // real page; the same source is also listed below (intentional).
         results.push({
             url: valid[0]?.url ?? FALLBACK_URL,
             title: "DeepSeek answer",
@@ -280,7 +315,7 @@ export const plugin = {
                 execute: async ({ query }, context) => {
                     const signal = context?.signal;
                     try {
-                        const apiKey = await resolveApiKey(ctx, options);
+                        const apiKey = await resolveApiKey(ctx, options, signal);
                         if (!apiKey) {
                             throw new Error("No DeepSeek API key: set the DEEPSEEK_API_KEY env var, pass the apiKey plugin option, or sign in to the deepseek provider in OpenCode");
                         }
@@ -320,6 +355,9 @@ export const plugin = {
                             throw new Error(`DeepSeek API error ${response.status}: ${text.slice(0, 300)}`);
                         }
                         const data = (await response.json());
+                        // A cancellation may arrive after the response completed.
+                        if (signal?.aborted)
+                            throwCancellation(signal, undefined);
                         const { answer, sources } = extractAnswerAndSources(data);
                         return toResults(answer, sources);
                     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-websearch-deepseek",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DeepSeek-powered web search provider for OpenCode's built-in websearch tool.",
   "type": "module",
   "license": "MIT",
@@ -44,7 +44,7 @@
     "build": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "test": "npm run build && node --test",
-    "prepare": "node -e \"try{require.resolve('typescript')}catch{process.exit(0)};require('node:child_process').execSync('npm run build',{stdio:'inherit'})\"",
+    "prepare": "node -e \"const fs=require('node:fs');if(fs.existsSync('dist/index.js'))process.exit(0);try{require.resolve('typescript')}catch{process.exit(0)};require('node:child_process').execSync('npm run build',{stdio:'inherit'})\"",
     "prepack": "npm run build",
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },