@cantinasecurity/apex-cli 0.1.40 → 0.1.42

package/.claude-plugin/marketplace.json

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

package/.claude-plugin/plugin.json

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

package/.mcp.codex.json

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

package/README.md

@@ -158,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.40 to start one free standard security scan of this repository immediately.
+Install and run Cantina Apex CLI 0.1.42 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.40 apex
+  npx -y -p @cantinasecurity/apex-cli@0.1.42 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.40 apex redeem <TRIAL_CODE> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.42 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.40 apex scan --mode standard --non-interactive --no-open --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.42 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.40 apex status --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.42 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.40 apex findings --scan <SCAN_ID> --json
+     npx -y -p @cantinasecurity/apex-cli@0.1.42 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.40 apex claim
+     npx -y -p @cantinasecurity/apex-cli@0.1.42 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.
@@ -687,7 +687,7 @@ Telemetry event posts do not include bearer tokens. The telemetry endpoint is `P
     {
       "schemaVersion": 1,
       "event": "apex.invocation.completed",
-      "cliVersion": "0.1.40",
+      "cliVersion": "0.1.42",
       "invocation": {
         "surface": "mcp",
         "command": "apex-scan",
@@ -718,7 +718,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.40 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.42 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/args.js

@@ -1,5 +1,8 @@
 export const KNOWN_CLI_FLAG_NAMES = [
-    "instance-type", "disk", "minutes", "key-file", "retention-days", "snapshot",
+    "instance-type",
+    "disk",
+    "minutes",
+    "key-file",
     "setup",
     "draft",
     "file",
@@ -41,6 +44,8 @@ export const KNOWN_CLI_FLAG_NAMES = [
     "scope",
     "source-mode",
     "status",
+    "validity",
+    "severity",
     "suggested-severity",
     "workspace-name",
     "workspace-ref",
@@ -48,7 +53,9 @@ export const KNOWN_CLI_FLAG_NAMES = [
 ];
 const KNOWN_CLI_FLAGS = new Set(KNOWN_CLI_FLAG_NAMES);
 const BOOLEAN_FLAGS = new Set([
-    "wait", "start-scan", "no-feedback-context",
+    "wait",
+    "start-scan",
+    "no-feedback-context",
     "force",
     "non-interactive",
     "json",
@@ -103,7 +110,10 @@ export function parseArgs(argv) {
         if (flags.setup !== undefined) {
             throw new Error("Audit Setup does not accept scan targets. Use --workspace-ref <workspace>.");
         }
-        flags.repo = [...(flags.repo ?? []), ...positional.slice(1)];
+        flags.repo = [
+            ...(flags.repo ?? []),
+            ...positional.slice(1),
+        ];
         positional.splice(1);
     }
     return {
@@ -114,9 +124,15 @@ export function parseArgs(argv) {
     };
 }
 export function validateCommandFlags(parsed) {
-    if (parsed.flags["source-mode"] !== undefined && !["auto", "remote", "local"].includes(String(parsed.flags["source-mode"]))) {
+    if (parsed.flags["source-mode"] !== undefined &&
+        !["auto", "remote", "local"].includes(String(parsed.flags["source-mode"]))) {
         throw new Error("--source-mode must be auto, remote, or local.");
     }
+    if ((parsed.flags.validity !== undefined ||
+        parsed.flags.severity !== undefined) &&
+        parsed.command !== "triage") {
+        throw new Error("--validity and --severity are only supported with triage.");
+    }
     if (parsed.flags["workspace-ref"] === undefined) {
         return;
     }
@@ -124,7 +140,9 @@ export function validateCommandFlags(parsed) {
         parsed.subcommand === null &&
         parsed.flags.workspace === true;
     const isSetupScan = parsed.command === "scan" && parsed.flags.setup !== undefined;
-    if (!isWorkspaceFindings && !isSetupScan && !["code-access", "triage"].includes(parsed.command ?? "")) {
+    if (!isWorkspaceFindings &&
+        !isSetupScan &&
+        !["code-access", "triage"].includes(parsed.command ?? "")) {
         throw new Error("--workspace-ref is only supported with `apex findings --workspace`. To change the local workspace used by scans or exports, run `apex workspace use <workspace-ref>` first.");
     }
 }
@@ -145,7 +163,9 @@ export function canPromptInteractively(flags) {
 }
 export function getFlagString(flags, key) {
     const value = flags[key];
-    return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+    return typeof value === "string" && value.trim().length > 0
+        ? value.trim()
+        : null;
 }
 export function getFlagList(flags, key) {
     const value = flags[key];

package/dist/code-access.js

@@ -1,27 +1,99 @@
+import { createPrivateKey, randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
 import { spawn } from "node:child_process";
-import { existsSync, writeFileSync, rmSync, readFileSync } from "node:fs";
+import { accessSync, chmodSync, constants, existsSync, mkdtempSync, mkdirSync, writeFileSync, rmSync, readFileSync, } from "node:fs";
+import os from "node:os";
 import path from "node:path";
+import { Transform } from "node:stream";
 import { fileURLToPath } from "node:url";
 import { z } from "zod";
 import { getMe } from "./auth.js";
-import { getFlagString } from "./args.js";
+import { canPromptInteractively, getFlagString, } from "./args.js";
+import { withLoadingIndicator } from "./output.js";
+import { chooseOne } from "./prompt.js";
 export const CODE_ACCESS_HELP = `
 Internal employee beta:
