@cantinasecurity/apex-cli 0.1.33 → 0.1.35

package/.claude/skills/apex-cli/SKILL.md

@@ -13,7 +13,11 @@ This skill is bundled with Apex CLI and can be installed into the current reposi
 
 Use Apex through the MCP server when the `apex-*` tools are available. The tools installed by `apex setup` use the local stdio server and device login.
 
-For a production MCP client that does not need local filesystem access, use the hosted Streamable HTTP endpoint at `https://ai.cantina.xyz/mcp`. Read the organization service key from `APEX_SERVICE_KEY` and supply it only as `Authorization: Bearer <TOKEN>`; never put the raw key in a tool argument, result, prompt, source file, or log. The hosted tools are `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`.
+For a production MCP client that does not need local filesystem access, use the hosted Streamable HTTP endpoint at `https://ai.cantina.xyz/mcp`. Read the organization service key from `APEX_SERVICE_KEY` and supply it only as `Authorization: Bearer <TOKEN>`; never put the raw key in a tool argument, result, prompt, source file, or log. The hosted tools are `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-black-start`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`.
+
+OAuth-capable clients may instead use the hosted endpoint’s OAuth discovery and Cantina manager-consent flow. Let the client manage OAuth credentials; never pass them to tools, the REST API, or local CLI. Local stdio MCP continues to use device login.
+
+Apex Black is a hosted-only workflow. Confirm the connected deployment advertises `apex-black-start` and the organization has beta access, then check `apex-credits`. Start only with authorization for all 1–16 exact HTTPS origins and acceptance of the 200 Standard credit cost, honoring authorization already provided in the session. Pass `targetUrls`, `authorizationAccepted: true`, and one stable `idempotencyKey`. Use the returned Bedrock `scanId` with `apex-status` and `apex-findings`. Identical retries replay stored remote-start failures, including `APEX_BLACK_START_FAILED`; retain durable IDs and contact support before trying another request. Do not fall back to a local Black scan mode or tool; neither exists.
 
 For serverless, cron, or other explicit HTTP/JSON integrations, use the hosted Apex REST API instead of CLI or local stdio MCP. The hosted MCP and REST contract is documented at https://ai.cantina.xyz/docs/apex-api.
 
@@ -34,7 +38,7 @@ Parse the JSON from stdout only; do not merge stderr into stdout, because npm
 may write warnings to stderr. `idempotent` means the existing guest session
 resumed and it may already own a workspace.
 
-Recommended workflow:
+Local stdio MCP workflow:
 
 1. Start with `apex-auth-status`.
 2. Always call `apex-trial-status` next, even when account authentication succeeded. When `claimAvailable` is true, do not call `apex-auth-start`; tell the user to run `apex claim` in a terminal first so the trial workspace, scans, and findings are kept. When the claim deadline has passed and `claimAvailable` is false, continue normal account authentication instead of steering the user to an expired claim.
@@ -54,6 +58,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - A trial redeem with an ambiguous transport or response-loss failure may be retried exactly once with the same code, machine, HOME, and repository root. Never retry a typed server rejection or use `--replace` for response-loss recovery.
 - Guest standard scans validate the complete local archive before resolving or reserving a workspace. For an unbound renamed checkout, Apex may recover only the sole empty guest workspace when no explicit workspace name was supplied.
 - After a successful scan JSON response, inspect `localPersistence.workspaceBindingSaved`. If it is `false`, the server scan already started: capture and report `binding.lastScanId`, then STOP; do not run status or findings until local repository permissions are repaired.
+- Shared Standard-scan codes may be custom names such as `TEST100` (1-64 letters, numbers, underscores, or hyphens). Use CLI 0.1.34 or newer. One redemption provides either a guest Standard scan or 100% off one 200-credit checkout package, sharing the same cap. Never redeem both paths with a one-use code. Legacy `APEX-...` and `SPBT-...` codes remain accepted. Do not repeat the real code in output.
 - `apex-trial-status` is MCP-only; do not invoke it as a CLI command. In a CLI-only flow, use the `claimDeadline` returned by `apex redeem <code> --json` without repeating or persisting the secret code.
 - After a guest scan, tell the user to run `apex claim` on the same machine before that returned claim deadline. If the deadline is unavailable or uncertain, do not guess or start a replacement login; run `apex claim` and let the server validate the proof.
 - Claim moves the guest workspace, scans, and findings into the currently selected Cantina workspace when the account can run scans there. Personal workspace owners receive the trial in their existing workspace instead of a duplicate. If the selected workspace cannot run scans, tell the user to switch to one that can and retry before the claim deadline.
@@ -63,7 +68,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - For a headless REST adapter, read the service key from the secret-backed `APEX_SERVICE_KEY` environment variable, send it as a bearer token to `/api/apex/v1`, and redact it from errors and logs. Do not shell out to `apex` or launch local MCP from the adapter.
 - Hosted API integrations can call `GET /api/apex/v1/credits` with `scans:create` scope to inspect the organization's current standard, audit, and Lite balances and effective scan-type availability. Treat the response as a point-in-time snapshot; scan creation remains authoritative.
 - Hosted remote-repository scans require the GitHub repository to be connected to the service key's Apex organization. They reuse a linked active workspace or create and link one when no match exists; use optional `workspaceId` to disambiguate multiple matches and treat explicit workspace/repository mismatches as HTTP `409` setup errors. Local or non-Git REST scans use the documented source-upload flow; send `generateThreatModel: true` for the first scan of a newly created local workspace.
-- Hosted scan triggers require `Idempotency-Key`. Reuse one stable key only for an identical transport/timeout/5xx retry. After correcting a definitive 4xx response, or for any new intended scan, use a new key.
+- Hosted repository scan triggers require `Idempotency-Key`. Reuse one stable key only for an identical transport/timeout/5xx retry. After correcting a definitive 4xx response, or for any new intended repository scan, use a new key. Apex Black stored start failures follow the support escalation rule above; never change keys to bypass them.
 - Use `--non-interactive` and `--no-open` for automation-friendly CLI calls.
 - Use `--json` whenever structured output is helpful.
 - `apex credits` reports standard credits plus audit, fix review, and Lite scan entitlements when Bedrock returns those balances.

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "Cantina agent plugins for security review workflows.",
-    "version": "0.1.33"
+    "version": "0.1.35"
   },
   "plugins": [
     {
@@ -14,10 +14,10 @@
       "source": {
         "source": "npm",
         "package": "@cantinasecurity/apex-cli",
-        "version": "0.1.33"
+        "version": "0.1.35"
       },
       "description": "Run Apex security scans and review findings from Claude Code.",
-      "version": "0.1.33",
+      "version": "0.1.35",
       "author": {
         "name": "Cantina",
         "email": "support@cantina.xyz"

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apex-cli",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Run Apex security scans and review findings from Claude Code.",
   "author": {
     "name": "Cantina",

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apex-cli",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Run Apex security scans and review findings from Codex.",
   "author": {
     "name": "Cantina",

package/.mcp.claude.json

@@ -5,7 +5,7 @@
       "args": [
         "-y",
         "-p",
-        "@cantinasecurity/apex-cli@0.1.33",
+        "@cantinasecurity/apex-cli@0.1.35",
         "apex-mcp"
       ],
       "env": {

package/.mcp.codex.json

@@ -4,7 +4,7 @@
     "args": [
       "-y",
       "-p",
-      "@cantinasecurity/apex-cli@0.1.33",
+      "@cantinasecurity/apex-cli@0.1.35",
       "apex-mcp"
     ],
     "env": {

package/MARKETPLACE.md

@@ -13,7 +13,7 @@ This package is prepared as both a Claude Code plugin and a Codex plugin. The pu
 The plugin MCP configs launch the pinned npm CLI package with:
 
 ```bash
