From d8b818a8e48fb41ec361c20e9f4506fcad013096 Mon Sep 17 00:00:00 2001 From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com> Date: Thu, 1 Oct 2026 19:02:50 -0700 Subject: [PATCH] fix(build): import the Electron remote capability list from its own module #24203 moved ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES out of protocol-version.ts into electron-remote-runtime-client-capabilities.ts. Three files that landed on main while it was in review (SSH access links and managed orcad server work) still import it from protocol-version.ts, and a test #24203 added predates main making the structured host's logger option required, so main's node typecheck fails. Point the three imports at the new module and pass the logger. --- .../runtime/runtime-environment-identity-verification.ts | 2 +- .../runtime/structured-agent-session-held-signal.test.ts | 4 +++- src/main/ssh/orcad-terminal-census-client.ts | 6 ++---- src/main/ssh/runtime-ssh-access-verification.test.ts | 6 ++---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/runtime/runtime-environment-identity-verification.ts b/src/main/runtime/runtime-environment-identity-verification.ts index 6fec7dbc4d8f..b23f06587060 100644 --- a/src/main/runtime/runtime-environment-identity-verification.ts +++ b/src/main/runtime/runtime-environment-identity-verification.ts @@ -4,7 +4,7 @@ import { } from '../../shared/runtime-environments' import { sendRemoteRuntimeRequest } from '../../shared/remote-runtime-client' import { verifyRemotePairingRuntimeStatus } from '../../shared/remote-pairing-verification' -import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/protocol-version' +import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/electron-remote-runtime-client-capabilities' import type { RuntimeStatus } from '../../shared/runtime-types' export async function verifyRuntimeEnvironmentIdentity( diff --git a/src/main/runtime/structured-agent-session-held-signal.test.ts b/src/main/runtime/structured-agent-session-held-signal.test.ts index 2ce91a287f5a..a467e45521f4 100644 --- a/src/main/runtime/structured-agent-session-held-signal.test.ts +++ b/src/main/runtime/structured-agent-session-held-signal.test.ts @@ -20,6 +20,7 @@ import { ensureStructuredAgentSessionHost, stopStructuredAgentSessionRuntime } from './structured-agent-session-runtime' +import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger' vi.mock('../ai-vault/session-scanner-worker-spawn', () => ({ scanAiVaultSessionsInWorker: vi.fn(), @@ -41,7 +42,8 @@ function installHost(): Promise { claimKeyId: 'key-1', resolveWorkspacePath: async () => stateDirectory, resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }), - resolveEnvironment: async () => ({}) + resolveEnvironment: async () => ({}), + logger: createStructuredAgentSessionLogger() }) } diff --git a/src/main/ssh/orcad-terminal-census-client.ts b/src/main/ssh/orcad-terminal-census-client.ts index 244589e9827a..d039fa8e120a 100644 --- a/src/main/ssh/orcad-terminal-census-client.ts +++ b/src/main/ssh/orcad-terminal-census-client.ts @@ -2,10 +2,8 @@ * Asks a managed orcad, through its tunnel, how many terminals its daemon runs. Every failure, * including an older host without the method, reads as an unverifiable census, never as zero. */ -import { - ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES, - ORCAD_TERMINAL_CENSUS_RUNTIME_CAPABILITY -} from '../../shared/protocol-version' +import { ORCAD_TERMINAL_CENSUS_RUNTIME_CAPABILITY } from '../../shared/protocol-version' +import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/electron-remote-runtime-client-capabilities' import { getPreferredPairingOffer, type KnownRuntimeEnvironment diff --git a/src/main/ssh/runtime-ssh-access-verification.test.ts b/src/main/ssh/runtime-ssh-access-verification.test.ts index c99a807dbad6..d847b801a231 100644 --- a/src/main/ssh/runtime-ssh-access-verification.test.ts +++ b/src/main/ssh/runtime-ssh-access-verification.test.ts @@ -1,9 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { createEnvironmentFromPairingOffer } from '../../shared/runtime-environments' -import { - ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES, - RUNTIME_PROTOCOL_VERSION -} from '../../shared/protocol-version' +import { RUNTIME_PROTOCOL_VERSION } from '../../shared/protocol-version' +import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../shared/electron-remote-runtime-client-capabilities' import { RemoteRuntimeClientError } from '../../shared/remote-runtime-client-error' import { verifyRuntimeEnvironmentSshTunnel } from './runtime-ssh-access-verification'