@cantinasecurity/apex-cli 0.1.10 → 0.1.11

package/dist/setup.js

@@ -9,6 +9,8 @@ import { logLine, printJson } from "./output.js";
 const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const CODEX_SKILL_NAME = "apex-cli";
 const MCP_SERVER_NAME = "apex";
+const MCP_CLIENT_ENV_NAME = "APEX_MCP_CLIENT";
+const MCP_CLIENT_INTEGRATION_ENV_NAME = "APEX_CLIENT_INTEGRATION";
 const execFile = promisify(execFileCallback);
 const SETUP_CLIENTS = ["codex", "claude", "copilot"];
 function quoteShellArg(value) {
@@ -96,21 +98,49 @@ function normalizeTools(value) {
     }
     return [];
 }
+function mcpClientEnv(client) {
+    return {
+        [MCP_CLIENT_ENV_NAME]: client,
+        [MCP_CLIENT_INTEGRATION_ENV_NAME]: client,
+    };
+}
+function normalizeEnvKeys(value) {
+    if (Array.isArray(value)) {
+        return value.filter((item) => typeof item === "string");
+    }
+    if (value && typeof value === "object") {
+        return Object.keys(value);
+    }
+    return [];
+}
+function envMatches(value, expected) {
+    if (!value || typeof value !== "object" || Array.isArray(value)) {
+        return false;
+    }
+    const env = value;
+    return Object.entries(expected).every(([key, expectedValue]) => env[key] === expectedValue);
+}
+function envKeyListMatches(value, expected) {
+    const keys = normalizeEnvKeys(value);
+    return Object.keys(expected).every((key) => keys.includes(key));
+}
 function codexConfigMatches(existing, launch) {
     if (!existing?.transport) {
         return false;
     }
+    const expectedEnv = mcpClientEnv("codex");
     return (existing.transport.type === "stdio" &&
         existing.transport.command === launch.command &&
-        JSON.stringify(normalizeArgs(existing.transport.args)) === JSON.stringify(launch.args));
+        JSON.stringify(normalizeArgs(existing.transport.args)) === JSON.stringify(launch.args) &&
+        (envMatches(existing.transport.env, expectedEnv) ||
+            envKeyListMatches(existing.transport.env_vars, expectedEnv)));
 }
 function claudeConfigMatches(existing, launch) {
-    const env = existing?.env;
-    const normalizedEnv = env && typeof env === "object" && !Array.isArray(env) ? Object.keys(env).length : 0;
+    const expectedEnv = mcpClientEnv("claude");
     return (existing?.type === "stdio" &&
         existing.command === launch.command &&
         JSON.stringify(normalizeArgs(existing.args)) === JSON.stringify(launch.args) &&
-        normalizedEnv === 0);
+        envMatches(existing.env, expectedEnv));
 }
 function copilotConfigMatches(existing, launch) {
     const env = existing?.env;
@@ -174,12 +204,24 @@ async function readCopilotUserMcpConfig() {
 }
 async function configureCodex(launch) {
     const existing = await readCodexMcpConfig();
+    const env = mcpClientEnv("codex");
     const mcpStatus = existing === null
         ? "installed"
         : codexConfigMatches(existing, launch)
             ? "unchanged"
             : "updated";
-    await execText("codex", ["mcp", "add", MCP_SERVER_NAME, "--", launch.command, ...launch.args]);
+    await execText("codex", [
+        "mcp",
+        "add",
+        MCP_SERVER_NAME,
+        "--env",
+        `${MCP_CLIENT_ENV_NAME}=${env[MCP_CLIENT_ENV_NAME]}`,
+        "--env",
+        `${MCP_CLIENT_INTEGRATION_ENV_NAME}=${env[MCP_CLIENT_INTEGRATION_ENV_NAME]}`,
+        "--",
+        launch.command,
+        ...launch.args,
+    ]);
     const skillSource = path.join(PACKAGE_ROOT, "skills", CODEX_SKILL_NAME, "SKILL.md");
     const skillTarget = path.join(getCodexHome(), "skills", CODEX_SKILL_NAME, "SKILL.md");
     const skillContent = await readFile(skillSource, "utf8");
@@ -203,6 +245,7 @@ async function configureCodex(launch) {
 }
 async function configureClaude(cwd, launch) {
     const existing = await readClaudeUserMcpConfig();
+    const env = mcpClientEnv("claude");
     const mcpStatus = existing === null
         ? "installed"
         : claudeConfigMatches(existing, launch)
@@ -216,6 +259,10 @@ async function configureClaude(cwd, launch) {
         "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,

package/dist/shell.js

@@ -1,9 +1,10 @@
 import { SHELL_HELP_TEXT } from "./help.js";
-import { commandCancelScan, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandLogout, commandScan, commandScans, commandStatus, commandUpdate, commandWorkspace, commandWorkspaceUse, commandWorkspaces, initializeInteractiveSession, openCurrentApexView, } from "./commands.js";
+import { commandCancelScan, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, 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";
 import { formatApiError } from "./api-client.js";
+import { createShellTelemetryInvocation, emitInvocationCompleted, emitInvocationStarted, withTelemetryContext, } from "./telemetry.js";
 const SHELL_COMPLETIONS = [
     { command: "credits" },
     { command: "scan", args: ["standard", "audit", "ultra", "pr"] },
@@ -15,6 +16,7 @@ const SHELL_COMPLETIONS = [
     { command: "cancel" },
     { command: "status" },
     { command: "doctor" },
+    { command: "telemetry", args: ["status", "enable", "disable"] },
     { command: "update" },
     { command: "logout" },
     { command: "repos" },
@@ -151,7 +153,7 @@ export async function runInteractiveShell(client, cwd, initialFlags) {
         }
         let shouldContinue;
         try {
-            shouldContinue = await runShellCommand(client, cwd, parsed, shellFlags, session);
+            shouldContinue = await runShellCommandWithTelemetry(client, cwd, parsed, shellFlags, session);
         }
         catch (error) {
             process.stderr.write(`${formatApiError(error)}\n`);
@@ -168,6 +170,21 @@ export async function runInteractiveShell(client, cwd, initialFlags) {
         }
     }
 }
+async function runShellCommandWithTelemetry(client, cwd, parsed, shellFlags, session) {
+    const invocation = createShellTelemetryInvocation(parsed, shellFlags);
+    emitInvocationStarted(invocation);
+    return withTelemetryContext(invocation, async () => {
+        try {
+            const result = await runShellCommand(client, cwd, parsed, shellFlags, session);
+            emitInvocationCompleted(invocation);
+            return result;
+        }
+        catch (error) {
+            emitInvocationCompleted(invocation, error);
+            throw error;
+        }
+    });
+}
 async function runShellCommand(client, cwd, parsed, shellFlags, session) {
     switch (parsed.command) {
         case "help":
@@ -300,6 +317,14 @@ async function runShellCommand(client, cwd, parsed, shellFlags, session) {
         case "doctor":
             await commandDoctor(client, cwd, shellFlags);
             return {};
+        case "telemetry": {
+            if (parsed.args.length > 1) {
+                process.stderr.write("Usage: /telemetry [status|enable|disable]\n");
+                return {};
+            }
+            await commandTelemetry(shellFlags, parsed.args[0] ?? null);
+            return {};
+        }
         case "update":
             await commandUpdate(shellFlags);
             return false;