make runtime provenance platform-neutral

This commit is contained in:
Sinabina
2026-07-17 13:40:04 -07:00
parent d0d770e811
commit 2bc7775f89
7 changed files with 69 additions and 13 deletions
+12
View File
@@ -6543,6 +6543,10 @@
{ {
"name": "browse", "name": "browse",
"source_path": "browse/dist/browse", "source_path": "browse/dist/browse",
"platform_source_paths": {
"posix": "browse/dist/browse",
"win32": "browse/dist/browse.exe"
},
"consumer_modules": [ "consumer_modules": [
"benchmark", "benchmark",
"browse", "browse",
@@ -6831,6 +6835,10 @@
{ {
"name": "gstack-design", "name": "gstack-design",
"source_path": "design/dist/design", "source_path": "design/dist/design",
"platform_source_paths": {
"posix": "design/dist/design",
"win32": "design/dist/design.exe"
},
"consumer_modules": [ "consumer_modules": [
"design-consultation", "design-consultation",
"design-html", "design-html",
@@ -7712,6 +7720,10 @@
{ {
"name": "make-pdf", "name": "make-pdf",
"source_path": "make-pdf/dist/pdf", "source_path": "make-pdf/dist/pdf",
"platform_source_paths": {
"posix": "make-pdf/dist/pdf",
"win32": "make-pdf/dist/pdf.exe"
},
"consumer_modules": [ "consumer_modules": [
"make-pdf" "make-pdf"
], ],
+12
View File
@@ -6543,6 +6543,10 @@
{ {
"name": "browse", "name": "browse",
"source_path": "browse/dist/browse", "source_path": "browse/dist/browse",
"platform_source_paths": {
"posix": "browse/dist/browse",
"win32": "browse/dist/browse.exe"
},
"consumer_modules": [ "consumer_modules": [
"benchmark", "benchmark",
"browse", "browse",
@@ -6831,6 +6835,10 @@
{ {
"name": "gstack-design", "name": "gstack-design",
"source_path": "design/dist/design", "source_path": "design/dist/design",
"platform_source_paths": {
"posix": "design/dist/design",
"win32": "design/dist/design.exe"
},
"consumer_modules": [ "consumer_modules": [
"design-consultation", "design-consultation",
"design-html", "design-html",
@@ -7712,6 +7720,10 @@
{ {
"name": "make-pdf", "name": "make-pdf",
"source_path": "make-pdf/dist/pdf", "source_path": "make-pdf/dist/pdf",
"platform_source_paths": {
"posix": "make-pdf/dist/pdf",
"win32": "make-pdf/dist/pdf.exe"
},
"consumer_modules": [ "consumer_modules": [
"make-pdf" "make-pdf"
], ],
+12
View File
@@ -6,6 +6,10 @@
{ {
"name": "browse", "name": "browse",
"source_path": "browse/dist/browse", "source_path": "browse/dist/browse",
"platform_source_paths": {
"posix": "browse/dist/browse",
"win32": "browse/dist/browse.exe"
},
"consumer_modules": [ "consumer_modules": [
"benchmark", "benchmark",
"browse", "browse",
@@ -294,6 +298,10 @@
{ {
"name": "gstack-design", "name": "gstack-design",
"source_path": "design/dist/design", "source_path": "design/dist/design",
"platform_source_paths": {
"posix": "design/dist/design",
"win32": "design/dist/design.exe"
},
"consumer_modules": [ "consumer_modules": [
"design-consultation", "design-consultation",
"design-html", "design-html",
@@ -1175,6 +1183,10 @@
{ {
"name": "make-pdf", "name": "make-pdf",
"source_path": "make-pdf/dist/pdf", "source_path": "make-pdf/dist/pdf",
"platform_source_paths": {
"posix": "make-pdf/dist/pdf",
"win32": "make-pdf/dist/pdf.exe"
},
"consumer_modules": [ "consumer_modules": [
"make-pdf" "make-pdf"
], ],
+15 -9
View File
@@ -599,22 +599,28 @@ function runtimeHelperClosure(rendered: Map<string, RenderedModuleRecord>): Arra
consumers.set(match[1], sources); consumers.set(match[1], sources);
} }
} }
const platformSourceOverrides: Record<string, { posix: string; win32: string }> = {
browse: { posix: 'browse/dist/browse', win32: 'browse/dist/browse.exe' },
'gstack-design': { posix: 'design/dist/design', win32: 'design/dist/design.exe' },
'make-pdf': { posix: 'make-pdf/dist/pdf', win32: 'make-pdf/dist/pdf.exe' },
};
const sourceOverrides: Record<string, string> = { const sourceOverrides: Record<string, string> = {
browse: process.platform === 'win32' ? 'browse/dist/browse.exe' : 'browse/dist/browse',
'gstack-design': process.platform === 'win32' ? 'design/dist/design.exe' : 'design/dist/design',
'make-pdf': process.platform === 'win32' ? 'make-pdf/dist/pdf.exe' : 'make-pdf/dist/pdf',
'remote-slug': 'browse/bin/remote-slug', 'remote-slug': 'browse/bin/remote-slug',
'gstack-gbrain-sync': 'bin/gstack-gbrain-sync.ts', 'gstack-gbrain-sync': 'bin/gstack-gbrain-sync.ts',
'gstack-memory-ingest': 'bin/gstack-memory-ingest.ts', 'gstack-memory-ingest': 'bin/gstack-memory-ingest.ts',
'gstack-global-discover': 'bin/gstack-global-discover.ts', 'gstack-global-discover': 'bin/gstack-global-discover.ts',
'gstack-redact-audit-log': 'bin/gstack-redact-audit-log', 'gstack-redact-audit-log': 'bin/gstack-redact-audit-log',
}; };
return [...consumers].sort(([left], [right]) => left.localeCompare(right)).map(([name, sources]) => ({ return [...consumers].sort(([left], [right]) => left.localeCompare(right)).map(([name, sources]) => {
name, const platformPaths = platformSourceOverrides[name];
source_path: sourceOverrides[name] ?? `bin/${name}`, return {
consumer_modules: [...sources].sort(), name,
stable_path: `\${GSTACK_HOME:-$HOME/.gstack}/bin/${name}`, source_path: platformPaths?.posix ?? sourceOverrides[name] ?? `bin/${name}`,
})); ...(platformPaths ? { platform_source_paths: platformPaths } : {}),
consumer_modules: [...sources].sort(),
stable_path: `\${GSTACK_HOME:-$HOME/.gstack}/bin/${name}`,
};
});
} }
interface SectionCopyRecord { interface SectionCopyRecord {
+3 -1
View File
@@ -248,7 +248,9 @@ export function runParity(): ParityResult {
const helperClosure = json(path.join(ROOT, 'evals', 'parity', 'runtime-helper-closure.json')); const helperClosure = json(path.join(ROOT, 'evals', 'parity', 'runtime-helper-closure.json'));
check(JSON.stringify(helperClosure.helpers) === JSON.stringify(manifest.runtime_helpers), 'Runtime helper closure and provenance differ'); check(JSON.stringify(helperClosure.helpers) === JSON.stringify(manifest.runtime_helpers), 'Runtime helper closure and provenance differ');
for (const helper of helperClosure.helpers) { for (const helper of helperClosure.helpers) {
check(fs.existsSync(path.join(ROOT, helper.source_path)), `Preserved helper ${helper.name} has no source payload at ${helper.source_path}`); const sourcePath = helper.platform_source_paths?.[process.platform === 'win32' ? 'win32' : 'posix']
?? helper.source_path;
check(fs.existsSync(path.join(ROOT, sourcePath)), `Preserved helper ${helper.name} has no source payload at ${sourcePath}`);
check(Array.isArray(helper.consumer_modules) && helper.consumer_modules.length > 0, `Preserved helper ${helper.name} has no consumer provenance`); check(Array.isArray(helper.consumer_modules) && helper.consumer_modules.length > 0, `Preserved helper ${helper.name} has no consumer provenance`);
} }
for (const record of [...manifest.sources, ...manifest.sections]) { for (const record of [...manifest.sources, ...manifest.sections]) {
+1 -1
View File
@@ -99,7 +99,7 @@ describe("gstack 2 host-neutral paths and state", () => {
const { state } = await inspectProject(home, identity); const { state } = await inspectProject(home, identity);
expect(state.concurrentCounter).toBe(60); expect(state.concurrentCounter).toBe(60);
expect(state.revision).toBe(60); expect(state.revision).toBe(60);
}); }, 15_000);
test("crash/resume never automatically repeats an uncertain external effect", async () => { test("crash/resume never automatically repeats an uncertain external effect", async () => {
const root = await temporaryRoot(); const root = await temporaryRoot();
+14 -2
View File
@@ -128,6 +128,16 @@ describe("GStack 2 managed runtime installer", () => {
test("generated helper closure is fully declared and selected helpers resolve from the managed home", async () => { test("generated helper closure is fully declared and selected helpers resolve from the managed home", async () => {
const contract = await readJson(path.join(REPO_ROOT, "evals", "parity", "runtime-helper-closure.json")); const contract = await readJson(path.join(REPO_ROOT, "evals", "parity", "runtime-helper-closure.json"));
const compiledHelpers = Object.fromEntries(
contract.helpers
.filter((helper) => helper.platform_source_paths)
.map((helper) => [helper.name, helper.platform_source_paths]),
);
expect(compiledHelpers).toEqual({
browse: { posix: "browse/dist/browse", win32: "browse/dist/browse.exe" },
"gstack-design": { posix: "design/dist/design", win32: "design/dist/design.exe" },
"make-pdf": { posix: "make-pdf/dist/pdf", win32: "make-pdf/dist/pdf.exe" },
});
const bundlePaths = new Set(DEFAULT_RUNTIME_BUNDLE.map((item) => item.path)); const bundlePaths = new Set(DEFAULT_RUNTIME_BUNDLE.map((item) => item.path));
for (const dependency of [ for (const dependency of [
"node_modules/sharp", "node_modules/sharp",
@@ -139,10 +149,12 @@ describe("GStack 2 managed runtime installer", () => {
expect(bundlePaths.has("node_modules/@ngrok")).toBe(false); expect(bundlePaths.has("node_modules/@ngrok")).toBe(false);
expect([...bundlePaths].some((item) => item.includes("@huggingface"))).toBe(false); expect([...bundlePaths].some((item) => item.includes("@huggingface"))).toBe(false);
for (const helper of contract.helpers) { for (const helper of contract.helpers) {
expect(bundlePaths.has(helper.source_path)).toBe(true); const sourcePath = helper.platform_source_paths?.[process.platform === "win32" ? "win32" : "posix"]
?? helper.source_path;
expect(bundlePaths.has(sourcePath)).toBe(true);
if (helper.name === "gstack") continue; if (helper.name === "gstack") continue;
const declaredTarget = DEFAULT_RUNTIME_HELPERS[helper.name]?.target ?? DEFAULT_CAPABILITY_LAUNCHERS[helper.name]; const declaredTarget = DEFAULT_RUNTIME_HELPERS[helper.name]?.target ?? DEFAULT_CAPABILITY_LAUNCHERS[helper.name];
expect(declaredTarget).toBe(helper.source_path); expect(declaredTarget).toBe(sourcePath);
} }
await withFixture(async ({ home }) => { await withFixture(async ({ home }) => {