@primitivedotdev/sdk 0.20.0 → 0.21.0

package/dist/oclif/commands/login.js

@@ -4,7 +4,7 @@ import { Command, Errors, Flags } from "@oclif/core";
 import { getAccount, pollCliLogin, startCliLogin, } from "../../api/generated/sdk.gen.js";
 import { PrimitiveApiClient } from "../../api/index.js";
 import { API_ERROR_CODES, extractErrorCode, extractErrorPayload, removeStaleSavedCredentialOnUnauthorized, writeErrorWithHints, } from "../api-command.js";
-import { acquireCliCredentialsLock, credentialsPath, loadCliCredentials, normalizeBaseUrl, saveCliCredentials, } from "../auth.js";
+import { acquireCliCredentialsLock, credentialsPath, loadCliCredentials, normalizeApiBaseUrl1, normalizeApiBaseUrl2, saveCliCredentials, } from "../auth.js";
 const MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS = 60;
 function cliError(message) {
     return new Errors.CLIError(message, { exit: 1 });
@@ -36,13 +36,13 @@ function retryAfterSeconds(result) {
     return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
 }
 export async function checkExistingLogin(params) {
-    const baseUrlOverridden = params.baseUrl !== undefined;
-    const probeBaseUrl = baseUrlOverridden
-        ? normalizeBaseUrl(params.baseUrl)
-        : params.credentials.base_url;
+    const baseUrlOverridden = params.apiBaseUrl1 !== undefined;
+    const probeApiBaseUrl1 = baseUrlOverridden
+        ? normalizeApiBaseUrl1(params.apiBaseUrl1)
+        : params.credentials.api_base_url_1;
     const apiClient = new PrimitiveApiClient({
         apiKey: params.credentials.api_key,
-        baseUrl: probeBaseUrl,
+        apiBaseUrl1: probeApiBaseUrl1,
     });
     const result = await (params.checkAccount ??
         ((client) => getAccount({
@@ -54,7 +54,10 @@ export async function checkExistingLogin(params) {
     const payload = extractErrorPayload(result.error);
     const auth = {
         apiKey: params.credentials.api_key,
-        baseUrl: probeBaseUrl,
+        apiBaseUrl1: probeApiBaseUrl1,
+        // Host-2 isn't relevant to checkExistingLogin (login is on host-1
+        // only), but the auth shape requires it. Use the default.
+        apiBaseUrl2: normalizeApiBaseUrl2(undefined),
         credentials: params.credentials,
         source: "stored",
     };
@@ -84,9 +87,10 @@ class LoginCommand extends Command {
         "<%= config.bin %> login --force",
     ];
     static flags = {
-        "base-url": Flags.string({
-            description: "API base URL (defaults to PRIMITIVE_API_URL or production)",
-            env: "PRIMITIVE_API_URL",
+        "api-base-url-1": Flags.string({
+            description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_1",
+            hidden: true,
         }),
         "device-name": Flags.string({
             description: "Device name shown in the browser approval screen",
@@ -117,7 +121,7 @@ class LoginCommand extends Command {
         }
     }
     async runWithCredentialLock(flags) {
-        const baseUrl = normalizeBaseUrl(flags["base-url"]);
+        const apiBaseUrl1 = normalizeApiBaseUrl1(flags["api-base-url-1"]);
         let existing;
         try {
             existing = loadCliCredentials(this.config.configDir);
@@ -134,7 +138,7 @@ class LoginCommand extends Command {
         }
         else if (existing) {
             const existingStatus = await checkExistingLogin({
-                baseUrl: flags["base-url"],
+                apiBaseUrl1: flags["api-base-url-1"],
                 configDir: this.config.configDir,
                 credentials: existing,
             });
@@ -150,7 +154,7 @@ class LoginCommand extends Command {
                 throw cliError(`Already logged in${org}. Run \`primitive logout\` before logging in again.`);
             }
         }
-        const apiClient = new PrimitiveApiClient({ baseUrl });
+        const apiClient = new PrimitiveApiClient({ apiBaseUrl1 });
         const deviceName = flags["device-name"] ?? hostname();
         const started = await startCliLogin({
             body: {
@@ -192,7 +196,7 @@ class LoginCommand extends Command {
                 }
                 saveCliCredentials(this.config.configDir, {
                     api_key: login.api_key,
-                    base_url: baseUrl,
+                    api_base_url_1: apiBaseUrl1,
                     created_at: new Date().toISOString(),
                     key_id: login.key_id,
                     key_prefix: login.key_prefix,

package/dist/oclif/commands/logout.js

@@ -2,7 +2,7 @@ import { Command, Errors, Flags } from "@oclif/core";
 import { cliLogout } from "../../api/generated/sdk.gen.js";
 import { PrimitiveApiClient } from "../../api/index.js";
 import { API_ERROR_CODES, extractErrorCode, extractErrorPayload, writeErrorWithHints, } from "../api-command.js";
-import { acquireCliCredentialsLock, deleteCliCredentials, loadCliCredentials, normalizeBaseUrl, } from "../auth.js";
+import { acquireCliCredentialsLock, deleteCliCredentials, loadCliCredentials, normalizeApiBaseUrl1, } from "../auth.js";
 function cliError(message) {
     return new Errors.CLIError(message, { exit: 1 });
 }
@@ -15,9 +15,10 @@ class LogoutCommand extends Command {
     static summary = "Log out and revoke the saved CLI key";
     static examples = ["<%= config.bin %> logout"];
     static flags = {
-        "base-url": Flags.string({
-            description: "Override the API base URL used for key revocation",
-            env: "PRIMITIVE_API_URL",
+        "api-base-url-1": Flags.string({
+            description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_1",
+            hidden: true,
         }),
     };
     async run() {
@@ -52,12 +53,12 @@ class LogoutCommand extends Command {
         if (!credentials) {
             throw cliError("Not logged in. Run `primitive login` to create saved CLI credentials.");
         }
-        const baseUrl = flags["base-url"]
-            ? normalizeBaseUrl(flags["base-url"])
-            : credentials.base_url;
+        const apiBaseUrl1 = flags["api-base-url-1"]
+            ? normalizeApiBaseUrl1(flags["api-base-url-1"])
+            : credentials.api_base_url_1;
         const apiClient = new PrimitiveApiClient({
             apiKey: credentials.api_key,
-            baseUrl,
+            apiBaseUrl1,
         });
         const result = await cliLogout({
             body: { key_id: credentials.key_id },

package/dist/oclif/commands/send.js

@@ -115,9 +115,15 @@ class SendCommand extends Command {
             description: "Primitive API key (defaults to PRIMITIVE_API_KEY or saved `primitive login` credentials)",
             env: "PRIMITIVE_API_KEY",
         }),
-        "base-url": Flags.string({
-            description: "API base URL (defaults to PRIMITIVE_API_URL or production)",
-            env: "PRIMITIVE_API_URL",
+        "api-base-url-1": Flags.string({
+            description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_1",
+            hidden: true,
+        }),
+        "api-base-url-2": Flags.string({
+            description: "Override the attachments-supporting send host base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_2",
+            hidden: true,
         }),
         to: Flags.string({
             description: "Recipient address (e.g. alice@example.com).",
@@ -154,15 +160,18 @@ class SendCommand extends Command {
             throw new Errors.CLIError("Either --body or --html (or both) is required.");
         }
         await runWithTiming(flags.time, async () => {
-            const baseUrlOverridden = flags["base-url"] !== undefined;
+            const baseUrlOverridden = flags["api-base-url-1"] !== undefined ||
+                flags["api-base-url-2"] !== undefined;
             const auth = resolveCliAuth({
                 apiKey: flags["api-key"],
-                baseUrl: flags["base-url"],
+                apiBaseUrl1: flags["api-base-url-1"],
+                apiBaseUrl2: flags["api-base-url-2"],
                 configDir: this.config.configDir,
             });
             const apiClient = new PrimitiveApiClient({
                 apiKey: auth.apiKey,
-                baseUrl: auth.baseUrl,
+                apiBaseUrl1: auth.apiBaseUrl1,
+                apiBaseUrl2: auth.apiBaseUrl2,
             });
             const authFailureContext = {
                 auth,
@@ -187,7 +196,12 @@ class SendCommand extends Command {
                         ? { wait_timeout_ms: flags["wait-timeout-ms"] }
                         : {}),
                 },
-                client: apiClient.client,
+                // /send-mail goes to the attachments-supporting host. The
+                // wrapper exposes the host-2 client as _sendClient for this
+                // and any other host-2 operation that lands here. Customer
+                // SDK callers should use PrimitiveClient.send() instead so
+                // the routing stays internal.
+                client: apiClient._sendClient,
                 responseStyle: "fields",
             });
             if (result.error) {

package/dist/oclif/commands/whoami.js

@@ -25,9 +25,15 @@ class WhoamiCommand extends Command {
             description: "Primitive API key (defaults to PRIMITIVE_API_KEY or saved `primitive login` credentials)",
             env: "PRIMITIVE_API_KEY",
         }),
-        "base-url": Flags.string({
-            description: "API base URL (defaults to PRIMITIVE_API_URL or production)",
-            env: "PRIMITIVE_API_URL",
+        "api-base-url-1": Flags.string({
+            description: "Override the primary API base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_1",
+            hidden: true,
+        }),
+        "api-base-url-2": Flags.string({
+            description: "Override the attachments-supporting send host base URL. Internal testing only; not documented to customers.",
+            env: "PRIMITIVE_API_BASE_URL_2",
+            hidden: true,
         }),
         time: Flags.boolean({
             description: TIME_FLAG_DESCRIPTION,
@@ -36,15 +42,18 @@ class WhoamiCommand extends Command {
     async run() {
         const { flags } = await this.parse(WhoamiCommand);
         await runWithTiming(flags.time, async () => {
-            const baseUrlOverridden = flags["base-url"] !== undefined;
+            const baseUrlOverridden = flags["api-base-url-1"] !== undefined ||
+                flags["api-base-url-2"] !== undefined;
             const auth = resolveCliAuth({
                 apiKey: flags["api-key"],
-                baseUrl: flags["base-url"],
+                apiBaseUrl1: flags["api-base-url-1"],
+                apiBaseUrl2: flags["api-base-url-2"],
                 configDir: this.config.configDir,
             });
             const apiClient = new PrimitiveApiClient({
                 apiKey: auth.apiKey,
-                baseUrl: auth.baseUrl,
+                apiBaseUrl1: auth.apiBaseUrl1,
+                apiBaseUrl2: auth.apiBaseUrl2,
             });
             const result = await getAccount({
                 client: apiClient.client,

package/dist/oclif/fish-completion.js

@@ -73,7 +73,7 @@ export function renderFishCompletion(binName) {
             ]) {
                 lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l '${fishEscape(parameter.name.replace(/_/g, "-"))}' -r -d '${fishEscape(parameter.description ?? parameter.name)}'`);
             }
-            lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'api-key' -r -d 'Primitive API key (defaults to PRIMITIVE_API_KEY or saved primitive login credentials)'`, `complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'base-url' -r -d 'API base URL (defaults to PRIMITIVE_API_URL or production)'`);
+            lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'api-key' -r -d 'Primitive API key (defaults to PRIMITIVE_API_KEY or saved primitive login credentials)'`);
             if (operation.hasJsonBody) {
                 lines.push(`complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'body' -r -d 'JSON request body'`, `complete -c ${binName} -n '${operationCondition(operation).replace(BIN_PLACEHOLDER, binName)}' -l 'body-file' -r -d 'Path to a JSON file used as the request body'`);
             }

package/dist/oclif/index.js

@@ -2,6 +2,8 @@ import { Args, Command, Errors } from "@oclif/core";
 import { operationManifest, } from "../openapi/index.js";
 import { createOperationCommand } from "./api-command.js";
 import EmailsLatestCommand from "./commands/emails-latest.js";
+import EmailsWaitCommand from "./commands/emails-wait.js";
+import EmailsWatchCommand from "./commands/emails-watch.js";
 import FunctionsDeployCommand from "./commands/functions-deploy.js";
 import FunctionsRedeployCommand from "./commands/functions-redeploy.js";
 import LoginCommand from "./commands/login.js";
@@ -133,6 +135,10 @@ export const COMMANDS = {
     // inbound emails as a compact text table. emails:list-emails stays
     // available for the full JSON envelope + cursor pagination.
     "emails:latest": EmailsLatestCommand,
+    // `emails:watch` and `emails:wait` poll the search API for new matching
+    // inbound mail. `watch` defaults to a human table; `wait` defaults to JSONL.
+    "emails:watch": EmailsWatchCommand,
+    "emails:wait": EmailsWaitCommand,
     // `functions:deploy` and `functions:redeploy` are file-input
     // shortcuts for create-function / update-function. The underlying
     // ops take `code` as a body string, which is awkward at the CLI