From 7cd65278ea941bcafaf5606600184c9f94f251a2 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 26 Oct 2026 14:53:20 +0800 Subject: [PATCH] refactor(config): remove legacy provider timeout re-exports --- src/config/environment.ts | 6 ++++-- src/config/providerStartupTimeout.ts | 7 ------- src/ghidra/GhidraClient.ts | 2 +- src/hopper/HopperClient.ts | 2 +- src/jeb/JebMcpDeadline.ts | 2 +- src/process/DarwinProcessRunTokenReader.timeout.test.ts | 2 +- src/process/DarwinProcessRunTokenReader.ts | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/config/environment.ts b/src/config/environment.ts index aed0a19f9f..9dc3d816bb 100644 --- a/src/config/environment.ts +++ b/src/config/environment.ts @@ -10,12 +10,14 @@ import { } from "./ghidraLanguageOverride.js"; import { ghidraDisabledAnalyzersSchema } from "./ghidraDisabledAnalyzers.js"; import { - DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS, - DEFAULT_HOPPER_STARTUP_TIMEOUT_MS, DEFAULT_SWIFTC_COMPILE_TIMEOUT_MS, ghidraDecompileTimeoutSchema, providerStartupTimeoutSchema, } from "./providerStartupTimeout.js"; +import { + DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS, + DEFAULT_HOPPER_STARTUP_TIMEOUT_MS, +} from "../domain/analysisResourceLimits.js"; import { mcpInputSchemaProfileSchema } from "./mcpInputSchemaProfile.js"; import { mcpOutputSchemaProfileSchema } from "./mcpOutputSchemaProfile.js"; import { mcpResponseBudgetSchema } from "./mcpResponseBudget.js"; diff --git a/src/config/providerStartupTimeout.ts b/src/config/providerStartupTimeout.ts index 5fe56b6028..0398120d33 100644 --- a/src/config/providerStartupTimeout.ts +++ b/src/config/providerStartupTimeout.ts @@ -1,14 +1,7 @@ import { - DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS, - DEFAULT_HOPPER_STARTUP_TIMEOUT_MS, MAX_PROVIDER_STARTUP_TIMEOUT_MS, MAX_GHIDRA_DECOMPILE_TIMEOUT_SECONDS, } from "../domain/analysisResourceLimits.js"; -export { - DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS, - DEFAULT_HOPPER_STARTUP_TIMEOUT_MS, - MAX_PROVIDER_STARTUP_TIMEOUT_MS, -} from "../domain/analysisResourceLimits.js"; import { z } from "zod"; /** Default deadline for Darwin ownership-helper `swiftc` compilation. */ diff --git a/src/ghidra/GhidraClient.ts b/src/ghidra/GhidraClient.ts index 5a5a740e21..e42fe8bb18 100644 --- a/src/ghidra/GhidraClient.ts +++ b/src/ghidra/GhidraClient.ts @@ -39,7 +39,7 @@ import { type ProviderProcessSnapshot, ProviderProcessSupervisor, } from "../process/ProviderProcess.js"; -import { DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS } from "../config/providerStartupTimeout.js"; +import { DEFAULT_GHIDRA_STARTUP_TIMEOUT_MS } from "../domain/analysisResourceLimits.js"; import { DEFAULT_BRIDGE_MAX_REQUEST } from "../config/bridgeMaxRequestBytes.js"; import type { GhidraClientOptions, diff --git a/src/hopper/HopperClient.ts b/src/hopper/HopperClient.ts index ffd8a8936f..7819b2229f 100644 --- a/src/hopper/HopperClient.ts +++ b/src/hopper/HopperClient.ts @@ -74,7 +74,7 @@ import { hopperLauncherReportedApplicationNotFound, nativeHopperLaunchWasDenied, } from "./HopperProcessDiagnostic.js"; -import { DEFAULT_HOPPER_STARTUP_TIMEOUT_MS } from "../config/providerStartupTimeout.js"; +import { DEFAULT_HOPPER_STARTUP_TIMEOUT_MS } from "../domain/analysisResourceLimits.js"; import { bridgeRequestLimitMismatchError, bridgeRequestOversizeError, diff --git a/src/jeb/JebMcpDeadline.ts b/src/jeb/JebMcpDeadline.ts index 7faa52e4be..0ad49f7560 100644 --- a/src/jeb/JebMcpDeadline.ts +++ b/src/jeb/JebMcpDeadline.ts @@ -7,7 +7,7 @@ import { AnalysisCancelledError, AnalysisTimeoutError, } from "../domain/analysisErrorCore.js"; -import { MAX_PROVIDER_STARTUP_TIMEOUT_MS } from "../config/providerStartupTimeout.js"; +import { MAX_PROVIDER_STARTUP_TIMEOUT_MS } from "../domain/analysisResourceLimits.js"; import { ProviderStartupDeadline } from "../process/ProviderDeadline.js"; /** Which JEB MCP phase consumed `REA_JEB_MCP_TIMEOUT_MS`. */ diff --git a/src/process/DarwinProcessRunTokenReader.timeout.test.ts b/src/process/DarwinProcessRunTokenReader.timeout.test.ts index 84147d66fe..f807d5ce22 100644 --- a/src/process/DarwinProcessRunTokenReader.timeout.test.ts +++ b/src/process/DarwinProcessRunTokenReader.timeout.test.ts @@ -4,7 +4,7 @@ import { resolveSwiftcCompileTimeoutMs, swiftcCompileTimeoutRecovery, } from "./DarwinProcessRunTokenReader.js"; -import { MAX_PROVIDER_STARTUP_TIMEOUT_MS } from "../config/providerStartupTimeout.js"; +import { MAX_PROVIDER_STARTUP_TIMEOUT_MS } from "../domain/analysisResourceLimits.js"; describe("resolveSwiftcCompileTimeoutMs", () => { it("keeps the historical default when unset", () => { diff --git a/src/process/DarwinProcessRunTokenReader.ts b/src/process/DarwinProcessRunTokenReader.ts index acf9b5f7ab..bd047077a7 100644 --- a/src/process/DarwinProcessRunTokenReader.ts +++ b/src/process/DarwinProcessRunTokenReader.ts @@ -7,9 +7,9 @@ import { z } from "zod"; import { DEFAULT_SWIFTC_COMPILE_TIMEOUT_MS, - MAX_PROVIDER_STARTUP_TIMEOUT_MS, providerStartupTimeoutSchema, } from "../config/providerStartupTimeout.js"; +import { MAX_PROVIDER_STARTUP_TIMEOUT_MS } from "../domain/analysisResourceLimits.js"; import { err, ok, type Result } from "../domain/result.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import type {