@mars-sea/dsh-commandcode-provider 0.10.0-alpha.3 → 0.10.0-alpha.4

package/lib/index.d.ts

@@ -2,6 +2,7 @@ import z from "@deepseek-ai/schemastery";
 import { GenerateOptions, LlmAdapter, LlmModelInfo, LlmProviderInfo, LlmResolvedModelInfo, ResolvedRetryPolicy, StreamChunk } from "@deepseek-ai/dsh-llm";
 import { CredentialRef } from "@deepseek-ai/dsh-credentials";
 import { TypertRemoteService, TypertSchema } from "@deepseek-ai/dsh-typert-protocol";
+import { WebRuntime, WebSearchProvider, WebSearchRequest, WebSearchResult } from "@deepseek-ai/dsh-web";
 import { Context } from "@deepseek-ai/cordis";
 import { AttachmentStore } from "@deepseek-ai/dsh-attachment";
 import { CommandDefinition } from "@deepseek-ai/dsh-commands";
@@ -948,6 +949,48 @@ declare class CommandCodeLoginFlow {
   private teardown;
 }
 //#endregion
+//#region src/web-search.d.ts
+/** Stable id this provider registers under in `ctx.web`. */
+declare const COMMANDCODE_SEARCH_PROVIDER_ID = "commandcode";
+/**
+ * The factory-declared search provider id dsh ships by default (from
+ * `dsh-base`'s cordis patch `web.config.searchProvider`). A plugin that wants
+ * its own backend to win rewrites `WebRuntime.searchProviderId` to its own id;
+ * disabling that plugin restores this value.
+ */
+declare const DEFAULT_WEB_SEARCH_PROVIDER_ID = "deepseek-official";
+/**
+ * Point the web seam's search selection at this plugin's provider (`commandcode`).
+ * Sets the runtime field; the next search call honours it because `search()`
+ * re-reads `searchProviderId` each time. Returns the prior id (or undefined).
+ */
+declare function selectCommandCodeSearchProvider(web: WebRuntime, enable: boolean): string | undefined;
+/** Per-request facts the provider needs, all injected so the class stays cordis-free and testable. */
+interface CommandCodeSearchProviderDeps {
+  /** Resolve one usable Command Code key (credential seam → env → auth file), or undefined when none. */
+  resolveKey(): Promise<string | undefined>;
+  /** The API base host (defaults to `https://api.commandcode.ai`). */
+  apiBase(): string;
+  /** Injectable fetch for tests; defaults to the global fetch. */
+  fetchImpl?: typeof fetch;
+}
+/**
+ * A `ctx.web` search provider backed by the Command Code Provider API. Reuses
+ * the plugin's credential chain and `apiBase`, so search "just works" with the
+ * existing key — the model-facing `web_search` tool needs no separate
+ * configuration. Selection between multiple search providers is the web seam's
+ * job (pin `searchProvider: commandcode` if ambiguous).
+ */
+declare class CommandCodeSearchProvider implements WebSearchProvider {
+  private readonly deps;
+  readonly id = "commandcode";
+  constructor(deps: CommandCodeSearchProviderDeps);
+  /** Cheap local check; must not make network calls. Presence of a key path + a parseable base is enough. */
+  available(): boolean;
+  search(request: WebSearchRequest, signal?: AbortSignal): Promise<WebSearchResult>;
+  private resolveKey;
+}
+//#endregion
 //#region src/index.d.ts
 declare const name = "llm-commandcode";
 declare const inject: string[];
