Yichen Jiang
0512b12714
$DSH_HOME/.env had just become an ordinary environment layer, which left the harness resolving user-facing values from a flattened process.env that could no longer say where a value came from. A key stored through the web page stayed shadowed by an older key in the user's own .env. An endpoint could be redirected by the project: the invoking directory's .env is materialized like every other layer, and a base URL decides where a resolved API key is sent, so a DEEPSEEK_BASE_URL written into a model-editable workspace would send the user's credential — and the prompts carrying their code — to whatever host that file named. Give every user-facing value one ordering, with four kinds of source: explicit for this run per-operation override, CLI argument > authored by deployment --config / --config-replace > this launch's shell inherited process environment > product-managed store settings.yaml, .credentials.yaml > discovered file $DSH_HOME/.env > defaults schema default, shipped base, public default The domains differ only in which tiers exist. The earlier split — credentials ranking the environment over the managed file while settings ranked over the environment — was inconsistent: the distinguishing fact is who authored the source, not the domain. packages/util/environment owns an immutable snapshot with per-layer provenance. getFrom(name, sources) searches only the layers a caller names, and omitting one is a refusal rather than a demotion: the adapters ask for ['process', 'user-env'], so no reordering can let a project file back into a decision it was excluded from. isBootstrapOnly rejects, before anything is materialized, any .env setting a variable that governs how a process launches (PATH, SHELL, NODE_OPTIONS, LD_PRELOAD), where code or model-visible instructions load from (the whole DSH_* namespace, HOME, XDG_*), or how the network is reached (proxy and CA variables). The namespace is denied wholesale so a switch added later cannot become settable by being forgotten, and there is no opt-out. verify-config-source-ownership keeps both rules: no unregistered process.env read under packages/*/*/src (26 allowlisted with reasons), and no apiKey, baseURL, or headers inlined from the environment in shipped Cordis config — removing those inlines is what makes the deployment tier meaningful.
72 lines
2.8 KiB
TypeScript
72 lines
2.8 KiB
TypeScript
/**
|
|
* `@deepseek-ai/dsh-web-search-exa`: registers an Exa-backed `WebSearchProvider`
|
|
* with `ctx.web`. A function/namespace plugin (NOT a default-export service):
|
|
* a search provider does not own the `ctx.web` key — it registers INTO the
|
|
* seam's provider registry, exactly as `@deepseek-ai/dsh-llm-deepseek`
|
|
* registers an adapter into `ctx.llm`. The key is owned by `@deepseek-ai/dsh-web`.
|
|
*
|
|
* @module @deepseek-ai/dsh-web-search-exa
|
|
*/
|
|
|
|
import type { Context } from 'cordis'
|
|
import { environmentOf } from '@deepseek-ai/dsh-environment'
|
|
import z from 'schemastery'
|
|
import type {} from '@deepseek-ai/dsh-web'
|
|
import {
|
|
ExaSearchProvider,
|
|
EXA_DEFAULT_BASE_URL,
|
|
EXA_DEFAULT_HIGHLIGHTS_PER_RESULT,
|
|
EXA_DEFAULT_SEARCH_TYPE,
|
|
} from './provider.ts'
|
|
|
|
export {
|
|
EXA_DEFAULT_BASE_URL,
|
|
EXA_DEFAULT_HIGHLIGHTS_PER_RESULT,
|
|
EXA_DEFAULT_SEARCH_TYPE,
|
|
EXA_PROVIDER_ID,
|
|
ExaSearchProvider,
|
|
} from './provider.ts'
|
|
export type { ExaSearchProviderOptions } from './provider.ts'
|
|
|
|
/** Cordis plugin name used by loader diagnostics. */
|
|
export const name = 'web-search-exa'
|
|
|
|
/** The web seam this provider registers into. */
|
|
export const inject = ['web']
|
|
|
|
/** Plugin config (all optional — `apply` fills env-var and constant defaults). */
|
|
export interface Config {
|
|
/** Exa API key. Falls back to `$EXA_API_KEY`. Empty → provider unavailable. */
|
|
apiKey?: string
|
|
/** Endpoint base; `/search` is appended. Defaults to the public API. */
|
|
baseURL?: string
|
|
/** Retrieval mode sent as Exa's `type`. Defaults to `auto`. */
|
|
searchType?: 'auto' | 'keyword' | 'neural'
|
|
/** Default result count when a request carries no `maxResults`. Omitted = none. */
|
|
numResults?: number
|
|
/** Highlight sentences requested per result. Defaults to 1. */
|
|
highlightsPerResult?: number
|
|
}
|
|
|
|
export const Config: z<Config> = z.object({
|
|
apiKey: z.string(),
|
|
baseURL: z.string(),
|
|
searchType: z.union(['auto', 'keyword', 'neural'] as const),
|
|
numResults: z.number().step(1).min(1),
|
|
highlightsPerResult: z.number().step(1).min(1),
|
|
})
|
|
|
|
/** Register the Exa search provider with `ctx.web`. */
|
|
export function apply(ctx: Context, config: Config): void {
|
|
ctx.web.registerSearchProvider(new ExaSearchProvider({
|
|
// Only the launching shell and the user's own `.env` may name this key:
|
|
// a project directory can be written by the model, and a substituted key
|
|
// would route every request through an account someone else reads.
|
|
apiKey: config.apiKey ?? environmentOf(ctx).getFrom('EXA_API_KEY', ['process', 'user-env'])?.value ?? '',
|
|
baseURL: config.baseURL ?? EXA_DEFAULT_BASE_URL,
|
|
searchType: config.searchType ?? EXA_DEFAULT_SEARCH_TYPE,
|
|
highlightsPerResult: config.highlightsPerResult ?? EXA_DEFAULT_HIGHLIGHTS_PER_RESULT,
|
|
...config.numResults !== undefined ? { numResults: config.numResults } : {},
|
|
}))
|
|
}
|