@cantinasecurity/apex-cli 0.1.23 → 0.1.24

package/.claude-plugin/marketplace.json

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

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "apex-cli",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "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.23",
+  "version": "0.1.24",
   "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.23",
+        "@cantinasecurity/apex-cli@0.1.24",
         "apex-mcp"
       ],
       "env": {

package/.mcp.codex.json

@@ -4,7 +4,7 @@
     "args": [
       "-y",
       "-p",
-      "@cantinasecurity/apex-cli@0.1.23",
+      "@cantinasecurity/apex-cli@0.1.24",
       "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.23 apex-mcp
+npx -y -p @cantinasecurity/apex-cli@0.1.24 apex-mcp
 ```
 
 That keeps marketplace installs independent of a user's global `apex` install.

package/README.md

@@ -145,30 +145,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.23 to start one free standard security scan of this repository immediately.
+Install and run Cantina Apex CLI 0.1.24 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.23 apex
+  npx -y -p @cantinasecurity/apex-cli@0.1.24 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.23 apex redeem <TRIAL_CODE> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.24 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. Continue when the command exits 0 and stdout is JSON with `redeemed: true` and `outcome` equal to `redeemed` or `idempotent`. 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.23 apex scan --mode standard --non-interactive --no-open --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.24 apex scan --mode standard --non-interactive --no-open --json
    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.23 apex status --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.24 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.23 apex findings --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.24 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.23 apex claim
+     npx -y -p @cantinasecurity/apex-cli@0.1.24 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.
@@ -421,14 +421,16 @@ codex mcp add apex \
 For Claude Code:
 
 ```bash
-claude mcp add --scope user \
+claude mcp add apex \
+  --scope user \
   -e APEX_MCP_CLIENT=claude \
   -e APEX_CLIENT_INTEGRATION=claude \
-  -- apex apex-mcp
+  -- apex-mcp
 ```
 
-`apex setup claude` checks whether the installed Claude CLI supports
-`--scope user`. On older Claude versions that reject that option, setup safely
+`apex setup claude` uses Claude's name-first stdio command syntax and checks
+whether the installed Claude CLI supports `--scope user`. If a Claude build
+omits that option or advertises it but rejects it at runtime, setup safely
 merges the same user-level `mcpServers.apex` entry into `~/.claude.json`
 without replacing other settings or servers.
 
@@ -567,7 +569,7 @@ Telemetry event posts do not include bearer tokens. The telemetry endpoint is `P
     {
       "schemaVersion": 1,
       "event": "apex.invocation.completed",
-      "cliVersion": "0.1.23",
+      "cliVersion": "0.1.24",
       "invocation": {
         "surface": "mcp",
         "command": "apex-scan",
@@ -598,7 +600,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.23 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.24 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/setup.js

@@ -55,6 +55,20 @@ async function tryExecText(command, args, cwd) {
         return null;
     }
 }
+function isUnknownClaudeScopeOption(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const processError = error;
+    const output = [
+        processError.message,
+        processError.stdout,
+        processError.stderr,
+    ]
+        .filter((value) => typeof value === "string")
+        .join("\n");
+    return /(?:unknown|unrecognized) option(?::)?\s+['"]?--scope['"]?/i.test(output);
+}
 async function resolveMcpLaunchSpec(packageRoot = PACKAGE_ROOT) {
     const repoLocalBinary = path.join(packageRoot, "bin", "apex-mcp");
     if ((await pathExists(path.join(packageRoot, ".git"))) &&
@@ -315,35 +329,52 @@ async function configureClaude(cwd, launch) {
     const existing = await readClaudeUserMcpConfig();
     const env = mcpClientEnv("claude");
     const supportsUserScope = await claudeSupportsUserScope();
+    let usedConfigFallback = supportsUserScope === false;
     const mcpStatus = existing === null
         ? "installed"
         : claudeConfigMatches(existing, launch)
             ? "unchanged"
             : "updated";
-    if (supportsUserScope === false) {
-        // Older Claude Code releases reject --scope. Merge the same stdio
-        // registration into the user config while preserving all other settings.
+    if (usedConfigFallback) {
         await writeClaudeUserMcpConfig(launch);
     }
     else {
-        if (existing) {
-            await execText("claude", ["mcp", "remove", "--scope", "user", MCP_SERVER_NAME]);
+        try {
+            if (existing) {
+                await execText("claude", [
+                    "mcp",
+                    "remove",
+                    MCP_SERVER_NAME,
+                    "--scope",
+                    "user",
+                ]);
+            }
+            // Keep the server name before `--`, which separates Claude options from
+            // the stdio command and its arguments.
+            await execText("claude", [
+                "mcp",
+                "add",
+                MCP_SERVER_NAME,
+                "--scope",
+                "user",
+                "-e",
+                `${MCP_CLIENT_ENV_NAME}=${env[MCP_CLIENT_ENV_NAME]}`,
+                "-e",
+                `${MCP_CLIENT_INTEGRATION_ENV_NAME}=${env[MCP_CLIENT_INTEGRATION_ENV_NAME]}`,
+                "--",
+                launch.command,
+                ...launch.args,
+            ]);
+        }
+        catch (error) {
+            if (!isUnknownClaudeScopeOption(error)) {
+                throw error;
+            }
+            // Some Claude Code builds advertise --scope in help but reject it when
+            // the command runs. Preserve the user-level registration directly.
+            await writeClaudeUserMcpConfig(launch);
+            usedConfigFallback = true;
         }
-        // Claude's variadic --env option consumes later tokens until `--`.
-        await execText("claude", [
-            "mcp",
-            "add",
-            "--scope",
-            "user",
-            "-e",
-            `${MCP_CLIENT_ENV_NAME}=${env[MCP_CLIENT_ENV_NAME]}`,
-            "-e",
-            `${MCP_CLIENT_INTEGRATION_ENV_NAME}=${env[MCP_CLIENT_INTEGRATION_ENV_NAME]}`,
-            "--",
-            MCP_SERVER_NAME,
-            launch.command,
-            ...launch.args,
-        ]);
     }
     const skillSource = path.join(PACKAGE_ROOT, ".claude", "skills", CODEX_SKILL_NAME, "SKILL.md");
     const skillTarget = path.join(cwd, ".claude", "skills", CODEX_SKILL_NAME, "SKILL.md");
@@ -355,8 +386,8 @@ async function configureClaude(cwd, launch) {
             kind: "mcp",
             status: mcpStatus,
             path: path.join(os.homedir(), ".claude.json"),
-            detail: supportsUserScope === false
-                ? `Registered ${MCP_SERVER_NAME} -> ${launch.label} in Claude Code user config (legacy CLI compatibility)`
+            detail: usedConfigFallback
+                ? `Registered ${MCP_SERVER_NAME} -> ${launch.label} in Claude Code user config (CLI compatibility fallback)`
                 : `Registered ${MCP_SERVER_NAME} -> ${launch.label} in Claude Code user config`,
         },
         {

package/package.json

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