@project-ajax/cli 0.0.14 → 0.0.16

package/dist/config.js

@@ -1,194 +1,376 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-const Environments = ["local", "staging", "dev", "prod"];
-function parseEnvironment(name) {
-  if (["local", "staging", "dev", "prod"].includes(name)) {
-    return name;
-  }
-  throw new Error(`Invalid environment name: ${name}`);
-}
-class TokenNotSetError extends Error {
-  constructor(message = "Not authenticated. Run 'workers auth login' first.") {
-    super(message);
-    this.name = "TokenNotSetError";
+import Debug from "debug";
+import z from "zod";
+import {
+  fetchToken,
+  parseToken,
+  storeToken,
+  TokenNotSetError
+} from "./token.js";
+const debug = Debug("notion:workers:config");
+const Environment = z.literal(["local", "dev", "stg", "prod"]);
+const SpaceCache = z.object({
+  version: z.literal("1"),
+  spaces: z.record(
+    z.string(),
+    z.object({ id: z.string(), name: z.string(), cellId: z.string() })
+  )
+});
+const LocalConfig = z.object({
+  version: z.literal("1"),
+  environment: Environment,
+  baseURL: z.string().optional(),
+  spaceId: z.string().nullable(),
+  workerId: z.string().nullable()
+});
+const LocalConfigV0 = z.object({
+  environment: z.string(),
+  baseUrl: z.string(),
+  token: z.string().nullable(),
+  workerId: z.string().nullable()
+}).partial();
+class NoSuitableConfigFileError extends Error {
+  constructor() {
+    super("No suitable config file found");
+    this.name = "NoSuitableConfigFileError";
   }
 }
 class Config {
-  #configMap;
-  #configFilePath;
+  #spaceCachePath;
+  #spaceCache;
+  #localConfigPath;
+  #localConfig;
+  #baseURL;
+  #environment;
+  #spaceId;
+  #workerId;
+  #token = null;
   constructor(opts) {
-    this.#configMap = opts.configMap;
-    this.#configFilePath = opts.configFilePath;
+    this.#spaceCachePath = opts.spaceCachePath;
+    this.#spaceCache = opts.spaceCache;
+    this.#localConfigPath = opts.localConfigPath;
+    this.#localConfig = opts.localConfig;
+    this.#baseURL = opts.baseURL;
+    this.#spaceId = opts.spaceId;
+    this.#workerId = opts.workerId;
+    this.#environment = opts.environment;
+    this.#token = opts.token;
   }
-  // Getters read from the environment variables, and then the config file.
-  get baseUrl() {
-    return this.#configMap.baseUrl;
+  get environment() {
+    return this.#environment;
   }
-  get token() {
-    return this.#configMap.token;
+  get baseURL() {
+    return this.#baseURL;
   }
-  get environment() {
-    return this.#configMap.environment;
+  get spaceId() {
+    return this.#spaceId;
   }
   get workerId() {
-    return this.#configMap.workerId;
+    return this.#workerId;
+  }
+  /**
+   * Get the list of cached spaces.
+   *
+   * @returns An array of cached spaces with id, name, and cellId.
+   */
+  getCachedSpaces() {
+    return Object.values(this.#spaceCache.spaces);
   }
-  get tokenInfo() {
-    const token = this.token;
+  /**
+   * Get the token and token information from the keychain.
+   *
+   * @returns The token and token information, or null if no token is found.
+   */
+  async getToken() {
+    if (this.#token) {
+      return [this.#token, parseToken(this.#token)];
+    }
+    if (!this.spaceId) {
+      return null;
+    }
+    const token = await fetchToken(this.spaceId);
     if (!token) {
+      return null;
+    }
+    this.#token = token;
+    return [this.#token, parseToken(this.#token)];
+  }
+  /**
+   * Get the token and token information from the keychain.
+   *
+   * Throws an error if no token is found.
+   *
+   * @returns The token and token information.
+   */
+  async mustGetToken() {
+    const result = await this.getToken();
+    if (!result) {
       throw new TokenNotSetError();
     }
-    const { spaceId, cellId } = extractPayloadFromToken(token);
-    return { token, spaceId, cellId };
+    return result;
   }
   /**
-   * Update the config with a partial config map.
+   * Log in by updating the local configuration and the space cache, and
+   * storing the token in the keychain.
    *
-   * 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 args The arguments to login.
+   * @param args.environment The environment to login to.
+   * @param args.token The token to login with.
+   * @param args.spaceId The space ID to login to.
+   * @param args.spaceName The space name to login to.
+   * @param args.cellId The cell ID to login to.
+   */
+  async login(args) {
+    this.#environment = args.environment;
+    this.#spaceId = args.spaceId;
+    this.#localConfig.environment = args.environment;
+    this.#localConfig.spaceId = args.spaceId;
+    this.#writeLocalConfig();
+    this.#spaceCache.spaces[args.spaceId] = {
+      id: args.spaceId,
+      name: args.spaceName,
+      cellId: args.cellId
+    };
+    this.#writeSpaceCache();
+    await storeToken(args.spaceId, args.token);
+  }
+  /**
+   * Set the worker ID.
+   *
+   * @param workerId The worker ID to set.
+   */
+  setWorker(workerId) {
+    this.#workerId = workerId;
+    this.#localConfig.workerId = workerId;
+    this.#writeLocalConfig();
+  }
+  /**
+   * Switch to an existing cached space.
+   *
+   * This updates the local configuration to use the specified space.
+   * The token for this space should already exist in the keychain.
    *
-   * @param config The config update.
+   * @param spaceId The space ID to switch to.
+   * @throws Error if the space is not in the cache.
    */
-  async update(config) {
-    Object.assign(this.#configMap, config);
-    const currentConfigFile = await Config.#readConfigFile(
-      this.#configFilePath
+  switchToSpace(spaceId) {
+    const space = this.#spaceCache.spaces[spaceId];
+    if (!space) {
+      throw new Error(`Space ${spaceId} not found in cache`);
+    }
+    this.#spaceId = spaceId;
+    this.#localConfig.spaceId = spaceId;
+    this.#writeLocalConfig();
+  }
+  #writeSpaceCache() {
+    fs.writeFileSync(
+      this.#spaceCachePath,
+      JSON.stringify(this.#spaceCache, null, 2)
     );
-    Object.assign(currentConfigFile, config);
-    await fs.promises.writeFile(
-      this.#configFilePath,
-      JSON.stringify(currentConfigFile, null, 2),
-      "utf-8"
+  }
+  #writeLocalConfig() {
+    fs.writeFileSync(
+      this.#localConfigPath,
+      JSON.stringify(this.#localConfig, null, 2)
     );
   }
-  static async load(opts) {
-    const absConfigFilePath = path.resolve(process.cwd(), opts.configFilePath);
-    const partialConfig = await Config.#readConfigFile(absConfigFilePath);
-    if (opts.processEnv.WORKERS_TOKEN) {
-      partialConfig.token = opts.processEnv.WORKERS_TOKEN;
-    }
-    if (opts.processEnv.WORKERS_ENVIRONMENT) {
-      partialConfig.environment = parseEnvironment(
-        opts.processEnv.WORKERS_ENVIRONMENT
-      );
-    }
-    if (opts.processEnv.WORKERS_WORKER_ID) {
-      partialConfig.workerId = opts.processEnv.WORKERS_WORKER_ID;
-    }
-    if (opts.processEnv.WORKERS_BASE_URL) {
-      partialConfig.baseUrl = opts.processEnv.WORKERS_BASE_URL;
+  /**
+   * Resolve the space cache path.
+   *
+   * @param opts Options for resolving the space cache path.
+   * @param opts.filePath The path to the space cache file.
+   * @param opts.env The environment variables.
+   * @returns The path to the space cache file.
+   */
+  static resolveSpaceCachePath(opts) {
+    const env = opts.env;
+    const home = env.HOME;
+    const xdgConfigHome = env.XDG_CONFIG_HOME;
+    const notionHome = env.NOTION_HOME;
+    let configFileDir;
+    let configFilePath;
+    if (opts.filePath) {
+      const absPath = path.resolve(process.cwd(), opts.filePath);
+      configFileDir = path.dirname(absPath);
+      configFilePath = absPath;
+    } else {
+      if (notionHome && isDir(notionHome)) {
+        configFileDir = notionHome;
+        configFilePath = path.join(configFileDir, "spaces.json");
+      } else if (xdgConfigHome && isDir(xdgConfigHome)) {
+        configFileDir = path.join(xdgConfigHome, "notion");
+        configFilePath = path.join(configFileDir, "spaces.json");
+      } else if (home && isDir(path.join(home, ".config"))) {
+        configFileDir = path.join(home, ".config", "notion");
+        configFilePath = path.join(configFileDir, "spaces.json");
+      } else if (home && isDir(home)) {
+        configFileDir = path.join(home, ".notion");
+        configFilePath = path.join(configFileDir, "spaces.json");
+      }
     }
-    if (opts.flags.token) {
-      partialConfig.token = opts.flags.token;
+    debug("%o", { configFileDir, configFilePath });
+    if (!(configFileDir && configFilePath)) {
+      throw new NoSuitableConfigFileError();
     }
-    if (opts.flags.env) {
-      partialConfig.environment = parseEnvironment(opts.flags.env);
+    if (!fs.existsSync(configFileDir)) {
+      fs.mkdirSync(configFileDir, { recursive: true });
     }
-    if (opts.flags["base-url"]) {
-      partialConfig.baseUrl = opts.flags["base-url"];
+    if (!isDir(configFileDir)) {
+      throw new NoSuitableConfigFileError();
     }
-    if (opts.flags["worker-id"]) {
-      partialConfig.workerId = opts.flags["worker-id"];
+    if (!fs.existsSync(configFilePath)) {
+      fs.writeFileSync(
+        configFilePath,
+        JSON.stringify(Config.emptySpaceCache, null, 2)
+      );
     }
-    partialConfig.environment ??= "prod";
-    partialConfig.baseUrl ??= baseUrlForEnvironment(partialConfig.environment);
-    const environment = partialConfig.environment;
-    if (!environment) {
-      throw new Error("Environment is required");
+    if (!isFile(configFilePath)) {
+      throw new NoSuitableConfigFileError();
     }
-    const baseUrl = partialConfig.baseUrl;
-    if (!baseUrl) {
-      throw new Error("Base URL is required");
+    return configFilePath;
+  }
+  /**
+   * Resolve the local config path.
+   *
+   * @param opts Options for resolving the local config path.
+   * @param opts.filePath The path to the local config file.
+   * @returns
+   */
+  static resolveLocalConfigPath(opts = {}) {
+    const absPath = path.resolve(
+      process.cwd(),
+      opts.filePath ?? "./workers.json"
+    );
+    if (!fs.existsSync(absPath)) {
+      fs.writeFileSync(
+        absPath,
+        JSON.stringify(Config.emptyLocalConfig, null, 2)
+      );
     }
-    const token = partialConfig.token;
-    if (token === void 0) {
-      throw new Error("Token is required");
+    if (!isFile(absPath)) {
+      throw new NoSuitableConfigFileError();
     }
-    const workerId = partialConfig.workerId;
-    if (workerId === void 0) {
-      throw new Error("Worker ID is required");
+    return absPath;
+  }
+  /**
+   * Load config from space cache and local config files, then resolve them to
+   * a final config for this execution of the command line interface.
+   *
+   * If the local config is v0, it will be upgraded to v1.
+   *
+   * Overrides:
+   *
+   * - Environment: WORKERS_ENVIRONMENT or --env flag
+   * - Token: WORKERS_TOKEN or --token flag
+   * - Base URL: WORKERS_BASE_URL or --base-url flag
+   *
+   * @param opts The options to load the config from.
+   * @param opts.spaceCachePath The path to the space cache file.
+   * @param opts.localPath The path to the local config file.
+   * @param opts.env The process environment.
+   * @param opts.processEnv The process environment.
+   * @param opts.flags The global flags.
+   * @returns The resolved config.
+   */
+  static load(opts) {
+    const { spaceCachePath, localPath, env, flags } = opts;
+    const cacheJson = fs.readFileSync(spaceCachePath, "utf-8");
+    const cacheRaw = JSON.parse(cacheJson);
+    const spaceCache = SpaceCache.parse(cacheRaw);
+    const localJson = fs.readFileSync(localPath, "utf-8");
+    const localRaw = JSON.parse(localJson);
+    let localConfig;
+    const v1Result = LocalConfig.safeParse(localRaw);
+    if (v1Result.success) {
+      localConfig = v1Result.data;
+    } else {
+      const v0Config = LocalConfigV0.parse(localRaw);
+      localConfig = upgradeV0ToV1(v0Config, localPath);
     }
-    const configMap = {
-      environment,
-      baseUrl,
-      token,
-      workerId
-    };
+    const environment = Environment.parse(
+      env.WORKERS_ENVIRONMENT ?? flags.env ?? localConfig.environment
+    );
+    const baseURLOverride = env.WORKERS_BASE_URL ?? flags["base-url"] ?? localConfig.baseURL;
+    const baseURL = baseURLOverride ?? baseUrlForEnvironment(environment);
+    const spaceId = localConfig.spaceId;
+    const workerId = localConfig.workerId;
+    const token = env.WORKERS_TOKEN ?? flags.token ?? null;
     return new Config({
-      configFilePath: absConfigFilePath,
-      configMap
+      spaceCachePath,
+      spaceCache,
+      localConfigPath: localPath,
+      localConfig,
+      environment,
+      baseURL,
+      spaceId,
+      workerId,
+      token
     });
   }
-  static async #readConfigFile(configFilePath) {
-    let configFile;
-    try {
-      const configContents = await fs.promises.readFile(
-        configFilePath,
-        "utf-8"
-      );
-      configFile = JSON.parse(configContents);
-    } catch (error) {
-      if (isENOENT(error)) {
-        configFile = {
-          token: null,
-          workerId: null
-        };
-      } else {
-        throw error;
-      }
-    }
-    return configFile;
+  /**
+   * The empty local config.
+   */
+  static get emptyLocalConfig() {
+    return { version: "1", environment: "prod", spaceId: null, workerId: null };
+  }
+  /**
+   * The empty space cache.
+   */
+  static get emptySpaceCache() {
+    return { version: "1", spaces: {} };
   }
 }
-function isENOENT(error) {
-  return error instanceof Error && "code" in error && error.code === "ENOENT";
+function isDir(path2) {
+  try {
+    return fs.statSync(path2).isDirectory();
+  } catch {
+    return false;
+  }
 }
-function extractPayloadFromToken(token) {
+function isFile(path2) {
   try {
-    const parts = token.split(".");
-    if (parts.length !== 4 || !parts[2]) {
-      throw new Error("Invalid token format.");
-    }
-    const payloadBase64 = parts[2];
-    const payloadJson = Buffer.from(payloadBase64, "base64url").toString(
-      "utf-8"
-    );
-    const payload = JSON.parse(payloadJson);
-    if (!payload.spaceId || !payload.userId || !payload.cellId) {
-      throw new Error(
-        "Token payload missing required fields (spaceId, userId, cellId)."
-      );
-    }
-    return {
-      spaceId: payload.spaceId,
-      userId: payload.userId,
-      cellId: payload.cellId
-    };
-  } catch (error) {
-    if (error instanceof Error && error.message.startsWith("Token")) {
-      throw error;
-    }
-    throw new Error("Failed to parse token payload.");
+    return fs.statSync(path2).isFile();
+  } catch {
+    return false;
   }
 }
 function baseUrlForEnvironment(environment) {
   switch (environment) {
     case "local":
       return "http://localhost:3000";
-    case "staging":
-      return "https://staging.notion.so";
+    case "stg":
+      return "https://stg.notion.so";
     case "dev":
       return "https://dev.notion.so";
     case "prod":
       return "https://www.notion.so";
   }
 }
+function upgradeV0ToV1(v0Config, localPath) {
+  let environment = "prod";
+  if (v0Config.environment === "local" || v0Config.environment === "dev" || v0Config.environment === "stg" || v0Config.environment === "prod") {
+    environment = v0Config.environment;
+  } else if (v0Config.environment === "staging") {
+    environment = "stg";
+  }
+  let spaceId = null;
+  if (v0Config.token) {
+    const tokenInfo = parseToken(v0Config.token);
+    spaceId = tokenInfo.spaceId;
+  }
+  const localConfig = {
+    version: "1",
+    environment,
+    baseURL: v0Config.baseUrl,
+    spaceId,
+    workerId: v0Config.workerId ?? null
+  };
+  fs.writeFileSync(localPath, JSON.stringify(localConfig, null, 2));
+  return localConfig;
+}
 export {
   Config,
-  Environments,
-  TokenNotSetError,
-  extractPayloadFromToken,
-  parseEnvironment
+  Environment,
+  NoSuitableConfigFileError
 };

package/dist/deploy.d.ts

@@ -1,5 +1,6 @@
-import type { ApiError, Environment } from "./api/client.js";
+import type { ApiError } from "./api/client.js";
 import { Result } from "./api/result.js";
+import type { Environment } from "./config.js";
 import type { AuthedContext } from "./handler.js";
 export interface BaseDeployOptions {
     /**

package/dist/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEtE;;GAEG;AACH,wBAAsB,YAAY,CACjC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,CAAC,CAAC,CAgFjD"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../src/deploy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,WAAW,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC7D;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG,mBAAmB,CAAC;AAEtE;;GAEG;AACH,wBAAsB,YAAY,CACjC,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,EAAE,QAAQ,CAAC,CAAC,CAgFjD"}

package/dist/flags.d.ts

@@ -1,13 +1,12 @@
 import type { TypedFlagParameter } from "@stricli/core";
-import { type Environment } from "./config.js";
+import { Environment } from "./config.js";
 import type { LocalContext } from "./context.js";
 export interface GlobalFlags {
     config?: string;
     debug: boolean;
     env?: Environment;
-    "base-url"?: string;
     token?: string;
-    "worker-id"?: string;
+    "base-url"?: string;
 }
 export declare const globalFlags: {
     [K in keyof Required<GlobalFlags>]: TypedFlagParameter<GlobalFlags[K], LocalContext>;

package/dist/flags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../src/flags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,KAAK,WAAW,EAAgB,MAAM,aAAa,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,WAAW,WAAW;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE;KACxB,CAAC,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,kBAAkB,CACrD,WAAW,CAAC,CAAC,CAAC,EACd,YAAY,CACZ;CAqCD,CAAC;AAEF,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,WAAW,EAAE;KACxB,CAAC,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,kBAAkB,CACrD,WAAW,CAAC,CAAC,CAAC,EACd,YAAY,CACZ;CAOD,CAAC"}
+{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../src/flags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,WAAW,WAAW;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,EAAE;KACxB,CAAC,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,kBAAkB,CACrD,WAAW,CAAC,CAAC,CAAC,EACd,YAAY,CACZ;CA+BD,CAAC;AAEF,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,WAAW,EAAE;KACxB,CAAC,IAAI,MAAM,QAAQ,CAAC,WAAW,CAAC,GAAG,kBAAkB,CACrD,WAAW,CAAC,CAAC,CAAC,EACd,YAAY,CACZ;CAOD,CAAC"}

package/dist/flags.js

@@ -1,4 +1,4 @@
-import { Environments } from "./config.js";
+import { Environment } from "./config.js";
 const globalFlags = {
   config: {
     kind: "parsed",
@@ -13,26 +13,20 @@ const globalFlags = {
   },
   env: {
     kind: "enum",
-    values: Environments,
+    values: Array.from(Environment.values),
     brief: "The environment to use for the command",
     optional: true
   },
-  "base-url": {
-    kind: "parsed",
-    parse: String,
-    brief: "The base URL to use for all API requests",
-    optional: true
-  },
   token: {
     kind: "parsed",
     parse: String,
     brief: "The token to use for authentication",
     optional: true
   },
-  "worker-id": {
+  "base-url": {
     kind: "parsed",
     parse: String,
-    brief: "The ID of the worker to use for the command",
+    brief: "The base URL to use for all API requests",
     optional: true
   }
 };

package/dist/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,cAAe,SAAQ,YAAY;IACnD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc;IACpD,SAAS,EAAE,SAAS,CAAC;CACrB;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,EAAE,EACzE,OAAO,EAAE,CACR,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,KAAK,EACZ,GAAG,IAAI,EAAE,IAAI,KACT,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAGxB,MAAM,YAAY,EAClB,OAAO,WAAW,GAAG,KAAK,EAC1B,GAAG,MAAM,IAAI,mBAiBd;AAED,wBAAgB,kBAAkB,CACjC,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,EAAE,EAEhC,OAAO,EAAE,CACR,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,KAAK,EACZ,GAAG,IAAI,EAAE,IAAI,KACT,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,UA7BlB,YAAY,8DA6CnB"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,cAAe,SAAQ,YAAY;IACnD,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,cAAc;IACpD,SAAS,EAAE,SAAS,CAAC;CACrB;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,EAAE,EACzE,OAAO,EAAE,CACR,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,KAAK,EACZ,GAAG,IAAI,EAAE,IAAI,KACT,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,IAGxB,MAAM,YAAY,EAClB,OAAO,WAAW,GAAG,KAAK,EAC1B,GAAG,MAAM,IAAI,mBAsBd;AAED,wBAAgB,kBAAkB,CACjC,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,IAAI,SAAS,QAAQ,GAAG,EAAE,EAEhC,OAAO,EAAE,CACR,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,KAAK,EACZ,GAAG,IAAI,EAAE,IAAI,KACT,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,UAlClB,YAAY,8DAiDnB"}

package/dist/handler.js

@@ -2,10 +2,16 @@ import { ApiClient } from "./api/client.js";
 import { Config } from "./config.js";
 function buildHandler(handler) {
   return async function(flags, ...args) {
-    const configFilePath = flags.config ?? this.process.env.WORKERS_CONFIG_FILE_PATH ?? "./workers.json";
-    const config = await Config.load({
-      configFilePath,
-      processEnv: process.env,
+    const globalConfigPath = Config.resolveSpaceCachePath({
+      env: this.process.env
+    });
+    const localConfigPath = Config.resolveLocalConfigPath({
+      filePath: flags.config ?? this.process.env.WORKERS_CONFIG ?? "./workers.json"
+    });
+    const config = Config.load({
+      spaceCachePath: globalConfigPath,
+      localPath: localConfigPath,
+      env: process.env,
       flags
     });
     this.io.debugEnabled = flags.debug;
@@ -13,13 +19,11 @@ function buildHandler(handler) {
   };
 }
 function buildAuthedHandler(handler) {
-  return buildHandler(function(flags, ...args) {
-    const { token, cellId } = this.config.tokenInfo;
-    const environment = this.config.environment;
+  return buildHandler(async function(flags, ...args) {
+    const [token, { cellId }] = await this.config.mustGetToken();
     const client = new ApiClient({
       token,
-      environment,
-      baseUrl: this.config.baseUrl,
+      baseUrl: this.config.baseURL,
       cellId,
       writer: this.io
     });

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAiDA,eAAO,MAAM,GAAG,0EAgBd,CAAC"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAgDA,eAAO,MAAM,GAAG,0EAgBd,CAAC"}

package/dist/routes.js

@@ -10,7 +10,7 @@ import { oauthCommands } from "./commands/oauth.js";
 import pack from "./commands/pack.js";
 import { runsCommands } from "./commands/runs.js";
 import { secretsCommands } from "./commands/secrets.js";
-import { TokenNotSetError } from "./config.js";
+import { TokenNotSetError } from "./token.js";
 const routes = buildRouteMap({
   docs: {
     brief: "A CLI for the Project Ajax platform",
@@ -22,10 +22,9 @@ data, providing tools to Custom Agents, or running automation tasks.
 Most flags are configured either with a config file or flags, but environment
 variables can also be provided:
 
-- WORKERS_CONFIG_FILE_PATH: The path to the config file to use (e.g. ./workers.dev.json)
+- WORKERS_CONFIG: The path to the config file to use (e.g. ./workers.dev.json)
 - WORKERS_TOKEN: The token to use for authentication
 - WORKERS_ENVIRONMENT: The environment to use
-- WORKERS_WORKER_ID: The worker ID to use
 - WORKERS_BASE_URL: The base API URL to use
 `.trim(),
     hideRoute: {