-npx -y -p @cantinasecurity/apex-cli@0.1.33 apex-mcp
+npx -y -p @cantinasecurity/apex-cli@0.1.35 apex-mcp
 ```
 
 That keeps marketplace installs independent of a user's global `apex` install.

package/README.md

@@ -93,13 +93,19 @@ APEX_BASE_URL=https://bedrock.customer.example pnpm apex
 
 ## Try Apex With A Trial Code
 
+Shared Standard-scan codes (including custom names such as `TEST100`) work with
+Apex CLI 0.1.34 or newer. They provide either one guest Standard scan or 100% off
+one 200-credit checkout package. Both paths share the code's redemption limit;
+a one-use code cannot fund both. Previously issued `APEX-...` and `SPBT-...` codes
+remain accepted. Code eligibility and remaining uses are checked by Bedrock.
+
 A Cantina-issued trial code can start a temporary guest scan without a Cantina
 account, browser, or device login. Redeem it from the repository root, run the
 normal scan lifecycle, and create a Cantina account only after reviewing the
 findings:
 
 ```bash
-apex redeem SPBT-DEVREL-XXXXXXXX --json
+apex redeem <code> --json
 apex scan --non-interactive --json
 apex status --json
 apex findings --json
@@ -152,30 +158,30 @@ unclaimed local trial proof so `apex claim` can still use it.
 Agent-safe copy/paste prompt (substitute the issued code):
 
 ```text
-Install and run Cantina Apex CLI 0.1.33 to start one free standard security scan of this repository immediately.
+Install and run Cantina Apex CLI 0.1.35 to start one free standard security scan of this repository immediately.
 
 Use this trial code only where <TRIAL_CODE> appears below: SPBT-DEVREL-XXXXXXXX
 
 Run the commands yourself from the repository root; do not stop after setup or only explain the steps. Use terminal CLI commands only. Do not use an Apex MCP tool or run `apex setup`, `apex mcp`, `apex login`, `apex-auth-start`, or `apex-auth-wait`. Never use `--replace` or `--force`.
 
 Use this exact command prefix for every Apex command:
-  npx -y -p @cantinasecurity/apex-cli@0.1.33 apex
+  npx -y -p @cantinasecurity/apex-cli@0.1.35 apex
 
 1. Before redeeming, confirm every command will use the same persistent, user-accessible machine or container, HOME, filesystem, and repository root. Confirm Node.js 20+ and npx are available. If `APEX_BASE_URL` is set, continue only when its origin is `https://ai.cantina.xyz`. Run the exact prefix with `--help` and continue only if help lists both `redeem` and `claim`. If any check fails, STOP before sending the code; do not install system packages.
 2. Redeem, with at most one response-loss recovery retry:
