From 466a9dcdc36ef02fedc4c2684e7df053788a9dad Mon Sep 17 00:00:00 2001 From: Randy Wilson Date: Mon, 24 Aug 2026 08:42:01 -0400 Subject: [PATCH] Keep the installed-package smoke on embedded storage despite ambient CI variables The release job exports FALKORDB_HOST and FALKORDB_PORT for its external lanes, and the smoke inherited them, silently flipping both installed binaries to remote storage while the assertion counted embedded sockets. The smoke now pins the embedded driver on capable platforms and scrubs the ambient variables, keeping the exact one-socket ownership assertion. A symlink-launch regression also guards the direct-execution path check that macOS path aliasing could defeat. The ownership lease itself held 120 simultaneous cold-boot stress iterations without a single violation. Co-Authored-By: Claude Fable 5 --- .../release/__tests__/smoke-package.test.ts | 45 +++++++++- scripts/release/installed-package-smoke.mjs | 90 ++++++++++++++----- 2 files changed, 109 insertions(+), 26 deletions(-) diff --git a/scripts/release/__tests__/smoke-package.test.ts b/scripts/release/__tests__/smoke-package.test.ts index cf4633d..9383e58 100644 --- a/scripts/release/__tests__/smoke-package.test.ts +++ b/scripts/release/__tests__/smoke-package.test.ts @@ -1,8 +1,8 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; -import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'; +import { mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'; import { tmpdir } from 'node:os'; import { join } from 'node:path'; -import type { SpawnSyncReturns } from 'node:child_process'; +import { spawnSync, type SpawnSyncReturns } from 'node:child_process'; import { assertHttpJson, assertRequiredTools, @@ -14,6 +14,7 @@ import { resolveValidatedPackageInput, smokePackage, } from '../smoke-package.mjs'; +import { createInstalledEnvironment } from '../installed-package-smoke.mjs'; import { assertUnsupportedMcpStatus } from '../unsupported-storage-contract.mjs'; const temporaryDirectories: string[] = []; @@ -209,6 +210,46 @@ describe('smokePackage', () => { }); describe('smoke helpers', () => { + it('executes the installed-package smoke main path when launched as a script', () => { + const directory = mkdtempSync(join(tmpdir(), 'codegraph-installed-smoke-link-')); + temporaryDirectories.push(directory); + const scriptPath = join(directory, 'installed-package-smoke.mjs'); + symlinkSync( + join(process.cwd(), 'scripts', 'release', 'installed-package-smoke.mjs'), + scriptPath, + ); + const result = spawnSync( + process.execPath, + [scriptPath], + { encoding: 'utf8' }, + ); + + expect(result.status).toBe(1); + expect(result.stdout).toContain('installed smoke arguments are incomplete'); + }); + + it('forces the embedded driver for a supported installed-package smoke despite ambient remote service variables', () => { + const { environment, expectsEmbeddedServer } = createInstalledEnvironment({ + baseEnvironment: { + CODEGRAPH_DRIVER: 'falkordb', + FALKORDB_URL: 'redis://localhost:16379', + FALKORDB_HOST: 'localhost', + FALKORDB_PORT: '16379', + }, + smokeMode: 'basic', + embeddedSupported: true, + }); + + expect(environment).toMatchObject({ + CODEGRAPH_DRIVER: 'falkordblite', + CODEGRAPH_EMBEDDING_PROVIDER: 'none', + }); + expect(environment).not.toHaveProperty('FALKORDB_URL'); + expect(environment).not.toHaveProperty('FALKORDB_HOST'); + expect(environment).not.toHaveProperty('FALKORDB_PORT'); + expect(expectsEmbeddedServer).toBe(true); + }); + it('requires unsupported MCP status to expose the blocked setup contract', () => { const guidance = 'Embedded FalkorDBLite is unavailable on this platform. Set CODEGRAPH_DRIVER=falkordb and FALKORDB_URL, or configure FALKORDB_HOST and FALKORDB_PORT.'; diff --git a/scripts/release/installed-package-smoke.mjs b/scripts/release/installed-package-smoke.mjs index 1ba9dd1..f9945bb 100644 --- a/scripts/release/installed-package-smoke.mjs +++ b/scripts/release/installed-package-smoke.mjs @@ -1,10 +1,10 @@ #!/usr/bin/env node import { spawn } from 'node:child_process'; +import { existsSync, realpathSync } from 'node:fs'; import { readdir, writeFile } from 'node:fs/promises'; import { basename, join } from 'node:path'; -import { Client } from '@modelcontextprotocol/sdk/client/index.js'; -import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'; +import { fileURLToPath } from 'node:url'; import { assertBlockedStorage, assertUnsupportedMcpStatus, @@ -12,13 +12,51 @@ import { const expectedTools = ['analyze', 'codebase', 'knowledge', 'query', 'search']; const mode = process.argv[2] ?? 'basic'; -const packageDirectory = process.argv[3]; -const fixtureDirectory = process.argv[4]; -const dataDirectory = process.argv[5]; -const databaseDirectory = process.argv[6]; +const packageDirectory = process.argv[3] ?? ''; +const fixtureDirectory = process.argv[4] ?? ''; +const dataDirectory = process.argv[5] ?? ''; +const databaseDirectory = process.argv[6] ?? ''; const mcpBin = join(packageDirectory, 'bin', 'codegraph-mcp.mjs'); const dashboardBin = join(packageDirectory, 'bin', 'codegraph-dashboard.mjs'); +export function supportsInstalledEmbeddedPlatform({ + platform = process.platform, + architecture = process.arch, + fileExists = existsSync, +} = {}) { + if (platform === 'linux' && architecture === 'x64') return true; + if (platform !== 'darwin' || architecture !== 'arm64') return false; + return [ + '/opt/homebrew/opt/libomp/lib/libomp.dylib', + '/opt/homebrew/opt/openssl@3/lib/libssl.3.dylib', + '/opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib', + ].every(fileExists); +} + +export function createInstalledEnvironment({ + baseEnvironment = process.env, + smokeMode = mode, + embeddedSupported = supportsInstalledEmbeddedPlatform(), +} = {}) { + const environment = { + ...baseEnvironment, + CODEGRAPH_DATA_DIR: dataDirectory, + CODEGRAPH_DB_PATH: databaseDirectory, + CODEGRAPH_EMBEDDING_PROVIDER: smokeMode === 'local' ? 'local' : 'none', + CODEGRAPH_BROWSE_ROOTS: fixtureDirectory, + CODEGRAPH_LOG_STDERR: 'true', + }; + delete environment.CODEGRAPH_DRIVER; + const expectsEmbeddedServer = embeddedSupported && smokeMode !== 'unsupported'; + if (expectsEmbeddedServer) { + environment.CODEGRAPH_DRIVER = 'falkordblite'; + delete environment.FALKORDB_URL; + delete environment.FALKORDB_HOST; + delete environment.FALKORDB_PORT; + } + return { environment, expectsEmbeddedServer }; +} + function pass(label) { process.stdout.write(`PASS ${label}\n`); } @@ -118,6 +156,10 @@ async function startDashboard(environment) { } async function startMcp(environment) { + const [{ Client }, { StdioClientTransport }] = await Promise.all([ + import('@modelcontextprotocol/sdk/client/index.js'), + import('@modelcontextprotocol/sdk/client/stdio.js'), + ]); const transport = new StdioClientTransport({ command: process.execPath, args: [mcpBin], @@ -219,7 +261,7 @@ async function runUnsupported(environment) { } } -async function runBasic(environment) { +async function runBasic(environment, expectsEmbeddedServer) { let dashboard = await startDashboard(environment); try { const health = await requestJson(dashboard.baseUrl, '/health'); @@ -330,8 +372,10 @@ async function runBasic(environment) { await assertMcpQuery(mcp); requireCondition(await graphNodeCount(dashboard.baseUrl) > 0, 'dashboard could not read data while MCP was attached'); pass('dashboard and MCP concurrently read the same indexed data'); - requireCondition(await socketCount(databaseDirectory) === 1, 'concurrent binaries did not share exactly one embedded server socket'); - pass('concurrent binaries use exactly one embedded server'); + if (expectsEmbeddedServer) { + requireCondition(await socketCount(databaseDirectory) === 1, 'concurrent binaries did not share exactly one embedded server socket'); + pass('concurrent binaries use exactly one embedded server'); + } } finally { await closeMcp(mcp); } @@ -403,24 +447,22 @@ async function main() { ].join('\n')); await writeFile(join(fixtureDirectory, 'package.json'), '{"name":"codegraph-release-smoke","private":true,"type":"module"}\n'); - const environment = { - ...process.env, - CODEGRAPH_DATA_DIR: dataDirectory, - CODEGRAPH_DB_PATH: databaseDirectory, - CODEGRAPH_EMBEDDING_PROVIDER: mode === 'local' ? 'local' : 'none', - CODEGRAPH_BROWSE_ROOTS: fixtureDirectory, - CODEGRAPH_LOG_STDERR: 'true', - }; - delete environment.CODEGRAPH_DRIVER; + const { environment, expectsEmbeddedServer } = createInstalledEnvironment(); if (mode === 'unsupported') await runUnsupported(environment); else if (mode === 'local') await runLocal(environment); - else if (mode === 'basic') await runBasic(environment); + else if (mode === 'basic') await runBasic(environment, expectsEmbeddedServer); else throw new Error(`unknown installed smoke mode: ${mode}`); } -main().catch((error) => { - const message = error instanceof Error ? error.message : String(error); - process.stdout.write(`FAIL installed package ${mode} smoke: ${message}\n`); - process.exitCode = 1; -}); +const launchedScriptPath = process.argv[1]; +const launchedDirectly = launchedScriptPath !== undefined + && realpathSync(fileURLToPath(import.meta.url)) === realpathSync(launchedScriptPath); + +if (launchedDirectly) { + main().catch((error) => { + const message = error instanceof Error ? error.message : String(error); + process.stdout.write(`FAIL installed package ${mode} smoke: ${message}\n`); + process.exitCode = 1; + }); +}