@@ -1012,6 +1055,17 @@ interface Config {
    * gate. The first matching rule wins.
    */
   modelAccountRules?: CommandCodeModelAccountRule[];
+  /**
+   * Whether to use Command Code as the backend for dsh's model-facing
+   * `web_search` tool. When enabled, the plugin registers a `commandcode`
+   * search provider on `ctx.web` AND rewrites the web seam's selected
+   * `searchProviderId` to `commandcode` (so it wins over the shipped
+   * `deepseek-official`), using the SAME Command Code API key/base as chat.
+   * The rewrite rides dsh's internal `searchProviderId`, which is read per
+   * search call, so a setting change lands on the next search without a
+   * restart. Defaults to true.
+   */
+  webSearch?: boolean;
   /**
    * Language override for the `/commandcode` Host-side command's user-facing
    * copy. Host commands cannot read the client's `ctx.locale`, so this is
@@ -1039,5 +1093,5 @@ interface ResolvedCommandCodeOptions extends CommandCodeConnectionOptions {
 declare function resolveAdapterOptions(config: Config): ResolvedCommandCodeOptions;
 declare function apply(ctx: Context, config: Config): void;
 //#endregion
-export { type ApiKeyValidation, BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, type CommandCodeAccountConfig, CommandCodeAccountPool, type CommandCodeAccountSlot, type CommandCodeAccountState, type CommandCodeAccountUsage, type CommandCodeAccountsReport, CommandCodeAdapter, type CommandCodeAdapterDeps, type CommandCodeBillingAccess, type CommandCodeCommandDeps, type CommandCodeConnectionOptions, type CommandCodeLoginCredentials, type CommandCodeLoginFailureReason, CommandCodeLoginFlow, type CommandCodeLoginFlowDeps, type CommandCodeLoginStatus, type CommandCodeModelAccountRule, type CommandCodeUsageDeps, type CommandCodeUsageReport, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, type LoginFlowFacade, PLAN_LABELS, PLAN_ORDER, PROVIDER, type ResolveAttachments, ResolvedCommandCodeOptions, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
+export { type ApiKeyValidation, BILLING_ACCESS_TTL_MS, COMMANDCODE_SEARCH_PROVIDER_ID, COMMAND_CODE_CLI_VERSION, type CommandCodeAccountConfig, CommandCodeAccountPool, type CommandCodeAccountSlot, type CommandCodeAccountState, type CommandCodeAccountUsage, type CommandCodeAccountsReport, CommandCodeAdapter, type CommandCodeAdapterDeps, type CommandCodeBillingAccess, type CommandCodeCommandDeps, type CommandCodeConnectionOptions, type CommandCodeLoginCredentials, type CommandCodeLoginFailureReason, CommandCodeLoginFlow, type CommandCodeLoginFlowDeps, type CommandCodeLoginStatus, type CommandCodeModelAccountRule, CommandCodeSearchProvider, type CommandCodeSearchProviderDeps, type CommandCodeUsageDeps, type CommandCodeUsageReport, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, DEFAULT_WEB_SEARCH_PROVIDER_ID, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, type LoginFlowFacade, PLAN_LABELS, PLAN_ORDER, PROVIDER, type ResolveAttachments, ResolvedCommandCodeOptions, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, selectCommandCodeSearchProvider, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
 //# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -11,6 +11,7 @@ import { randomBytes, randomUUID } from "node:crypto";
 import { TypertRemoteService } from "@deepseek-ai/dsh-typert-protocol";
 import { createServer } from "node:http";
 import { createServer as createServer$1 } from "node:net";
+import { WebError } from "@deepseek-ai/dsh-web";
 //#region src/accounts.ts
 /**
 * Multi-account pool for the Command Code provider (host side).
@@ -2749,6 +2750,185 @@ function corsOrigin(origin) {
 	return origin !== void 0 && LOGIN_ALLOWED_ORIGINS.includes(origin) ? origin : "";
 }
 //#endregion
+//#region src/web-search.ts
+/**
+* dsh-commandcode-provider — Command Code web search provider over `ctx.web`.
+*
+* The official Command Code CLI ships a built-in `web_search` tool that POSTs
+* `{ query, numResults, allowedDomains?, blockedDomains? }` to
+* `{apiBase}/alpha/web-search` and reads `{ results: [{ title, url, snippet }] }`
+* back. It authenticates with the SAME `Authorization: Bearer <key>` header and
+* `x-command-code-version` the model adapter uses, so this provider reuses the
+* plugin's existing credential chain (`COMMANDCODE_API_KEY` → credentials seam →
+* `~/.commandcode/auth.json`) — no separate DeepSeek key, no extra endpoint.
+*
+* This mirrors the host-side `@deepseek-ai/dsh-web-search-deepseek` provider in
+* shape: a cordis-free class registered into the web seam, resolving its key per
+* search, mapping each server-side result to the harness's normalized
+* `WebSearchSource`. The web seam owns `maxResults` truncation.
+*
+* @module dsh-commandcode-provider/web-search
+*/
+/** Stable id this provider registers under in `ctx.web`. */
+const COMMANDCODE_SEARCH_PROVIDER_ID = "commandcode";
+/**
+* The factory-declared search provider id dsh ships by default (from
+* `dsh-base`'s cordis patch `web.config.searchProvider`). A plugin that wants
+* its own backend to win rewrites `WebRuntime.searchProviderId` to its own id;
+* disabling that plugin restores this value.
+*/
+const DEFAULT_WEB_SEARCH_PROVIDER_ID = "deepseek-official";
+/**
+* Point the web seam's search selection at this plugin's provider (`commandcode`).
+* Sets the runtime field; the next search call honours it because `search()`
+* re-reads `searchProviderId` each time. Returns the prior id (or undefined).
+*/
+function selectCommandCodeSearchProvider(web, enable) {
+	const field = web;
+	const prior = field.searchProviderId;
+	field.searchProviderId = enable ? COMMANDCODE_SEARCH_PROVIDER_ID : DEFAULT_WEB_SEARCH_PROVIDER_ID;
+	return prior;
+}
+/** Command Code's lower/upper bound on `numResults` (from the CLI's `web_search` schema). */
+const MIN_NUM_RESULTS = 1;
+const MAX_NUM_RESULTS = 10;
+/** CLI default when the caller sets no result cap. */
+const DEFAULT_NUM_RESULTS = 5;
+/** The endpoint the search POST goes to; `{apiBase}` is prepended. */
+const SEARCH_ROUTE = "/alpha/web-search";
+/**
+* Clamp a DSH `maxResults` bound into Command Code's 1–10 range, applying the
+* CLI default of 5 when the caller supplied none.
+*/
+function clampNumResults(maxResults) {
+	return maxResults === void 0 ? DEFAULT_NUM_RESULTS : Math.max(MIN_NUM_RESULTS, Math.min(MAX_NUM_RESULTS, Math.round(maxResults)));
+}
+/** Build a `WebSearchSource` from one raw `{ title, url, snippet }` result, omitting empty optional fields. */
+function toSource(result) {
+	const url = result.url?.trim();
+	if (url === void 0 || url.length === 0) return void 0;
+	const title = result.title?.trim();
+	const snippet = result.snippet?.trim();
+	return {
+		url,
+		...title !== void 0 && title.length > 0 ? { title } : {},
+		...snippet !== void 0 && snippet.length > 0 ? { snippet } : {}
+	};
+}
+function isAbortError(error) {
+	return error instanceof DOMException && error.name === "AbortError";
+}
+/** Build the provider's stable cancellation error while retaining the caller's reason. */
+function searchAborted(signal, fallback) {
+	return new WebError("Command Code web search aborted", "WEB_ABORTED", { cause: signal?.aborted === true ? signal.reason : fallback });
+}
+function throwIfAborted(signal) {
+	if (signal?.aborted === true) throw searchAborted(signal, void 0);
+}
+/**
+* A `ctx.web` search provider backed by the Command Code Provider API. Reuses
+* the plugin's credential chain and `apiBase`, so search "just works" with the
+* existing key — the model-facing `web_search` tool needs no separate
+* configuration. Selection between multiple search providers is the web seam's
+* job (pin `searchProvider: commandcode` if ambiguous).
+*/
+var CommandCodeSearchProvider = class {
+	deps;
+	id = COMMANDCODE_SEARCH_PROVIDER_ID;
+	constructor(deps) {
+		this.deps = deps;
+	}
+	/** Cheap local check; must not make network calls. Presence of a key path + a parseable base is enough. */
+	available() {
+		const base = this.deps.apiBase();
+		return base.length > 0 && URL.canParse(base);
+	}
+	async search(request, signal) {
+		throwIfAborted(signal);
+		const apiBase = this.deps.apiBase();
+		if (!URL.canParse(apiBase)) throw new WebError(`Command Code web search is misconfigured: apiBase ${JSON.stringify(apiBase)} is not a valid URL`, "WEB_PROVIDER_ERROR");
+		const key = await this.resolveKey(signal);
+		throwIfAborted(signal);
+		const endpoint = `${apiBase.replace(/\/$/, "")}${SEARCH_ROUTE}`;
+		const body = {
+			query: request.query,
+			numResults: clampNumResults(request.maxResults)
+		};
+		let response;
+		try {
+			response = await (this.deps.fetchImpl ?? fetch)(endpoint, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: `Bearer ${key}`,
+					"x-command-code-version": COMMAND_CODE_CLI_VERSION,
+					"x-cli-environment": "production",
+					...attributionHeaders()
+				},
+				body: JSON.stringify(body),
+				...signal !== void 0 ? { signal } : {}
+			});
+		} catch (error) {
+			if (signal?.aborted === true || isAbortError(error)) throw searchAborted(signal, error);
+			throw new WebError(`Command Code web search request failed: ${error instanceof Error ? error.message : String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+		}
+		if (!response.ok) {
+			let message = `Command Code web search failed (HTTP ${response.status})`;
+			try {
+				const parsed = await response.json();
+				const detail = typeof parsed === "object" && parsed !== null ? parsed?.error : void 0;
+				if (typeof detail === "string" && detail.length > 0) message += `: ${detail}`;
+				else if (typeof detail === "object" && detail !== null) {
+					const code = detail?.code;
+					const inner = detail?.message;
+					if (typeof code === "string" || typeof inner === "string") message += `: ${typeof code === "string" ? code : ""}${typeof code === "string" && typeof inner === "string" ? " — " : ""}${typeof inner === "string" ? inner : ""}`;
+				}
+			} catch (error) {
+				if (signal?.aborted === true || isAbortError(error)) throw searchAborted(signal, error);
+			}
+			throw new WebError(message, "WEB_PROVIDER_ERROR");
+		}
+		let payload;
+		try {
+			payload = await response.json();
+		} catch (error) {
+			if (signal?.aborted === true || isAbortError(error)) throw searchAborted(signal, error);
+			throw new WebError("Command Code web search returned an unparseable response body", "WEB_PROVIDER_ERROR");
+		}
+		const results = payload?.results;
+		if (!Array.isArray(results)) throw new WebError("Command Code web search returned no results array (the server may have rejected the query)", "WEB_PROVIDER_ERROR");
+		const sources = [];
+		const seen = /* @__PURE__ */ new Set();
+		for (const item of results) {
+			if (typeof item !== "object" || item === null) continue;
+			const source = toSource(item);
+			if (source === void 0 || seen.has(source.url)) continue;
+			seen.add(source.url);
+			sources.push(source);
+		}
+		return {
+			sources,
+			truncated: false
+		};
+	}
+	async resolveKey(signal) {
+		let key;
+		try {
+			key = await this.deps.resolveKey();
+		} catch (error) {
+			if (signal?.aborted === true || isAbortError(error)) throw searchAborted(signal, error);
+			if (error instanceof Error && typeof error.code === "string") {
+				const code = error.code;
+				if (code === "MISSING_CREDENTIAL") throw new WebError(error.message, "WEB_PROVIDER_CREDENTIAL_MISSING", { cause: error });
+				if (code === "INVALID_CREDENTIAL" || code === "RATE_LIMIT") throw new WebError(error.message, "WEB_PROVIDER_ERROR", { cause: error });
+			}
+			throw new WebError(`Command Code web search credential resolution failed: ${error instanceof Error ? error.message : String(error)}`, "WEB_PROVIDER_ERROR", { cause: error });
+		}
+		if (key === void 0 || key.length === 0) throw new WebError("Command Code web search has no API key; store COMMANDCODE_API_KEY through the credentials service (the web Models page writes it), export it in the launching environment, set config.apiKey, or run `command-code login` to write ~/.commandcode/auth.json", "WEB_PROVIDER_CREDENTIAL_MISSING");
+		return key;
+	}
+};
+//#endregion
 //#region src/index.ts
 /**
 * dsh-commandcode-provider — DeepSeek Harness LLM provider plugin for Command
@@ -2794,6 +2974,7 @@ const Config = z.object({
 	requestTimeoutMs: z.number().min(1).max(MAX_TIMER_DELAY_MS),
 	streamIdleTimeoutMs: z.number().min(1).max(MAX_TIMER_DELAY_MS),
 	filterModelsByPlan: z.boolean(),
+	webSearch: z.boolean().default(true),
 	accounts: z.array(z.object({
 		label: z.string(),
 		apiKeyEnv: z.string().role("credential-ref"),
@@ -2962,16 +3143,30 @@ function apply(ctx, config) {
 		login: loginFlow,
 		listModels: catalogForRules
 	});
+	let webRuntime;
+	ctx.inject(["web"], (webCtx) => {
+		webRuntime = webCtx.web;
+		webCtx.web.registerSearchProvider(new CommandCodeSearchProvider({
+			resolveKey: async () => {
+				const resolved = await pool.resolveKey();
+				return resolved === void 0 ? void 0 : resolved.key;
+			},
+			apiBase: () => options().apiBase
+		}));
+		selectCommandCodeSearchProvider(webCtx.web, current().webSearch ?? true);
+	});
 	ctx.inject(["settings"], (settingsCtx) => {
 		settingsCtx.settings.installSection(ctx, NS, Config, config, {
 			setSource: (source) => {
 				current = source;
 			},
-			onChange: () => {}
+			onChange: () => {
+				if (webRuntime !== void 0) selectCommandCodeSearchProvider(webRuntime, current().webSearch ?? true);
+			}
 		});
 	});
 }
 //#endregion
-export { BILLING_ACCESS_TTL_MS, COMMAND_CODE_CLI_VERSION, CommandCodeAccountPool, CommandCodeAdapter, CommandCodeLoginFlow, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, PLAN_LABELS, PLAN_ORDER, PROVIDER, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
+export { BILLING_ACCESS_TTL_MS, COMMANDCODE_SEARCH_PROVIDER_ID, COMMAND_CODE_CLI_VERSION, CommandCodeAccountPool, CommandCodeAdapter, CommandCodeLoginFlow, CommandCodeSearchProvider, CommandCodeUsageService, Config, DEFAULT_API_BASE, DEFAULT_GENERATE_MAX_TOKENS, DEFAULT_MAX_OUTPUT_TOKENS, DEFAULT_MODELS_CACHE_PATH, DEFAULT_REQUEST_TIMEOUT_MS, DEFAULT_STREAM_IDLE_TIMEOUT_MS, DEFAULT_WEB_SEARCH_PROVIDER_ID, KNOWN_DEALS, KNOWN_EFFORTS, KNOWN_IMAGE_MODELS, KNOWN_PEAK_PRICING, KNOWN_PLANS, KNOWN_SUBSCRIPTION_PLANS, KNOWN_THINKING_MODELS, LOGIN_ALLOWED_ORIGINS, LOGIN_BEGIN_ENDPOINT, LOGIN_BODY_LIMIT_BYTES, LOGIN_CANCEL_ENDPOINT, LOGIN_MAX_PORT_ATTEMPTS, LOGIN_START_PORT, LOGIN_STATUS_ENDPOINT, LOGIN_TIMEOUT_MS, PLAN_LABELS, PLAN_ORDER, PROVIDER, USAGE_REPORT_ENDPOINT, accountUsable, apply, applyCommands, applyUsageRemote, buildCommandAuthUrl, capabilityDescription, commandDefinition, compareByPlan, dealLabel, formatContext, inject, loginStatusSchema, matchModelRule, modelVisibleInPlan, name, parseLoginStatus, peakPricingLabel, peakPricingState, planLabel, projectSlugFromPath, resolveAdapterOptions, resolveAuthFileApiKey, selectAccountForModel, selectActiveAccount, selectCommandCodeSearchProvider, studioBaseForApiBase, subscriptionPlanInfo, usageReportSchema, validateCommandApiKey };
 
 //# sourceMappingURL=index.js.map