-  apex code-access create --workspace-ref <id> [--instance-type m7i.2xlarge] [--disk 200]
+  apex code-access create --workspace-ref <id> [--instance-type m7i.xlarge] [--disk 100]
   apex code-access list --workspace-ref <id>
-  apex code-access get|connect|extend|snapshot|resume|respawn|revoke-ssh|stop|delete <id> --workspace-ref <id>
-  connect requires --key-file <new-path>; snapshot accepts --retention-days 1..30; respawn requires --snapshot <id>.
+  apex code-access ssh|get|connect|extend|resume|revoke-ssh|stop|kill <id> --workspace-ref <id>
+  ssh opens the sandbox immediately with a temporary key that is deleted on exit. create prompts for compute and disk, then prints the one-line ssh command. connect is an advanced flow and requires --key-file <new-path>. kill permanently removes sandbox resources while retaining execution history.
   apex triage findings --workspace-ref <id>
-  apex triage edit <finding-id> --workspace-ref <id> --file <edit.json> --expected-updated-at <timestamp from findings>
-  Edit JSON: {"action":"comment","content":"..."}, {"action":"severity","severity":"high"},
-  {"action":"review","validity":"valid","severity":"high","note":"..."}, or {"action":"cvss","vector":"CVSS:3.1/...","note":"..."}.
+  apex triage review <finding-id> --workspace-ref <id> --expected-updated-at <timestamp from findings> --validity valid|partially_valid|invalid [--severity high] [--note <rationale>] [--request-id <uuid>]
+  apex triage edit <finding-id> --workspace-ref <id> --file <edit.json> --expected-updated-at <timestamp from findings> [--request-id <uuid>]
+  Edit JSON supports comments only: {"action":"comment","content":"..."}.
 `;
 export function hasCodeAccess(me) {
     return Boolean(me?.user.triageWorkspaces?.length);
 }
 const uuid = z.string().uuid();
+const commentEdit = z
+    .object({
+    action: z.literal("comment"),
+    content: z.string().trim().min(1).max(10_000),
+})
+    .strict();
 const quote = (s) => `'${s.replaceAll("'", "'\\''")}'`;
+export function createSsmPluginOutputFilter() {
+    const prefix = Buffer.from("\nStarting session with SessionId:");
+    let buffered = Buffer.alloc(0);
+    let decided = false;
+    return new Transform({
+        transform(chunk, _encoding, callback) {
+            if (decided)
+                return callback(null, chunk);
+            buffered = Buffer.concat([buffered, chunk]);
+            const comparable = Math.min(buffered.length, prefix.length);
+            if (!buffered.subarray(0, comparable).equals(prefix.subarray(0, comparable))) {
+                decided = true;
+                callback(null, buffered);
+                buffered = Buffer.alloc(0);
+                return;
+            }
+            const end = buffered.indexOf(0x0a, prefix.length);
+            if (end < 0)
+                return callback();
+            decided = true;
+            const remainder = buffered.subarray(end + 1);
+            buffered = Buffer.alloc(0);
+            callback(null, remainder);
+        },
+        flush(callback) {
+            callback(null, decided ? undefined : buffered);
+        },
+    });
+}
+const machineOptions = [
+    { value: "m7i.xlarge", label: "4 vCPU / 16 GiB RAM (default)" },
+    { value: "m7i.2xlarge", label: "8 vCPU / 32 GiB RAM" },
+    { value: "m7i.4xlarge", label: "16 vCPU / 64 GiB RAM" },
+];
+const diskOptions = [
+    { value: 100, label: "100 GiB SSD (default)" },
+    { value: 200, label: "200 GiB SSD" },
+    { value: 500, label: "500 GiB SSD" },
+];
+function prepareCredentialPath(requestedPath) {
+    let keyFile;
+    if (requestedPath) {
+        keyFile = path.resolve(requestedPath);
+        try {
+            accessSync(path.dirname(keyFile), constants.W_OK);
+        }
+        catch {
+            throw new Error("Credential directory does not exist or is not writable");
+        }
+    }
+    else {
+        const directory = path.join(os.homedir(), ".config", "apex", "ssh");
+        mkdirSync(directory, { recursive: true, mode: 0o700 });
+        chmodSync(directory, 0o700);
+        keyFile = path.join(directory, `triage-${randomUUID()}.pem`);
+    }
+    const hostsFile = keyFile + ".known_hosts";
+    if (existsSync(keyFile) || existsSync(hostsFile))
+        throw new Error("Choose new credential filenames; existing files are never overwritten");
+    return keyFile;
+}
 export async function codeAccessScope(client, flags) {
     const me = await getMe(client);
     const scopes = me?.user.triageWorkspaces ?? [];
@@ -39,6 +111,29 @@ function numberFlag(flags, key, fallback) {
         ? fallback
         : z.coerce.number().int().positive().parse(value);
 }
+async function createConfiguration(flags) {
+    const interactive = canPromptInteractively(flags);
+    const machineFlag = getFlagString(flags, "instance-type");
+    const diskFlag = getFlagString(flags, "disk");
+    const machine = machineFlag
+        ? machineOptions.find((option) => option.value === machineFlag)
+        : interactive
+            ? await chooseOne("Select sandbox compute:", [...machineOptions])
+            : machineOptions[0];
+    if (!machine)
+        throw new Error("--instance-type must be m7i.xlarge, m7i.2xlarge, or m7i.4xlarge");
+    const requestedDisk = diskFlag
+        ? z.coerce.number().int().parse(diskFlag)
+        : null;
+    const disk = requestedDisk !== null
+        ? diskOptions.find((option) => option.value === requestedDisk)
+        : interactive
+            ? await chooseOne("Select encrypted SSD size:", [...diskOptions])
+            : diskOptions[0];
+    if (!disk)
+        throw new Error("--disk must be 100, 200, or 500");
+    return { instanceType: machine.value, storageGiB: disk.value };
+}
 export async function commandCodeAccess(client, flags, action, id) {
     const workspaceId = await codeAccessScope(client, flags);
     const endpoint = `/api/workspaces/${workspaceId}/code-access`;
@@ -48,15 +143,119 @@ export async function commandCodeAccess(client, flags, action, id) {
         signal: AbortSignal.timeout(790_000),
     });
     const print = (body) => process.stdout.write(JSON.stringify(body, null, 2) + "\n");
+    const issueConnection = async (executionId, keyFile) => {
+        const act = (input) => request({ operation: "act", id: executionId, input });
+        const hostsFile = keyFile + ".known_hosts";
+        if (existsSync(keyFile) || existsSync(hostsFile))
+            throw new Error("Choose new credential filenames; existing files are never overwritten");
+        const issued = await act({ action: "connect" });
+        const parsed = z
+            .object({
+            connection: z.object({
+                privateKey: z.string().min(1),
+                hostPublicKey: z.string(),
+                hostAlias: z.literal(`triage-${executionId}`),
+                username: z.literal("triage"),
+                expiresAt: z.string().datetime({ offset: true }),
+            }),
+        })
+            .safeParse(issued);
+        if (!parsed.success)
+            throw new Error("Invalid SSH identity returned by Apex");
+        const { connection } = parsed.data;
+        const hostKey = connection.hostPublicKey
+            .trim()
+            .split(/\s+/)
+            .slice(0, 2)
+            .join(" ");
+        if (!/^ssh-ed25519 [A-Za-z0-9+/]+=*$/.test(hostKey) ||
+            Date.parse(connection.expiresAt) <= Date.now())
+            throw new Error("Invalid SSH identity");
+        try {
+            if (createPrivateKey(connection.privateKey).asymmetricKeyType !== "rsa")
+                throw new Error("unexpected key type");
+        }
+        catch {
+            throw new Error("Invalid SSH private key returned by Apex");
+        }
+        let wroteKey = false;
+        try {
+            writeFileSync(keyFile, connection.privateKey, {
+                flag: "wx",
+                mode: 0o600,
+            });
+            wroteKey = true;
+            writeFileSync(hostsFile, `${connection.hostAlias} ${hostKey}\n`, {
+                flag: "wx",
+                mode: 0o600,
+            });
+        }
+        catch {
+            if (wroteKey)
+                rmSync(keyFile);
+            throw new Error("Could not save credentials");
+        }
+        const source = import.meta.url.endsWith(".ts");
+        const entry = fileURLToPath(new URL(source ? "./apex.ts" : "./apex.js", import.meta.url));
+        const invocation = [
+            quote(process.execPath),
+            ...(source
+                ? ["--import", quote(createRequire(import.meta.url).resolve("tsx"))]
+                : []),
+            quote(entry),
+            "code-access",
+            "proxy",
+            executionId,
+            "--workspace-ref",
+            workspaceId,
+        ].join(" ");
+        const sshArgs = [
+            "-i",
+            keyFile.replaceAll("%", "%%"),
+            "-o",
+            "IdentitiesOnly=yes",
+            "-o",
+            "StrictHostKeyChecking=yes",
+            "-o",
+            "UpdateHostKeys=no",
+            "-o",
+            "ForwardAgent=no",
+            "-o",
+            "ClearAllForwardings=yes",
+            "-o",
+            `UserKnownHostsFile="${hostsFile.replaceAll("%", "%%").replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`,
+            "-o",
+            `HostKeyAlias=${connection.hostAlias}`,
+            "-o",
+            `ProxyCommand=${invocation.replaceAll("%", "%%")}`,
+            `triage@${connection.hostAlias}`,
+        ];
+        const sshCommand = ["ssh", ...sshArgs.map(quote)].join(" ");
+        return {
+            keyFile,
+            hostsFile,
+            expiresAt: connection.expiresAt,
+            sshCommand,
+            sshArgs,
+        };
+    };
     if (action === "create") {
-        print(await request({
+        const config = await createConfiguration(flags);
+        const created = await withLoadingIndicator("Starting sandbox and cloning workspace repositories...", flags, () => request({
             operation: "create",
             input: {
-                instanceType: getFlagString(flags, "instance-type") ?? "m7i.2xlarge",
-                storageGiB: numberFlag(flags, "disk", 200),
+                ...config,
                 leaseMinutes: numberFlag(flags, "minutes", 1440),
             },
         }));
+        const execution = z
+            .object({ execution: z.object({ id: uuid }).passthrough() })
+            .passthrough()
+            .parse(created);
+        print({
+            ...execution,
+            sshCommand: `apex code-access ssh ${execution.execution.id} --workspace-ref ${workspaceId}`,
+        });
         return;
     }
     if (action === "list") {
@@ -94,102 +293,84 @@ export async function commandCodeAccess(client, flags, action, id) {
             }),
             `https://ssm.${session.region}.amazonaws.com`,
         ], {
-            stdio: "inherit",
+            stdio: ["pipe", "pipe", "inherit"],
             env: {
                 PATH: process.env.PATH,
                 HOME: process.env.HOME,
                 LANG: process.env.LANG,
             },
         });
-        await new Promise((resolve, reject) => {
-            child.once("error", () => reject(new Error("Install the AWS session-manager-plugin to connect")));
-            child.once("exit", (code) => code === 0 ? resolve() : reject(new Error("SSH transport closed")));
+        child.stdin.on("error", () => undefined);
+        process.stdin.pipe(child.stdin);
+        child.stdout.pipe(createSsmPluginOutputFilter()).pipe(process.stdout, {
+            end: false,
         });
-        return;
-    }
-    if (action === "connect") {
-        const keyPath = getFlagString(flags, "key-file");
-        if (!keyPath)
-            throw new Error("--key-file is required");
-        const keyFile = path.resolve(keyPath), hostsFile = keyFile + ".known_hosts";
-        if (existsSync(keyFile) || existsSync(hostsFile))
-            throw new Error("Choose new credential filenames; existing files are never overwritten");
-        const issued = await act({ action: "connect" });
-        const parsed = z
-            .object({
-            connection: z.object({
-                privateKey: z.string().min(1),
-                hostPublicKey: z.string(),
-                hostAlias: z.literal(`triage-${executionId}`),
-                username: z.literal("triage"),
-                expiresAt: z.string().datetime({ offset: true }),
-            }),
-        })
-            .safeParse(issued);
-        if (!parsed.success) {
-            await act({ action: "revoke-ssh" });
-            throw new Error("Invalid SSH identity; access was revoked");
+        try {
+            await new Promise((resolve, reject) => {
+                child.once("error", () => reject(new Error("Install the AWS session-manager-plugin to connect")));
+                child.once("close", (code) => code === 0 ? resolve() : reject(new Error("SSH transport closed")));
+            });
         }
-        const { connection } = parsed.data;
-        const hostKey = connection.hostPublicKey
-            .trim()
-            .split(/\s+/)
-            .slice(0, 2)
-            .join(" ");
-        if (!/^ssh-ed25519 [A-Za-z0-9+/]+=*$/.test(hostKey) ||
-            Date.parse(connection.expiresAt) <= Date.now()) {
-            await act({ action: "revoke-ssh" });
-            throw new Error("Invalid SSH identity");
+        finally {
+            process.stdin.unpipe(child.stdin);
         }
-        let wroteKey = false;
+        return;
+    }
+    if (action === "ssh") {
+        const directory = mkdtempSync(path.join(os.tmpdir(), "apex-triage-ssh-"));
+        let child = null;
+        let interruptedBy = null;
+        const cleanup = () => rmSync(directory, { recursive: true, force: true });
+        const onSignal = (signal) => {
+            interruptedBy = signal;
+            cleanup();
+            child?.kill(signal);
+        };
+        const signals = ["SIGHUP", "SIGINT", "SIGTERM"];
+        const signalHandlers = signals.map((signal) => [signal, () => onSignal(signal)]);
+        for (const [signal, handler] of signalHandlers)
+            process.once(signal, handler);
         try {
-            writeFileSync(keyFile, connection.privateKey, {
-                flag: "wx",
-                mode: 0o600,
-            });
-            wroteKey = true;
-            writeFileSync(hostsFile, `${connection.hostAlias} ${hostKey}\n`, {
-                flag: "wx",
-                mode: 0o600,
+            const connection = await issueConnection(executionId, path.join(directory, "identity"));
+            if (interruptedBy)
+                throw new Error(`SSH interrupted by ${interruptedBy}`);
+            const ssh = spawn("ssh", connection.sshArgs, { stdio: "inherit" });
+            child = ssh;
+            await new Promise((resolve, reject) => {
+                ssh.once("error", () => reject(new Error("Unable to start SSH")));
+                ssh.once("close", (code) => {
+                    if (interruptedBy)
+                        reject(new Error(`SSH interrupted by ${interruptedBy}`));
+                    else if (code === 255)
+                        reject(new Error("SSH connection failed"));
+                    else {
+                        if (code)
+                            process.exitCode = code;
+                        resolve();
+                    }
+                });
             });
         }
-        catch {
-            if (wroteKey)
-                rmSync(keyFile);
-            await act({ action: "revoke-ssh" });
-            throw new Error("Could not save credentials; SSH access was revoked");
+        finally {
+            for (const [signal, handler] of signalHandlers)
+                process.removeListener(signal, handler);
+            cleanup();
         }
-        const source = import.meta.url.endsWith(".ts");
-        const entry = fileURLToPath(new URL(source ? "./apex.ts" : "./apex.js", import.meta.url));
-        const invocation = [
-            quote(process.execPath),
-            ...(source
-                ? ["--import", quote(createRequire(import.meta.url).resolve("tsx"))]
-                : []),
-            quote(entry),
-            "code-access",
-            "proxy",
-            executionId,
-            "--workspace-ref",
-            workspaceId,
-        ].join(" ");
-        const sshCommand = `ssh -i ${quote(keyFile.replaceAll("%", "%%"))} -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o ${quote(`UserKnownHostsFile="${hostsFile.replaceAll("%", "%%").replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`)} -o ${quote("ProxyCommand=" + invocation.replaceAll("%", "%%"))} triage@${connection.hostAlias}`;
-        print({ keyFile, hostsFile, expiresAt: connection.expiresAt, sshCommand });
+        return;
+    }
+    if (action === "connect") {
+        const keyPath = getFlagString(flags, "key-file");
+        if (!keyPath)
+            throw new Error("--key-file is required");
+        const { sshArgs: _sshArgs, ...connection } = await issueConnection(executionId, prepareCredentialPath(keyPath));
+        print(connection);
         return;
     }
     const input = action === "extend"
         ? { action, minutes: numberFlag(flags, "minutes", 1440) }
-        : action === "snapshot"
-            ? { action, retentionDays: numberFlag(flags, "retention-days", 7) }
-            : action === "respawn"
-                ? {
-                    action,
-                    snapshotId: uuid.parse(getFlagString(flags, "snapshot")),
-                    leaseMinutes: numberFlag(flags, "minutes", 1440),
-                }
-                : ["resume", "revoke-ssh", "stop", "delete"].includes(action)
-                    ? { action }
-                    : null;
+        : ["resume", "revoke-ssh", "stop", "kill", "delete"].includes(action)
+            ? { action }
+            : null;
     if (!input)
         throw new Error("Unknown command");
     print(await act(input));
@@ -201,19 +382,70 @@ export async function commandInternalTriage(client, flags, action, id) {
         process.stdout.write(JSON.stringify(await client.request(endpoint), null, 2) + "\n");
         return;
     }
+    if (action === "review") {
+        const findingId = uuid.parse(id).toLowerCase();
+        const validity = z
+            .enum(["valid", "partially_valid", "invalid"])
+            .parse(getFlagString(flags, "validity"));
+        const severityValue = getFlagString(flags, "severity");
+        const severity = severityValue
+            ? z
+                .enum([
+                "extreme",
+                "critical",
+                "high",
+                "medium",
+                "low",
+                "informational",
+            ])
+                .parse(severityValue)
+            : null;
+        if (validity === "invalid" && severity)
+            throw new Error("Invalid reviews must omit --severity");
+        if (validity !== "invalid" && !severity)
+            throw new Error("Valid and partially valid reviews require --severity");
+        const expectedUpdatedAt = z
+            .string()
+            .datetime({ offset: true })
+            .parse(getFlagString(flags, "expected-updated-at"));
+        const requestedId = getFlagString(flags, "request-id");
+        const requestId = uuid.parse(requestedId ?? randomUUID()).toLowerCase();
+        if (!requestedId)
+            process.stderr.write(`Request ID: ${requestId}\n`);
+        const result = await client.request(endpoint, {
+            method: "POST",
+            json: {
+                findingId,
+                requestId,
+                expectedUpdatedAt,
+                edit: {
+                    action: "review",
+                    validity,
+                    severity,
+                    note: getFlagString(flags, "note") ?? "",
+                },
+            },
+        });
+        process.stdout.write(JSON.stringify(result, null, 2) + "\n");
+        return;
+    }
     if (action !== "edit")
         throw new Error("Unknown command");
-    const findingId = uuid.parse(id), file = getFlagString(flags, "file");
+    const findingId = uuid.parse(id).toLowerCase(), file = getFlagString(flags, "file");
     if (!file)
         throw new Error("--file is required");
-    const edit = JSON.parse(readFileSync(file, "utf8"));
+    const edit = commentEdit.parse(JSON.parse(readFileSync(file, "utf8")));
     const expectedUpdatedAt = z
         .string()
         .datetime({ offset: true })
         .parse(getFlagString(flags, "expected-updated-at"));
+    const requestedId = getFlagString(flags, "request-id");
+    const requestId = uuid.parse(requestedId ?? randomUUID()).toLowerCase();
+    if (!requestedId)
+        process.stderr.write(`Request ID: ${requestId}\n`);
     const result = await client.request(endpoint, {
         method: "POST",
-        json: { findingId, expectedUpdatedAt, edit },
+        json: { findingId, requestId, expectedUpdatedAt, edit },
     });
     process.stdout.write(JSON.stringify(result, null, 2) + "\n");
 }

package/dist/commands.js

@@ -23,6 +23,45 @@ import { commandUpdate as runCliUpdate } from "./update.js";
 import { mkdir, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { z } from "zod";
+function getRequestedWorkspaceSrDoctorPayload(me, flags) {
+    const requested = getFlagString(flags, "company")?.trim().toLowerCase();
+    if (!requested)
+        return null;
+    if (me.companies.some((company) => company.id.toLowerCase() === requested ||
+        company.handle?.toLowerCase() === requested)) {
+        return null;
+    }
+    const triageWorkspaces = me.user.triageWorkspaces ?? [];
+    const scopes = triageWorkspaces.filter((workspace) => workspace.companyId.toLowerCase() === requested ||
+        workspace.companyHandle?.toLowerCase() === requested);
+    if (scopes.length === 0) {
+        const companyIdsMissingHandles = [
+            ...new Set(triageWorkspaces
+                .filter((workspace) => !workspace.companyHandle)
+                .map((workspace) => workspace.companyId)),
+        ];
+        if (companyIdsMissingHandles.length > 0) {
+            throw new Error(`Workspace SR access metadata is missing a company handle. Retry with --company ${companyIdsMissingHandles.join(" or --company ")}.`);
+        }
+        return null;
+    }
+    const company = scopes[0];
+    const workspaceIds = [...new Set(scopes.map((scope) => scope.workspaceId))];
+    return {
+        authenticatedAs: me.user.username ?? me.user.id,
+        accessMode: "workspace_sr",
+        company: {
+            id: company.companyId,
+            name: company.companyName ?? null,
+            handle: company.companyHandle ?? null,
+        },
+        workspaces: workspaceIds.map((workspaceId) => ({
+            workspaceId,
+            findingsCommand: `apex triage findings --workspace-ref ${workspaceId}`,
+            createSandboxCommand: `apex code-access create --workspace-ref ${workspaceId}`,
+        })),
+    };
+}
 const WORKSPACE_USE_PATTERN = "<workspace-name|workspace-prefix|workspace-id>";
 const WORKSPACE_BINDING_GUIDANCE = "Run `apex workspaces` to list workspace names, prefixes, and IDs, then bind one with `apex workspace use \"<workspace name>\"`, or run `apex scan` to create or resolve one automatically.";
 const WORKSPACE_SELECTION_GUIDANCE = "Run `apex workspaces` to list available workspace names, prefixes, and IDs, then retry `apex workspace use \"<workspace name>\"`.";
@@ -1005,6 +1044,22 @@ export async function commandDoctor(client, cwd, flags) {
         const me = existingMe ?? (await ensureAuthenticated(client, flags));
         const authState = await getCommandAuthState(client, me);
         setTelemetryAuthKind(authState.authKind);
+        const workspaceSrPayload = getRequestedWorkspaceSrDoctorPayload(me, flags);
+        if (workspaceSrPayload) {
+            if (isJsonMode(flags)) {
+                printJson(workspaceSrPayload);
+                return workspaceSrPayload;
+            }
+            logLine(`Authenticated as ${workspaceSrPayload.authenticatedAs}`, flags);
+            logLine(`Company: ${workspaceSrPayload.company.handle ?? workspaceSrPayload.company.id}`, flags);
+            logLine("Access: workspace-scoped SR", flags);
+            for (const workspace of workspaceSrPayload.workspaces) {
+                logLine(`Workspace: ${workspace.workspaceId}`, flags);
+                logLine(`Findings: ${workspace.findingsCommand}`, flags);
+                logLine(`Create sandbox: ${workspace.createSandboxCommand}`, flags);
+            }
+            return workspaceSrPayload;
+        }
         const result = await withLoadingIndicator("Inspecting this directory and checking Apex setup...", flags, async () => {
             if (authState.authKind === "guest") {
                 const selection = await selectWorkspaceTarget(cwd, me, flags);
@@ -1015,6 +1070,7 @@ export async function commandDoctor(client, cwd, flags) {
         const localSnapshotCount = result.resolve.plannedSources.filter((source) => source.sourceKind === "local_archive").length;
         const payload = {
             authenticatedAs: me.user.username ?? me.user.id,
+            accessMode: "company",
             company: result.company,
             workspaceName: result.workspaceName,
             binding: result.binding,

package/package.json

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