-     npx -y -p @cantinasecurity/apex-cli@0.1.33 apex redeem <TRIAL_CODE> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.35 apex redeem <TRIAL_CODE> --json
    This terminal command is the only allowed tool call containing the code. Never echo or restate the code, store it in a file or environment variable, put it in a URL or MCP call, or include it in your response. Parse the JSON from stdout only; do not merge stderr into stdout, because npm may write warnings to stderr. Continue when the command exits 0 and stdout is JSON with `redeemed: true` and `outcome` equal to `redeemed` or `idempotent`. `idempotent` means the existing guest session resumed and it may already own a workspace. If and only if the first attempt ends with an ambiguous transport/connection failure or an interrupted/missing response and no typed server error code, retry this exact same command once on the same machine, HOME, and repository root. Never retry a typed server rejection and never make more than one recovery retry. If the allowed retry does not return a successful JSON outcome, STOP.
 3. Immediately start exactly one scan; do not wait for another instruction:
-     npx -y -p @cantinasecurity/apex-cli@0.1.33 apex scan --mode standard --non-interactive --no-open --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.35 apex scan --mode standard --non-interactive --no-open --json
    The CLI validates the complete guest local archive before it reserves a workspace. An unbound renamed checkout may recover only the sole empty guest workspace when no explicit workspace name was supplied. On any error or nonzero exit, STOP. After a successful scan JSON response, inspect `localPersistence.workspaceBindingSaved`. If it is `false`, the server scan already started: capture and report `binding.lastScanId`, then STOP; do not run status or findings until local repository permissions are repaired. Otherwise capture `binding.lastScanId` from the JSON as <SCAN_ID>; if it is absent, STOP.
 4. About every 60 seconds, poll that exact scan:
-     npx -y -p @cantinasecurity/apex-cli@0.1.33 apex status --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.35 apex status --scan <SCAN_ID> --json
    Read `progress.progress.status`. Wait while it is `created`, `pending`, `queued`, `starting`, `running`, `in_progress`, or `processing`. Continue on `completed`. STOP on `failed`, `cancelled`, a missing or unknown status, or a command failure.
 5. Fetch that exact scan's findings:
-     npx -y -p @cantinasecurity/apex-cli@0.1.33 apex findings --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.35 apex findings --scan <SCAN_ID> --json
    On success, summarize findings by severity, most severe first, including identifier, title, status, and confidence. This command does not return file locations, so do not invent them. On failure, STOP.
 6. Do not claim automatically. Tell me the claim deadline from step 2 and remind me to run this exact command myself from the same repository root, machine, and HOME:
-     npx -y -p @cantinasecurity/apex-cli@0.1.33 apex claim
+     npx -y -p @cantinasecurity/apex-cli@0.1.35 apex claim
    It may open a browser so I can create or sign in to a Cantina account and keep the results. Claim moves the trial into the currently selected Cantina workspace when I can run scans there, or into my existing personal workspace. If the selected workspace cannot run scans, tell me to switch to one that can and retry before the claim deadline.
 
 Never paste raw command transcripts. For any failure, report only the step, exit code, and sanitized error. Redact the trial code and every `apex_at_`, `apex_rt_`, or `apex_ct_` value from all reports.
@@ -319,7 +325,9 @@ Service-key management is intentionally available only through the scripted CLI.
 
 ### Hosted HTTPS MCP
 
-Point any Streamable HTTP MCP client at `https://ai.cantina.xyz/mcp` and send the service key as `Authorization: Bearer <TOKEN>`. No local `apex-mcp` process, browser, TTY, or device-login session is required.
+For a service-key connection, point your Streamable HTTP MCP client at `https://ai.cantina.xyz/mcp` and send the service key as `Authorization: Bearer <TOKEN>`. No local `apex-mcp` process, browser, TTY, or device-login session is required.
+
+OAuth-capable clients can connect to the same hosted endpoint through its OAuth discovery flow. Sign in with Cantina, select an organization you manage, and approve the requested scopes. Keep OAuth tokens in the client’s credential store; they authenticate only this MCP resource, not the REST API or local CLI. See the [hosted OAuth setup guide](https://ai.cantina.xyz/docs/apex-api#hosted-mcp) for the supported connection flow.
 
 Keep the key in the environment. For Codex:
 
@@ -346,7 +354,9 @@ Claude Code can expand the same environment variable from `.mcp.json`:
 }
 ```
 
-The hosted server exposes `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`. Ticket creation and linking require an explicit `findings:write` scope and a connected Linear/Jira integration. It operates only on repositories and workspaces available to the service key's organization. Use local stdio MCP for device auth, local filesystem/archive access, provider connection, setup, comments, feedback, fix reviews, and trial flows.
+The hosted server exposes `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-black-start`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`. Ticket creation and linking require an explicit `findings:write` scope and a connected Linear/Jira integration. Hosted operations are scoped to the authenticated organization. Repository scans use connected GitHub repositories; Apex Black scans use explicitly authorized HTTPS origins. Use local stdio MCP for device auth, local filesystem/archive access, provider connection, setup, comments, feedback, fix reviews, and trial flows.
+
+Apex Black is hosted-only: use `apex-black-start` when the connected deployment advertises it and the organization has Apex Black beta access. Check `apex-credits` first. Supply 1–16 exact HTTPS origins, a stable `idempotencyKey`, and `authorizationAccepted: true` only when the user has authorized every target and accepted the 200 Standard credit cost; honor authorization already provided in the session. Use the returned Bedrock `scanId` with `apex-status` and `apex-findings`. An identical retry replays a stored start failure, including `APEX_BLACK_START_FAILED`; retain its durable IDs and contact support before trying another request. Local CLI and stdio MCP do not expose this web-scan tool or a Black scan mode.
 
 ### Hosted REST API
 
