@open-mercato/enterprise 0.10.1-develop.7822.1.5d6a1d00a1 → 0.10.1-develop.7825.1.185c04f3b7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/agent_orchestrator/api/web-search/preview/route.js +4 -3
- package/dist/modules/agent_orchestrator/api/web-search/preview/route.js.map +2 -2
- package/dist/modules/agent_orchestrator/lib/webSearch/policy.js +7 -0
- package/dist/modules/agent_orchestrator/lib/webSearch/policy.js.map +2 -2
- package/dist/modules/agent_orchestrator/lib/webSearch/tools.js +4 -2
- package/dist/modules/agent_orchestrator/lib/webSearch/tools.js.map +2 -2
- package/package.json +9 -9
- package/src/modules/agent_orchestrator/api/web-search/preview/route.ts +4 -3
- package/src/modules/agent_orchestrator/lib/webSearch/policy.ts +10 -0
- package/src/modules/agent_orchestrator/lib/webSearch/tools.ts +4 -2
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
enforceWebSearchRateLimit,
|
|
8
8
|
resolveSpentAdapterBudgets
|
|
9
9
|
} from "../../../lib/webSearch/guardrails.js";
|
|
10
|
-
import { hostnameOf, isHostAllowed, resolveWebSearchSettings } from "../../../lib/webSearch/policy.js";
|
|
10
|
+
import { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from "../../../lib/webSearch/policy.js";
|
|
11
11
|
import { buildWebSearchEngine } from "../../../lib/webSearch/registry.js";
|
|
12
12
|
import { agentOrchestratorTag } from "../../openapi.js";
|
|
13
13
|
const metadata = {
|
|
@@ -72,12 +72,13 @@ async function POST(req) {
|
|
|
72
72
|
const host = hostnameOf(url);
|
|
73
73
|
return host === null || !isHostAllowed(host, settings.guardrails);
|
|
74
74
|
};
|
|
75
|
+
const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails);
|
|
75
76
|
return NextResponse.json({
|
|
76
77
|
query: parsed.data.query,
|
|
77
78
|
settleMode: settings.policy.settleMode,
|
|
78
79
|
fused: result.results.filter((hit) => !blockedByGuardrails(hit.url)),
|
|
79
|
-
answer
|
|
80
|
-
diagnostics: result.diagnostics,
|
|
80
|
+
answer,
|
|
81
|
+
diagnostics: { ...result.diagnostics, ...answerDiagnostics },
|
|
81
82
|
// Guardrails are reported rather than applied here: an operator tuning a
|
|
82
83
|
// deny list needs to see that a source returned a hit and that the list
|
|
83
84
|
// removed it, which silent filtering would hide.
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../src/modules/agent_orchestrator/api/web-search/preview/route.ts"],
|
|
4
|
-
"sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport {\n chargeAdapterCalls,\n enforceWebSearchRateLimit,\n resolveSpentAdapterBudgets,\n} from '../../../lib/webSearch/guardrails'\nimport { hostnameOf, isHostAllowed, resolveWebSearchSettings } from '../../../lib/webSearch/policy'\nimport { buildWebSearchEngine } from '../../../lib/webSearch/registry'\nimport { agentOrchestratorTag } from '../../openapi'\n\n/**\n * Runs one search against the tenant's own configuration and returns what each\n * adapter produced, side by side.\n *\n * This is the operator's answer to \"is the paid source earning its keep\": the\n * fused list an agent sees is deliberately lossy \u2014 dedup, the per-domain cap and\n * the limit drop hits, and only the first prose answer survives \u2014 so comparing\n * sources from it is impossible. Agents never get this view: N raw lists cost a\n * lot of context and push fusion back onto the model, which is what the ranking\n * step exists to avoid.\n *\n * Gated on `agents.manage` rather than `agents.view` because it spends real\n * egress and, with a metered adapter enabled, real money.\n */\nexport const metadata = {\n POST: { requireAuth: true, requireFeatures: ['agent_orchestrator.agents.manage'] },\n}\n\nconst previewInput = z.object({\n query: z.string().trim().min(1).max(500),\n limit: z.number().int().min(1).max(20).optional(),\n site: z.string().min(1).max(253).optional(),\n freshness: z.enum(['day', 'week', 'month', 'year']).optional(),\n})\n\nexport async function POST(req: Request) {\n const auth = await getAuthFromRequest(req)\n if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n\n let body: unknown\n try {\n body = await req.json()\n } catch {\n return NextResponse.json({ error: 'Invalid JSON body' }, { status: 400 })\n }\n\n const parsed = previewInput.safeParse(body)\n if (!parsed.success) {\n return NextResponse.json({ error: 'Invalid query', details: parsed.error.issues }, { status: 400 })\n }\n\n const container = await createRequestContainer()\n const tenantId = auth.tenantId ?? null\n const settings = await resolveWebSearchSettings(container, tenantId)\n\n // Same tenant ceiling the agent path obeys. Being behind `agents.manage` bounds\n // who can call this, not how often, and every call is real egress on every\n // enabled adapter \u2014 a held-down key would be the most expensive loop here.\n const gate = await enforceWebSearchRateLimit(\n container,\n { runId: null, tenantId, kind: 'search' },\n settings.guardrails,\n )\n if (!gate.ok) return NextResponse.json({ error: gate.error }, { status: 429 })\n\n // Exhaustive on purpose: under the tenant's own settle mode the scheduler\n // cancels adapters as soon as it has enough, which is right for a search and\n // useless for a comparison \u2014 the sources you wanted to weigh never run.\n const comparison = {\n ...settings,\n policy: { ...settings.policy, settleMode: 'exhaustive' as const },\n }\n // A comparison runs every enabled adapter on purpose, which is precisely when a\n // spent ceiling matters most.\n const spentBudgets = await resolveSpentAdapterBudgets(container, tenantId, settings.policy.adapters)\n const { engine, problems } = buildWebSearchEngine({\n container,\n settings: comparison,\n tenantId,\n spentBudgets,\n })\n\n try {\n const result = await engine.search(\n {\n query: parsed.data.query,\n ...(parsed.data.limit === undefined ? {} : { limit: parsed.data.limit }),\n ...(parsed.data.site === undefined ? {} : { site: parsed.data.site }),\n ...(parsed.data.freshness === undefined ? {} : { freshness: parsed.data.freshness }),\n },\n { includeAdapterResults: true },\n )\n\n await chargeAdapterCalls(\n container,\n tenantId,\n settings.policy.adapters,\n result.diagnostics.adapters\n .filter((entry) => entry.status !== 'skipped' && entry.status !== 'cancelled')\n .map((entry) => entry.id),\n )\n\n const blockedByGuardrails = (url: string): boolean => {\n const host = hostnameOf(url)\n return host === null || !isHostAllowed(host, settings.guardrails)\n }\n\n return NextResponse.json({\n query: parsed.data.query,\n settleMode: settings.policy.settleMode,\n fused: result.results.filter((hit) => !blockedByGuardrails(hit.url)),\n answer
|
|
5
|
-
"mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,SAAS;AAElB,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,YAAY,eAAe,gCAAgC;
|
|
4
|
+
"sourcesContent": ["import { NextResponse } from 'next/server'\nimport { z } from 'zod'\nimport type { OpenApiRouteDoc } from '@open-mercato/shared/lib/openapi'\nimport { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'\nimport { createRequestContainer } from '@open-mercato/shared/lib/di/container'\nimport {\n chargeAdapterCalls,\n enforceWebSearchRateLimit,\n resolveSpentAdapterBudgets,\n} from '../../../lib/webSearch/guardrails'\nimport { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from '../../../lib/webSearch/policy'\nimport { buildWebSearchEngine } from '../../../lib/webSearch/registry'\nimport { agentOrchestratorTag } from '../../openapi'\n\n/**\n * Runs one search against the tenant's own configuration and returns what each\n * adapter produced, side by side.\n *\n * This is the operator's answer to \"is the paid source earning its keep\": the\n * fused list an agent sees is deliberately lossy \u2014 dedup, the per-domain cap and\n * the limit drop hits, and only the first prose answer survives \u2014 so comparing\n * sources from it is impossible. Agents never get this view: N raw lists cost a\n * lot of context and push fusion back onto the model, which is what the ranking\n * step exists to avoid.\n *\n * Gated on `agents.manage` rather than `agents.view` because it spends real\n * egress and, with a metered adapter enabled, real money.\n */\nexport const metadata = {\n POST: { requireAuth: true, requireFeatures: ['agent_orchestrator.agents.manage'] },\n}\n\nconst previewInput = z.object({\n query: z.string().trim().min(1).max(500),\n limit: z.number().int().min(1).max(20).optional(),\n site: z.string().min(1).max(253).optional(),\n freshness: z.enum(['day', 'week', 'month', 'year']).optional(),\n})\n\nexport async function POST(req: Request) {\n const auth = await getAuthFromRequest(req)\n if (!auth) return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })\n\n let body: unknown\n try {\n body = await req.json()\n } catch {\n return NextResponse.json({ error: 'Invalid JSON body' }, { status: 400 })\n }\n\n const parsed = previewInput.safeParse(body)\n if (!parsed.success) {\n return NextResponse.json({ error: 'Invalid query', details: parsed.error.issues }, { status: 400 })\n }\n\n const container = await createRequestContainer()\n const tenantId = auth.tenantId ?? null\n const settings = await resolveWebSearchSettings(container, tenantId)\n\n // Same tenant ceiling the agent path obeys. Being behind `agents.manage` bounds\n // who can call this, not how often, and every call is real egress on every\n // enabled adapter \u2014 a held-down key would be the most expensive loop here.\n const gate = await enforceWebSearchRateLimit(\n container,\n { runId: null, tenantId, kind: 'search' },\n settings.guardrails,\n )\n if (!gate.ok) return NextResponse.json({ error: gate.error }, { status: 429 })\n\n // Exhaustive on purpose: under the tenant's own settle mode the scheduler\n // cancels adapters as soon as it has enough, which is right for a search and\n // useless for a comparison \u2014 the sources you wanted to weigh never run.\n const comparison = {\n ...settings,\n policy: { ...settings.policy, settleMode: 'exhaustive' as const },\n }\n // A comparison runs every enabled adapter on purpose, which is precisely when a\n // spent ceiling matters most.\n const spentBudgets = await resolveSpentAdapterBudgets(container, tenantId, settings.policy.adapters)\n const { engine, problems } = buildWebSearchEngine({\n container,\n settings: comparison,\n tenantId,\n spentBudgets,\n })\n\n try {\n const result = await engine.search(\n {\n query: parsed.data.query,\n ...(parsed.data.limit === undefined ? {} : { limit: parsed.data.limit }),\n ...(parsed.data.site === undefined ? {} : { site: parsed.data.site }),\n ...(parsed.data.freshness === undefined ? {} : { freshness: parsed.data.freshness }),\n },\n { includeAdapterResults: true },\n )\n\n await chargeAdapterCalls(\n container,\n tenantId,\n settings.policy.adapters,\n result.diagnostics.adapters\n .filter((entry) => entry.status !== 'skipped' && entry.status !== 'cancelled')\n .map((entry) => entry.id),\n )\n\n const blockedByGuardrails = (url: string): boolean => {\n const host = hostnameOf(url)\n return host === null || !isHostAllowed(host, settings.guardrails)\n }\n const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails)\n\n return NextResponse.json({\n query: parsed.data.query,\n settleMode: settings.policy.settleMode,\n fused: result.results.filter((hit) => !blockedByGuardrails(hit.url)),\n answer,\n diagnostics: { ...result.diagnostics, ...answerDiagnostics },\n // Guardrails are reported rather than applied here: an operator tuning a\n // deny list needs to see that a source returned a hit and that the list\n // removed it, which silent filtering would hide.\n byAdapter: (result.byAdapter ?? []).map((entry) => ({\n adapterId: entry.adapterId,\n weight: entry.weight,\n answer: entry.answer,\n results: entry.results.map((hit) => ({\n url: hit.url,\n title: hit.title ?? null,\n snippet: hit.snippet ?? null,\n blockedByGuardrails: blockedByGuardrails(hit.url),\n })),\n })),\n problems,\n })\n } finally {\n await engine.dispose().catch(() => undefined)\n }\n}\n\nconst previewResponseSchema = z.object({\n query: z.string(),\n settleMode: z.string(),\n fused: z.array(z.object({}).passthrough()),\n answer: z.string().nullable(),\n diagnostics: z.object({}).passthrough(),\n byAdapter: z.array(\n z.object({\n adapterId: z.string(),\n weight: z.number(),\n answer: z.string().nullable(),\n results: z.array(\n z.object({\n url: z.string(),\n title: z.string().nullable(),\n snippet: z.string().nullable(),\n blockedByGuardrails: z.boolean(),\n }),\n ),\n }),\n ),\n problems: z.array(z.object({ id: z.string().nullable(), packageName: z.string(), reason: z.string() })),\n})\n\nexport const openApi: OpenApiRouteDoc = {\n tag: agentOrchestratorTag,\n summary: 'Compare what each web-search adapter returns',\n methods: {\n POST: {\n summary: 'Run one search and return every adapter\u2019s own results',\n description:\n 'Runs the tenant\u2019s configured adapters exhaustively and returns each one\u2019s untouched result list and prose alongside the fused ranking, so an operator can weigh sources against each other. Never cached. Spends real egress and, with a metered adapter, real money \u2014 gated by agent_orchestrator.agents.manage.',\n responses: [{ status: 200, description: 'Per-adapter comparison', schema: previewResponseSchema }],\n errors: [\n { status: 400, description: 'Invalid query', schema: z.object({ error: z.string() }) },\n { status: 401, description: 'Unauthorized', schema: z.object({ error: z.string() }) },\n {\n status: 403,\n description: 'Missing agent_orchestrator.agents.manage',\n schema: z.object({ error: z.string() }),\n },\n { status: 429, description: 'Tenant rate limit exceeded', schema: z.object({ error: z.string() }) },\n ],\n },\n },\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -158,9 +158,16 @@ function isHostAllowed(hostname, guardrails) {
|
|
|
158
158
|
if (guardrails.allowDomains.length > 0) return guardrails.allowDomains.some(matches);
|
|
159
159
|
return true;
|
|
160
160
|
}
|
|
161
|
+
function applyAnswerDomainPolicy(answer, guardrails) {
|
|
162
|
+
if (answer !== null && (guardrails.allowDomains.length > 0 || guardrails.denyDomains.length > 0)) {
|
|
163
|
+
return { answer: null, answerWithheld: "domain_policy" };
|
|
164
|
+
}
|
|
165
|
+
return { answer };
|
|
166
|
+
}
|
|
161
167
|
export {
|
|
162
168
|
WEB_SEARCH_CONFIG_MODULE,
|
|
163
169
|
WEB_SEARCH_CONFIG_NAME,
|
|
170
|
+
applyAnswerDomainPolicy,
|
|
164
171
|
guardrailsSchema,
|
|
165
172
|
hostnameOf,
|
|
166
173
|
isHostAllowed,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/modules/agent_orchestrator/lib/webSearch/policy.ts"],
|
|
4
|
-
"sourcesContent": ["import type { AwilixContainer } from 'awilix'\nimport { z } from 'zod'\nimport {\n DEFAULT_POLICY,\n MODEL_ADAPTER_TIMEOUT_MS,\n resolvePolicy,\n searchPolicySchema,\n type SearchPolicy,\n type SearchPolicyInput,\n} from '@open-mercato/web-research'\nimport { adapterSecretFields, decryptAdapterSecrets } from './secretStorage'\n\n/** The adapter enabled by default; also the one that needs its own budget. */\nconst MODEL_ADAPTER_ID = 'model-native'\n\n/** Module + key under which the per-tenant policy is stored. */\nexport const WEB_SEARCH_CONFIG_MODULE = 'agent_orchestrator'\nexport const WEB_SEARCH_CONFIG_NAME = 'web_search'\n\nexport type WebSearchGuardrails = {\n readonly allowDomains: readonly string[]\n readonly denyDomains: readonly string[]\n /**\n * Hosts allowed to resolve to a non-public address.\n *\n * Egress, not filtering: `allowDomains`/`denyDomains` decide which results an\n * agent may see, this decides where the engine may connect at all. It exists so\n * an operator-hosted service \u2014 a SearXNG instance on the container network \u2014 is\n * reachable, which the SSRF guard otherwise refuses by design.\n *\n * Naming a host here also makes it reachable by `web_fetch`. Pair it with\n * `denyDomains` when only an adapter should be able to talk to it.\n */\n readonly allowPrivateHosts: readonly string[]\n readonly searchesPerRun: number\n readonly fetchesPerRun: number\n readonly callsPerTenantPerMinute: number\n readonly maxFetchBytes: number\n}\n\nexport type WebSearchSettings = {\n readonly policy: SearchPolicy\n readonly guardrails: WebSearchGuardrails\n /** Per-adapter options, keyed by adapter id. Secrets arrive already decrypted. */\n readonly adapterOptions: Readonly<Record<string, unknown>>\n readonly source: 'tenant' | 'instance'\n}\n\nconst GUARDRAIL_DEFAULTS = {\n searchesPerRun: 20,\n fetchesPerRun: 40,\n callsPerTenantPerMinute: 120,\n maxFetchBytes: 128 * 1024,\n} as const\n\nfunction positiveInt(raw: string | undefined, fallback: number): number {\n const value = Number.parseInt((raw ?? '').trim(), 10)\n return Number.isFinite(value) && value > 0 ? value : fallback\n}\n\nfunction domainList(raw: string | undefined): string[] {\n return (raw ?? '')\n .split(',')\n .map((entry) => entry.trim().toLowerCase())\n .filter((entry) => entry.length > 0)\n}\n\nfunction csv(raw: string | undefined): string[] {\n return (raw ?? '')\n .split(',')\n .map((entry) => entry.trim())\n .filter((entry) => entry.length > 0)\n}\n\n/**\n * Instance-level defaults from `OM_WEB_SEARCH_*`. Adapters listed in\n * `OM_WEB_SEARCH_ADAPTERS` are enabled in that order; everything else stays off,\n * which is what keeps SERP scraping opt-in.\n */\nexport function resolveEnvSettings(env: NodeJS.ProcessEnv = process.env): {\n policy: SearchPolicyInput\n guardrails: WebSearchGuardrails\n} {\n const enabled = csv(env.OM_WEB_SEARCH_ADAPTERS)\n const adapters = (enabled.length > 0 ? enabled : [MODEL_ADAPTER_ID]).map((id, index) => ({\n id,\n enabled: true,\n order: index,\n weight: 1,\n // The model adapter runs its own multi-step web search and measures around\n // 30s; under the generic budget it times out on every run, which is what\n // made the shipped default configuration return nothing at all.\n ...(id === MODEL_ADAPTER_ID ? { timeoutMs: MODEL_ADAPTER_TIMEOUT_MS } : {}),\n }))\n\n return {\n policy: {\n adapters,\n ...(env.OM_WEB_SEARCH_SETTLE_MODE\n ? { settleMode: env.OM_WEB_SEARCH_SETTLE_MODE as SearchPolicyInput['settleMode'] }\n : {}),\n concurrency: positiveInt(env.OM_WEB_SEARCH_CONCURRENCY, DEFAULT_POLICY.concurrency),\n minResults: positiveInt(env.OM_WEB_SEARCH_MIN_RESULTS, DEFAULT_POLICY.minResults),\n adapterTimeoutMs: positiveInt(env.OM_WEB_SEARCH_ADAPTER_TIMEOUT_MS, DEFAULT_POLICY.adapterTimeoutMs),\n softDeadlineMs: positiveInt(env.OM_WEB_SEARCH_SOFT_DEADLINE_MS, DEFAULT_POLICY.softDeadlineMs),\n hardDeadlineMs: positiveInt(env.OM_WEB_SEARCH_HARD_DEADLINE_MS, DEFAULT_POLICY.hardDeadlineMs),\n cacheTtlMs: positiveInt(env.OM_WEB_SEARCH_CACHE_TTL_MS, DEFAULT_POLICY.cacheTtlMs),\n lastResort: env.OM_WEB_SEARCH_LAST_RESORT ?? DEFAULT_POLICY.lastResort,\n },\n guardrails: {\n allowDomains: domainList(env.OM_WEB_SEARCH_ALLOW_DOMAINS),\n denyDomains: domainList(env.OM_WEB_SEARCH_DENY_DOMAINS),\n allowPrivateHosts: domainList(env.OM_WEB_SEARCH_ALLOW_PRIVATE_HOSTS),\n searchesPerRun: positiveInt(env.OM_WEB_SEARCH_RATE_PER_RUN, GUARDRAIL_DEFAULTS.searchesPerRun),\n fetchesPerRun: positiveInt(env.OM_WEB_FETCH_RATE_PER_RUN, GUARDRAIL_DEFAULTS.fetchesPerRun),\n callsPerTenantPerMinute: positiveInt(\n env.OM_WEB_SEARCH_RATE_PER_TENANT_PER_MINUTE,\n GUARDRAIL_DEFAULTS.callsPerTenantPerMinute,\n ),\n maxFetchBytes: positiveInt(env.OM_WEB_FETCH_MAX_BYTES, GUARDRAIL_DEFAULTS.maxFetchBytes),\n },\n }\n}\n\n/**\n * Backfills the model adapter's budget on a policy that did not name one.\n *\n * A stored adapter list replaces the env-derived one outright, so every tenant\n * who ever saved from the settings page has a `model-native` row with no\n * `timeoutMs` \u2014 and the shared 8s budget times it out on every run, which is the\n * whole failure this default exists to prevent. An explicit value is left alone:\n * an operator who chose one owns it.\n */\nexport function withModelAdapterBudget(policy: SearchPolicy): SearchPolicy {\n const needsBudget = policy.adapters.some(\n (entry) => entry.id === MODEL_ADAPTER_ID && entry.timeoutMs === undefined,\n )\n if (!needsBudget) return policy\n return {\n ...policy,\n hardDeadlineMs: Math.max(policy.hardDeadlineMs, MODEL_ADAPTER_TIMEOUT_MS),\n adapters: policy.adapters.map((entry) =>\n entry.id === MODEL_ADAPTER_ID && entry.timeoutMs === undefined\n ? { ...entry, timeoutMs: MODEL_ADAPTER_TIMEOUT_MS }\n : entry,\n ),\n }\n}\n\n/**\n * The guardrails a TENANT may store.\n *\n * `allowPrivateHosts` is deliberately absent. Naming a host there lets an\n * adapter \u2014 and `web_fetch` \u2014 resolve to a private address, which widens the\n * deployment's egress boundary past the SSRF guard. That is an operator\n * decision about the network the app runs in, not a per-tenant preference, so\n * it lives in `OM_WEB_SEARCH_ALLOW_PRIVATE_HOSTS` only. A tenant admin with\n * `agents.manage` could otherwise point the fetcher at the cloud metadata\n * endpoint from a settings form.\n *\n * The field is not merely ignored on write \u2014 it is not in the schema, so a body\n * carrying it is REJECTED rather than silently accepted. Silent acceptance\n * would leave an operator believing they had set something.\n */\nexport const guardrailsSchema = z.object({\n allowDomains: z.array(z.string()).optional(),\n denyDomains: z.array(z.string()).optional(),\n searchesPerRun: z.number().int().min(1).optional(),\n fetchesPerRun: z.number().int().min(1).optional(),\n callsPerTenantPerMinute: z.number().int().min(1).optional(),\n maxFetchBytes: z.number().int().min(1024).optional(),\n}).strict()\n\n/** Shape persisted under `agent_orchestrator` / `web_search`. */\nexport const storedSettingsSchema = searchPolicySchema.extend({\n guardrails: guardrailsSchema.optional(),\n adapterOptions: z.record(z.string(), z.unknown()).optional(),\n})\n\ntype ModuleConfigServiceLike = {\n getRecord(\n moduleId: string,\n name: string,\n scope?: { tenantId?: string | null },\n ): Promise<{ value: unknown; source?: string } | null>\n}\n\nfunction resolveModuleConfig(container: AwilixContainer): ModuleConfigServiceLike | null {\n try {\n return container.resolve('moduleConfigService') as ModuleConfigServiceLike\n } catch {\n return null\n }\n}\n\n/**\n * Env is the deployment default; a tenant row overrides it. Reads never fail the\n * caller \u2014 an unreachable config store degrades to env, because losing web search\n * entirely is worse than losing per-tenant tuning.\n */\nexport async function resolveWebSearchSettings(\n container: AwilixContainer,\n tenantId: string | null,\n env: NodeJS.ProcessEnv = process.env,\n): Promise<WebSearchSettings> {\n const base = resolveEnvSettings(env)\n const service = resolveModuleConfig(container)\n\n let stored: Record<string, unknown> | null = null\n let source: 'tenant' | 'instance' = 'instance'\n if (service) {\n try {\n const record = await service.getRecord(WEB_SEARCH_CONFIG_MODULE, WEB_SEARCH_CONFIG_NAME, {\n tenantId,\n })\n if (record && typeof record.value === 'object' && record.value !== null) {\n stored = record.value as Record<string, unknown>\n if (record.source === 'tenant') source = 'tenant'\n }\n } catch {\n stored = null\n }\n }\n\n const storedPolicy = stored ? searchPolicySchema.safeParse(stored) : null\n const merged = resolvePolicy({\n ...base.policy,\n ...(storedPolicy?.success ? storedPolicy.data : {}),\n })\n const policy = withModelAdapterBudget(merged)\n\n const storedGuardrails = (stored?.guardrails ?? {}) as Partial<WebSearchGuardrails>\n // Adapter credentials are encrypted at rest (see `secretStorage.ts`). Every\n // consumer \u2014 the engine, the health probe, the preview, the settings form \u2014\n // comes through here, so decrypting once at this seam is what keeps a second\n // reader from acquiring its own copy of the rule.\n const adapterOptions = await decryptAdapterSecrets(\n container,\n tenantId,\n (stored?.adapterOptions ?? {}) as Record<string, unknown>,\n adapterSecretFields(container),\n )\n\n return {\n policy,\n guardrails: {\n allowDomains: storedGuardrails.allowDomains ?? base.guardrails.allowDomains,\n denyDomains: storedGuardrails.denyDomains ?? base.guardrails.denyDomains,\n // Env only, never the stored row \u2014 see `guardrailsSchema`. Reading a\n // stored value here would reopen the hole the schema closes for any row\n // written before the field was removed.\n allowPrivateHosts: base.guardrails.allowPrivateHosts,\n searchesPerRun: storedGuardrails.searchesPerRun ?? base.guardrails.searchesPerRun,\n fetchesPerRun: storedGuardrails.fetchesPerRun ?? base.guardrails.fetchesPerRun,\n callsPerTenantPerMinute:\n storedGuardrails.callsPerTenantPerMinute ?? base.guardrails.callsPerTenantPerMinute,\n maxFetchBytes: storedGuardrails.maxFetchBytes ?? base.guardrails.maxFetchBytes,\n },\n adapterOptions,\n source,\n }\n}\n\nexport function hostnameOf(rawUrl: string): string | null {\n try {\n return new URL(rawUrl).hostname.toLowerCase()\n } catch {\n return null\n }\n}\n\n/**\n * Deny wins over allow; a non-empty allowlist is exclusive. Matching is exact\n * host or a dot-boundary suffix, so `example.com` covers `news.example.com` but\n * not `notexample.com`.\n */\nexport function isHostAllowed(hostname: string, guardrails: WebSearchGuardrails): boolean {\n const host = hostname.toLowerCase()\n const matches = (domain: string): boolean => host === domain || host.endsWith(`.${domain}`)\n if (guardrails.denyDomains.some(matches)) return false\n if (guardrails.allowDomains.length > 0) return guardrails.allowDomains.some(matches)\n return true\n}\n"],
|
|
5
|
-
"mappings": "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",
|
|
4
|
+
"sourcesContent": ["import type { AwilixContainer } from 'awilix'\nimport { z } from 'zod'\nimport {\n DEFAULT_POLICY,\n MODEL_ADAPTER_TIMEOUT_MS,\n resolvePolicy,\n searchPolicySchema,\n type SearchPolicy,\n type SearchPolicyInput,\n} from '@open-mercato/web-research'\nimport { adapterSecretFields, decryptAdapterSecrets } from './secretStorage'\n\n/** The adapter enabled by default; also the one that needs its own budget. */\nconst MODEL_ADAPTER_ID = 'model-native'\n\n/** Module + key under which the per-tenant policy is stored. */\nexport const WEB_SEARCH_CONFIG_MODULE = 'agent_orchestrator'\nexport const WEB_SEARCH_CONFIG_NAME = 'web_search'\n\nexport type WebSearchGuardrails = {\n readonly allowDomains: readonly string[]\n readonly denyDomains: readonly string[]\n /**\n * Hosts allowed to resolve to a non-public address.\n *\n * Egress, not filtering: `allowDomains`/`denyDomains` decide which results an\n * agent may see, this decides where the engine may connect at all. It exists so\n * an operator-hosted service \u2014 a SearXNG instance on the container network \u2014 is\n * reachable, which the SSRF guard otherwise refuses by design.\n *\n * Naming a host here also makes it reachable by `web_fetch`. Pair it with\n * `denyDomains` when only an adapter should be able to talk to it.\n */\n readonly allowPrivateHosts: readonly string[]\n readonly searchesPerRun: number\n readonly fetchesPerRun: number\n readonly callsPerTenantPerMinute: number\n readonly maxFetchBytes: number\n}\n\nexport type WebSearchSettings = {\n readonly policy: SearchPolicy\n readonly guardrails: WebSearchGuardrails\n /** Per-adapter options, keyed by adapter id. Secrets arrive already decrypted. */\n readonly adapterOptions: Readonly<Record<string, unknown>>\n readonly source: 'tenant' | 'instance'\n}\n\nconst GUARDRAIL_DEFAULTS = {\n searchesPerRun: 20,\n fetchesPerRun: 40,\n callsPerTenantPerMinute: 120,\n maxFetchBytes: 128 * 1024,\n} as const\n\nfunction positiveInt(raw: string | undefined, fallback: number): number {\n const value = Number.parseInt((raw ?? '').trim(), 10)\n return Number.isFinite(value) && value > 0 ? value : fallback\n}\n\nfunction domainList(raw: string | undefined): string[] {\n return (raw ?? '')\n .split(',')\n .map((entry) => entry.trim().toLowerCase())\n .filter((entry) => entry.length > 0)\n}\n\nfunction csv(raw: string | undefined): string[] {\n return (raw ?? '')\n .split(',')\n .map((entry) => entry.trim())\n .filter((entry) => entry.length > 0)\n}\n\n/**\n * Instance-level defaults from `OM_WEB_SEARCH_*`. Adapters listed in\n * `OM_WEB_SEARCH_ADAPTERS` are enabled in that order; everything else stays off,\n * which is what keeps SERP scraping opt-in.\n */\nexport function resolveEnvSettings(env: NodeJS.ProcessEnv = process.env): {\n policy: SearchPolicyInput\n guardrails: WebSearchGuardrails\n} {\n const enabled = csv(env.OM_WEB_SEARCH_ADAPTERS)\n const adapters = (enabled.length > 0 ? enabled : [MODEL_ADAPTER_ID]).map((id, index) => ({\n id,\n enabled: true,\n order: index,\n weight: 1,\n // The model adapter runs its own multi-step web search and measures around\n // 30s; under the generic budget it times out on every run, which is what\n // made the shipped default configuration return nothing at all.\n ...(id === MODEL_ADAPTER_ID ? { timeoutMs: MODEL_ADAPTER_TIMEOUT_MS } : {}),\n }))\n\n return {\n policy: {\n adapters,\n ...(env.OM_WEB_SEARCH_SETTLE_MODE\n ? { settleMode: env.OM_WEB_SEARCH_SETTLE_MODE as SearchPolicyInput['settleMode'] }\n : {}),\n concurrency: positiveInt(env.OM_WEB_SEARCH_CONCURRENCY, DEFAULT_POLICY.concurrency),\n minResults: positiveInt(env.OM_WEB_SEARCH_MIN_RESULTS, DEFAULT_POLICY.minResults),\n adapterTimeoutMs: positiveInt(env.OM_WEB_SEARCH_ADAPTER_TIMEOUT_MS, DEFAULT_POLICY.adapterTimeoutMs),\n softDeadlineMs: positiveInt(env.OM_WEB_SEARCH_SOFT_DEADLINE_MS, DEFAULT_POLICY.softDeadlineMs),\n hardDeadlineMs: positiveInt(env.OM_WEB_SEARCH_HARD_DEADLINE_MS, DEFAULT_POLICY.hardDeadlineMs),\n cacheTtlMs: positiveInt(env.OM_WEB_SEARCH_CACHE_TTL_MS, DEFAULT_POLICY.cacheTtlMs),\n lastResort: env.OM_WEB_SEARCH_LAST_RESORT ?? DEFAULT_POLICY.lastResort,\n },\n guardrails: {\n allowDomains: domainList(env.OM_WEB_SEARCH_ALLOW_DOMAINS),\n denyDomains: domainList(env.OM_WEB_SEARCH_DENY_DOMAINS),\n allowPrivateHosts: domainList(env.OM_WEB_SEARCH_ALLOW_PRIVATE_HOSTS),\n searchesPerRun: positiveInt(env.OM_WEB_SEARCH_RATE_PER_RUN, GUARDRAIL_DEFAULTS.searchesPerRun),\n fetchesPerRun: positiveInt(env.OM_WEB_FETCH_RATE_PER_RUN, GUARDRAIL_DEFAULTS.fetchesPerRun),\n callsPerTenantPerMinute: positiveInt(\n env.OM_WEB_SEARCH_RATE_PER_TENANT_PER_MINUTE,\n GUARDRAIL_DEFAULTS.callsPerTenantPerMinute,\n ),\n maxFetchBytes: positiveInt(env.OM_WEB_FETCH_MAX_BYTES, GUARDRAIL_DEFAULTS.maxFetchBytes),\n },\n }\n}\n\n/**\n * Backfills the model adapter's budget on a policy that did not name one.\n *\n * A stored adapter list replaces the env-derived one outright, so every tenant\n * who ever saved from the settings page has a `model-native` row with no\n * `timeoutMs` \u2014 and the shared 8s budget times it out on every run, which is the\n * whole failure this default exists to prevent. An explicit value is left alone:\n * an operator who chose one owns it.\n */\nexport function withModelAdapterBudget(policy: SearchPolicy): SearchPolicy {\n const needsBudget = policy.adapters.some(\n (entry) => entry.id === MODEL_ADAPTER_ID && entry.timeoutMs === undefined,\n )\n if (!needsBudget) return policy\n return {\n ...policy,\n hardDeadlineMs: Math.max(policy.hardDeadlineMs, MODEL_ADAPTER_TIMEOUT_MS),\n adapters: policy.adapters.map((entry) =>\n entry.id === MODEL_ADAPTER_ID && entry.timeoutMs === undefined\n ? { ...entry, timeoutMs: MODEL_ADAPTER_TIMEOUT_MS }\n : entry,\n ),\n }\n}\n\n/**\n * The guardrails a TENANT may store.\n *\n * `allowPrivateHosts` is deliberately absent. Naming a host there lets an\n * adapter \u2014 and `web_fetch` \u2014 resolve to a private address, which widens the\n * deployment's egress boundary past the SSRF guard. That is an operator\n * decision about the network the app runs in, not a per-tenant preference, so\n * it lives in `OM_WEB_SEARCH_ALLOW_PRIVATE_HOSTS` only. A tenant admin with\n * `agents.manage` could otherwise point the fetcher at the cloud metadata\n * endpoint from a settings form.\n *\n * The field is not merely ignored on write \u2014 it is not in the schema, so a body\n * carrying it is REJECTED rather than silently accepted. Silent acceptance\n * would leave an operator believing they had set something.\n */\nexport const guardrailsSchema = z.object({\n allowDomains: z.array(z.string()).optional(),\n denyDomains: z.array(z.string()).optional(),\n searchesPerRun: z.number().int().min(1).optional(),\n fetchesPerRun: z.number().int().min(1).optional(),\n callsPerTenantPerMinute: z.number().int().min(1).optional(),\n maxFetchBytes: z.number().int().min(1024).optional(),\n}).strict()\n\n/** Shape persisted under `agent_orchestrator` / `web_search`. */\nexport const storedSettingsSchema = searchPolicySchema.extend({\n guardrails: guardrailsSchema.optional(),\n adapterOptions: z.record(z.string(), z.unknown()).optional(),\n})\n\ntype ModuleConfigServiceLike = {\n getRecord(\n moduleId: string,\n name: string,\n scope?: { tenantId?: string | null },\n ): Promise<{ value: unknown; source?: string } | null>\n}\n\nfunction resolveModuleConfig(container: AwilixContainer): ModuleConfigServiceLike | null {\n try {\n return container.resolve('moduleConfigService') as ModuleConfigServiceLike\n } catch {\n return null\n }\n}\n\n/**\n * Env is the deployment default; a tenant row overrides it. Reads never fail the\n * caller \u2014 an unreachable config store degrades to env, because losing web search\n * entirely is worse than losing per-tenant tuning.\n */\nexport async function resolveWebSearchSettings(\n container: AwilixContainer,\n tenantId: string | null,\n env: NodeJS.ProcessEnv = process.env,\n): Promise<WebSearchSettings> {\n const base = resolveEnvSettings(env)\n const service = resolveModuleConfig(container)\n\n let stored: Record<string, unknown> | null = null\n let source: 'tenant' | 'instance' = 'instance'\n if (service) {\n try {\n const record = await service.getRecord(WEB_SEARCH_CONFIG_MODULE, WEB_SEARCH_CONFIG_NAME, {\n tenantId,\n })\n if (record && typeof record.value === 'object' && record.value !== null) {\n stored = record.value as Record<string, unknown>\n if (record.source === 'tenant') source = 'tenant'\n }\n } catch {\n stored = null\n }\n }\n\n const storedPolicy = stored ? searchPolicySchema.safeParse(stored) : null\n const merged = resolvePolicy({\n ...base.policy,\n ...(storedPolicy?.success ? storedPolicy.data : {}),\n })\n const policy = withModelAdapterBudget(merged)\n\n const storedGuardrails = (stored?.guardrails ?? {}) as Partial<WebSearchGuardrails>\n // Adapter credentials are encrypted at rest (see `secretStorage.ts`). Every\n // consumer \u2014 the engine, the health probe, the preview, the settings form \u2014\n // comes through here, so decrypting once at this seam is what keeps a second\n // reader from acquiring its own copy of the rule.\n const adapterOptions = await decryptAdapterSecrets(\n container,\n tenantId,\n (stored?.adapterOptions ?? {}) as Record<string, unknown>,\n adapterSecretFields(container),\n )\n\n return {\n policy,\n guardrails: {\n allowDomains: storedGuardrails.allowDomains ?? base.guardrails.allowDomains,\n denyDomains: storedGuardrails.denyDomains ?? base.guardrails.denyDomains,\n // Env only, never the stored row \u2014 see `guardrailsSchema`. Reading a\n // stored value here would reopen the hole the schema closes for any row\n // written before the field was removed.\n allowPrivateHosts: base.guardrails.allowPrivateHosts,\n searchesPerRun: storedGuardrails.searchesPerRun ?? base.guardrails.searchesPerRun,\n fetchesPerRun: storedGuardrails.fetchesPerRun ?? base.guardrails.fetchesPerRun,\n callsPerTenantPerMinute:\n storedGuardrails.callsPerTenantPerMinute ?? base.guardrails.callsPerTenantPerMinute,\n maxFetchBytes: storedGuardrails.maxFetchBytes ?? base.guardrails.maxFetchBytes,\n },\n adapterOptions,\n source,\n }\n}\n\nexport function hostnameOf(rawUrl: string): string | null {\n try {\n return new URL(rawUrl).hostname.toLowerCase()\n } catch {\n return null\n }\n}\n\n/**\n * Deny wins over allow; a non-empty allowlist is exclusive. Matching is exact\n * host or a dot-boundary suffix, so `example.com` covers `news.example.com` but\n * not `notexample.com`.\n */\nexport function isHostAllowed(hostname: string, guardrails: WebSearchGuardrails): boolean {\n const host = hostname.toLowerCase()\n const matches = (domain: string): boolean => host === domain || host.endsWith(`.${domain}`)\n if (guardrails.denyDomains.some(matches)) return false\n if (guardrails.allowDomains.length > 0) return guardrails.allowDomains.some(matches)\n return true\n}\n\nexport function applyAnswerDomainPolicy(\n answer: string | null,\n guardrails: Pick<WebSearchGuardrails, 'allowDomains' | 'denyDomains'>,\n): { answer: string | null; answerWithheld?: 'domain_policy' } {\n if (answer !== null && (guardrails.allowDomains.length > 0 || guardrails.denyDomains.length > 0)) {\n return { answer: null, answerWithheld: 'domain_policy' }\n }\n return { answer }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
resolveRunId,
|
|
7
7
|
resolveSpentAdapterBudgets
|
|
8
8
|
} from "./guardrails.js";
|
|
9
|
-
import { hostnameOf, isHostAllowed, resolveWebSearchSettings } from "./policy.js";
|
|
9
|
+
import { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from "./policy.js";
|
|
10
10
|
import { buildWebSearchEngine } from "./registry.js";
|
|
11
11
|
import { createStepEmitter } from "./steps.js";
|
|
12
12
|
const WEB_SEARCH_TOOL_ID = "agent_orchestrator.web_search";
|
|
@@ -101,11 +101,13 @@ const webSearchTool = {
|
|
|
101
101
|
const host = hostnameOf(hit.url);
|
|
102
102
|
return host ? isHostAllowed(host, settings.guardrails) : false;
|
|
103
103
|
});
|
|
104
|
+
const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails);
|
|
104
105
|
return {
|
|
105
106
|
ok: true,
|
|
106
107
|
results: allowed,
|
|
107
|
-
answer
|
|
108
|
+
answer,
|
|
108
109
|
diagnostics: {
|
|
110
|
+
...answerDiagnostics,
|
|
109
111
|
adapters: result.diagnostics.adapters,
|
|
110
112
|
degraded: result.diagnostics.degraded || allowed.length !== result.results.length,
|
|
111
113
|
cached: result.diagnostics.cached,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/modules/agent_orchestrator/lib/webSearch/tools.ts"],
|
|
4
|
-
"sourcesContent": ["import { z } from 'zod'\nimport type { AiToolDefinition, McpToolContext } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/types'\nimport {\n chargeAdapterCalls,\n chargeWebFetchBudget,\n enforceWebSearchRateLimit,\n resolveRunId,\n resolveSpentAdapterBudgets,\n} from './guardrails'\nimport { hostnameOf, isHostAllowed, resolveWebSearchSettings } from './policy'\nimport { buildWebSearchEngine } from './registry'\nimport { createStepEmitter } from './steps'\n\nexport const WEB_SEARCH_TOOL_ID = 'agent_orchestrator.web_search'\nexport const WEB_FETCH_TOOL_ID = 'agent_orchestrator.web_fetch'\n\n/**\n * Split so a tenant can be granted discovery without arbitrary URL retrieval.\n * `web_fetch` keeps the original feature id as a second requirement, so every\n * existing grant keeps working while the new one can be withheld.\n */\nconst WEB_SEARCH_FEATURE = 'agent_orchestrator.web_search'\nconst WEB_FETCH_FEATURE = 'agent_orchestrator.web_fetch'\n\nconst webSearchInput = z.object({\n query: z\n .string()\n .min(1)\n .max(500)\n .describe('Search query. Use for discovery - finding pages and sources on the public web.'),\n limit: z\n .number()\n .int()\n .min(1)\n .max(20)\n .optional()\n .describe('Max results to return; the server caps this to its configured maximum.'),\n site: z.string().max(253).optional().describe('Restrict results to a single domain, e.g. \"example.com\".'),\n freshness: z\n .enum(['day', 'week', 'month', 'year'])\n .optional()\n .describe('Prefer sources published within this window.'),\n includeContent: z\n .boolean()\n .optional()\n .describe(\n 'Also read the top results and return their page text inline. Prefer this over calling web_fetch per result.',\n ),\n})\n\nconst webFetchInput = z.object({\n url: z.url().max(2048).describe('Absolute http(s) URL to retrieve as readable text.'),\n render: z\n .enum(['auto', 'never', 'always'])\n .optional()\n .describe('auto (default) renders in a browser only when the plain read looks like a JavaScript shell.'),\n})\n\n/**\n * Resolves the run this call belongs to and wires the live step feed to it.\n * Steps are broadcast, never returned to the model: `diagnostics` is the compact\n * summary it can act on, and a full narration would just spend context.\n */\nasync function loadContext(ctx: McpToolContext, query: string) {\n const settings = await resolveWebSearchSettings(ctx.container, ctx.tenantId ?? null)\n const runId = await resolveRunId(ctx.container, ctx.sessionId)\n const agentId = await resolveAgentId(ctx)\n // Checked before the engine is built, because the only way to not pay for an\n // adapter is to not enable it \u2014 the engine has no notion of cost.\n const spentBudgets = await resolveSpentAdapterBudgets(\n ctx.container,\n ctx.tenantId ?? null,\n settings.policy.adapters,\n )\n const built = buildWebSearchEngine({\n container: ctx.container,\n settings,\n tenantId: ctx.tenantId ?? null,\n spentBudgets,\n onStep: createStepEmitter({\n runId,\n agentId,\n tenantId: ctx.tenantId ?? null,\n organizationId: ctx.organizationId ?? null,\n query,\n }),\n })\n return { settings, runId, ...built }\n}\n\n/**\n * The engine is built per call, and adapters may own OS resources \u2014 the browser\n * tier holds a sidecar process and a Chromium. Without this every call that\n * touched that tier would leak one of each for the life of the server.\n */\nasync function disposeQuietly(engine: { dispose(): Promise<void> }): Promise<void> {\n try {\n await engine.dispose()\n } catch {\n // Teardown is best-effort; a disposal fault must not mask the tool's result.\n }\n}\n\nasync function resolveAgentId(ctx: McpToolContext): Promise<string | null> {\n if (!ctx.sessionId) return null\n try {\n const store = ctx.container.resolve('agentRunSessionStore') as {\n resolveActiveAgentId(token: string): Promise<string | null>\n }\n return await store.resolveActiveAgentId(ctx.sessionId)\n } catch {\n return null\n }\n}\n\n/**\n * Read-only web search over the adapter engine. Errors are returned as data so a\n * failed lookup can never crash the agent loop, and `diagnostics` explains what\n * each adapter did - a thin answer should be legible to the model, not silent.\n */\nexport const webSearchTool: AiToolDefinition = {\n name: WEB_SEARCH_TOOL_ID,\n displayName: 'Web search',\n description:\n 'Search the public web and return ranked results (title, url, snippet, confidence). Set includeContent to also read the top pages in one call. Read-only.',\n inputSchema: webSearchInput,\n requiredFeatures: [WEB_SEARCH_FEATURE],\n isMutation: false,\n tags: ['read', 'agent_orchestrator', 'web'],\n async handler(rawInput, ctx) {\n const input = webSearchInput.parse(rawInput)\n const { settings, engine, problems, runId } = await loadContext(ctx, input.query)\n\n try {\n const gate = await enforceWebSearchRateLimit(\n ctx.container,\n { runId, tenantId: ctx.tenantId ?? null, kind: 'search' },\n settings.guardrails,\n )\n if (!gate.ok) return { ok: false as const, code: 'rate_limited' as const, error: gate.error }\n\n const result = await engine.search({\n query: input.query,\n ...(input.limit === undefined ? {} : { limit: input.limit }),\n ...(input.site === undefined ? {} : { site: input.site }),\n ...(input.freshness === undefined ? {} : { freshness: input.freshness }),\n ...(input.includeContent === undefined ? {} : { includeContent: input.includeContent }),\n })\n\n // includeContent reads pages under a single search point, so the reads are\n // charged here or the fetch budget never engages on the path the tool\n // description recommends.\n await chargeWebFetchBudget(ctx.container, runId, settings.guardrails, result.diagnostics.pagesRead)\n\n // Charged from what actually ran, not from what was planned: quorum often\n // settles before the expensive adapter is ever reached, and billing for a\n // call that never happened would exhaust a ceiling that cost nothing.\n await chargeAdapterCalls(\n ctx.container,\n ctx.tenantId ?? null,\n settings.policy.adapters,\n result.diagnostics.adapters\n .filter((entry) => entry.status !== 'skipped' && entry.status !== 'cancelled')\n .map((entry) => entry.id),\n )\n\n const allowed = result.results.filter((hit) => {\n const host = hostnameOf(hit.url)\n return host ? isHostAllowed(host, settings.guardrails) : false\n })\n\n return {\n ok: true as const,\n results: allowed,\n answer
|
|
5
|
-
"mappings": "AAAA,SAAS,SAAS;AAElB;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,YAAY,eAAe,gCAAgC;
|
|
4
|
+
"sourcesContent": ["import { z } from 'zod'\nimport type { AiToolDefinition, McpToolContext } from '@open-mercato/ai-assistant/modules/ai_assistant/lib/types'\nimport {\n chargeAdapterCalls,\n chargeWebFetchBudget,\n enforceWebSearchRateLimit,\n resolveRunId,\n resolveSpentAdapterBudgets,\n} from './guardrails'\nimport { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from './policy'\nimport { buildWebSearchEngine } from './registry'\nimport { createStepEmitter } from './steps'\n\nexport const WEB_SEARCH_TOOL_ID = 'agent_orchestrator.web_search'\nexport const WEB_FETCH_TOOL_ID = 'agent_orchestrator.web_fetch'\n\n/**\n * Split so a tenant can be granted discovery without arbitrary URL retrieval.\n * `web_fetch` keeps the original feature id as a second requirement, so every\n * existing grant keeps working while the new one can be withheld.\n */\nconst WEB_SEARCH_FEATURE = 'agent_orchestrator.web_search'\nconst WEB_FETCH_FEATURE = 'agent_orchestrator.web_fetch'\n\nconst webSearchInput = z.object({\n query: z\n .string()\n .min(1)\n .max(500)\n .describe('Search query. Use for discovery - finding pages and sources on the public web.'),\n limit: z\n .number()\n .int()\n .min(1)\n .max(20)\n .optional()\n .describe('Max results to return; the server caps this to its configured maximum.'),\n site: z.string().max(253).optional().describe('Restrict results to a single domain, e.g. \"example.com\".'),\n freshness: z\n .enum(['day', 'week', 'month', 'year'])\n .optional()\n .describe('Prefer sources published within this window.'),\n includeContent: z\n .boolean()\n .optional()\n .describe(\n 'Also read the top results and return their page text inline. Prefer this over calling web_fetch per result.',\n ),\n})\n\nconst webFetchInput = z.object({\n url: z.url().max(2048).describe('Absolute http(s) URL to retrieve as readable text.'),\n render: z\n .enum(['auto', 'never', 'always'])\n .optional()\n .describe('auto (default) renders in a browser only when the plain read looks like a JavaScript shell.'),\n})\n\n/**\n * Resolves the run this call belongs to and wires the live step feed to it.\n * Steps are broadcast, never returned to the model: `diagnostics` is the compact\n * summary it can act on, and a full narration would just spend context.\n */\nasync function loadContext(ctx: McpToolContext, query: string) {\n const settings = await resolveWebSearchSettings(ctx.container, ctx.tenantId ?? null)\n const runId = await resolveRunId(ctx.container, ctx.sessionId)\n const agentId = await resolveAgentId(ctx)\n // Checked before the engine is built, because the only way to not pay for an\n // adapter is to not enable it \u2014 the engine has no notion of cost.\n const spentBudgets = await resolveSpentAdapterBudgets(\n ctx.container,\n ctx.tenantId ?? null,\n settings.policy.adapters,\n )\n const built = buildWebSearchEngine({\n container: ctx.container,\n settings,\n tenantId: ctx.tenantId ?? null,\n spentBudgets,\n onStep: createStepEmitter({\n runId,\n agentId,\n tenantId: ctx.tenantId ?? null,\n organizationId: ctx.organizationId ?? null,\n query,\n }),\n })\n return { settings, runId, ...built }\n}\n\n/**\n * The engine is built per call, and adapters may own OS resources \u2014 the browser\n * tier holds a sidecar process and a Chromium. Without this every call that\n * touched that tier would leak one of each for the life of the server.\n */\nasync function disposeQuietly(engine: { dispose(): Promise<void> }): Promise<void> {\n try {\n await engine.dispose()\n } catch {\n // Teardown is best-effort; a disposal fault must not mask the tool's result.\n }\n}\n\nasync function resolveAgentId(ctx: McpToolContext): Promise<string | null> {\n if (!ctx.sessionId) return null\n try {\n const store = ctx.container.resolve('agentRunSessionStore') as {\n resolveActiveAgentId(token: string): Promise<string | null>\n }\n return await store.resolveActiveAgentId(ctx.sessionId)\n } catch {\n return null\n }\n}\n\n/**\n * Read-only web search over the adapter engine. Errors are returned as data so a\n * failed lookup can never crash the agent loop, and `diagnostics` explains what\n * each adapter did - a thin answer should be legible to the model, not silent.\n */\nexport const webSearchTool: AiToolDefinition = {\n name: WEB_SEARCH_TOOL_ID,\n displayName: 'Web search',\n description:\n 'Search the public web and return ranked results (title, url, snippet, confidence). Set includeContent to also read the top pages in one call. Read-only.',\n inputSchema: webSearchInput,\n requiredFeatures: [WEB_SEARCH_FEATURE],\n isMutation: false,\n tags: ['read', 'agent_orchestrator', 'web'],\n async handler(rawInput, ctx) {\n const input = webSearchInput.parse(rawInput)\n const { settings, engine, problems, runId } = await loadContext(ctx, input.query)\n\n try {\n const gate = await enforceWebSearchRateLimit(\n ctx.container,\n { runId, tenantId: ctx.tenantId ?? null, kind: 'search' },\n settings.guardrails,\n )\n if (!gate.ok) return { ok: false as const, code: 'rate_limited' as const, error: gate.error }\n\n const result = await engine.search({\n query: input.query,\n ...(input.limit === undefined ? {} : { limit: input.limit }),\n ...(input.site === undefined ? {} : { site: input.site }),\n ...(input.freshness === undefined ? {} : { freshness: input.freshness }),\n ...(input.includeContent === undefined ? {} : { includeContent: input.includeContent }),\n })\n\n // includeContent reads pages under a single search point, so the reads are\n // charged here or the fetch budget never engages on the path the tool\n // description recommends.\n await chargeWebFetchBudget(ctx.container, runId, settings.guardrails, result.diagnostics.pagesRead)\n\n // Charged from what actually ran, not from what was planned: quorum often\n // settles before the expensive adapter is ever reached, and billing for a\n // call that never happened would exhaust a ceiling that cost nothing.\n await chargeAdapterCalls(\n ctx.container,\n ctx.tenantId ?? null,\n settings.policy.adapters,\n result.diagnostics.adapters\n .filter((entry) => entry.status !== 'skipped' && entry.status !== 'cancelled')\n .map((entry) => entry.id),\n )\n\n const allowed = result.results.filter((hit) => {\n const host = hostnameOf(hit.url)\n return host ? isHostAllowed(host, settings.guardrails) : false\n })\n const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails)\n\n return {\n ok: true as const,\n results: allowed,\n answer,\n diagnostics: {\n ...answerDiagnostics,\n adapters: result.diagnostics.adapters,\n degraded: result.diagnostics.degraded || allowed.length !== result.results.length,\n cached: result.diagnostics.cached,\n escalated: result.diagnostics.escalated,\n elapsedMs: result.diagnostics.elapsedMs,\n ...(problems.length > 0 ? { problems } : {}),\n },\n }\n } finally {\n await disposeQuietly(engine)\n }\n },\n}\n\n/** Read-only single-URL retrieval, with automatic browser rendering for JS shells. */\nexport const webFetchTool: AiToolDefinition = {\n name: WEB_FETCH_TOOL_ID,\n displayName: 'Web fetch',\n description:\n 'Retrieve a single public http(s) URL and return its readable text (size-capped). Read-only; prefer web_search with includeContent when you have not chosen a page yet.',\n inputSchema: webFetchInput,\n requiredFeatures: [WEB_SEARCH_FEATURE, WEB_FETCH_FEATURE],\n isMutation: false,\n tags: ['read', 'agent_orchestrator', 'web'],\n async handler(rawInput, ctx) {\n const input = webFetchInput.parse(rawInput)\n const { settings, engine, runId } = await loadContext(ctx, input.url)\n\n try {\n const host = hostnameOf(input.url)\n if (!host || !isHostAllowed(host, settings.guardrails)) {\n return {\n ok: false as const,\n code: 'domain_blocked' as const,\n error: `domain not allowed: ${host ?? input.url}`,\n }\n }\n\n const gate = await enforceWebSearchRateLimit(\n ctx.container,\n { runId, tenantId: ctx.tenantId ?? null, kind: 'fetch' },\n settings.guardrails,\n )\n if (!gate.ok) return { ok: false as const, code: 'rate_limited' as const, error: gate.error }\n\n const outcome = await engine.fetch({\n url: input.url,\n maxBytes: settings.guardrails.maxFetchBytes,\n ...(input.render === undefined ? {} : { render: input.render }),\n })\n\n if (outcome.status !== 'ok') {\n const code = outcome.status === 'blocked' ? outcome.code ?? outcome.status : outcome.status\n return { ok: false as const, code, error: outcome.reason ?? outcome.status }\n }\n // The engine follows redirects, so the host that actually answered may not\n // be the one the guardrail cleared above.\n const finalHost = hostnameOf(outcome.page.url)\n if (!finalHost || !isHostAllowed(finalHost, settings.guardrails)) {\n return {\n ok: false as const,\n code: 'domain_blocked' as const,\n error: `domain not allowed after redirect: ${finalHost ?? outcome.page.url}`,\n }\n }\n return { ok: true as const, ...outcome.page }\n } finally {\n await disposeQuietly(engine)\n }\n },\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@open-mercato/enterprise",
|
|
3
|
-
"version": "0.10.1-develop.
|
|
3
|
+
"version": "0.10.1-develop.7825.1.185c04f3b7",
|
|
4
4
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -70,12 +70,12 @@
|
|
|
70
70
|
"@dnd-kit/core": "^6.3.1",
|
|
71
71
|
"@dnd-kit/sortable": "^10.0.0",
|
|
72
72
|
"@dnd-kit/utilities": "^3.2.2",
|
|
73
|
-
"@open-mercato/ai-assistant": "0.10.1-develop.
|
|
74
|
-
"@open-mercato/core": "0.10.1-develop.
|
|
75
|
-
"@open-mercato/queue": "0.10.1-develop.
|
|
76
|
-
"@open-mercato/scheduler": "0.10.1-develop.
|
|
77
|
-
"@open-mercato/ui": "0.10.1-develop.
|
|
78
|
-
"@open-mercato/web-research": "0.10.1-develop.
|
|
73
|
+
"@open-mercato/ai-assistant": "0.10.1-develop.7825.1.185c04f3b7",
|
|
74
|
+
"@open-mercato/core": "0.10.1-develop.7825.1.185c04f3b7",
|
|
75
|
+
"@open-mercato/queue": "0.10.1-develop.7825.1.185c04f3b7",
|
|
76
|
+
"@open-mercato/scheduler": "0.10.1-develop.7825.1.185c04f3b7",
|
|
77
|
+
"@open-mercato/ui": "0.10.1-develop.7825.1.185c04f3b7",
|
|
78
|
+
"@open-mercato/web-research": "0.10.1-develop.7825.1.185c04f3b7",
|
|
79
79
|
"@simplewebauthn/browser": "^13.3.0",
|
|
80
80
|
"@simplewebauthn/server": "^13.3.2",
|
|
81
81
|
"@simplewebauthn/types": "^12.0.0",
|
|
@@ -87,13 +87,13 @@
|
|
|
87
87
|
},
|
|
88
88
|
"peerDependencies": {
|
|
89
89
|
"@mikro-orm/core": "^7.0.14",
|
|
90
|
-
"@open-mercato/shared": "0.10.1-develop.
|
|
90
|
+
"@open-mercato/shared": "0.10.1-develop.7825.1.185c04f3b7",
|
|
91
91
|
"react": "^19.0.0",
|
|
92
92
|
"react-dom": "^19.0.0",
|
|
93
93
|
"zod": ">=3.23.0"
|
|
94
94
|
},
|
|
95
95
|
"devDependencies": {
|
|
96
|
-
"@open-mercato/shared": "0.10.1-develop.
|
|
96
|
+
"@open-mercato/shared": "0.10.1-develop.7825.1.185c04f3b7",
|
|
97
97
|
"@types/jest": "^30.0.0",
|
|
98
98
|
"@types/react": "^19.2.18",
|
|
99
99
|
"@types/react-dom": "^19.2.5",
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
enforceWebSearchRateLimit,
|
|
9
9
|
resolveSpentAdapterBudgets,
|
|
10
10
|
} from '../../../lib/webSearch/guardrails'
|
|
11
|
-
import { hostnameOf, isHostAllowed, resolveWebSearchSettings } from '../../../lib/webSearch/policy'
|
|
11
|
+
import { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from '../../../lib/webSearch/policy'
|
|
12
12
|
import { buildWebSearchEngine } from '../../../lib/webSearch/registry'
|
|
13
13
|
import { agentOrchestratorTag } from '../../openapi'
|
|
14
14
|
|
|
@@ -108,13 +108,14 @@ export async function POST(req: Request) {
|
|
|
108
108
|
const host = hostnameOf(url)
|
|
109
109
|
return host === null || !isHostAllowed(host, settings.guardrails)
|
|
110
110
|
}
|
|
111
|
+
const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails)
|
|
111
112
|
|
|
112
113
|
return NextResponse.json({
|
|
113
114
|
query: parsed.data.query,
|
|
114
115
|
settleMode: settings.policy.settleMode,
|
|
115
116
|
fused: result.results.filter((hit) => !blockedByGuardrails(hit.url)),
|
|
116
|
-
answer
|
|
117
|
-
diagnostics: result.diagnostics,
|
|
117
|
+
answer,
|
|
118
|
+
diagnostics: { ...result.diagnostics, ...answerDiagnostics },
|
|
118
119
|
// Guardrails are reported rather than applied here: an operator tuning a
|
|
119
120
|
// deny list needs to see that a source returned a hit and that the list
|
|
120
121
|
// removed it, which silent filtering would hide.
|
|
@@ -281,3 +281,13 @@ export function isHostAllowed(hostname: string, guardrails: WebSearchGuardrails)
|
|
|
281
281
|
if (guardrails.allowDomains.length > 0) return guardrails.allowDomains.some(matches)
|
|
282
282
|
return true
|
|
283
283
|
}
|
|
284
|
+
|
|
285
|
+
export function applyAnswerDomainPolicy(
|
|
286
|
+
answer: string | null,
|
|
287
|
+
guardrails: Pick<WebSearchGuardrails, 'allowDomains' | 'denyDomains'>,
|
|
288
|
+
): { answer: string | null; answerWithheld?: 'domain_policy' } {
|
|
289
|
+
if (answer !== null && (guardrails.allowDomains.length > 0 || guardrails.denyDomains.length > 0)) {
|
|
290
|
+
return { answer: null, answerWithheld: 'domain_policy' }
|
|
291
|
+
}
|
|
292
|
+
return { answer }
|
|
293
|
+
}
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
resolveRunId,
|
|
8
8
|
resolveSpentAdapterBudgets,
|
|
9
9
|
} from './guardrails'
|
|
10
|
-
import { hostnameOf, isHostAllowed, resolveWebSearchSettings } from './policy'
|
|
10
|
+
import { applyAnswerDomainPolicy, hostnameOf, isHostAllowed, resolveWebSearchSettings } from './policy'
|
|
11
11
|
import { buildWebSearchEngine } from './registry'
|
|
12
12
|
import { createStepEmitter } from './steps'
|
|
13
13
|
|
|
@@ -168,12 +168,14 @@ export const webSearchTool: AiToolDefinition = {
|
|
|
168
168
|
const host = hostnameOf(hit.url)
|
|
169
169
|
return host ? isHostAllowed(host, settings.guardrails) : false
|
|
170
170
|
})
|
|
171
|
+
const { answer, ...answerDiagnostics } = applyAnswerDomainPolicy(result.answer, settings.guardrails)
|
|
171
172
|
|
|
172
173
|
return {
|
|
173
174
|
ok: true as const,
|
|
174
175
|
results: allowed,
|
|
175
|
-
answer
|
|
176
|
+
answer,
|
|
176
177
|
diagnostics: {
|
|
178
|
+
...answerDiagnostics,
|
|
177
179
|
adapters: result.diagnostics.adapters,
|
|
178
180
|
degraded: result.diagnostics.degraded || allowed.length !== result.results.length,
|
|
179
181
|
cached: result.diagnostics.cached,
|