diff --git a/src/contracts/applicationWorkflowInputContracts.ts b/src/contracts/applicationWorkflowInputContracts.ts index 11d63137b..2cd48e397 100644 --- a/src/contracts/applicationWorkflowInputContracts.ts +++ b/src/contracts/applicationWorkflowInputContracts.ts @@ -67,19 +67,3 @@ export const compareJavaScriptExportShapesRequestSchema = z.strictObject({ left: evidenceSchema, right: evidenceSchema, }); - -export type TraceApplicationFeatureRequest = z.output< - typeof traceApplicationFeatureRequestSchema ->; -export type TraceJavaScriptSemanticsRequest = z.output< - typeof traceJavaScriptSemanticsRequestSchema ->; -export type CompareApplicationVersionsRequest = z.output< - typeof compareApplicationVersionsRequestSchema ->; -export type CompareSourceToBundleRequest = z.output< - typeof compareSourceToBundleRequestSchema ->; -export type CompareJavaScriptExportShapesRequest = z.output< - typeof compareJavaScriptExportShapesRequestSchema ->; diff --git a/src/contracts/browserToolContracts.ts b/src/contracts/browserToolContracts.ts index 6c2d7baea..e3c5cb13e 100644 --- a/src/contracts/browserToolContracts.ts +++ b/src/contracts/browserToolContracts.ts @@ -1,12 +1,12 @@ import type { ToolContract } from "./toolContracts.js"; import { browserTargetListSchema, - inspectWebPageToolInputSchema, + inspectWebPageInputSchema, listBrowserTargetsInputSchema, webPageInspectionSchema, } from "../domain/browserObservation.js"; import { - analyzeWebBundleToolInputSchema, + analyzeWebBundleInputSchema, webBundleAnalysisSchema, } from "../domain/webBundleAnalysis.js"; import { @@ -140,7 +140,7 @@ export const BROWSER_TOOL_CONTRACTS = [ description: "Passively inspect one approved page target through CDP without evaluating JavaScript, navigating, clicking, closing, or mutating the page. Returns DOM structure, accessibility, scripts, resources, attach-window network and console metadata, workers, and redacted storage inventory as Evidence.", kind: "browser-provider", - inputSchema: inspectWebPageToolInputSchema, + inputSchema: inspectWebPageInputSchema, outputSchema: inspectionOutputSchema, examples: [ { @@ -159,7 +159,7 @@ export const BROWSER_TOOL_CONTRACTS = [ description: "Capture JavaScript source from one configured CDP page and statically derive a chunk graph, route and endpoint candidates, vendor fingerprints, page-declared WebMCP metadata, and optionally fetch source maps from allowed origins. JavaScript is parsed but never executed.", kind: "browser-provider", - inputSchema: analyzeWebBundleToolInputSchema, + inputSchema: analyzeWebBundleInputSchema, outputSchema: bundleOutputSchema, examples: [ { diff --git a/src/contracts/electronToolContracts.ts b/src/contracts/electronToolContracts.ts index b809f68ca..adb46f104 100644 --- a/src/contracts/electronToolContracts.ts +++ b/src/contracts/electronToolContracts.ts @@ -4,7 +4,7 @@ import { evidenceResultOf } from "./toolOutputSchemas.js"; import { electronPageInspectionSchema, electronTargetListSchema, - inspectElectronPageToolInputSchema, + inspectElectronPageInputSchema, listElectronTargetsInputSchema, } from "../domain/electronObservation.js"; import { @@ -64,7 +64,7 @@ export const ELECTRON_TOOL_CONTRACTS = [ description: "Passively inspect one Electron file page by supplying its loopback CDP endpoint and target ID. The provider rechecks that the target currently exists at that endpoint and is a local file page. Returns frames, DOM structure, resource paths, and scripts without evaluating renderer JavaScript or invoking Electron APIs. The selected endpoint exposes every local file page and its metadata to this tool.", kind: "electron-provider", - inputSchema: inspectElectronPageToolInputSchema, + inputSchema: inspectElectronPageInputSchema, outputSchema: inspectionOutputSchema, examples: [ { diff --git a/src/contracts/javascriptRuntimeObservationToolContracts.ts b/src/contracts/javascriptRuntimeObservationToolContracts.ts index 787736dab..c26c6d055 100644 --- a/src/contracts/javascriptRuntimeObservationToolContracts.ts +++ b/src/contracts/javascriptRuntimeObservationToolContracts.ts @@ -5,7 +5,7 @@ import { javascriptRuntimeObservationSchema, javascriptRuntimeTargetListSchema, listJavaScriptRuntimeTargetsInputSchema, - observeJavaScriptRuntimeToolInputSchema, + observeJavaScriptRuntimeInputSchema, } from "../domain/javascriptRuntimeObservation.js"; const endpoint = "http://127.0.0.1:9229"; @@ -35,7 +35,7 @@ export const JAVASCRIPT_RUNTIME_OBSERVATION_TOOL_CONTRACTS = [ description: "Attach passively to one Node/Electron V8 Inspector target by supplying its loopback Inspector endpoint and target ID. The provider rechecks that the target currently exists at that endpoint and is an attachable file or URL target. Captures Debugger.scriptParsed and Runtime execution-context events. REA never evaluates, pauses, resumes, reads source, or instruments the target; require/import edges, EventEmitter activity, and Electron IPC remain explicit unknowns. Reconcile the result with static Application Graph Evidence using reconcile_javascript_runtime. The selected endpoint exposes every target it serves to this tool.", kind: "runtime-provider", - inputSchema: observeJavaScriptRuntimeToolInputSchema, + inputSchema: observeJavaScriptRuntimeInputSchema, outputSchema: evidenceResultOf(javascriptRuntimeObservationSchema), examples: [ { diff --git a/src/domain/browserObservation.ts b/src/domain/browserObservation.ts index debca875c..01c93f370 100644 --- a/src/domain/browserObservation.ts +++ b/src/domain/browserObservation.ts @@ -137,14 +137,11 @@ export const inspectWebPageWithSourceInputSchema = inspectWebPageWithSourceShapeSchema.superRefine(refineInspectWebPageInput); /** Caller-visible schema for one passive inspection. */ -export const inspectWebPageToolInputSchema = z.union([ +export const inspectWebPageInputSchema = z.union([ inspectWebPageWithoutSourceSchema.superRefine(refineInspectWebPageInput), inspectWebPageWithSourceInputSchema, ]); -/** Parsed passive browser inspection input. */ -export const inspectWebPageInputSchema = inspectWebPageToolInputSchema; - export type ListBrowserTargetsInput = z.infer< typeof listBrowserTargetsInputSchema >; diff --git a/src/domain/electronObservation.ts b/src/domain/electronObservation.ts index 75ef148e1..442a4c3a5 100644 --- a/src/domain/electronObservation.ts +++ b/src/domain/electronObservation.ts @@ -32,8 +32,6 @@ export const inspectElectronPageInputSchema = z.union([ include_script_sources: z.literal(true), }), ]); -export const inspectElectronPageToolInputSchema = - inspectElectronPageInputSchema; export type InspectElectronPageInput = z.infer< typeof inspectElectronPageInputSchema >; diff --git a/src/domain/javascriptRuntimeObservation.ts b/src/domain/javascriptRuntimeObservation.ts index 46dc533ff..81e91579b 100644 --- a/src/domain/javascriptRuntimeObservation.ts +++ b/src/domain/javascriptRuntimeObservation.ts @@ -34,8 +34,6 @@ export const observeJavaScriptRuntimeInputSchema = z.strictObject({ runtime_kind: javascriptRuntimeKindSchema.optional(), observation_ms: z.number().int().min(0).default(100), }); -export const observeJavaScriptRuntimeToolInputSchema = - observeJavaScriptRuntimeInputSchema; export type ObserveJavaScriptRuntimeInput = z.infer< typeof observeJavaScriptRuntimeInputSchema >; diff --git a/src/domain/webBundleAnalysis.ts b/src/domain/webBundleAnalysis.ts index f060bd988..743415e6e 100644 --- a/src/domain/webBundleAnalysis.ts +++ b/src/domain/webBundleAnalysis.ts @@ -4,11 +4,10 @@ import { inspectWebPageWithSourceInputSchema } from "./browserObservation.js"; import { webTextArtifactSchema } from "./webContentArtifact.js"; /** Capture-and-analyze input with optional source-map fetching. */ -export const analyzeWebBundleToolInputSchema = +export const analyzeWebBundleInputSchema = inspectWebPageWithSourceInputSchema.safeExtend({ fetch_source_maps: z.boolean().default(false), }); -export const analyzeWebBundleInputSchema = analyzeWebBundleToolInputSchema; export type AnalyzeWebBundleInput = z.infer; const sourceLocationSchema = z.object({ diff --git a/src/server/registerElectronTools.ts b/src/server/registerElectronTools.ts index 2a5dc84db..db58ddc50 100644 --- a/src/server/registerElectronTools.ts +++ b/src/server/registerElectronTools.ts @@ -17,10 +17,7 @@ import type { ToolContract } from "../contracts/toolContracts.js"; import type { AnalysisError } from "../domain/errors.js"; import type { Evidence } from "../domain/evidence.js"; import type { Result } from "../domain/result.js"; -import { - inspectElectronPageInputSchema, - inspectElectronPageToolInputSchema, -} from "../domain/electronObservation.js"; +import { inspectElectronPageInputSchema } from "../domain/electronObservation.js"; import type { Logger } from "../logger.js"; import { mcpProgressReporter } from "./mcpProgress.js"; import { logToolExecution } from "./toolLogging.js"; @@ -82,13 +79,11 @@ export const registerElectronTools = ( inspectContract, { input, context }, async (parsed, { signal, progress }) => { - const request = inspectElectronPageToolInputSchema.parse(parsed); + const request = inspectElectronPageInputSchema.parse(parsed); return inspectElectronPage( options.electron, options.permissionAuthority, - inspectElectronPageInputSchema.parse({ - ...request, - }), + request, { signal, progress }, ); }, diff --git a/src/server/registerJavaScriptRuntimeObservationTools.ts b/src/server/registerJavaScriptRuntimeObservationTools.ts index c8b6e3022..f273e4148 100644 --- a/src/server/registerJavaScriptRuntimeObservationTools.ts +++ b/src/server/registerJavaScriptRuntimeObservationTools.ts @@ -12,10 +12,7 @@ import type { ToolContract } from "../contracts/toolContracts.js"; import type { AnalysisError } from "../domain/errors.js"; import type { Evidence } from "../domain/evidence.js"; import type { Result } from "../domain/result.js"; -import { - observeJavaScriptRuntimeInputSchema, - observeJavaScriptRuntimeToolInputSchema, -} from "../domain/javascriptRuntimeObservation.js"; +import { observeJavaScriptRuntimeInputSchema } from "../domain/javascriptRuntimeObservation.js"; import type { Logger } from "../logger.js"; import { logToolExecution } from "./toolLogging.js"; import { toolRegistrationOptions } from "./toolRegistrationOptions.js"; @@ -61,13 +58,11 @@ export const registerJavaScriptRuntimeObservationTools = ( observeContract, { input, context }, async (parsed, signal) => { - const request = observeJavaScriptRuntimeToolInputSchema.parse(parsed); + const request = observeJavaScriptRuntimeInputSchema.parse(parsed); return observeJavaScriptRuntime( options.runtime, options.permissionAuthority, - observeJavaScriptRuntimeInputSchema.parse({ - ...request, - }), + request, { signal }, ); }, diff --git a/tests/boundary/browser/javascriptRuntimeObservation.test.ts b/tests/boundary/browser/javascriptRuntimeObservation.test.ts index 108dc2633..034026807 100644 --- a/tests/boundary/browser/javascriptRuntimeObservation.test.ts +++ b/tests/boundary/browser/javascriptRuntimeObservation.test.ts @@ -18,7 +18,7 @@ import type { JavaScriptRuntimeObservation, ObserveJavaScriptRuntimeInput, } from "../../../src/domain/javascriptRuntimeObservation.js"; -import { observeJavaScriptRuntimeToolInputSchema } from "../../../src/domain/javascriptRuntimeObservation.js"; +import { observeJavaScriptRuntimeInputSchema } from "../../../src/domain/javascriptRuntimeObservation.js"; import { javascriptRuntimeReconciliationResultSchema } from "../../../src/domain/javascriptRuntimeReconciliationSchemas.js"; import type { PermissionCeiling, @@ -30,7 +30,7 @@ import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; describe("passive V8 Inspector provider", () => { test("rejects unknown runtime observation fields", () => { expect( - observeJavaScriptRuntimeToolInputSchema.safeParse({ + observeJavaScriptRuntimeInputSchema.safeParse({ inspector_endpoint: "http://127.0.0.1:9229", target_id: "target-1", unknown_field: true,