@@ -657,7 +667,7 @@ Telemetry event posts do not include bearer tokens. The telemetry endpoint is `P
     {
       "schemaVersion": 1,
       "event": "apex.invocation.completed",
-      "cliVersion": "0.1.33",
+      "cliVersion": "0.1.35",
       "invocation": {
         "surface": "mcp",
         "command": "apex-scan",
@@ -688,7 +698,7 @@ The npm package also includes marketplace-ready plugin artifacts:
 - `.claude-plugin/plugin.json` and `.mcp.claude.json` for Claude Code plugin installs
 - `.claude-plugin/marketplace.json` for a Claude marketplace entry backed by the public npm package
 
-These plugin installs launch the pinned npm package with `npx -y -p @cantinasecurity/apex-cli@0.1.33 apex-mcp`, so users do not need to install `apex` globally before enabling the plugin.
+These plugin installs launch the pinned npm package with `npx -y -p @cantinasecurity/apex-cli@0.1.35 apex-mcp`, so users do not need to install `apex` globally before enabling the plugin.
 
 The repository also includes `.agents/plugins/marketplace.json` for local Codex marketplace testing from a checkout.
 

package/dist/help.js

@@ -25,7 +25,7 @@ export const CLI_HELP_TEXT = `Usage:
   apex status                       Show progress for the latest or selected scan
   apex doctor                       Validate auth, repos, connections, and workspace binding
   apex login                        Sign in to Apex
-  apex redeem <trial-code>          Start a temporary guest session without device login
+  apex redeem <code>                Redeem a Standard-scan code without device login
   apex claim                        Link a guest workspace and findings to a Cantina account
   apex logout                       Sign out locally
   apex service-key create           Create an organization service key (shown once)
@@ -183,8 +183,8 @@ Commands:
   /exit                   Exit Apex
 
 Scripted-only commands (run outside the interactive shell):
-  apex redeem <trial-code> [--json] [--replace]
-                           Start a guest session without device login or browser access
+  apex redeem <code> [--json] [--replace]
+                           Redeem a Standard-scan code without device login or browser access
   apex service-key create --name <name> [--company <id-or-handle>] [--scope <scope[,scope]>]
                            Create an organization service key (shown once)
   apex service-key list [--company <id-or-handle>]

package/dist/onboarding-error-redaction.js

@@ -0,0 +1,27 @@
+import { redactSensitiveText, redactSensitiveValue } from "./redaction.js";
+// These top-level names describe the API error envelope, not user input.
+const ONBOARDING_ERROR_FIELDS = new Set(["code", "error", "detail", "message"]);
+// Public protocol enums are classification, never a free-form echo of the
+// submitted code. Keep this allowlist aligned with Bedrock's onboarding errors.
+const ONBOARDING_ERROR_CODES = new Set([
+    "INVALID_CODE_FORMAT", "INVALID_FINGERPRINT", "CODE_NOT_FOUND",
+    "CODE_EXPIRED", "CODE_REVOKED", "CODE_PAUSED", "CODE_EXHAUSTED",
+    "ACTIVE_GUEST_SESSION", "TRIAL_ALREADY_REDEEMED", "RATE_LIMITED",
+    "TRIAL_CAPACITY", "GUEST_SESSION_INVALID", "GUEST_SESSION_EXPIRED",
+    "GUEST_SESSION_CLAIMED", "GUEST_SESSION_REVOKED", "CLAIM_INVALID",
+    "CLAIM_EXPIRED", "ALREADY_CLAIMED", "FINGERPRINT_MISMATCH",
+    "CLAIM_PERSONAL_TENANT_EXISTS", "CLAIM_TARGET_UNAUTHORIZED",
+    "CLAIM_TARGET_PREFIX_EXHAUSTED", "CLAIM_SCAN_START_INDETERMINATE",
+    "CLAIM_RECONCILIATION_PENDING",
+]);
+export function redactOnboardingErrorBody(body, requestCode) {
+    if (!body || typeof body !== "object" || Array.isArray(body)) {
+        return redactSensitiveValue(body, [requestCode]);
+    }
+    return Object.fromEntries(Object.entries(body).map(([key, value]) => [
+        ONBOARDING_ERROR_FIELDS.has(key) ? key : redactSensitiveText(key, [requestCode]),
+        key === "code" && typeof value === "string" && ONBOARDING_ERROR_CODES.has(value)
+            ? value
+            : redactSensitiveValue(value, [requestCode]),
+    ]));
+}

