@project-ajax/sdk 0.0.54 → 0.0.55

package/dist/cli/commands/auth.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auth.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,eAAO,MAAM,KAAK,+GA+BhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAEjB,CAAC"}
+{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/auth.impl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,eAAO,MAAM,KAAK,+GAiChB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}

package/dist/cli/commands/auth.impl.js

@@ -19,16 +19,20 @@ ${url}
     }
     return;
   }
-  await this.config.setEnvironment(environment);
-  await this.config.setToken(token);
-  await this.config.setWorkerId(null);
+  await this.config.update({
+    environment,
+    token,
+    workerId: null
+  });
   this.writer.writeErr("Successfully logged in!");
 });
 const show = buildHandler(function() {
   this.writer.writeOut(`${this.config.token ?? ""}`);
 });
 const logout = buildHandler(async function() {
-  await this.config.setToken(null);
+  await this.config.update({
+    token: null
+  });
 });
 export {
   login,

package/dist/cli/commands/deploy.impl.js

@@ -53,7 +53,7 @@ const deploy = buildAuthedHandler(async function(flags) {
   }
   if (Result.isSuccess(result)) {
     const { workerId: workerId2 } = Result.unwrap(result);
-    await this.config.setWorkerId(workerId2);
+    await this.config.update({ workerId: workerId2 });
     this.writer.writeErr("\u2713 Successfully deployed worker");
   } else {
     this.writer.writeErr("\u2717 Failed to deploy worker");

package/dist/cli/commands/utils/testing.d.ts

@@ -1,19 +1,16 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { Config, type Environment } from "../../config.js";
+import { Config, type ConfigMap } from "../../config.js";
 import type { GlobalFlags } from "../../flags.js";
 import { Writer } from "../../writer.js";
-export type ConfigFileContents = {
-    token: string | null;
-    workerId: string | null;
-    environment: Environment;
-    baseUrl: string;
-};
 export declare const tmpDirectories: string[];
 export declare const baseFlags: GlobalFlags;
-export declare function createConfigFile(contents: ConfigFileContents): Promise<string>;
-export declare function createTestConfig(configFileContents: ConfigFileContents): Promise<Config>;
+export declare function createAndLoadConfig({ configFile, env, flags, }: {
+    configFile: Partial<ConfigMap>;
+    env?: Partial<NodeJS.ProcessEnv>;
+    flags?: Partial<GlobalFlags>;
+}): Promise<[config: Config, path: string]>;
 export declare function createBaseContext(): {
     writer: Writer;
     process: NodeJS.Process;

package/dist/cli/commands/utils/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/utils/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,MAAM,EAAO,CAAC;AAE3C,eAAO,MAAM,SAAS,EAAE,WAEvB,CAAC;AAEF,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,mBAOlE;AAED,wBAAsB,gBAAgB,CACrC,kBAAkB,EAAE,kBAAkB,GACpC,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAgB,iBAAiB;;;;;;EAQhC;AAED,wBAAsB,qBAAqB,kBAO1C"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/utils/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,eAAO,MAAM,cAAc,EAAE,MAAM,EAAO,CAAC;AAE3C,eAAO,MAAM,SAAS,EAAE,WAEvB,CAAC;AAEF,wBAAsB,mBAAmB,CAAC,EACzC,UAAU,EACV,GAAG,EACH,KAAK,GACL,EAAE;IACF,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;CAC7B,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAa1C;AAED,wBAAgB,iBAAiB;;;;;;EAQhC;AAED,wBAAsB,qBAAqB,kBAO1C"}

package/dist/cli/commands/utils/testing.js

@@ -9,20 +9,21 @@ const tmpDirectories = [];
 const baseFlags = {
   debug: false
 };
-async function createConfigFile(contents) {
-  const dir = await mkdtemp(path.join(tmpdir(), "cmd-test-"));
-  tmpDirectories.push(dir);
-  const configFilePath = path.join(dir, "config.json");
-  await writeFile(configFilePath, JSON.stringify(contents, null, 2), "utf-8");
-  return configFilePath;
-}
-async function createTestConfig(configFileContents) {
-  const configFilePath = await createConfigFile(configFileContents);
-  return Config.load({
+async function createAndLoadConfig({
+  configFile,
+  env,
+  flags
+}) {
+  const configFilePath = await createConfigFile(configFile);
+  const map = await Config.load({
     configFilePath,
-    processEnv: {},
-    flags: { debug: false }
+    processEnv: env ?? {},
+    flags: {
+      ...baseFlags,
+      ...flags ?? {}
+    }
   });
+  return [map, configFilePath];
 }
 function createBaseContext() {
   return {
@@ -41,11 +42,17 @@ async function cleanupTmpDirectories() {
     }
   }
 }
+async function createConfigFile(contents) {
+  const dir = await mkdtemp(path.join(tmpdir(), "cmd-test-"));
+  tmpDirectories.push(dir);
+  const configFilePath = path.join(dir, "config.json");
+  await writeFile(configFilePath, JSON.stringify(contents, null, 2), "utf-8");
+  return configFilePath;
+}
 export {
   baseFlags,
   cleanupTmpDirectories,
+  createAndLoadConfig,
   createBaseContext,
-  createConfigFile,
-  createTestConfig,
   tmpDirectories
 };

package/dist/cli/config.d.ts

@@ -1,7 +1,7 @@
 import type { GlobalFlags } from "./flags.js";
 export declare const Environments: readonly ["local", "staging", "dev", "prod"];
 export type Environment = (typeof Environments)[number];
-interface ConfigMap {
+export interface ConfigMap {
     environment: Environment;
     baseUrl: string;
     token: string | null;
@@ -26,21 +26,29 @@ export declare class TokenNotSetError extends Error {
 export declare class Config {
     #private;
     constructor(opts: {
+        configMap: ConfigMap;
         configFilePath: string;
-        configFile: ConfigMap;
     });
     get baseUrl(): string;
     get token(): string | null;
     get environment(): "local" | "staging" | "dev" | "prod";
     get workerId(): string | null;
-    setEnvironment(environment: Environment): Promise<void>;
-    setToken(token: string | null): Promise<void>;
-    setWorkerId(workerId: string | null): Promise<void>;
     get tokenInfo(): {
         token: string;
         spaceId: string;
         cellId: string;
     };
+    /**
+     * Update the config with a partial config map.
+     *
+     * This will write only the updated keys in the config file on disk. Not all
+     * keys are written, since some current keys in the Config object may have
+     * come from e.g. environment variables, rather than the original config
+     * file.
+     *
+     * @param config The config update.
+     */
+    update(config: Partial<ConfigMap>): Promise<void>;
     static load(opts: {
         configFilePath: string;
         processEnv: NodeJS.ProcessEnv;
@@ -52,5 +60,4 @@ export declare function extractPayloadFromToken(token: string): {
     userId: string;
     cellId: string;
 };
-export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/cli/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,eAAO,MAAM,YAAY,8CAA+C,CAAC;AACzE,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,UAAU,SAAS;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAM1D;AAED,qBAAa,gBAAiB,SAAQ,KAAK;gBAEzC,OAAO,GAAE,MAA6D;CAKvE;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,MAAM;;gBAIN,IAAI,EAAE;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,SAAS,CAAC;KACtB;IAOD,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,kBAER;IAED,IAAI,WAAW,yCAEd;IAED,IAAI,QAAQ,kBAEX;IAIK,cAAc,CAAC,WAAW,EAAE,WAAW;IAMvC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK7B,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAazC,IAAI,SAAS,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAQlE;WAEY,IAAI,CAAC,IAAI,EAAE;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;QAC9B,KAAK,EAAE,WAAW,CAAC;KACnB;CAkED;AAQD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf,CAoCA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/cli/config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,eAAO,MAAM,YAAY,8CAA+C,CAAC;AACzE,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,MAAM,WAAW,SAAS;IACzB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAM1D;AAED,qBAAa,gBAAiB,SAAQ,KAAK;gBAEzC,OAAO,GAAE,MAA6D;CAKvE;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,MAAM;;gBAIN,IAAI,EAAE;QACjB,SAAS,EAAE,SAAS,CAAC;QACrB,cAAc,EAAE,MAAM,CAAC;KACvB;IAOD,IAAI,OAAO,WAEV;IAED,IAAI,KAAK,kBAER;IAED,IAAI,WAAW,yCAEd;IAED,IAAI,QAAQ,kBAEX;IAED,IAAI,SAAS,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAQlE;IAED;;;;;;;;;OASG;IACG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC;WAc1B,IAAI,CAAC,IAAI,EAAE;QACvB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC;QAC9B,KAAK,EAAE,WAAW,CAAC;KACnB;CA+FD;AAQD,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CACf,CAoCA"}

package/dist/cli/config.js

@@ -17,8 +17,8 @@ class Config {
   #configMap;
   #configFilePath;
   constructor(opts) {
+    this.#configMap = opts.configMap;
     this.#configFilePath = opts.configFilePath;
-    this.#configMap = opts.configFile;
   }
   // Getters read from the environment variables, and then the config file.
   get baseUrl() {
@@ -33,27 +33,6 @@ class Config {
   get workerId() {
     return this.#configMap.workerId;
   }
-  // Setters update the config file, and then write it to disk.
-  async setEnvironment(environment) {
-    this.#configMap.environment = environment;
-    this.#configMap.baseUrl = baseUrl(environment);
-    await this.#writeConfigFile();
-  }
-  async setToken(token) {
-    this.#configMap.token = token;
-    await this.#writeConfigFile();
-  }
-  async setWorkerId(workerId) {
-    this.#configMap.workerId = workerId;
-    await this.#writeConfigFile();
-  }
-  async #writeConfigFile() {
-    await fs.promises.writeFile(
-      this.#configFilePath,
-      JSON.stringify(this.#configMap, null, 2),
-      "utf-8"
-    );
-  }
   get tokenInfo() {
     const token = this.token;
     if (!token) {
@@ -62,39 +41,85 @@ class Config {
     const { spaceId, cellId } = extractPayloadFromToken(token);
     return { token, spaceId, cellId };
   }
+  /**
+   * Update the config with a partial config map.
+   *
+   * This will write only the updated keys in the config file on disk. Not all
+   * keys are written, since some current keys in the Config object may have
+   * come from e.g. environment variables, rather than the original config
+   * file.
+   *
+   * @param config The config update.
+   */
+  async update(config) {
+    Object.assign(this.#configMap, config);
+    const currentConfigFile = await Config.#readConfigFile(
+      this.#configFilePath
+    );
+    Object.assign(currentConfigFile, config);
+    await fs.promises.writeFile(
+      this.#configFilePath,
+      JSON.stringify(currentConfigFile, null, 2),
+      "utf-8"
+    );
+  }
   static async load(opts) {
     const absConfigFilePath = path.resolve(process.cwd(), opts.configFilePath);
-    const configFile = await Config.#readConfigFile(absConfigFilePath);
+    const partialConfig = await Config.#readConfigFile(absConfigFilePath);
     if (opts.processEnv.WORKERS_TOKEN) {
-      configFile.token = opts.processEnv.WORKERS_TOKEN;
+      partialConfig.token = opts.processEnv.WORKERS_TOKEN;
     }
     if (opts.processEnv.WORKERS_ENVIRONMENT) {
-      configFile.environment = parseEnvironment(
+      partialConfig.environment = parseEnvironment(
         opts.processEnv.WORKERS_ENVIRONMENT
       );
     }
     if (opts.processEnv.WORKERS_WORKER_ID) {
-      configFile.workerId = opts.processEnv.WORKERS_WORKER_ID;
+      partialConfig.workerId = opts.processEnv.WORKERS_WORKER_ID;
     }
     if (opts.processEnv.WORKERS_BASE_URL) {
-      configFile.baseUrl = opts.processEnv.WORKERS_BASE_URL;
+      partialConfig.baseUrl = opts.processEnv.WORKERS_BASE_URL;
     }
     if (opts.flags.token) {
-      configFile.token = opts.flags.token;
+      partialConfig.token = opts.flags.token;
     }
     if (opts.flags.env) {
-      configFile.environment = parseEnvironment(opts.flags.env);
+      partialConfig.environment = parseEnvironment(opts.flags.env);
     }
     if (opts.flags["base-url"]) {
-      configFile.baseUrl = opts.flags["base-url"];
+      partialConfig.baseUrl = opts.flags["base-url"];
     }
     if (opts.flags["worker-id"]) {
-      configFile.workerId = opts.flags["worker-id"];
+      partialConfig.workerId = opts.flags["worker-id"];
+    }
+    partialConfig.baseUrl ??= baseUrlForEnvironment(
+      partialConfig.environment ?? "prod"
+    );
+    const environment = partialConfig.environment;
+    if (!environment) {
+      throw new Error("Environment is required");
+    }
+    const baseUrl = partialConfig.baseUrl;
+    if (!baseUrl) {
+      throw new Error("Base URL is required");
+    }
+    const token = partialConfig.token;
+    if (token === void 0) {
+      throw new Error("Token is required");
     }
-    configFile.baseUrl ??= baseUrl(configFile.environment ?? "prod");
+    const workerId = partialConfig.workerId;
+    if (workerId === void 0) {
+      throw new Error("Worker ID is required");
+    }
+    const configMap = {
+      environment,
+      baseUrl,
+      token,
+      workerId
+    };
     return new Config({
       configFilePath: absConfigFilePath,
-      configFile
+      configMap
     });
   }
   static async #readConfigFile(configFilePath) {
@@ -111,7 +136,7 @@ class Config {
           token: null,
           workerId: null,
           environment: "prod",
-          baseUrl: baseUrl("prod")
+          baseUrl: baseUrlForEnvironment("prod")
         };
       } else {
         throw error;
@@ -151,7 +176,7 @@ function extractPayloadFromToken(token) {
     throw new Error("Failed to parse token payload.");
   }
 }
-function baseUrl(environment) {
+function baseUrlForEnvironment(environment) {
   switch (environment) {
     case "local":
       return "http://localhost:3000";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@project-ajax/sdk",
-	"version": "0.0.54",
+	"version": "0.0.55",
 	"description": "An SDK for building workers for the Project Ajax platform",
 	"license": "UNLICENSED",
 	"type": "module",

package/src/cli/commands/auth.impl.test.ts

@@ -11,8 +11,8 @@ import { Config } from "../config.js";
 import {
 	baseFlags,
 	cleanupTmpDirectories,
+	createAndLoadConfig,
 	createBaseContext,
-	createTestConfig,
 } from "./utils/testing.js";
 
 // Mock the openUrl module before importing the implementation
@@ -35,11 +35,13 @@ describe("login", () => {
 	});
 
 	it("opens browser and displays instructions when no token provided", async () => {
-		const mockConfig = await createTestConfig({
-			token: null,
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: null,
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -63,11 +65,13 @@ describe("login", () => {
 	});
 
 	it("shows error message when browser fails to open", async () => {
-		const mockConfig = await createTestConfig({
-			token: null,
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: null,
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -85,11 +89,13 @@ describe("login", () => {
 	});
 
 	it("saves token and clears workerId when token is provided", async () => {
-		const mockConfig = await createTestConfig({
-			token: null,
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: null,
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		// Spy on Config.load to return our mock config
@@ -98,28 +104,30 @@ describe("login", () => {
 		const testToken =
 			"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig";
 
-		const setEnvironmentSpy = vi.spyOn(mockConfig, "setEnvironment");
-		const setTokenSpy = vi.spyOn(mockConfig, "setToken");
-		const setWorkerIdSpy = vi.spyOn(mockConfig, "setWorkerId");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 
 		const context = createBaseContext();
 
 		await login.call(context, baseFlags, testToken);
 
-		expect(setEnvironmentSpy).toHaveBeenCalledWith("local");
-		expect(setTokenSpy).toHaveBeenCalledWith(testToken);
-		expect(setWorkerIdSpy).toHaveBeenCalledWith(null);
+		expect(updateSpy).toHaveBeenCalledWith({
+			environment: "local",
+			token: testToken,
+			workerId: null,
+		});
 		expect(stderrSpy).toHaveBeenCalledWith(
 			expect.stringContaining("Successfully logged in!"),
 		);
 	});
 
 	it("saves environment from config when logging in", async () => {
-		const mockConfig = await createTestConfig({
-			token: null,
-			workerId: null,
-			environment: "prod",
-			baseUrl: "https://www.notion.so",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: null,
+				workerId: null,
+				environment: "prod",
+				baseUrl: "https://www.notion.so",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -127,13 +135,17 @@ describe("login", () => {
 		const testToken =
 			"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig";
 
-		const setEnvironmentSpy = vi.spyOn(mockConfig, "setEnvironment");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 
 		const context = createBaseContext();
 
 		await login.call(context, baseFlags, testToken);
 
-		expect(setEnvironmentSpy).toHaveBeenCalledWith("prod");
+		expect(updateSpy).toHaveBeenCalledWith({
+			environment: "prod",
+			token: testToken,
+			workerId: null,
+		});
 	});
 });
 
@@ -150,11 +162,13 @@ describe("show", () => {
 		const testToken =
 			"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig";
 
-		const mockConfig = await createTestConfig({
-			token: testToken,
-			workerId: "worker-1",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: testToken,
+				workerId: "worker-1",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -167,11 +181,13 @@ describe("show", () => {
 	});
 
 	it("writes empty string to stdout when no token exists", async () => {
-		const mockConfig = await createTestConfig({
-			token: null,
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: null,
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -186,21 +202,25 @@ describe("show", () => {
 
 describe("logout", () => {
 	it("calls setToken with null", async () => {
-		const mockConfig = await createTestConfig({
-			token: "existing-token",
-			workerId: "worker-1",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token: "existing-token",
+				workerId: "worker-1",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
 
-		const setTokenSpy = vi.spyOn(mockConfig, "setToken");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 
 		const context = createBaseContext();
 
 		await logout.call(context, baseFlags);
 
-		expect(setTokenSpy).toHaveBeenCalledWith(null);
+		expect(updateSpy).toHaveBeenCalledWith({
+			token: null,
+		});
 	});
 });

package/src/cli/commands/auth.impl.ts

@@ -28,9 +28,11 @@ export const login = buildHandler(async function (
 		return;
 	}
 
-	await this.config.setEnvironment(environment);
-	await this.config.setToken(token);
-	await this.config.setWorkerId(null);
+	await this.config.update({
+		environment,
+		token,
+		workerId: null,
+	});
 
 	this.writer.writeErr("Successfully logged in!");
 });
@@ -40,5 +42,7 @@ export const show = buildHandler(function (this: HandlerContext) {
 });
 
 export const logout = buildHandler(async function (this: HandlerContext) {
-	await this.config.setToken(null);
+	await this.config.update({
+		token: null,
+	});
 });

package/src/cli/commands/bundle.impl.test.ts

@@ -14,8 +14,8 @@ import { downloadBundle } from "./bundle.impl.js";
 import {
 	baseFlags,
 	cleanupTmpDirectories,
+	createAndLoadConfig,
 	createBaseContext,
-	createTestConfig,
 } from "./utils/testing.js";
 
 afterEach(cleanupTmpDirectories);
@@ -34,12 +34,14 @@ describe("downloadBundle", () => {
 	});
 
 	it("downloads and pipes bundle to stdout when workerId is set", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: "worker-123",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: "worker-123",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -76,12 +78,14 @@ describe("downloadBundle", () => {
 	});
 
 	it("throws error when workerId is not set", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -101,12 +105,14 @@ describe("downloadBundle", () => {
 	});
 
 	it("handles download failure gracefully", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: "worker-123",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: "worker-123",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);

package/src/cli/commands/deploy.impl.test.ts

@@ -12,8 +12,8 @@ import { Config } from "../config.js";
 import {
 	baseFlags,
 	cleanupTmpDirectories,
+	createAndLoadConfig,
 	createBaseContext,
-	createTestConfig,
 } from "./utils/testing.js";
 
 // Mock external dependencies
@@ -41,12 +41,14 @@ describe("deploy", () => {
 	});
 
 	it("deploys existing worker when workerId is set", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: "worker-123",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: "worker-123",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -54,7 +56,7 @@ describe("deploy", () => {
 			Result.success({ workerId: "worker-123" }),
 		);
 
-		const setWorkerIdSpy = vi.spyOn(mockConfig, "setWorkerId");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 		const context = createBaseContext();
 
 		await deploy.call(context, baseFlags);
@@ -67,7 +69,9 @@ describe("deploy", () => {
 			environment: "local",
 		});
 
-		expect(setWorkerIdSpy).toHaveBeenCalledWith("worker-123");
+		expect(updateSpy).toHaveBeenCalledWith({
+			workerId: "worker-123",
+		});
 
 		const allCalls = stderrSpy.mock.calls.map((call) => call[0]).join("");
 		expect(allCalls).toContain("Deploying worker...");
@@ -75,12 +79,14 @@ describe("deploy", () => {
 	});
 
 	it("deploys new worker with name flag", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -88,7 +94,7 @@ describe("deploy", () => {
 			Result.success({ workerId: "worker-456" }),
 		);
 
-		const setWorkerIdSpy = vi.spyOn(mockConfig, "setWorkerId");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 		const context = createBaseContext();
 
 		await deploy.call(context, { ...baseFlags, name: "my-worker" });
@@ -101,7 +107,9 @@ describe("deploy", () => {
 			environment: "local",
 		});
 
-		expect(setWorkerIdSpy).toHaveBeenCalledWith("worker-456");
+		expect(updateSpy).toHaveBeenCalledWith({
+			workerId: "worker-456",
+		});
 		expect(prompts).not.toHaveBeenCalled();
 
 		const allCalls = stderrSpy.mock.calls.map((call) => call[0]).join("");
@@ -109,12 +117,14 @@ describe("deploy", () => {
 	});
 
 	it("prompts for name when deploying new worker without name flag", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -123,7 +133,7 @@ describe("deploy", () => {
 			Result.success({ workerId: "worker-789" }),
 		);
 
-		const setWorkerIdSpy = vi.spyOn(mockConfig, "setWorkerId");
+		const updateSpy = vi.spyOn(mockConfig, "update");
 		const context = createBaseContext();
 
 		await deploy.call(context, baseFlags);
@@ -143,16 +153,20 @@ describe("deploy", () => {
 			environment: "local",
 		});
 
-		expect(setWorkerIdSpy).toHaveBeenCalledWith("worker-789");
+		expect(updateSpy).toHaveBeenCalledWith({
+			workerId: "worker-789",
+		});
 	});
 
 	it("throws error when prompt is cancelled", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -166,12 +180,14 @@ describe("deploy", () => {
 	});
 
 	it("throws error when both workerId and name are provided", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: "worker-123",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: "worker-123",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -184,12 +200,14 @@ describe("deploy", () => {
 	});
 
 	it("handles deployment failure", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: "worker-123",
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: "worker-123",
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);
@@ -211,12 +229,14 @@ describe("deploy", () => {
 	});
 
 	it("trims whitespace from prompted name", async () => {
-		const mockConfig = await createTestConfig({
-			token:
-				"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
-			workerId: null,
-			environment: "local",
-			baseUrl: "http://localhost:3000",
+		const [mockConfig] = await createAndLoadConfig({
+			configFile: {
+				token:
+					"1.2.eyJzcGFjZUlkIjoic3BhY2UxIiwidXNlcklkIjoidXNlcjEiLCJjZWxsSWQiOiJjZWxsMSJ9.sig",
+				workerId: null,
+				environment: "local",
+				baseUrl: "http://localhost:3000",
+			},
 		});
 
 		vi.spyOn(Config, "load").mockResolvedValue(mockConfig);

package/src/cli/commands/deploy.impl.ts

@@ -68,7 +68,7 @@ export const deploy = buildAuthedHandler(async function (flags: DeployFlags) {
 
 	if (Result.isSuccess(result)) {
 		const { workerId } = Result.unwrap(result);
-		await this.config.setWorkerId(workerId);
+		await this.config.update({ workerId });
 		this.writer.writeErr("✓ Successfully deployed worker");
 	} else {
 		this.writer.writeErr("✗ Failed to deploy worker");

package/src/cli/commands/utils/testing.ts

@@ -3,41 +3,37 @@ import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import * as os from "node:os";
 import { tmpdir } from "node:os";
 import * as path from "node:path";
-import { Config, type Environment } from "../../config.js";
+import { Config, type ConfigMap } from "../../config.js";
 import type { GlobalFlags } from "../../flags.js";
 import { Writer } from "../../writer.js";
 
-export type ConfigFileContents = {
-	token: string | null;
-	workerId: string | null;
-	environment: Environment;
-	baseUrl: string;
-};
-
 export const tmpDirectories: string[] = [];
 
 export const baseFlags: GlobalFlags = {
 	debug: false,
 };
 
-export async function createConfigFile(contents: ConfigFileContents) {
-	const dir = await mkdtemp(path.join(tmpdir(), "cmd-test-"));
-	tmpDirectories.push(dir);
-	const configFilePath = path.join(dir, "config.json");
-
-	await writeFile(configFilePath, JSON.stringify(contents, null, 2), "utf-8");
-	return configFilePath;
-}
+export async function createAndLoadConfig({
+	configFile,
+	env,
+	flags,
+}: {
+	configFile: Partial<ConfigMap>;
+	env?: Partial<NodeJS.ProcessEnv>;
+	flags?: Partial<GlobalFlags>;
+}): Promise<[config: Config, path: string]> {
+	const configFilePath = await createConfigFile(configFile);
 
-export async function createTestConfig(
-	configFileContents: ConfigFileContents,
-): Promise<Config> {
-	const configFilePath = await createConfigFile(configFileContents);
-	return Config.load({
+	const map = await Config.load({
 		configFilePath,
-		processEnv: {} as NodeJS.ProcessEnv,
-		flags: { debug: false },
+		processEnv: env ?? {},
+		flags: {
+			...baseFlags,
+			...(flags ?? {}),
+		},
 	});
+
+	return [map, configFilePath];
 }
 
 export function createBaseContext() {
@@ -58,3 +54,12 @@ export async function cleanupTmpDirectories() {
 		}
 	}
 }
+
+async function createConfigFile(contents: Partial<ConfigMap>) {
+	const dir = await mkdtemp(path.join(tmpdir(), "cmd-test-"));
+	tmpDirectories.push(dir);
+	const configFilePath = path.join(dir, "config.json");
+
+	await writeFile(configFilePath, JSON.stringify(contents, null, 2), "utf-8");
+	return configFilePath;
+}

package/src/cli/config.test.ts

@@ -1,74 +1,30 @@
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import * as path from "node:path";
+import { readFile } from "node:fs/promises";
 import { afterEach, describe, expect, it } from "vitest";
-import { Config, type Environment } from "./config.js";
-import type { GlobalFlags } from "./flags.js";
-
-type ConfigFileContents = {
-	token: string | null;
-	workerId: string | null;
-	environment: Environment;
-	baseUrl: string;
-};
-
-const tmpDirectories: string[] = [];
-
-async function createConfigFile(contents: ConfigFileContents) {
-	const dir = await mkdtemp(path.join(tmpdir(), "config-test-"));
-	tmpDirectories.push(dir);
-	const configFilePath = path.join(dir, "config.json");
+import {
+	cleanupTmpDirectories,
+	createAndLoadConfig,
+} from "./commands/utils/testing.js";
+import { Config, type ConfigMap } from "./config.js";
 
-	await writeFile(configFilePath, JSON.stringify(contents, null, 2), "utf-8");
-	return configFilePath;
-}
-
-afterEach(async () => {
-	while (tmpDirectories.length > 0) {
-		const dir = tmpDirectories.pop();
-		if (dir) {
-			await rm(dir, { recursive: true, force: true });
-		}
-	}
-});
-
-async function loadTestConfig({
-	configFile,
-	env,
-	flags,
-}: {
-	configFile: ConfigFileContents;
-	env?: Partial<NodeJS.ProcessEnv>;
-	flags?: Partial<GlobalFlags>;
-}) {
-	const configFilePath = await createConfigFile(configFile);
-	return Config.load({
-		configFilePath,
-		processEnv: { ...(env ?? {}) } as NodeJS.ProcessEnv,
-		flags: {
-			debug: false,
-			...(flags ?? {}),
-		},
-	});
-}
-
-const baseConfigFile: ConfigFileContents = {
+const baseConfigMap: ConfigMap = {
 	token: "file-token",
 	workerId: "file-worker",
 	environment: "local",
 	baseUrl: "https://config.example.com",
 };
 
+afterEach(cleanupTmpDirectories);
+
 describe("Config.load precedence", () => {
 	it("uses values from the config file when no overrides are present", async () => {
-		const config = await loadTestConfig({
-			configFile: baseConfigFile,
+		const [config] = await createAndLoadConfig({
+			configFile: baseConfigMap,
 		});
 
-		expect(config.token).toBe(baseConfigFile.token);
-		expect(config.workerId).toBe(baseConfigFile.workerId);
-		expect(config.environment).toBe(baseConfigFile.environment);
-		expect(config.baseUrl).toBe(baseConfigFile.baseUrl);
+		expect(config.token).toBe(baseConfigMap.token);
+		expect(config.workerId).toBe(baseConfigMap.workerId);
+		expect(config.environment).toBe(baseConfigMap.environment);
+		expect(config.baseUrl).toBe(baseConfigMap.baseUrl);
 	});
 
 	it("prefers environment variables over the config file", async () => {
@@ -77,15 +33,15 @@ describe("Config.load precedence", () => {
 			WORKERS_WORKER_ID: "env-worker",
 			WORKERS_ENVIRONMENT: "staging",
 		};
-		const config = await loadTestConfig({
-			configFile: baseConfigFile,
+		const [config] = await createAndLoadConfig({
+			configFile: baseConfigMap,
 			env: envVars,
 		});
 
 		expect(config.token).toBe(envVars.WORKERS_TOKEN);
 		expect(config.workerId).toBe(envVars.WORKERS_WORKER_ID);
 		expect(config.environment).toBe(envVars.WORKERS_ENVIRONMENT);
-		expect(config.baseUrl).toBe(baseConfigFile.baseUrl);
+		expect(config.baseUrl).toBe(baseConfigMap.baseUrl);
 	});
 
 	it("prefers flags over environment variables and config file values", async () => {
@@ -100,59 +56,53 @@ describe("Config.load precedence", () => {
 			"base-url": "https://flag.example.com",
 		};
 
-		const config = await loadTestConfig({
-			configFile: baseConfigFile,
+		const [config] = await createAndLoadConfig({
+			configFile: baseConfigMap,
 			env: envVars,
 			flags,
 		});
 
-		expect(config.token).toBe(baseConfigFile.token);
+		expect(config.token).toBe(baseConfigMap.token);
 		expect(config.workerId).toBe(envVars.WORKERS_WORKER_ID);
 		expect(config.environment).toBe(flags.env);
 		expect(config.baseUrl).toBe(flags["base-url"]);
 	});
 });
 
-describe("Config.setEnvironment", () => {
-	it("updates the baseUrl when environment is changed", async () => {
-		const config = await loadTestConfig({
+describe("Config.update", () => {
+	it("persists only provided keys to disk", async () => {
+		const [, configFilePath] = await createAndLoadConfig({
 			configFile: {
-				token: "test-token",
-				workerId: null,
+				token: "file-token",
+				workerId: "file-worker",
 				environment: "prod",
-				baseUrl: "https://www.notion.so",
+				baseUrl: "https://config.example.com",
 			},
 		});
 
-		expect(config.environment).toBe("prod");
-		expect(config.baseUrl).toBe("https://www.notion.so");
-
-		await config.setEnvironment("local");
+		const config = await Config.load({
+			configFilePath,
+			processEnv: {
+				WORKERS_BASE_URL: "https://env.example.com",
+			} as NodeJS.ProcessEnv,
+			flags: { debug: false },
+		});
 
-		expect(config.environment).toBe("local");
-		expect(config.baseUrl).toBe("http://localhost:3000");
-	});
+		expect(config.baseUrl).toBe("https://env.example.com");
 
-	it("updates baseUrl for all environments", async () => {
-		const config = await loadTestConfig({
-			configFile: {
-				token: "test-token",
-				workerId: null,
-				environment: "prod",
-				baseUrl: "https://www.notion.so",
-			},
+		await config.update({
+			token: "updated-token",
 		});
 
-		await config.setEnvironment("staging");
-		expect(config.baseUrl).toBe("https://staging.notion.so");
+		expect(config.token).toBe("updated-token");
 
-		await config.setEnvironment("dev");
-		expect(config.baseUrl).toBe("https://dev.notion.so");
+		const persisted = JSON.parse(await readFile(configFilePath, "utf-8"));
 
-		await config.setEnvironment("prod");
-		expect(config.baseUrl).toBe("https://www.notion.so");
-
-		await config.setEnvironment("local");
-		expect(config.baseUrl).toBe("http://localhost:3000");
+		expect(persisted).toEqual({
+			token: "updated-token",
+			workerId: "file-worker",
+			environment: "prod",
+			baseUrl: "https://config.example.com",
+		});
 	});
 });

package/src/cli/config.ts

@@ -5,7 +5,7 @@ import type { GlobalFlags } from "./flags.js";
 export const Environments = ["local", "staging", "dev", "prod"] as const;
 export type Environment = (typeof Environments)[number];
 
-interface ConfigMap {
+export interface ConfigMap {
 	environment: Environment;
 	baseUrl: string;
 	token: string | null;
@@ -46,11 +46,11 @@ export class Config {
 	readonly #configFilePath: string;
 
 	constructor(opts: {
+		configMap: ConfigMap;
 		configFilePath: string;
-		configFile: ConfigMap;
 	}) {
+		this.#configMap = opts.configMap;
 		this.#configFilePath = opts.configFilePath;
-		this.#configMap = opts.configFile;
 	}
 
 	// Getters read from the environment variables, and then the config file.
@@ -71,32 +71,6 @@ export class Config {
 		return this.#configMap.workerId;
 	}
 
-	// Setters update the config file, and then write it to disk.
-
-	async setEnvironment(environment: Environment) {
-		this.#configMap.environment = environment;
-		this.#configMap.baseUrl = baseUrl(environment);
-		await this.#writeConfigFile();
-	}
-
-	async setToken(token: string | null) {
-		this.#configMap.token = token;
-		await this.#writeConfigFile();
-	}
-
-	async setWorkerId(workerId: string | null) {
-		this.#configMap.workerId = workerId;
-		await this.#writeConfigFile();
-	}
-
-	async #writeConfigFile() {
-		await fs.promises.writeFile(
-			this.#configFilePath,
-			JSON.stringify(this.#configMap, null, 2),
-			"utf-8",
-		);
-	}
-
 	get tokenInfo(): { token: string; spaceId: string; cellId: string } {
 		const token = this.token;
 		if (!token) {
@@ -107,47 +81,100 @@ export class Config {
 		return { token, spaceId, cellId };
 	}
 
+	/**
+	 * Update the config with a partial config map.
+	 *
+	 * This will write only the updated keys in the config file on disk. Not all
+	 * keys are written, since some current keys in the Config object may have
+	 * come from e.g. environment variables, rather than the original config
+	 * file.
+	 *
+	 * @param config The config update.
+	 */
+	async update(config: Partial<ConfigMap>) {
+		Object.assign(this.#configMap, config);
+
+		const currentConfigFile = await Config.#readConfigFile(
+			this.#configFilePath,
+		);
+		Object.assign(currentConfigFile, config);
+		await fs.promises.writeFile(
+			this.#configFilePath,
+			JSON.stringify(currentConfigFile, null, 2),
+			"utf-8",
+		);
+	}
+
 	static async load(opts: {
 		configFilePath: string;
 		processEnv: NodeJS.ProcessEnv;
 		flags: GlobalFlags;
 	}) {
 		const absConfigFilePath = path.resolve(process.cwd(), opts.configFilePath);
-		const configFile = await Config.#readConfigFile(absConfigFilePath);
+		const partialConfig = await Config.#readConfigFile(absConfigFilePath);
 
 		if (opts.processEnv.WORKERS_TOKEN) {
-			configFile.token = opts.processEnv.WORKERS_TOKEN;
+			partialConfig.token = opts.processEnv.WORKERS_TOKEN;
 		}
 		if (opts.processEnv.WORKERS_ENVIRONMENT) {
-			configFile.environment = parseEnvironment(
+			partialConfig.environment = parseEnvironment(
 				opts.processEnv.WORKERS_ENVIRONMENT,
 			);
 		}
 		if (opts.processEnv.WORKERS_WORKER_ID) {
-			configFile.workerId = opts.processEnv.WORKERS_WORKER_ID;
+			partialConfig.workerId = opts.processEnv.WORKERS_WORKER_ID;
 		}
 		if (opts.processEnv.WORKERS_BASE_URL) {
-			configFile.baseUrl = opts.processEnv.WORKERS_BASE_URL;
+			partialConfig.baseUrl = opts.processEnv.WORKERS_BASE_URL;
 		}
 
 		if (opts.flags.token) {
-			configFile.token = opts.flags.token;
+			partialConfig.token = opts.flags.token;
 		}
 		if (opts.flags.env) {
-			configFile.environment = parseEnvironment(opts.flags.env);
+			partialConfig.environment = parseEnvironment(opts.flags.env);
 		}
 		if (opts.flags["base-url"]) {
-			configFile.baseUrl = opts.flags["base-url"];
+			partialConfig.baseUrl = opts.flags["base-url"];
 		}
 		if (opts.flags["worker-id"]) {
-			configFile.workerId = opts.flags["worker-id"];
+			partialConfig.workerId = opts.flags["worker-id"];
+		}
+
+		partialConfig.baseUrl ??= baseUrlForEnvironment(
+			partialConfig.environment ?? "prod",
+		);
+
+		const environment = partialConfig.environment;
+		if (!environment) {
+			throw new Error("Environment is required");
+		}
+
+		const baseUrl = partialConfig.baseUrl;
+		if (!baseUrl) {
+			throw new Error("Base URL is required");
+		}
+
+		const token = partialConfig.token;
+		if (token === undefined) {
+			throw new Error("Token is required");
+		}
+
+		const workerId = partialConfig.workerId;
+		if (workerId === undefined) {
+			throw new Error("Worker ID is required");
 		}
 
-		configFile.baseUrl ??= baseUrl(configFile.environment ?? "prod");
+		const configMap: ConfigMap = {
+			environment,
+			baseUrl,
+			token,
+			workerId,
+		};
 
 		return new Config({
 			configFilePath: absConfigFilePath,
-			configFile: configFile as ConfigMap,
+			configMap,
 		});
 	}
 
@@ -168,7 +195,7 @@ export class Config {
 					token: null,
 					workerId: null,
 					environment: "prod",
-					baseUrl: baseUrl("prod"),
+					baseUrl: baseUrlForEnvironment("prod"),
 				};
 			} else {
 				throw error;
@@ -227,7 +254,7 @@ export function extractPayloadFromToken(token: string): {
 	}
 }
 
-function baseUrl(environment: Environment): string {
+function baseUrlForEnvironment(environment: Environment): string {
 	switch (environment) {
 		case "local":
 			return "http://localhost:3000";