opencode-websearch-deepseek 0.1.1 → 0.2.0

package/README.md

@@ -63,8 +63,8 @@ in:
 
 | Variable            | Required | Default            | Description                                                        |
 | ------------------- | -------- | ------------------ | ------------------------------------------------------------------ |
-| `DEEPSEEK_API_KEY`  | yes      | —                  | DeepSeek API key.                                                  |
-| `WEBSEARCH_API_KEY` | no       | —                  | Fallback key used when `DEEPSEEK_API_KEY` is not set.              |
+| `DEEPSEEK_API_KEY`  | no\*     | —                  | DeepSeek API key (takes precedence over the stored credential).    |
+| `WEBSEARCH_API_KEY` | no       | —                  | Fallback env key used when `DEEPSEEK_API_KEY` is not set.          |
 | `WEBSEARCH_MODEL`   | no       | `deepseek-v4-flash`| Model used for search and synthesis.                               |
 | `WEBSEARCH_MAX_USES`| no       | `5`                | Max server-side searches per query (positive integer).             |
 | `WEBSEARCH_THINKING`| no       | `enabled`          | `enabled` or `disabled`; disables extended thinking when set to `disabled`. |
@@ -72,6 +72,11 @@ in:
 > `WEBSEARCH_MODEL` is passed through as-is. DeepSeek maps unknown model names
 > to its default, so any server-side-search-capable DeepSeek model works.
 
+> \* If no environment key is set, the plugin reuses the API key OpenCode
+> stores for the `deepseek` provider (for example after `opencode auth login`),
+> so no environment variable is required when that provider is already
+> authenticated.
+
 > The plugin always selects the DeepSeek provider. Without an API key, a
 > `websearch` call fails with a clear error rather than silently falling back
 > to a different provider.

package/dist/index.d.ts

@@ -83,12 +83,32 @@ interface WebsearchEditor {
         set(providerID: string | false): void;
     };
 }
+/** A credential returned by OpenCode for a configured provider. */
+export interface StoredCredential {
+    type?: string;
+    key?: string;
+}
+/** Minimal slice of OpenCode's integration API used to read a stored provider key. */
+export interface IntegrationContext {
+    connection: {
+        active(integrationID: string): Promise<unknown>;
+        resolve(connection: unknown): Promise<StoredCredential | undefined>;
+    };
+}
 /** Context passed to the plugin's `setup`. */
 export interface WebsearchContext {
     websearch: {
         transform(callback: (editor: WebsearchEditor) => void): Promise<unknown> | unknown;
     };
+    /** Present in OpenCode 2.x; used to reuse the DeepSeek provider credential. */
+    integration?: IntegrationContext;
 }
+/**
+ * Resolve the DeepSeek API key. An explicit environment variable takes
+ * precedence; otherwise the key OpenCode stores for the `deepseek` provider
+ * (configured via `opencode auth login`) is used.
+ */
+export declare function resolveApiKey(ctx: WebsearchContext): 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

@@ -46,11 +46,52 @@ export const SYSTEM_PROMPT = [
     "",
     "Your response must be the final answer, not another search request.",
 ].join("\n");
+/**
+ * Resolve the DeepSeek API key. An explicit environment variable takes
+ * precedence; otherwise the key OpenCode stores for the `deepseek` provider
+ * (configured via `opencode auth login`) is used.
+ */
+export async function resolveApiKey(ctx) {
+    const fromEnv = readEnv("DEEPSEEK_API_KEY") ?? readEnv("WEBSEARCH_API_KEY");
+    if (fromEnv)
+        return fromEnv;
+    const integration = ctx.integration;
+    if (!integration)
+        return undefined;
+    try {
+        const connection = await integration.connection.active("deepseek");
+        if (!connection)
+            return undefined;
+        const credential = await integration.connection.resolve(connection);
+        const key = credential?.key;
+        return typeof key === "string" && key.trim() ? key.trim() : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Read an environment variable, treating blank strings as unset. */
 function readEnv(name, env = process.env) {
     const value = env[name];
     return value && value.trim() ? value.trim() : undefined;
 }
+/**
+ * Rethrow the cancellation reason from `signal`. `Error` and `DOMException`
+ * (e.g. `AbortError`) are preserved as-is; other values (primitives) are
+ * normalised to an `Error` so callers always receive one.
+ */
+function throwCancellation(signal, fallback) {
+    const reason = signal.reason;
+    if (reason instanceof Error)
+        throw reason;
+    if (typeof reason === "object" && reason !== null)
+        throw reason;
+    if (reason !== undefined && reason !== null)
+        throw new Error(String(reason));
+    if (fallback instanceof Error)
+        throw fallback;
+    throw new Error("The web search was aborted");
+}
 /**
  * Resolve the `max_uses` value for the search tool declaration.
  * Falls back to {@link DEFAULT_MAX_USES} for missing or invalid input.
@@ -194,9 +235,9 @@ export const plugin = {
                 id: "deepseek",
                 name: "DeepSeek Web Search",
                 execute: async ({ query }, { signal } = {}) => {
-                    const apiKey = readEnv("DEEPSEEK_API_KEY") ?? readEnv("WEBSEARCH_API_KEY");
+                    const apiKey = await resolveApiKey(ctx);
                     if (!apiKey) {
-                        throw new Error("DEEPSEEK_API_KEY is not set in the OpenCode environment");
+                        throw new Error("DEEPSEEK_API_KEY is not set and no stored DeepSeek credential was found; set the env var or sign in to the deepseek provider in OpenCode");
                     }
                     if (!/^[\x21-\x7e]+$/.test(apiKey)) {
                         throw new Error("The API key contains invalid characters");
@@ -220,7 +261,7 @@ export const plugin = {
                         const text = await response.text().catch((error) => {
                             // Preserve cancellation: never turn an abort into an API error.
                             if (signal?.aborted)
-                                throw signal.reason ?? error;
+                                return throwCancellation(signal, error);
                             if (error?.name === "AbortError")
                                 throw error;
                             return "";
@@ -228,7 +269,7 @@ export const plugin = {
                         // An abort can also arrive after the body resolves; re-check so it
                         // is not masked as an API error.
                         if (signal?.aborted)
-                            throw signal.reason ?? new Error("The web search was aborted");
+                            throwCancellation(signal, undefined);
                         throw new Error(`DeepSeek API error ${response.status}: ${text.slice(0, 300)}`);
                     }
                     const data = (await response.json());

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode-websearch-deepseek",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "DeepSeek-powered web search provider for OpenCode's built-in websearch tool.",
   "type": "module",
   "license": "MIT",