@cantinasecurity/apex-cli 0.1.19 → 0.1.21

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

@@ -37,7 +37,7 @@ Recommended workflow:
 4. For repository-scoped work, pass `cwd` explicitly.
 5. Call `apex-doctor` before starting a scan if workspace binding or source planning might be unclear.
 6. If the directory is not bound to the right workspace, call `apex-workspaces` and `apex-workspace-use`.
-7. Use `apex-scan`, `apex-status`, `apex-scans`, `apex-findings`, and `apex-export-findings` for the scan lifecycle.
+7. Use `apex-scan`, `apex-status`, `apex-scans`, `apex-findings`, and `apex-export-findings` for the scan lifecycle. Use `apex-workspace-findings` for the cross-scan workspace browser view.
 8. For Lite scans, call `apex-scan` with `mode: "lite"` only when the company has Lite Scan beta access and the sources are provider-backed.
 9. For PR scans, call `apex-scan` with `mode: "pr"` and `pullRequests`.
 10. Use `apex-finding-comment` and `apex-finding-feedback` when the user wants to leave review notes or valid/invalid feedback on a finding.
@@ -50,7 +50,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - 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.
 - `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 currently requires a Cantina account that does not already own a personal Apex tenant. If the user already completed Cantina Apex onboarding, explain that CLI linking is not available yet and tell them to contact Cantina support before the claim deadline.
+- 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.
 - Service-key management has no MCP tools. Never ask a user to paste a service key into a prompt, and never place one in an MCP call, tool result, source file, or log.
 - If a user explicitly needs a new service key, tell them to run `apex login` if needed, then run `apex service-key create --name <name> --scope <scope[,scope]>` directly in their own terminal. Use only the required scopes: `scans:create` to trigger, `scans:read` to poll status, and `findings:read` to retrieve findings. A P1-only adapter can use `--scope scans:read,findings:read`; omitting `--scope` grants all three. The CLI automatically selects the company when only one is available and prompts when there are several; use `--company <id-or-handle>` to skip that prompt or resolve a non-interactive command. Service-key commands never initiate login, and the secret is shown once.
 - For a headless HTTP adapter, read the service key from a secret-backed 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 MCP from the adapter.
@@ -69,6 +69,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - `apex-workspace-use` accepts a workspace name, prefix, or ID.
 - Use `sourceMode: "remote"` only when the user explicitly wants to forbid local snapshot fallbacks.
 - When checking a scan that is not the workspace binding's latest scan, pass `scanId` to `apex-status`; use `apex scans` or `apex-scans` first if you need to discover scan IDs.
+- Use `apex-workspace-findings` when the user asks for findings across a workspace instead of one scan. Pass `filters: ["status:open"]` for all open findings; supported filter facets are `severity`, `scan`, `status`, `validation`, and `visibility`, and a leading `!` negates a filter. In CLI-only flows, use `apex findings --workspace --filter status:open`.
 - Finding comments, feedback, and fix review scan starts use the same Apex device-login credentials as read tools. If a write tool reports missing auth, re-run `apex-auth-status`, check `apex-trial-status`, and complete `apex-auth-start` / `apex-auth-wait` only when no unexpired local claim proof is available, instead of asking for browser cookies or auth tokens.
 - Anonymous telemetry records only sanitized command/tool metadata such as command names, enum modes, counts, durations, success/failure categories, CLI version, and client integration. It must not include raw repository paths, scan IDs, finding IDs, comments, file paths, PR URLs, trial codes, claim tokens, onboarding fingerprints, or bearer tokens.
 - Invalid finding feedback requires `dismissalReason`; valid feedback can include `suggestedSeverity`, including `extreme`.
@@ -84,5 +85,6 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - Start a PR scan: call `apex-scan` with `mode: "pr"` and `pullRequests`.
 - Check an active scan: call `apex-status`, passing `scanId` when the scan is not the latest binding, then `apex-findings` when the scan completes.
 - Export findings for review: call `apex-export-findings` with `format` set to `markdown`, `json`, or `gitlab-sast`.
+- Review all open workspace findings: call `apex-workspace-findings` with `filters: ["status:open"]`.
 - Leave review feedback: call `apex-finding-comment` to add a note, or `apex-finding-feedback` with `status` set to `valid` or `invalid`.
 - Run a Fix PR review: call `apex-finding-fix-review` with `fixPrUrls`, optionally after recording fixed feedback with `apex-finding-feedback`.

package/.claude-plugin/marketplace.json

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

package/.claude-plugin/plugin.json

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

package/.mcp.codex.json

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

package/README.md

@@ -107,14 +107,14 @@ fingerprint before the first request, exchanges the code for a seven-day guest
 session, and stores the single-use claim proof only in the mode-0600 Apex
 credentials file. A one-way code hash distinguishes safe same-code retries
 without retaining the trial code. `apex claim` is the one onboarding command
-that may open a browser; it creates or signs into a Cantina account, then
-attaches the existing workspace, scans, and findings to that account. Run it on
-the same machine within 30 days. Unclaimed guest data is retained only for the
-limited period disclosed during redemption and is then queued for deletion.
-Currently, the account used for claim must not already own a personal Apex
-tenant. If you already completed Cantina Apex onboarding, the CLI cannot link
-the guest tenant to that account yet; contact Cantina support before the claim
-deadline.
+that may open a browser; it creates or signs into a Cantina account, then moves
+the guest workspace, scans, and findings into the currently selected Cantina
+workspace when that account can run scans there. Personal workspace owners
+receive the trial in their existing workspace instead of getting a duplicate.
+Run it on the same machine within 30 days. Unclaimed guest data is retained only
+for the limited period disclosed during redemption and is then queued for
+deletion. If the selected Cantina workspace cannot run scans, switch to one
+that can and retry before the claim deadline.
 Trial redemption, claim, and revocation are hosted-only and fail before sending
 any onboarding secret when `APEX_BASE_URL` is not `https://ai.cantina.xyz`.
 
