Skip to content
8 changes: 8 additions & 0 deletions packages/cli/src/commands/media-use.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ describe("mediaUseEngineEnv", () => {
});
});

// fails without the fix: the engine loaded a key the CLI had unset again from the same .env.
it("names each key the CLI unset from a project .env, so the engine leaves it unset", () => {
const env = mediaUseEngineEnv({}, "", "linux", {}, [["GEMINI_API_KEY", "/work/project"]]);
expect(JSON.parse(env.HYPERFRAMES_PROJECT_ENV_YIELDED ?? "[]")).toEqual([
["GEMINI_API_KEY", "/work/project"],
]);
});

it("hands nothing over from a TypeScript source entry, which plain node cannot run", () => {
expect(mediaUseEngineEnv({}, "src/cli.ts", "linux")).toEqual({});
expect(mediaUseEngineEnv({}, "", "linux")).toEqual({});
Expand Down
9 changes: 8 additions & 1 deletion packages/cli/src/commands/media-use.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import { spawnSync } from "node:child_process";
import { existsSync } from "node:fs";
import { finishCommand } from "../utils/commandResult.js";
import { withMediaAuthEnvironment } from "../auth/media-environment.js";
import { PROJECT_ENV_ORIGINS, projectEnvOrigins } from "../utils/dotEnv.js";
import {
PROJECT_ENV_ORIGINS,
PROJECT_ENV_YIELDED,
projectEnvOrigins,
projectEnvYielded,
} from "../utils/dotEnv.js";
import {
skipWorkingDirectoryInExeSearch,
withOnlyTrustedPathFolders,
Expand Down Expand Up @@ -85,10 +90,12 @@ export function mediaUseEngineEnv(
entry: string | undefined = process.argv[1],
platform: NodeJS.Platform = process.platform,
origins: Record<string, string> = projectEnvOrigins(),
yielded: [string, string][] = projectEnvYielded(),
): NodeJS.ProcessEnv {
const scoped = withOnlyTrustedPathFolders(env, platform);
skipWorkingDirectoryInExeSearch(scoped, platform);
if (Object.keys(origins).length > 0) scoped[PROJECT_ENV_ORIGINS] = JSON.stringify(origins);
if (yielded.length > 0) scoped[PROJECT_ENV_YIELDED] = JSON.stringify(yielded);
if (!entry || /\.[cm]?ts$/.test(entry)) return scoped;
return { ...scoped, HYPERFRAMES_CLI_ENTRY: resolve(entry) };
}
Expand Down
5 changes: 5 additions & 0 deletions packages/cli/src/media-use/lib/received-env.d.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function receivedFileState(
projectDir: string,
path: string,
options?: { atOrAboveOnly?: boolean },
): "received" | "unchecked" | null;
Loading
Loading