@cantinasecurity/apex-cli 0.1.9 → 0.1.11

package/dist/mcp.js

@@ -6,6 +6,7 @@ import { getMe, logout, startDeviceLogin, waitForDeviceLoginApproval } from "./a
 import { ApexApiClient, formatApiError } from "./api-client.js";
 import { commandCancelScan, commandConnect, commandCredits, commandDoctor, commandExportFindings, commandFindingComment, commandFindingFeedback, commandFindingFixReview, commandFindings, commandScan, commandScans, commandStatus, commandWorkspace, commandWorkspaceUse, commandWorkspaces, } from "./commands.js";
 import { CLI_HELP_TEXT } from "./help.js";
+import { createMcpServerTelemetryInvocation, createMcpTelemetryInvocation, emitInvocationCompleted, emitInvocationStarted, emitMcpServerStarted, withTelemetryContext, } from "./telemetry.js";
 import { APEX_CLI_VERSION } from "./version.js";
 const MCP_WORKFLOW_GUIDE = `Use Apex through these tools instead of shelling out to the CLI.
 
@@ -139,14 +140,20 @@ function errorResult(toolName, error) {
         isError: true,
     };
 }
-async function runTool(toolName, action, summary) {
-    try {
-        const value = await action();
-        return successResult(summary(value), value);
-    }
-    catch (error) {
-        return errorResult(toolName, error);
-    }
+async function runTool(toolName, action, summary, input = {}) {
+    const invocation = createMcpTelemetryInvocation(toolName, input);
+    emitInvocationStarted(invocation);
+    return withTelemetryContext(invocation, async () => {
+        try {
+            const value = await action();
+            emitInvocationCompleted(invocation);
+            return successResult(summary(value), value);
+        }
+        catch (error) {
+            emitInvocationCompleted(invocation, error);
+            return errorResult(toolName, error);
+        }
+    });
 }
 async function requireAuthenticated(client) {
     const me = await getMe(client);
@@ -235,7 +242,7 @@ function registerTools(server) {
             return "Device login expired before approval.";
         }
         return "Device login is still pending.";
-    }));
+    }, { deviceCode, intervalSeconds, expiresAt, timeoutSeconds }));
     server.registerTool("apex-logout", {
         title: "Log Out Of Apex",
         description: "Clear the locally stored Apex session.",
@@ -268,7 +275,13 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Apex doctor completed for ${String(value.cwd)}.`));
+    }, (value) => `Apex doctor completed for ${String(value.cwd)}.`, {
+        cwd,
+        company,
+        workspaceName,
+        repoPaths,
+        sourceMode,
+    }));
     server.registerTool("apex-credits", {
         title: "Get Apex Credits",
         description: "Show scan credits plus audit and fix review scan entitlements for the active or selected company.",
@@ -287,7 +300,10 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Fetched Apex credits for ${String(value.cwd)}.`));
+    }, (value) => `Fetched Apex credits for ${String(value.cwd)}.`, {
+        cwd,
+        company,
+    }));
     server.registerTool("apex-workspace", {
         title: "Get Current Apex Workspace Binding",
         description: "Show the current Apex workspace bound to a directory, if any.",
@@ -301,7 +317,9 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Loaded workspace binding for ${String(value.cwd)}.`));
+    }, (value) => `Loaded workspace binding for ${String(value.cwd)}.`, {
+        cwd,
+    }));
     server.registerTool("apex-workspaces", {
         title: "List Apex Workspaces",
         description: "List workspaces available to the active or selected company.",
@@ -320,7 +338,10 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Listed Apex workspaces for ${String(value.cwd)}.`));
+    }, (value) => `Listed Apex workspaces for ${String(value.cwd)}.`, {
+        cwd,
+        company,
+    }));
     server.registerTool("apex-workspace-use", {
         title: "Bind Directory To Apex Workspace",
         description: "Bind a directory to an existing Apex workspace by id, prefix, or name.",
@@ -340,7 +361,11 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Bound ${String(value.cwd)} to an Apex workspace.`));
+    }, (value) => `Bound ${String(value.cwd)} to an Apex workspace.`, {
+        cwd,
+        company,
+        workspaceRef,
+    }));
     server.registerTool("apex-scan", {
         title: "Start Apex Scan",
         description: "Start a new Apex scan for the provided cwd by default. Pass repoPaths only to scan explicit alternate local roots. Use mode audit for audit scans and mode pr for GitHub pull request scans.",
@@ -378,7 +403,16 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Started an Apex scan for ${String(value.cwd)}.`));
+    }, (value) => `Started an Apex scan for ${String(value.cwd)}.`, {
+        cwd,
+        company,
+        workspaceName,
+        repoPaths,
+        mode,
+        pullRequests,
+        sourceMode,
+        force,
+    }));
     server.registerTool("apex-status", {
         title: "Get Apex Scan Status",
         description: "Show progress for the most recent or selected Apex scan in a directory.",
@@ -395,7 +429,10 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Fetched scan status for ${String(value.cwd)}.`));
+    }, (value) => `Fetched scan status for ${String(value.cwd)}.`, {
+        cwd,
+        scanId,
+    }));
     server.registerTool("apex-scans", {
         title: "List Apex Scans",
         description: "List scans for the Apex workspace bound to a directory.",
@@ -411,7 +448,9 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Listed scans for ${String(value.cwd)}.`));
+    }, (value) => `Listed scans for ${String(value.cwd)}.`, {
+        cwd,
+    }));
     server.registerTool("apex-cancel-scan", {
         title: "Cancel Apex Scan",
         description: "Cancel a running Apex scan in the bound workspace.",
@@ -428,7 +467,10 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Cancelled the selected Apex scan for ${String(value.cwd)}.`));
+    }, (value) => `Cancelled the selected Apex scan for ${String(value.cwd)}.`, {
+        cwd,
+        scanId,
+    }));
     server.registerTool("apex-findings", {
         title: "List Apex Findings",
         description: "List findings for the latest or selected Apex scan in a directory.",
@@ -449,7 +491,11 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Fetched Apex findings for ${String(value.cwd)}.`));
+    }, (value) => `Fetched Apex findings for ${String(value.cwd)}.`, {
+        cwd,
+        scanId,
+        limit,
+    }));
     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.",
@@ -470,7 +516,13 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Added a finding comment for ${String(value.findingRef)}.`));
+    }, (value) => `Added a finding comment for ${String(value.findingRef)}.`, {
+        cwd,
+        findingRef,
+        content,
+        parentCommentId,
+        scanId,
+    }));
     server.registerTool("apex-finding-feedback", {
         title: "Leave Apex Finding Feedback",
         description: "Leave valid or invalid feedback on an Apex finding using the current Apex login. To attach a fix PR, send status valid with label fixed and fixPrUrls.",
@@ -508,7 +560,17 @@ function registerTools(server) {
             ...payload,
         };
     }, (value) => `Submitted ${String((value.feedback?.feedbackType ??
-        "finding"))} feedback for ${String(value.findingRef)}.`));
+        "finding"))} feedback for ${String(value.findingRef)}.`, {
+        cwd,
+        findingRef,
+        status,
+        comment,
+        labels,
+        fixPrUrls,
+        suggestedSeverity,
+        dismissalReason,
+        scanId,
+    }));
     server.registerTool("apex-finding-fix-review", {
         title: "Start Apex Finding Fix Review Scan",
         description: "Start a fix review scan for a finding after fixed feedback with one or more Fix PR URLs has been saved.",
@@ -527,7 +589,11 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Started fix review scan for ${String(value.findingRef)}.`));
+    }, (value) => `Started fix review scan for ${String(value.findingRef)}.`, {
+        cwd,
+        findingRef,
+        scanId,
+    }));
     server.registerTool("apex-export-findings", {
         title: "Export Apex Findings",
         description: "Export findings for the latest or selected Apex scan to a file on disk.",
@@ -556,7 +622,12 @@ function registerTools(server) {
             scan: payload.scan,
             outputPath: payload.outputPath,
         };
-    }, (value) => `Exported Apex findings for ${String(value.cwd)}.`));
+    }, (value) => `Exported Apex findings for ${String(value.cwd)}.`, {
+        cwd,
+        scanId,
+        format,
+        output,
+    }));
     server.registerTool("apex-connect-provider", {
         title: "Get Apex Provider Connection URL",
         description: "Return the browser URL a user needs to connect GitHub or GitLab access for Apex. This tool never opens a browser.",
@@ -576,16 +647,22 @@ function registerTools(server) {
             cwd: targetCwd,
             ...payload,
         };
-    }, (value) => `Fetched the ${String(value.provider)} connection URL.`));
+    }, (value) => `Fetched the ${String(value.provider)} connection URL.`, {
+        cwd,
+        company,
+        provider,
+    }));
 }
 export async function runMcpServer() {
     const server = new McpServer({
         name: "apex-cli",
         version: APEX_CLI_VERSION,
     });
+    const invocation = createMcpServerTelemetryInvocation();
     registerResources(server);
     registerTools(server);
     const transport = new StdioServerTransport();
+    emitMcpServerStarted(invocation);
     await server.connect(transport);
 }
 export const testing = {

package/dist/setup.js

@@ -9,7 +9,10 @@ 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) {
     return /[^A-Za-z0-9_./:-]/.test(value)
         ? `'${value.replace(/'/g, `'\\''`)}'`
@@ -73,24 +76,82 @@ function getCodexHome() {
     }
     return path.join(os.homedir(), ".codex");
 }
+function getCopilotHome() {
+    const configured = process.env.COPILOT_HOME?.trim();
+    if (configured) {
+        return configured;
+    }
+    return path.join(os.homedir(), ".copilot");
+}
 function normalizeArgs(value) {
     return Array.isArray(value) ? value.filter((item) => typeof item === "string") : [];
 }
+function normalizeTools(value) {
+    if (Array.isArray(value)) {
+        return value.filter((item) => typeof item === "string");
+    }
+    if (typeof value === "string") {
+        return value
+            .split(",")
+            .map((item) => item.trim())
+            .filter(Boolean);
+    }
+    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 expectedEnv = mcpClientEnv("claude");
+    return (existing?.type === "stdio" &&
+        existing.command === launch.command &&
+        JSON.stringify(normalizeArgs(existing.args)) === JSON.stringify(launch.args) &&
+        envMatches(existing.env, expectedEnv));
+}
+function copilotConfigMatches(existing, launch) {
     const env = existing?.env;
     const normalizedEnv = env && typeof env === "object" && !Array.isArray(env) ? Object.keys(env).length : 0;
-    return (existing?.type === "stdio" &&
+    const normalizedTools = normalizeTools(existing?.tools);
+    return ((existing?.type === "stdio" || existing?.type === "local") &&
         existing.command === launch.command &&
         JSON.stringify(normalizeArgs(existing.args)) === JSON.stringify(launch.args) &&
-        normalizedEnv === 0);
+        normalizedEnv === 0 &&
+        normalizedTools.length === 1 &&
+        normalizedTools[0] === "*");
 }
 async function writeManagedFile(filePath, content) {
     const current = await readTextFile(filePath);
@@ -127,14 +188,40 @@ async function readClaudeUserMcpConfig() {
         return null;
     }
 }
+async function readCopilotUserMcpConfig() {
+    const configPath = path.join(getCopilotHome(), "mcp-config.json");
+    const raw = await readTextFile(configPath);
+    if (!raw) {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        return parsed.mcpServers?.[MCP_SERVER_NAME] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
 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");
@@ -158,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)
@@ -171,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,
@@ -197,6 +289,49 @@ async function configureClaude(cwd, launch) {
         },
     ];
 }
+async function configureCopilot(launch) {
+    const existing = await readCopilotUserMcpConfig();
+    const mcpStatus = existing === null
+        ? "installed"
+        : copilotConfigMatches(existing, launch)
+            ? "unchanged"
+            : "updated";
+    if (existing) {
+        await execText("copilot", ["mcp", "remove", MCP_SERVER_NAME]);
+    }
+    await execText("copilot", [
+        "mcp",
+        "add",
+        MCP_SERVER_NAME,
+        "--type",
+        "stdio",
+        "--tools",
+        "*",
+        "--",
+        launch.command,
+        ...launch.args,
+    ]);
+    const skillSource = path.join(PACKAGE_ROOT, "skills", CODEX_SKILL_NAME, "SKILL.md");
+    const skillTarget = path.join(getCopilotHome(), "skills", CODEX_SKILL_NAME, "SKILL.md");
+    const skillContent = await readFile(skillSource, "utf8");
+    const skillStatus = await writeManagedFile(skillTarget, skillContent);
+    return [
+        {
+            client: "copilot",
+            kind: "mcp",
+            status: mcpStatus,
+            path: path.join(getCopilotHome(), "mcp-config.json"),
+            detail: `Registered ${MCP_SERVER_NAME} -> ${launch.label} in GitHub Copilot CLI user config`,
+        },
+        {
+            client: "copilot",
+            kind: "skill",
+            status: skillStatus,
+            path: skillTarget,
+            detail: "Installed the Apex GitHub Copilot CLI skill",
+        },
+    ];
+}
 function summarizeStep(step) {
     const prefix = `${step.client} ${step.kind}`;
     if (step.path) {
@@ -204,29 +339,51 @@ function summarizeStep(step) {
     }
     return `${prefix}: ${step.status}`;
 }
+function isSetupClient(value) {
+    return SETUP_CLIENTS.includes(value);
+}
+function displayClientName(client) {
+    switch (client) {
+        case "codex":
+            return "Codex";
+        case "claude":
+            return "Claude Code";
+        case "copilot":
+            return "GitHub Copilot CLI";
+    }
+}
+function isMissingClientError(error) {
+    return error instanceof Error && /spawn (codex|claude|copilot) ENOENT/i.test(error.message);
+}
+async function configureClient(client, cwd, launch) {
+    switch (client) {
+        case "codex":
+            return configureCodex(launch);
+        case "claude":
+            return configureClaude(cwd, launch);
+        case "copilot":
+            return configureCopilot(launch);
+    }
+}
 export async function commandSetup(cwd, flags, requestedTarget, packageRoot = PACKAGE_ROOT) {
-    if (requestedTarget !== null &&
-        requestedTarget !== "all" &&
-        requestedTarget !== "codex" &&
-        requestedTarget !== "claude") {
-        throw new Error("Usage: apex setup [all|codex|claude]");
+    if (requestedTarget !== null && requestedTarget !== "all" && !isSetupClient(requestedTarget)) {
+        throw new Error("Usage: apex setup [all|codex|claude|copilot]");
     }
     const target = requestedTarget ?? "all";
     const launch = await resolveMcpLaunchSpec(packageRoot);
     const steps = [];
-    const requestedClients = target === "all" ? ["codex", "claude"] : [target];
+    const requestedClients = target === "all" ? [...SETUP_CLIENTS] : [target];
     let configuredClients = 0;
     for (const client of requestedClients) {
         try {
-            const clientSteps = client === "codex" ? await configureCodex(launch) : await configureClaude(cwd, launch);
+            const clientSteps = await configureClient(client, cwd, launch);
             steps.push(...clientSteps);
             configuredClients += 1;
         }
         catch (error) {
-            const missingClient = error instanceof Error &&
-                /spawn (codex|claude) ENOENT/i.test(error.message);
+            const missingClient = isMissingClientError(error);
             if (missingClient && target !== "all") {
-                throw new Error(`${client === "codex" ? "Codex" : "Claude Code"} is not installed on this machine. Install it first, then re-run \`apex setup ${client}\`.`);
+                throw new Error(`${displayClientName(client)} is not installed on this machine. Install it first, then re-run \`apex setup ${client}\`.`);
             }
             if (!missingClient) {
                 throw error;
@@ -236,19 +393,19 @@ export async function commandSetup(cwd, flags, requestedTarget, packageRoot = PA
                 kind: "mcp",
                 status: "skipped",
                 path: null,
-                detail: `${client} is not installed on this machine`,
+                detail: `${displayClientName(client)} is not installed on this machine`,
             });
             steps.push({
                 client,
                 kind: "skill",
                 status: "skipped",
                 path: null,
-                detail: `${client} is not installed on this machine`,
+                detail: `${displayClientName(client)} is not installed on this machine`,
             });
         }
     }
     if (configuredClients === 0) {
-        throw new Error("Neither Codex nor Claude Code is installed. Install one of them first, then re-run `apex setup`.");
+        throw new Error("Neither Codex, Claude Code, nor GitHub Copilot CLI is installed. Install one of them first, then re-run `apex setup`.");
     }
     const payload = {
         target,
@@ -271,5 +428,8 @@ export async function commandSetup(cwd, flags, requestedTarget, packageRoot = PA
     if (requestedClients.includes("claude")) {
         logLine("Re-run `apex setup claude` in each repository where you want the Claude project skill.", flags);
     }
+    if (requestedClients.includes("copilot")) {
+        logLine("Restart GitHub Copilot CLI or run `/skills reload` to pick up a newly installed or updated skill.", flags);
+    }
     return payload;
 }

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;