@@ -141,31 +141,31 @@ 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.19 to start one free standard security scan of this repository immediately.
+Install and run Cantina Apex CLI 0.1.21 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.19 apex
+  npx -y -p @cantinasecurity/apex-cli@0.1.21 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.19 apex redeem <TRIAL_CODE> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.21 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.19 apex scan --mode standard --non-interactive --no-open --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.21 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.19 apex status --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.21 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.19 apex findings --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.21 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.19 apex claim
-   It may open a browser so I can create or sign in to a Cantina account and keep the results. The account must not already own a personal Apex tenant; if it does, tell me to contact Cantina support before the claim deadline because CLI linking is not available yet.
+     npx -y -p @cantinasecurity/apex-cli@0.1.21 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.
 ```
@@ -200,6 +200,7 @@ Supported shell commands:
 - `/scan pr <pr-number>`
 - `/scans`
 - `/findings [scan-id]`
+- `/findings workspace [filter...]`
 - `/findings comment <finding-id|finding-identifier> <comment>`
 - `/findings feedback <finding-id|finding-identifier> valid [comment]`
 - `/findings feedback <finding-id|finding-identifier> invalid <false-positive|by-design|not-relevant> [comment]`
@@ -234,6 +235,7 @@ Supported shell commands:
 - `apex scan --mode pr --pr <number> [--pr <number>] [--pr-path <path>]`
 - `apex scans`
 - `apex findings [--scan <scan-id>]`
+- `apex findings --workspace [--filter <[!]facet:value>]`
 - `apex findings comment <finding-id|finding-identifier> --content <markdown> [--parent-comment <comment-id>] [--scan <scan-id>]`
 - `apex findings feedback <finding-id|finding-identifier> <valid|invalid> [comment] [--comment <markdown>] [--scan <scan-id>] [--suggested-severity extreme|critical|high|medium|low|informational] [--dismissal-reason false-positive|by-design|not-relevant] [--label acknowledged|fixed] [--fix-pr-url <github-pr-url>]`
 - `apex findings fix-review <finding-id|finding-identifier> [--scan <scan-id>] [--review-target pull-request|repository-current] [--fix-pr-url <github-pr-url>]`
@@ -484,6 +486,7 @@ The MCP server exposes Apex-specific tools for:
 - doctor, credits, and provider connection URLs
 - workspace inspection and workspace binding
 - scan start, status, cancellation, findings, and findings export
+- cross-scan workspace findings through `apex-workspace-findings`, with filters such as `status:open` and `!validation:invalid`
 - Lite scan start by calling `apex-scan` with `mode: "lite"`
 - PR scan start by calling `apex-scan` with `mode: "pr"` and `pullRequests`
 - finding comments and valid/invalid feedback with `apex-finding-comment` and `apex-finding-feedback`
@@ -493,6 +496,8 @@ The MCP server does not expose trial redemption, trial claim, or service-key cre
 
 For repository-scoped operations, pass `cwd` explicitly so the server can resolve the right `.apex/workspace.json` binding and repository roots.
 
+Use `apex-workspace-findings` when an agent needs the same cross-scan finding set as the workspace browser. For example, pass `filters: ["status:open"]` to retrieve all open findings without enumerating scans. Repeated filters in one facet are ORed; filters across different facets are ANDed. Supported facets are `severity`, `scan`, `status`, `validation`, and `visibility`.
+
 For Codex-style clients, the packaged skill can be installed with `apex setup codex`. For GitHub Copilot CLI, the same skill is installed into `~/.copilot/skills/apex-cli` with `apex setup copilot`. The repo-local source lives at `skills/apex-cli/SKILL.md`.
 
 For Claude Code, the packaged project skill can be installed into the current repository with `apex setup claude`. The repo-local source lives at `.claude/skills/apex-cli/SKILL.md`. Anthropic documents project skills as filesystem directories under `.claude/skills/<name>/SKILL.md`, and the Claude Agent SDK uses the same location when the `Skill` tool is enabled.
@@ -528,7 +533,7 @@ Telemetry event posts do not include bearer tokens. The telemetry endpoint is `P
     {
       "schemaVersion": 1,
       "event": "apex.invocation.completed",
-      "cliVersion": "0.1.19",
+      "cliVersion": "0.1.21",
       "invocation": {
         "surface": "mcp",
         "command": "apex-scan",
@@ -559,7 +564,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.19 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.21 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.
 
@@ -595,3 +600,4 @@ To move between existing Apex workspaces from the CLI:
 2. Run `apex workspace use <workspace-name|workspace-prefix|workspace-id>` to bind the current directory.
 3. If the workspace name contains spaces, quote it, for example `apex workspace use "Core Platform"`.
 4. Use `apex scans`, `apex status --scan <scan-id>`, `apex findings`, and `apex export findings` against that binding.
+5. Use `apex findings --workspace --filter status:open` for the workspace browser's cross-scan open-findings view.

package/dist/apex.js

@@ -1,6 +1,6 @@
 import { ApexApiClient, formatApiError } from "./api-client.js";
 import { parseArgs } from "./args.js";
-import { commandCancelScan, commandClaim, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandLogin, commandLogout, commandRedeem, commandScan, commandScans, commandServiceKeyCreate, commandServiceKeyList, commandServiceKeyRevoke, commandSetup, commandStatus, commandTelemetry, commandUpdate, commandWorkspace, commandWorkspaceUse, commandWorkspaces, getRedeemExitCode, } from "./commands.js";
+import { commandCancelScan, commandClaim, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandWorkspaceFindings, commandLogin, commandLogout, commandRedeem, commandScan, commandScans, commandServiceKeyCreate, commandServiceKeyList, commandServiceKeyRevoke, commandSetup, commandStatus, commandTelemetry, commandUpdate, commandWorkspace, commandWorkspaceUse, commandWorkspaces, getRedeemExitCode, } from "./commands.js";
 import { CLI_HELP_TEXT } from "./help.js";
 import { runMcpServer } from "./mcp.js";
 import { runInteractiveShell } from "./shell.js";
@@ -127,6 +127,10 @@ async function dispatch(parsed) {
                 await commandFindingFixReview(client, cwd, parsed.flags, findingRef);
                 return;
             }
+            if (parsed.flags.workspace === true) {
+                await commandWorkspaceFindings(client, cwd, parsed.flags);
+                return;
+            }
             await commandFindings(client, cwd, parsed.flags);
             return;
         case "export":

package/dist/api-client.js

@@ -91,7 +91,11 @@ function getFriendlyApiErrorMessage(error) {
         case "CLAIM_INVALID":
             return "This trial claim proof is invalid or already consumed. Local trial state was cleared; run `apex login` to use the claimed Cantina account, or contact Cantina support if the results are missing.";
         case "CLAIM_PERSONAL_TENANT_EXISTS":
-            return "This Cantina account already owns a personal Apex tenant, so CLI claim linking is not available yet. Contact Cantina support before the trial claim deadline.";
+            return "The claim reached a legacy attachment path for an existing personal workspace. Wait a moment and run `apex claim` again; if it repeats, contact Cantina support before the trial claim deadline.";
+        case "CLAIM_TARGET_UNAUTHORIZED":
+            return "The selected Cantina workspace cannot receive this trial. Switch to a workspace where you can run scans, then run `apex claim` again.";
+        case "CLAIM_TARGET_PREFIX_EXHAUSTED":
+            return "The selected Cantina workspace could not allocate a workspace prefix. Contact Cantina support before the trial claim deadline.";
         case "EMAIL_UNVERIFIED":
             return "Verify your email, then run `apex claim` again. Your guest trial remains recoverable on this machine.";
         case "FINGERPRINT_MISMATCH":

package/dist/args.js

@@ -4,9 +4,17 @@ const BOOLEAN_FLAGS = new Set([
     "json",
     "no-open",
     "replace",
+    "workspace",
     "help",
 ]);
-const REPEATABLE_VALUE_FLAGS = new Set(["repo", "pr", "pr-path", "fix-pr-url", "label"]);
+const REPEATABLE_VALUE_FLAGS = new Set([
+    "repo",
+    "pr",
+    "pr-path",
+    "fix-pr-url",
+    "label",
+    "filter",
+]);
 export function parseArgs(argv) {
     const flags = {};
     const positional = [];

package/dist/commands.js

@@ -4,7 +4,7 @@ import { ApiError, formatApiError, getApiErrorCode, } from "./api-client.js";
 import { openInBrowser } from "./browser.js";
 import { getClaimProofState, isClaimProofAvailable, parseClaimDeadlineMs, } from "./claim-proof.js";
 import { loadConfig, updateConfig } from "./config.js";
-import { createFindingComment, fetchScanExport, fetchScanFindings, isFindingUuid, normalizeFindingRef, resolveFindingSelection, resolveScanSelection, startFindingFixReviewScan, submitFindingFeedback, } from "./findings.js";
+import { createFindingComment, fetchScanExport, fetchScanFindings, fetchWorkspaceFindings, isFindingUuid, normalizeFindingRef, resolveFindingSelection, resolveScanSelection, startFindingFixReviewScan, submitFindingFeedback, } from "./findings.js";
 import { prepareExplicitScanSources, supportsLegacyRemoteFlow, } from "./local-source-scan.js";
 import { logLine, printJson, withLoadingIndicator } from "./output.js";
 import { claimOnboardingSession, isProofOnlyOnboardingCredentials, redeemOnboardingCode, revokeGuestOnboardingSession, } from "./onboarding.js";
@@ -1435,6 +1435,42 @@ export async function commandFindings(client, cwd, flags) {
     logGuestScanFooter(authState, flags);
     return payload;
 }
+export async function commandWorkspaceFindings(client, cwd, flags) {
+    if (getFlagString(flags, "scan") || getFlagString(flags, "limit")) {
+        throw new Error("Workspace findings cannot be combined with --scan or --limit. Use --filter scan:<scan-id> to select a scan.");
+    }
+    const me = await ensureAuthenticated(client, flags);
+    const authState = await getCommandAuthState(client, me);
+    setTelemetryAuthKind(authState.authKind);
+    const binding = await requireWorkspaceBinding(cwd);
+    const response = await withLoadingIndicator("Loading workspace findings...", flags, () => fetchWorkspaceFindings(client, binding.workspaceId, getFlagList(flags, "filter")));
+    const payload = {
+        ...response,
+        binding,
+    };
+    if (isJsonMode(flags)) {
+        printJson(payload);
+        return payload;
+    }
+    logLine(`Workspace: ${response.workspace.name}`, flags);
+    if (response.filters.length > 0) {
+        logLine(`Filters: ${response.filters.join(", ")}`, flags);
+    }
+    if (response.findings.length === 0) {
+        logLine("Findings: none for this workspace view.", flags);
+        logGuestScanFooter(authState, flags);
+        return payload;
+    }
+    for (const finding of response.findings) {
+        const identifier = finding.findingIdentifier ?? finding.id;
+        logLine(`${finding.severity.toUpperCase()} ${identifier} ${finding.title} (${finding.status})`, flags);
+        if (finding.findingUrl) {
+            logLine(`View: ${finding.findingUrl}`, flags);
+        }
+    }
+    logGuestScanFooter(authState, flags);
+    return payload;
+}
 export async function commandFindingComment(client, cwd, flags, requestedFindingRef, content, parentCommentId) {
     const findingRef = normalizeFindingRefInput(requestedFindingRef);
     const trimmedContent = content.trim();

package/dist/findings.js

@@ -1,6 +1,9 @@
 import { fetchWorkspaceScans, getScanDisplayId, matchesScanId, } from "./scan.js";
 import { ApiError, CredentialGenerationChangedError, isTerminalGuestSessionError, } from "./api-client.js";
 const FINDING_UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+const WORKSPACE_FINDING_FILTER_PATTERN = /^!?(severity|scan|status|validation|visibility):[^:]+$/;
+const MAX_WORKSPACE_FINDING_FILTERS = 50;
+const MAX_WORKSPACE_FINDING_FILTER_LENGTH = 128;
 const CANTINA_AUTH_TOKEN_ENV = "CANTINA_AUTH_TOKEN";
 const FINDING_WRITE_AUTH_ERROR = "Finding comments, feedback, and fix review scans require Apex authentication. Run `apex login` or use MCP `apex-auth-start` followed by `apex-auth-wait`, then retry.";
 function parsePositiveInt(value) {
@@ -176,6 +179,28 @@ export async function fetchScanFindings(client, scanId, limit) {
     const suffix = params.toString();
     return client.request(`/api/cli/v1/scans/${encodeURIComponent(scanId)}/findings${suffix ? `?${suffix}` : ""}`);
 }
+export function normalizeWorkspaceFindingFilters(filters) {
+    if (filters.length > MAX_WORKSPACE_FINDING_FILTERS) {
+        throw new Error(`Workspace findings accept at most ${MAX_WORKSPACE_FINDING_FILTERS} filters.`);
+    }
+    return filters.map((filter) => {
+        const normalized = filter.trim();
+        if (normalized.length === 0 ||
+            normalized.length > MAX_WORKSPACE_FINDING_FILTER_LENGTH ||
+            !WORKSPACE_FINDING_FILTER_PATTERN.test(normalized)) {
+            throw new Error("Invalid workspace finding filter. Use [!]severity|scan|status|validation|visibility:<value>, for example status:open or !validation:invalid.");
+        }
+        return normalized;
+    });
+}
+export async function fetchWorkspaceFindings(client, workspaceId, filters) {
+    const params = new URLSearchParams();
+    for (const filter of normalizeWorkspaceFindingFilters(filters)) {
+        params.append("filter", filter);
+    }
+    const suffix = params.toString();
+    return client.request(`/api/cli/v1/local-workspaces/${encodeURIComponent(workspaceId)}/findings${suffix ? `?${suffix}` : ""}`);
+}
 export async function fetchScanExport(client, scanId, format) {
     const params = new URLSearchParams();
     if (format.trim().length > 0) {

package/dist/help.js

@@ -4,6 +4,7 @@ export const CLI_HELP_TEXT = `Usage:
   apex scan                         Create or resolve a workspace for this directory and start a scan
   apex scans                        List scans for the current workspace binding
   apex findings                     List findings for the latest or selected scan
+  apex findings --workspace         List findings across the workspace browser scan set
   apex findings comment <finding-id|finding-identifier>
                                     Add a comment or note to a finding
   apex findings feedback <finding-id|finding-identifier> <valid|invalid>
@@ -41,6 +42,8 @@ Flags:
   --expires-at <ISO-8601>           Set an optional service-key expiration time
   --workspace-name <name>           Set the Apex workspace name for this directory
   --scan <scan-id>                  Select a specific scan for status, findings, or export
+  --workspace                       Use the cross-scan workspace findings view
+  --filter <[!]facet:value>         Filter workspace findings; repeat for multiple filters
   --status valid|invalid            Set the finding feedback status explicitly
   --content <markdown>              Supply comment content for apex findings comment
   --comment <markdown>              Supply rationale for apex findings feedback
@@ -81,7 +84,7 @@ Tips:
   Trial redemption, claim, and revocation require https://ai.cantina.xyz and reject other APEX_BASE_URL origins before sending secrets.
   apex redeem never starts device login or opens a browser; apex claim is the only onboarding command that may open one.
   After a guest scan, run apex claim on the same machine within the displayed claim deadline to keep the results.
-  Claim currently requires an account without an existing personal Apex tenant; otherwise contact Cantina support before the deadline.
+  Claim moves trial results into the selected Cantina workspace when you can run scans there, or into your existing personal workspace.
   Service-key commands require an existing login; run apex login first when needed.
   Apex automatically selects your company when only one is available. With multiple companies, choose one interactively or pass --company.
   Service-key creation also requires --name and reveals the secret only once; omit --scope to grant all hosted API scopes.
@@ -89,6 +92,7 @@ Tips:
   Invalid finding feedback requires --dismissal-reason.
   Fix review scans use saved or supplied Fix PR URLs when present; otherwise they review the current repository when Bedrock has original scan repository context.
   Finding identifiers such as KERN2-25 resolve against the selected scan; pass --scan or use the finding UUID directly when needed.
+  Use apex findings --workspace --filter status:open to retrieve all open findings across the workspace browser scan set.
   Anonymous usage telemetry helps Apex understand CLI, MCP, Codex, Claude, and Copilot usage. Disable it with apex telemetry disable or APEX_TELEMETRY_DISABLED=1.
   Quote workspace names that contain spaces:
     apex workspace use "Core Platform"
@@ -102,6 +106,8 @@ Commands:
   /scan pr <pr-number>    Start a PR scan for this workspace
   /scans                  List scans for this workspace
   /findings [scan-id]     List findings for the latest or selected scan
+  /findings workspace [filter...]
+                          List workspace findings; for example status:open
   /findings comment <finding-ref> <comment>
                           Add a comment or note to a finding
   /findings feedback <finding-ref> valid [comment]
@@ -148,8 +154,9 @@ Tips:
   Lite scans require beta access plus provider-backed GitHub or GitLab sources.
   /workspace use accepts a workspace name, prefix, or ID.
   /findings comment, /findings feedback, and /findings fix-review use the current Apex login.
+  /findings workspace status:open returns all open findings in the workspace browser scan set.
   /claim is the only onboarding command that may open a browser. Trial redemption stays scripted-only and is not exposed through MCP.
-  Claim currently requires an account without an existing personal Apex tenant; otherwise contact Cantina support before the deadline.
+  /claim moves trial results into the selected Cantina workspace when you can run scans there, or into your existing personal workspace.
   Service-key commands automatically use your company when only one is available. With multiple companies, choose one interactively or pass --company.
   Service-key secrets are shown once. Run these commands in your terminal, not in the interactive shell or through MCP.
   Invalid finding feedback requires a dismissal reason.

package/dist/mcp.js

@@ -5,7 +5,7 @@ import { z } from "zod";
 import { getMe, logout, readStableDeviceLoginState, startDeviceLogin, waitForDeviceLoginApproval, } from "./auth.js";
 import { ApexApiClient, formatApiError } from "./api-client.js";
 import { getClaimProofState, isClaimProofAvailable, } from "./claim-proof.js";
-import { commandCancelScan, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandScan, commandScans, commandStatus, commandWorkspace, commandWorkspaceUse, commandWorkspaces, } from "./commands.js";
+import { commandCancelScan, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandWorkspaceFindings, commandScan, commandScans, commandStatus, commandWorkspace, commandWorkspaceUse, commandWorkspaces, } from "./commands.js";
 import { CLI_HELP_TEXT } from "./help.js";
 import { getLocalTrialStatus, isProofOnlyOnboardingCredentials, revokeGuestOnboardingSession, } from "./onboarding.js";
 import { createMcpServerTelemetryInvocation, createMcpTelemetryInvocation, emitInvocationCompleted, emitInvocationStarted, emitMcpServerStarted, withTelemetryContext, } from "./telemetry.js";
@@ -19,7 +19,7 @@ Suggested workflow:
 4. Only when Apex is unauthenticated and no unexpired claim proof or trial code is available, call apex-auth-start and ask the user to approve the device login URL, then call apex-auth-wait with both the returned deviceCode and credentialGeneration.
 5. Call apex-doctor for the target repository cwd.
 6. If the directory is not bound to the right workspace, call apex-workspaces and apex-workspace-use.
-7. Start and monitor scans with apex-scan, apex-status, apex-scans, apex-findings, and apex-export-findings.
+7. Start and monitor scans with apex-scan, apex-status, apex-scans, apex-findings, and apex-export-findings. Use apex-workspace-findings for the cross-scan workspace view.
 8. For PR scans, call apex-scan with mode "pr" and one or more pullRequests.
 9. Leave finding comments or valid/invalid feedback with apex-finding-comment and apex-finding-feedback when review collaboration is needed.
 10. To review a fix, call apex-finding-fix-review. Pass fixPrUrls for PR-based fix reviews, or omit them to review the current repository state when Bedrock has original scan repository context.
@@ -85,6 +85,9 @@ function buildFlags(options) {
     if (options.fixPrUrls && options.fixPrUrls.length > 0) {
         flags["fix-pr-url"] = options.fixPrUrls;
     }
+    if (options.filters && options.filters.length > 0) {
+        flags.filter = options.filters;
+    }
     if (options.pullRequests && options.pullRequests.length > 0) {
         flags.pr = options.pullRequests.map((pullRequest) => {
             const paths = pullRequest.paths
@@ -612,6 +615,23 @@ function registerTools(server) {
         scanId,
         limit,
     }));
+    server.registerTool("apex-workspace-findings", {
+        title: "List Apex Workspace Findings",
+        description: "List findings across the current Apex workspace using the same non-archived scan set as the web findings browser. Pass filters such as status:open or !validation:invalid; repeated filters in one facet are ORed and different facets are ANDed.",
+        inputSchema: {
+            cwd: z.string().optional(),
+            filters: z.array(z.string().min(1).max(128)).max(50).optional(),
+        },
+    }, async ({ cwd, filters }) => runTool("apex-workspace-findings", async () => {
+        const client = new ApexApiClient();
+        await requireAuthenticated(client);
+        const targetCwd = resolveCwd(cwd);
+        const payload = await commandWorkspaceFindings(client, targetCwd, buildFlags({ filters }));
+        return {
+            cwd: targetCwd,
+            ...payload,
+        };
+    }, (value) => `Fetched Apex workspace findings for ${String(value.cwd)}.`, { cwd, filters }));
     server.registerTool("apex-finding-comment", {
         title: "Add Apex Finding Comment",
         description: "Add a comment or note to an Apex finding using the current Apex login.",

package/dist/shell.js

@@ -1,5 +1,5 @@
 import { SHELL_HELP_TEXT } from "./help.js";
-import { commandCancelScan, commandClaim, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandLogout, commandScan, commandScans, commandStatus, commandTelemetry, commandUpdate, commandWorkspace, commandWorkspaceUse, commandWorkspaces, initializeInteractiveSession, openCurrentApexView, } from "./commands.js";
+import { commandCancelScan, commandClaim, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandWorkspaceFindings, commandLogout, commandScan, commandScans, commandStatus, commandTelemetry, commandUpdate, commandWorkspace, commandWorkspaceUse, commandWorkspaces, initializeInteractiveSession, openCurrentApexView, } from "./commands.js";
 import { withFlag } from "./args.js";
 import { printCompanyDetails, printInteractiveSessionSummary, printSourceList, printWorkspaceDetails, } from "./output.js";
 import { readLine } from "./prompt.js";
@@ -10,7 +10,10 @@ const SHELL_COMPLETIONS = [
     { command: "credits" },
     { command: "scan", args: ["standard", "audit", "ultra", "lite", "pr"] },
     { command: "scans" },
-    { command: "findings", args: ["comment", "feedback", "fix-review"] },
+    {
+        command: "findings",
+        args: ["workspace", "comment", "feedback", "fix-review"],
+    },
     { command: "export" },
     { command: "workspaces" },
     { command: "cancel-scan" },
@@ -245,6 +248,12 @@ async function runShellCommand(client, cwd, parsed, shellFlags, session) {
             await commandScans(client, cwd, shellFlags);
             return {};
         case "findings": {
+            if (parsed.args[0] === "workspace") {
+                await commandWorkspaceFindings(client, cwd, parsed.args.length > 1
+                    ? withFlag(shellFlags, "filter", parsed.args.slice(1))
+                    : shellFlags);
+                return {};
+            }
             if (parsed.args[0] === "comment") {
                 if (parsed.args.length < 3) {
                     process.stderr.write("Usage: /findings comment <finding-id|finding-identifier> <comment>\n");

package/dist/telemetry.js

@@ -18,6 +18,7 @@ const KNOWN_CLI_FLAG_NAMES = [
     "fix-pr-url",
     "force",
     "format",
+    "filter",
     "help",
     "json",
     "label",
@@ -39,6 +40,7 @@ const KNOWN_CLI_FLAG_NAMES = [
     "status",
     "suggested-severity",
     "workspace-name",
+    "workspace",
 ];
 const KNOWN_CLI_COMMANDS = [
     "cancel-scan",
@@ -225,6 +227,7 @@ function sanitizeCliFlags(flags) {
         replace: boolFlag(flags, "replace"),
         nonInteractive: boolFlag(flags, "non-interactive"),
         noOpen: boolFlag(flags, "no-open"),
+        workspaceFindings: boolFlag(flags, "workspace"),
         companyProvided: stringFlag(flags, "company") !== null,
         workspaceNameProvided: stringFlag(flags, "workspace-name") !== null,
         nameProvided: stringFlag(flags, "name") !== null,
@@ -263,6 +266,7 @@ function sanitizeCliFlags(flags) {
         prPathCount: flagCount(flags, "pr-path"),
         labelCount: flagCount(flags, "label"),
         fixPrUrlCount: flagCount(flags, "fix-pr-url"),
+        filterCount: flagCount(flags, "filter"),
         limitBucket: bucketLimit(flags.limit),
     };
 }
@@ -441,6 +445,7 @@ export function sanitizeMcpInput(input = {}) {
         pullRequestPathCount: pullRequestPathCount(input.pullRequests),
         labelCount: arrayLength(input.labels),
         fixPrUrlCount: arrayLength(input.fixPrUrls),
+        filterCount: arrayLength(input.filters),
         contentLengthBucket: bucketLength(input.content),
         commentLengthBucket: bucketLength(input.comment),
         limitBucket: bucketLimit(input.limit),

package/package.json

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

package/skills/apex-cli/SKILL.md

@@ -37,7 +37,7 @@ Workflow:
 4. For repository work, pass `cwd` explicitly.
 5. Call `apex-doctor` before starting a scan if workspace binding or source planning might be unclear.
 6. If the directory is not bound to the right workspace, call `apex-workspaces` and `apex-workspace-use`.
-7. Use `apex-scan`, `apex-status`, `apex-scans`, `apex-findings`, and `apex-export-findings` for the scan lifecycle.
+7. Use `apex-scan`, `apex-status`, `apex-scans`, `apex-findings`, and `apex-export-findings` for the scan lifecycle. Use `apex-workspace-findings` for the cross-scan workspace browser view.
 8. For Lite scans, call `apex-scan` with `mode: "lite"` only when the company has Lite Scan beta access and the sources are provider-backed.
 9. For PR scans, call `apex-scan` with `mode: "pr"` and `pullRequests`.
 10. Use `apex-finding-comment` and `apex-finding-feedback` when the user wants to leave review notes or valid/invalid feedback on a finding.
@@ -50,7 +50,7 @@ If the Apex MCP server is not configured, fall back to the local CLI:
 - 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.
 - `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 currently requires a Cantina account that does not already own a personal Apex tenant. If the user already completed Cantina Apex onboarding, explain that CLI linking is not available yet and tell them to contact Cantina support before the claim deadline.
+- 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.
 
 Guidelines:
 
@@ -74,6 +74,7 @@ Guidelines:
 - Use `force: true` on `apex-scan` only when the user explicitly wants to replace or overlap an active scan.
 - When checking a scan that is not the workspace binding's latest scan, pass `scanId` to `apex-status`; use `apex-scans` first if you need to discover scan IDs.
 - Prefer `apex-findings` for quick inspection and `apex-export-findings` when the user needs a file artifact.
+- Use `apex-workspace-findings` when the user asks for findings across a workspace instead of one scan. Pass `filters: ["status:open"]` for all open findings; supported filter facets are `severity`, `scan`, `status`, `validation`, and `visibility`, and a leading `!` negates a filter.
 - Finding comments, feedback, and fix review scan starts use the same Apex device-login credentials as read tools. If a write tool reports missing auth, re-run `apex-auth-status`, check `apex-trial-status`, and complete `apex-auth-start` / `apex-auth-wait` only when no unexpired local claim proof is available, instead of asking for browser cookies or auth tokens.
 - Anonymous telemetry records only sanitized command/tool metadata such as command names, enum modes, counts, durations, success/failure categories, CLI version, and client integration. It must not include raw repository paths, scan IDs, finding IDs, comments, file paths, PR URLs, trial codes, claim tokens, onboarding fingerprints, or bearer tokens.
 - Invalid finding feedback requires `dismissalReason`; valid feedback can include `suggestedSeverity`, including `extreme`.