package/dist/onboarding.js

@@ -3,9 +3,10 @@ import { loginWithoutPersist } from "./auth.js";
 import { isClaimProofAvailable } from "./claim-proof.js";
 import { ApiError, getApiErrorCode, redactSensitiveText, } from "./api-client.js";
 import { clearCredentialsIfCurrent, clearGuestFieldsIfClaimTokenMatches, getOrCreateConfigString, loadConfig, loadCredentials, replaceCredentialsIfCurrent, updateConfig, withCredentialLifecycleLock, } from "./config.js";
+import { redactOnboardingErrorBody } from "./onboarding-error-redaction.js";
 import { APEX_CLI_VERSION } from "./version.js";
 import { loadWorkspaceBinding, saveWorkspaceBinding } from "./workspace-binding.js";
-const ONBOARDING_CODE_PATTERN = /^SPBT-[A-Z0-9]{2,24}-[A-Z0-9]{8}$/;
+const ONBOARDING_CODE_PATTERN = /^[A-Z0-9_-]{1,64}$/;
 const ONBOARDING_FINGERPRINT_PATTERN = /^[a-f0-9]{64}$/;
 const DEFAULT_CLIENT_NAME = "apex";
 const HOSTED_APEX_ORIGIN = "https://ai.cantina.xyz";
@@ -541,8 +542,22 @@ async function redeemOnboardingCodeUnlocked(client, options = {}) {
             : {}),
     };
 }
