Build and revise procedural 3D assets with your coding agent. Local MCP server, CLI and TypeScript engine with rendered review, editable source and GLB export.
JavaScript 3d3d-assets3d-modelingagent-skillsagent-toolsai-agentsasset-pipelinecligame-assetsglbgltfmcpmcp-servermodel-context-protocolprocedural-generationprocedural-modelingtext-to-3dthreejstypescript
fix(cli): isolate local service token from remote render endpoints (#117)
Matthew Kissinger6a18f2aa70dd
diff --git a/dist/build.json b/dist/build.jsonindex 5d7a0676..b16dc5c2 100644--- a/dist/build.json+++ b/dist/build.json@@ -2,10 +2,10 @@"schemaVersion": 1,"entries": {"worker": {- "identity": "sha256:880a8a0108f54e052c288c468745267d552fa98cb201cc03e82cd06180485480",+ "identity": "sha256:5f0e79fc996e99fc4551b17c06d9889133b77459493b83ef12592b453ec53f76","engineVersion": "0.7.1","toolchain": "[email protected]",- "sourceHash": "473f464e372a97ef0cd14bd66c982c6a6b67c78589d5322d1c9f830a029fe91b",+ "sourceHash": "92c41a538190c8b8cfd2a32095baace5d4f80ad28930fd925235f22ad479e42a","dependencyHash": "363701eaf4938fc8f46405e6e92d0b36e218439c548b2427da0468edcc78a3dc","dependencies": {"@gltf-transform/core": "4.5.0",@@ -31,10 +31,10 @@"bundleHash": "sha256:791ac0f53486e31487bf731a24be45e74048436cec203d3d25c9df8343de374f"},"agent-run": {- "identity": "sha256:880a8a0108f54e052c288c468745267d552fa98cb201cc03e82cd06180485480",+ "identity": "sha256:5f0e79fc996e99fc4551b17c06d9889133b77459493b83ef12592b453ec53f76","engineVersion": "0.7.1","toolchain": "[email protected]",- "sourceHash": "473f464e372a97ef0cd14bd66c982c6a6b67c78589d5322d1c9f830a029fe91b",+ "sourceHash": "92c41a538190c8b8cfd2a32095baace5d4f80ad28930fd925235f22ad479e42a","dependencyHash": "363701eaf4938fc8f46405e6e92d0b36e218439c548b2427da0468edcc78a3dc","dependencies": {"@gltf-transform/core": "4.5.0",@@ -60,10 +60,10 @@"bundleHash": "sha256:4bbdfa2c89ce3f25cfb829be3aba0ff6ce5bf9c33a77a33355754af421935fad"},"agent-providers": {- "identity": "sha256:880a8a0108f54e052c288c468745267d552fa98cb201cc03e82cd06180485480",+ "identity": "sha256:5f0e79fc996e99fc4551b17c06d9889133b77459493b83ef12592b453ec53f76","engineVersion": "0.7.1","toolchain": "[email protected]",- "sourceHash": "473f464e372a97ef0cd14bd66c982c6a6b67c78589d5322d1c9f830a029fe91b",+ "sourceHash": "92c41a538190c8b8cfd2a32095baace5d4f80ad28930fd925235f22ad479e42a","dependencyHash": "363701eaf4938fc8f46405e6e92d0b36e218439c548b2427da0468edcc78a3dc","dependencies": {"@gltf-transform/core": "4.5.0",@@ -89,10 +89,10 @@"bundleHash": "sha256:fb2295599724eaa739ef31919eccae0ff6adece4c36b6886863eb7eeacb35650"},"mcp": {- "identity": "sha256:880a8a0108f54e052c288c468745267d552fa98cb201cc03e82cd06180485480",+ "identity": "sha256:5f0e79fc996e99fc4551b17c06d9889133b77459493b83ef12592b453ec53f76","engineVersion": "0.7.1","toolchain": "[email protected]",- "sourceHash": "473f464e372a97ef0cd14bd66c982c6a6b67c78589d5322d1c9f830a029fe91b",+ "sourceHash": "92c41a538190c8b8cfd2a32095baace5d4f80ad28930fd925235f22ad479e42a","dependencyHash": "363701eaf4938fc8f46405e6e92d0b36e218439c548b2427da0468edcc78a3dc","dependencies": {"@gltf-transform/core": "4.5.0",@@ -115,13 +115,13 @@},"target": "node","file": "mcp-server.mjs",- "bundleHash": "sha256:30e17cb877559a28338cbfa5c0044bfa4a7520e0060f3f975705ec177799a992"+ "bundleHash": "sha256:4372d66f8a03cd5ed9e5ce436713c74e490f3de2b8f5e5fed1b9e46a848f5230"},"cli": {- "identity": "sha256:880a8a0108f54e052c288c468745267d552fa98cb201cc03e82cd06180485480",+ "identity": "sha256:5f0e79fc996e99fc4551b17c06d9889133b77459493b83ef12592b453ec53f76","engineVersion": "0.7.1","toolchain": "[email protected]",- "sourceHash": "473f464e372a97ef0cd14bd66c982c6a6b67c78589d5322d1c9f830a029fe91b",+ "sourceHash": "92c41a538190c8b8cfd2a32095baace5d4f80ad28930fd925235f22ad479e42a","dependencyHash": "363701eaf4938fc8f46405e6e92d0b36e218439c548b2427da0468edcc78a3dc","dependencies": {"@gltf-transform/core": "4.5.0",@@ -144,7 +144,7 @@},"target": "node","file": "cli.mjs",- "bundleHash": "sha256:e052c3176f9524546dc5fa6ad23578fa92fd56201a91c7860b792194484235d6"+ "bundleHash": "sha256:ed8fac568a104daecb8e5a9c87f9aa7676d774098176d350b64a0d869de28b06"}}}diff --git a/dist/cli.mjs b/dist/cli.mjsindex fdd25848..322bc19c 100644--- a/dist/cli.mjs+++ b/dist/cli.mjs@@ -29362,20 +29362,22 @@ function describeDrawnBy(output, context) {return "cpu raster (GPU configured; scene needs no PBR shading)";}async function buildRenderPort(mode, portUrl, options) {+ const explicitClientToken = process.env["KILN_RENDER_TOKEN"];+ const localClientToken = explicitClientToken ?? process.env["RENDER_SERVICE_TOKEN"];const context = mode === "gpu" ? { viewRenderRequired: true } : {};- const attach = (url, label) => {- context.viewRenderPort = makeRemoteRenderPort(url, process.env["KILN_RENDER_TOKEN"]);+ const attach = (url, label, token) => {+ context.viewRenderPort = makeRemoteRenderPort(url, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;context.captureCacheIdentity = () => probeCaptureIdentity(url);selected.set(context, label);return context;};- const attachLazy = (start, label) => {+ const attachLazy = (start, label, token) => {let url;context.viewRenderPort = makeLazyRenderPort(async () => {url = await start();return url;- }, process.env["KILN_RENDER_TOKEN"] ?? process.env["RENDER_SERVICE_TOKEN"]);+ }, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;context.captureCacheIdentity = () => url ? probeCaptureIdentity(url) : undefined;selected.set(context, label);@@ -29386,20 +29388,20 @@ async function buildRenderPort(mode, portUrl, options) {return context;}if (portUrl)- return attach(portUrl, `GPU service (${portUrl})`);+ return attach(portUrl, `GPU service (${portUrl})`, explicitClientToken);const envUrl = process.env["KILN_RENDER_PORT_URL"];if (envUrl)- return attach(envUrl, `GPU service (${envUrl})`);+ return attach(envUrl, `GPU service (${envUrl})`, explicitClientToken);const localUrl = localRenderServiceUrl();const rendererId = await probeRenderService(localUrl);if (rendererId)- return attach(localUrl, `GPU service (${rendererId})`);+ return attach(localUrl, `GPU service (${rendererId})`, localClientToken);if (options?.autoSpawn || mode === "gpu") {const dir = options?.serviceDir ?? renderServiceDir();const state = options?.start ? "ready" : localRenderServiceState(dir);if (state === "ready") {const start = options?.start ?? (() => startLocalRenderService(dir));- return attachLazy(start, "GPU service (started on demand)");+ return attachLazy(start, "GPU service (started on demand)", localClientToken);}if (mode === "gpu")throw new Error(`no GPU render service is reachable at ${localUrl}, and ${explainRenderServiceState(state, dir)}.diff --git a/dist/mcp-server.mjs b/dist/mcp-server.mjsindex 9f0252c4..5a82ad83 100644--- a/dist/mcp-server.mjs+++ b/dist/mcp-server.mjs@@ -28933,20 +28933,22 @@ async function probeRenderService(url) {}var selected = new WeakMap;async function buildRenderPort(mode, portUrl, options) {+ const explicitClientToken = process.env["KILN_RENDER_TOKEN"];+ const localClientToken = explicitClientToken ?? process.env["RENDER_SERVICE_TOKEN"];const context = mode === "gpu" ? { viewRenderRequired: true } : {};- const attach = (url, label) => {- context.viewRenderPort = makeRemoteRenderPort(url, process.env["KILN_RENDER_TOKEN"]);+ const attach = (url, label, token) => {+ context.viewRenderPort = makeRemoteRenderPort(url, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;context.captureCacheIdentity = () => probeCaptureIdentity(url);selected.set(context, label);return context;};- const attachLazy = (start, label) => {+ const attachLazy = (start, label, token) => {let url;context.viewRenderPort = makeLazyRenderPort(async () => {url = await start();return url;- }, process.env["KILN_RENDER_TOKEN"] ?? process.env["RENDER_SERVICE_TOKEN"]);+ }, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;context.captureCacheIdentity = () => url ? probeCaptureIdentity(url) : undefined;selected.set(context, label);@@ -28957,20 +28959,20 @@ async function buildRenderPort(mode, portUrl, options) {return context;}if (portUrl)- return attach(portUrl, `GPU service (${portUrl})`);+ return attach(portUrl, `GPU service (${portUrl})`, explicitClientToken);const envUrl = process.env["KILN_RENDER_PORT_URL"];if (envUrl)- return attach(envUrl, `GPU service (${envUrl})`);+ return attach(envUrl, `GPU service (${envUrl})`, explicitClientToken);const localUrl = localRenderServiceUrl();const rendererId = await probeRenderService(localUrl);if (rendererId)- return attach(localUrl, `GPU service (${rendererId})`);+ return attach(localUrl, `GPU service (${rendererId})`, localClientToken);if (options?.autoSpawn || mode === "gpu") {const dir = options?.serviceDir ?? renderServiceDir();const state = options?.start ? "ready" : localRenderServiceState(dir);if (state === "ready") {const start = options?.start ?? (() => startLocalRenderService(dir));- return attachLazy(start, "GPU service (started on demand)");+ return attachLazy(start, "GPU service (started on demand)", localClientToken);}if (mode === "gpu")throw new Error(`no GPU render service is reachable at ${localUrl}, and ${explainRenderServiceState(state, dir)}.diff --git a/docs/rendering.md b/docs/rendering.mdindex 5c14a53a..1dd23758 100644--- a/docs/rendering.md+++ b/docs/rendering.md@@ -46,7 +46,7 @@ warning. `RENDER_SERVICE_ALLOW_UNAUTHENTICATED=1` waives that when something inalready authenticates for it. The container image sets `HOST=0.0.0.0` itself, because a containerbinding loopback is unreachable through `-p`.-If the server sets `RENDER_SERVICE_TOKEN`, set the matching `KILN_RENDER_TOKEN` in the client environment; a health check can succeed while unauthenticated render requests return 401. For a remote service, supply `--render-port URL` or set `KILN_RENDER_PORT_URL` — either short-circuits every local path above, so a hosted GPU stays one flag. See the service README for deployment and authentication options.+For local render services, client sessions automatically inherit `RENDER_SERVICE_TOKEN` as a fallback when `KILN_RENDER_TOKEN` is unset, whether starting on demand or joining an existing local service sharing the same environment on port 8000. `KILN_RENDER_TOKEN` remains the explicit client credential: set it to override the local token or to authenticate against a remote service. Explicit remote endpoints (`--render-port URL` or `KILN_RENDER_PORT_URL`) never infer credentials from `RENDER_SERVICE_TOKEN` and require `KILN_RENDER_TOKEN` directly. See the service README for deployment and authentication options.`--render auto` is deliberately not on the on-demand path. A one-shot `kiln render` should not pay aGPU process's startup to draw one sheet, so `auto` uses a service that is already listening anddiff --git a/src/__tests__/cli-render-mode.test.ts b/src/__tests__/cli-render-mode.test.tsindex 2ca731e5..be1097c7 100644--- a/src/__tests__/cli-render-mode.test.ts+++ b/src/__tests__/cli-render-mode.test.ts@@ -106,6 +106,7 @@ it('sends the shared grid background to the GPU service for ordinary asset sheetit('authenticates an auto-started local renderer with its inherited service token', async () => {const previousClientToken = process.env.KILN_RENDER_TOKEN;const previousServiceToken = process.env.RENDER_SERVICE_TOKEN;+ const previousPort = process.env.KILN_RENDER_SERVICE_PORT;const token = 'local-renderer-test-token';let receivedToken: string | undefined;const server = createServer(async (req, res) => {@@ -123,6 +124,14 @@ it('authenticates an auto-started local renderer with its inherited service toke);});servers.push(server);+ const dummyServer = createServer();+ servers.push(dummyServer);+ const unusedPort = await new Promise<number>((resolve) => {+ dummyServer.listen(0, '127.0.0.1', () => {+ const port = (dummyServer.address() as AddressInfo).port;+ dummyServer.close(() => resolve(port));+ });+ });const url = await new Promise<string>((resolve) => {server.listen(0, '127.0.0.1', () => {resolve(`http://127.0.0.1:${(server.address() as AddressInfo).port}`);@@ -132,6 +141,8 @@ it('authenticates an auto-started local renderer with its inherited service toketry {delete process.env.KILN_RENDER_TOKEN;process.env.RENDER_SERVICE_TOKEN = token;+ // Set local port to an unused port so probeRenderService fails fast to autoSpawn+ process.env.KILN_RENDER_SERVICE_PORT = String(unusedPort);const context = await buildRenderPort('auto', undefined, {autoSpawn: true,start: async () => url,@@ -147,5 +158,278 @@ it('authenticates an auto-started local renderer with its inherited service tokeelse process.env.KILN_RENDER_TOKEN = previousClientToken;if (previousServiceToken === undefined) delete process.env.RENDER_SERVICE_TOKEN;else process.env.RENDER_SERVICE_TOKEN = previousServiceToken;+ if (previousPort === undefined) delete process.env.KILN_RENDER_SERVICE_PORT;+ else process.env.KILN_RENDER_SERVICE_PORT = previousPort;+ }+});++it('authenticates when joining an already-running local renderer with its inherited service token', async () => {+ const previousClientToken = process.env.KILN_RENDER_TOKEN;+ const previousServiceToken = process.env.RENDER_SERVICE_TOKEN;+ const previousPort = process.env.KILN_RENDER_SERVICE_PORT;+ const token = 'running-renderer-test-token';+ let receivedToken: string | undefined;+ const server = createServer(async (req, res) => {+ if (req.url === '/health') {+ res.setHeader('content-type', 'application/json');+ res.end(JSON.stringify({ ok: true, rendererId: 'test-renderer' }));+ return;+ }+ receivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ // Drain the request.+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ servers.push(server);+ const port = await new Promise<number>((resolve) => {+ server.listen(0, '127.0.0.1', () => {+ resolve((server.address() as AddressInfo).port);+ });+ });++ try {+ delete process.env.KILN_RENDER_TOKEN;+ process.env.RENDER_SERVICE_TOKEN = token;+ process.env.KILN_RENDER_SERVICE_PORT = String(port);+ // Joining an auto-discovered running local renderer (no portUrl passed)+ const context = await buildRenderPort('auto', undefined);+ await context.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(receivedToken).toBe(token);+ } finally {+ if (previousClientToken === undefined) delete process.env.KILN_RENDER_TOKEN;+ else process.env.KILN_RENDER_TOKEN = previousClientToken;+ if (previousServiceToken === undefined) delete process.env.RENDER_SERVICE_TOKEN;+ else process.env.RENDER_SERVICE_TOKEN = previousServiceToken;+ if (previousPort === undefined) delete process.env.KILN_RENDER_SERVICE_PORT;+ else process.env.KILN_RENDER_SERVICE_PORT = previousPort;+ }+});++it('does not leak local service token to explicit remote renderers (portUrl or envUrl)', async () => {+ const previousClientToken = process.env.KILN_RENDER_TOKEN;+ const previousServiceToken = process.env.RENDER_SERVICE_TOKEN;+ const previousEnvUrl = process.env.KILN_RENDER_PORT_URL;+ let receivedToken: string | undefined;+ const server = createServer(async (req, res) => {+ receivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ // Drain the request.+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-remote-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ servers.push(server);+ const url = await new Promise<string>((resolve) => {+ server.listen(0, '127.0.0.1', () => {+ resolve(`http://127.0.0.1:${(server.address() as AddressInfo).port}`);+ });+ });++ try {+ delete process.env.KILN_RENDER_TOKEN;+ process.env.RENDER_SERVICE_TOKEN = 'secret-local-service-token';++ // Case A: explicit portUrl argument+ const contextArg = await buildRenderPort('auto', url);+ await contextArg.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(receivedToken).toBeUndefined();++ // Case B: KILN_RENDER_PORT_URL environment variable+ receivedToken = 'canary';+ process.env.KILN_RENDER_PORT_URL = url;+ const contextEnv = await buildRenderPort('auto', undefined);+ await contextEnv.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(receivedToken).toBeUndefined();+ } finally {+ if (previousClientToken === undefined) delete process.env.KILN_RENDER_TOKEN;+ else process.env.KILN_RENDER_TOKEN = previousClientToken;+ if (previousServiceToken === undefined) delete process.env.RENDER_SERVICE_TOKEN;+ else process.env.RENDER_SERVICE_TOKEN = previousServiceToken;+ if (previousEnvUrl === undefined) delete process.env.KILN_RENDER_PORT_URL;+ else process.env.KILN_RENDER_PORT_URL = previousEnvUrl;+ }+});++it('prioritizes explicit KILN_RENDER_TOKEN over RENDER_SERVICE_TOKEN', async () => {+ const previousClientToken = process.env.KILN_RENDER_TOKEN;+ const previousServiceToken = process.env.RENDER_SERVICE_TOKEN;+ const previousPort = process.env.KILN_RENDER_SERVICE_PORT;+ let receivedToken: string | undefined;+ const server = createServer(async (req, res) => {+ if (req.url === '/health') {+ res.setHeader('content-type', 'application/json');+ res.end(JSON.stringify({ ok: true, rendererId: 'test-renderer' }));+ return;+ }+ receivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ // Drain the request.+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ servers.push(server);+ const port = await new Promise<number>((resolve) => {+ server.listen(0, '127.0.0.1', () => {+ resolve((server.address() as AddressInfo).port);+ });+ });++ try {+ process.env.KILN_RENDER_TOKEN = 'explicit-client-token';+ process.env.RENDER_SERVICE_TOKEN = 'local-service-token';+ process.env.KILN_RENDER_SERVICE_PORT = String(port);++ // Case 1: local running renderer+ const contextLocal = await buildRenderPort('auto', undefined);+ await contextLocal.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(receivedToken).toBe('explicit-client-token');++ // Case 2: explicit remote renderer URL+ let remoteReceivedToken: string | undefined;+ server.removeAllListeners('request');+ server.on('request', async (req, res) => {+ remoteReceivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ const contextRemote = await buildRenderPort('auto', `http://127.0.0.1:${port}`);+ await contextRemote.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(remoteReceivedToken).toBe('explicit-client-token');++ // Case 3: auto-spawned local renderer+ let spawnReceivedToken: string | undefined;+ server.removeAllListeners('request');+ server.on('request', async (req, res) => {+ spawnReceivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ const contextSpawn = await buildRenderPort('auto', undefined, {+ autoSpawn: true,+ start: async () => `http://127.0.0.1:${port}`,+ });+ await contextSpawn.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(spawnReceivedToken).toBe('explicit-client-token');+ } finally {+ if (previousClientToken === undefined) delete process.env.KILN_RENDER_TOKEN;+ else process.env.KILN_RENDER_TOKEN = previousClientToken;+ if (previousServiceToken === undefined) delete process.env.RENDER_SERVICE_TOKEN;+ else process.env.RENDER_SERVICE_TOKEN = previousServiceToken;+ if (previousPort === undefined) delete process.env.KILN_RENDER_SERVICE_PORT;+ else process.env.KILN_RENDER_SERVICE_PORT = previousPort;+ }+});++it('sends no token when neither KILN_RENDER_TOKEN nor RENDER_SERVICE_TOKEN is set', async () => {+ const previousClientToken = process.env.KILN_RENDER_TOKEN;+ const previousServiceToken = process.env.RENDER_SERVICE_TOKEN;+ const previousPort = process.env.KILN_RENDER_SERVICE_PORT;+ let receivedToken: string | undefined;+ const server = createServer(async (req, res) => {+ if (req.url === '/health') {+ res.setHeader('content-type', 'application/json');+ res.end(JSON.stringify({ ok: true, rendererId: 'test-renderer' }));+ return;+ }+ receivedToken = req.headers['x-render-token'] as string | undefined;+ for await (const _chunk of req) {+ // Drain the request.+ }+ res.setHeader('content-type', 'application/json');+ res.end(+ JSON.stringify({+ ok: true,+ rendererId: 'test-renderer',+ views: [Buffer.from('png').toString('base64')],+ }),+ );+ });+ servers.push(server);+ const port = await new Promise<number>((resolve) => {+ server.listen(0, '127.0.0.1', () => {+ resolve((server.address() as AddressInfo).port);+ });+ });++ try {+ delete process.env.KILN_RENDER_TOKEN;+ delete process.env.RENDER_SERVICE_TOKEN;+ process.env.KILN_RENDER_SERVICE_PORT = String(port);++ const context = await buildRenderPort('auto', undefined);+ await context.viewRenderPort!({+ glb: new Uint8Array([1]),+ viewDirs: [[1, 0, 0]],+ size: 384,+ });+ expect(receivedToken).toBeUndefined();+ } finally {+ if (previousClientToken === undefined) delete process.env.KILN_RENDER_TOKEN;+ else process.env.KILN_RENDER_TOKEN = previousClientToken;+ if (previousServiceToken === undefined) delete process.env.RENDER_SERVICE_TOKEN;+ else process.env.RENDER_SERVICE_TOKEN = previousServiceToken;+ if (previousPort === undefined) delete process.env.KILN_RENDER_SERVICE_PORT;+ else process.env.KILN_RENDER_SERVICE_PORT = previousPort;}});diff --git a/src/cli-render-mode.ts b/src/cli-render-mode.tsindex f04c19bc..6e37947f 100644--- a/src/cli-render-mode.ts+++ b/src/cli-render-mode.ts@@ -324,20 +324,26 @@ export async function buildRenderPort(portUrl: string | undefined,options?: RenderPortOptions,): Promise<KilnToolContext> {+ const explicitClientToken = process.env['KILN_RENDER_TOKEN'];+ const localClientToken = explicitClientToken ?? process.env['RENDER_SERVICE_TOKEN'];const context: KilnToolContext = mode === 'gpu' ? { viewRenderRequired: true } : {};- const attach = (url: string, label: string): KilnToolContext => {- context.viewRenderPort = makeRemoteRenderPort(url, process.env['KILN_RENDER_TOKEN']);+ const attach = (url: string, label: string, token?: string): KilnToolContext => {+ context.viewRenderPort = makeRemoteRenderPort(url, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;context.captureCacheIdentity = () => probeCaptureIdentity(url);selected.set(context, label);return context;};- const attachLazy = (start: () => Promise<string>, label: string): KilnToolContext => {+ const attachLazy = (+ start: () => Promise<string>,+ label: string,+ token?: string,+ ): KilnToolContext => {let url: string | undefined;context.viewRenderPort = makeLazyRenderPort(async () => {url = await start();return url;- }, process.env['KILN_RENDER_TOKEN'] ?? process.env['RENDER_SERVICE_TOKEN']);+ }, token);context.viewRenderTimeoutMs = CLI_VIEW_RENDER_TIMEOUT_MS;// Nothing to attest until a producer exists. `undefined` bypasses cell reuse,// which is the correct reading of "no renderer has drawn anything yet".@@ -354,14 +360,14 @@ export async function buildRenderPort(// An explicit URL is taken on trust: the user said where the renderer is, and a// health probe that fails would only turn their explicit choice into a silent// downgrade. `captureViewsViaPort` still degrades per-call if it does not answer.- if (portUrl) return attach(portUrl, `GPU service (${portUrl})`);+ if (portUrl) return attach(portUrl, `GPU service (${portUrl})`, explicitClientToken);const envUrl = process.env['KILN_RENDER_PORT_URL'];- if (envUrl) return attach(envUrl, `GPU service (${envUrl})`);+ if (envUrl) return attach(envUrl, `GPU service (${envUrl})`, explicitClientToken);const localUrl = localRenderServiceUrl();const rendererId = await probeRenderService(localUrl);- if (rendererId) return attach(localUrl, `GPU service (${rendererId})`);+ if (rendererId) return attach(localUrl, `GPU service (${rendererId})`, localClientToken);// Nothing is listening. If this installation can start one, hand back a port// that will -- lazily, so a session that never renders a material never pays@@ -379,7 +385,7 @@ export async function buildRenderPort(const state = options?.start ? 'ready' : localRenderServiceState(dir);if (state === 'ready') {const start = options?.start ?? (() => startLocalRenderService(dir));- return attachLazy(start, 'GPU service (started on demand)');+ return attachLazy(start, 'GPU service (started on demand)', localClientToken);}// The only remaining way to fail `gpu`: nothing is listening AND this// installation cannot start one. Naming both facts is the whole message --