-export function redeemOnboardingCode(client, options = {}) {
-    return withCredentialLifecycleLock(() => redeemOnboardingCodeUnlocked(client, options));
+export async function redeemOnboardingCode(client, options = {}) {
+    const code = resolveOnboardingCode(options.code);
+    return withCredentialLifecycleLock(() => redeemOnboardingCodeUnlocked(client, { ...options, code })).catch((error) => {
+        // Custom codes have no recognizable prefix. Redact the exact request value
+        // at this boundary without retaining it in credentials or global state.
+        const message = redactSensitiveText(error instanceof Error ? error.message : String(error), [code]);
+        if (error instanceof ApiError) {
+            throw new ApiError(message, error.status, redactOnboardingErrorBody(error.body, code));
+        }
+        if (error instanceof AggregateError) {
+            throw new AggregateError(error.errors.map(e => new Error(redactSensitiveText(e instanceof Error ? e.message : String(e), [code]))), message);
+        }
+        // Rebuild ordinary errors so causes, stacks, and attached request fields
+        // cannot retain the custom code after its message has been sanitized.
+        throw new Error(message);
+    });
 }
 async function claimOnboardingSessionUnlocked(client, cwd, options = {}) {
     let expectedCredentials = await loadCredentials();

package/dist/redaction.js

@@ -1,23 +1,30 @@
 const APEX_SECRET_PATTERN = /(apex_(?:ct|at|rt|dc)_)[A-Za-z0-9._~+/=-]+/gi;
-const ONBOARDING_CODE_PATTERN = /SPBT-[A-Z0-9]{2,24}-[A-Z0-9]{8}/gi;
+const ONBOARDING_CODE_PATTERN = /(APEX|SPBT)-[A-Z0-9]{2,24}-[A-Z0-9]{8}/gi;
 // Hex-only boundaries avoid redacting a 64-character window from a longer hex
 // value while still catching fingerprints next to punctuation or prose.
 const ONBOARDING_FINGERPRINT_PATTERN = /(?<![A-Fa-f0-9])[A-Fa-f0-9]{64}(?![A-Fa-f0-9])/g;
-export function redactSensitiveText(value) {
-    return value
+export function redactSensitiveText(value, requestSecrets = []) {
+    let redacted = value;
+    for (const secret of requestSecrets) {
+        if (!secret)
+            continue;
+        const escaped = secret.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        redacted = redacted.replace(new RegExp(`(?<![A-Z0-9_-])${escaped}(?![A-Z0-9_-])`, "gi"), "[REDACTED]");
+    }
+    return redacted
         .replace(APEX_SECRET_PATTERN, (_match, prefix) => `${prefix}[REDACTED]`)
-        .replace(ONBOARDING_CODE_PATTERN, "SPBT-[REDACTED]")
+        .replace(ONBOARDING_CODE_PATTERN, (_match, prefix) => `${prefix.toUpperCase()}-[REDACTED]`)
         .replace(ONBOARDING_FINGERPRINT_PATTERN, "[REDACTED]");
 }
 export function containsSensitiveText(value) {
     return redactSensitiveText(value) !== value;
 }
 /** Redacts every string key and value in an API error body without mutating it. */
-export function redactSensitiveValue(value) {
+export function redactSensitiveValue(value, requestSecrets = []) {
     const seen = new WeakSet();
     const visit = (current) => {
         if (typeof current === "string")
-            return redactSensitiveText(current);
+            return redactSensitiveText(current, requestSecrets);
         if (!current || typeof current !== "object")
             return current;
         if (seen.has(current))
@@ -26,7 +33,7 @@ export function redactSensitiveValue(value) {
         if (Array.isArray(current))
             return current.map(visit);
         return Object.fromEntries(Object.entries(current).map(([key, nested]) => [
-            redactSensitiveText(key),
+            redactSensitiveText(key, requestSecrets),
             visit(nested),
         ]));
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cantinasecurity/apex-cli",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Standalone CLI and MCP server for Apex.",
   "private": false,
   "type": "module",

package/skills/apex-cli/SKILL.md

@@ -9,7 +9,11 @@ This skill is bundled with Apex CLI and can be installed into Codex with `apex s
 
 Prefer the Apex MCP tools over running `apex` in the shell when the server is available. The tools installed by `apex setup` use the local stdio server and device login.
 
-For a production MCP client that does not need local filesystem access, use the hosted Streamable HTTP endpoint at `https://ai.cantina.xyz/mcp`. Read the organization service key from `APEX_SERVICE_KEY` and supply it only as `Authorization: Bearer <TOKEN>`; never put the raw key in a tool argument, result, prompt, source file, or log. The hosted tools are `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`.
+For a production MCP client that does not need local filesystem access, use the hosted Streamable HTTP endpoint at `https://ai.cantina.xyz/mcp`. Read the organization service key from `APEX_SERVICE_KEY` and supply it only as `Authorization: Bearer <TOKEN>`; never put the raw key in a tool argument, result, prompt, source file, or log. The hosted tools are `apex-credits`, `apex-workspaces`, `apex-scan`, `apex-black-start`, `apex-status`, `apex-cancel-scan`, `apex-findings`, `apex-workspace-findings`, `apex-finding-tickets`, `apex-finding-link-ticket`, and `apex-finding-send`.
+
+OAuth-capable clients may instead use the hosted endpoint’s OAuth discovery and Cantina manager-consent flow. Let the client manage OAuth credentials; never pass them to tools, the REST API, or local CLI. Local stdio MCP continues to use device login.
+
+Apex Black is a hosted-only workflow. Confirm the connected deployment advertises `apex-black-start` and the organization has beta access, then check `apex-credits`. Start only with authorization for all 1–16 exact HTTPS origins and acceptance of the 200 Standard credit cost, honoring authorization already provided in the session. Pass `targetUrls`, `authorizationAccepted: true`, and one stable `idempotencyKey`. Use the returned Bedrock `scanId` with `apex-status` and `apex-findings`. Identical retries replay stored remote-start failures, including `APEX_BLACK_START_FAILED`; retain durable IDs and contact support before trying another request. Do not fall back to a local Black scan mode or tool; neither exists.
 
 For serverless, cron, or other explicit HTTP/JSON integrations, use the hosted Apex REST API instead of CLI or local stdio MCP. The hosted MCP and REST contract is documented at https://ai.cantina.xyz/docs/apex-api.
 
@@ -33,7 +37,7 @@ before passing the code when `APEX_BASE_URL` has any origin other than
 because npm may write warnings to stderr. `idempotent` means the existing guest
 session resumed and it may already own a workspace.
 
-Workflow:
+Local stdio MCP workflow:
 
 1. Start with `apex-auth-status`.
 2. Always call `apex-trial-status` next, even when account authentication succeeded. When `claimAvailable` is true, do not call `apex-auth-start`; tell the user to run `apex claim` in a terminal first so the trial workspace, scans, and findings are kept. When the claim deadline has passed and `claimAvailable` is false, continue normal account authentication instead of steering the user to an expired claim.
@@ -53,6 +57,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - A trial redeem with an ambiguous transport or response-loss failure may be retried exactly once with the same code, machine, HOME, and repository root. Never retry a typed server rejection or use `--replace` for response-loss recovery.
 - Guest standard scans validate the complete local archive before resolving or reserving a workspace. For an unbound renamed checkout, Apex may recover only the sole empty guest workspace when no explicit workspace name was supplied.
 - After a successful scan JSON response, inspect `localPersistence.workspaceBindingSaved`. If it is `false`, the server scan already started: capture and report `binding.lastScanId`, then STOP; do not run status or findings until local repository permissions are repaired.
+- Shared Standard-scan codes may be custom names such as `TEST100` (1-64 letters, numbers, underscores, or hyphens). Use CLI 0.1.34 or newer. One redemption provides either a guest Standard scan or 100% off one 200-credit checkout package, sharing the same cap. Never redeem both paths with a one-use code. Legacy `APEX-...` and `SPBT-...` codes remain accepted. Do not repeat the real code in output.
 - `apex-trial-status` is MCP-only; do not invoke it as a CLI command. In a CLI-only flow, use the `claimDeadline` returned by `apex redeem <code> --json` without repeating or persisting the secret code.
 - After a guest scan, tell the user to run `apex claim` on the same machine before that returned claim deadline. If the deadline is unavailable or uncertain, do not guess or start a replacement login; run `apex claim` and let the server validate the proof.
 - Claim moves the guest workspace, scans, and findings into the currently selected Cantina workspace when the account can run scans there. Personal workspace owners receive the trial in their existing workspace instead of a duplicate. If the selected workspace cannot run scans, tell the user to switch to one that can and retry before the claim deadline.
@@ -68,7 +73,7 @@ Guidelines:
 - For a headless REST adapter, read the service key from the secret-backed `APEX_SERVICE_KEY` environment variable, send it as a bearer token to `/api/apex/v1`, and redact it from errors and logs. Do not shell out to `apex` or launch local MCP from the adapter.
 - Hosted API integrations can call `GET /api/apex/v1/credits` with `scans:create` scope to inspect the organization's current standard, audit, and Lite balances and effective scan-type availability. Treat the response as a point-in-time snapshot; scan creation remains authoritative.
 - Hosted remote-repository scans require the GitHub repository to be connected to the service key's Apex organization. They reuse a linked active workspace or create and link one when no match exists; use optional `workspaceId` to disambiguate multiple matches and treat explicit workspace/repository mismatches as HTTP `409` setup errors. Local or non-Git REST scans use the documented source-upload flow; send `generateThreatModel: true` for the first scan of a newly created local workspace.
-- Hosted scan triggers require `Idempotency-Key`. Reuse one stable key only for an identical transport/timeout/5xx retry. After correcting a definitive 4xx response, or for any new intended scan, use a new key.
+- Hosted repository scan triggers require `Idempotency-Key`. Reuse one stable key only for an identical transport/timeout/5xx retry. After correcting a definitive 4xx response, or for any new intended repository scan, use a new key. Apex Black stored start failures follow the support escalation rule above; never change keys to bypass them.
 - `apex-credits` reports standard credits plus audit, fix review, and Lite scan entitlements when Bedrock returns those balances.
 - `apex-scan` scans the provided `cwd` by default; pass `repoPaths` only when the user asks to scan explicit alternate roots.
 - `apex-doctor` is read-only for guest sessions and reports the local snapshot plan without reserving a workspace. For account sessions it reports whether Apex will use remote materialization or a local snapshot upload for each selected source.