autokap 1.6.2 → 1.6.4

package/dist/cli-config.js

@@ -1,5 +1,18 @@
+// CLI-local config helpers.
+//
+// NOTE: this file currently duplicates the canonical implementation in
+// `@autokap/core/config`. The MCP server consumes the core package directly;
+// the bundled CLI binary still ships a self-contained copy because
+// `@autokap/core` is not yet published to npm. Once core@0.1.0 is on the
+// registry and the published CLI bumps to declare it as a runtime dep, this
+// file can become a thin re-export shim (just LOCAL_WS_URL + requireConfig).
+//
+// Hardening here must stay in lockstep with packages/core/src/config.ts:
+// atomic writes, scheme allowlist on URL inputs, env-var precedence, and
+// the "untrusted origin override" guard.
 import path from 'node:path';
 import os from 'node:os';
+import crypto from 'node:crypto';
 import fs from 'node:fs/promises';
 import { logger } from './logger.js';
 const DEFAULT_API_BASE_URL = 'https://autokap.app';
@@ -46,45 +59,76 @@ export async function readConfig() {
             wsUrl,
         };
     }
+    // Only swallow IO / parse failures. Origin-allowlist / schema errors must
+    // bubble up so the user sees what's wrong instead of "not authenticated".
+    let raw;
     try {
-        const raw = await fs.readFile(getConfigPath(), 'utf-8');
-        const parsed = JSON.parse(raw);
-        if (!parsed.apiKey)
-            return null;
-        const envApiBaseUrl = normalizeUrl(process.env[API_BASE_URL_ENV_VAR]);
-        const envWsUrl = normalizeUrl(process.env[WS_URL_ENV_VAR]);
-        const storedApiBaseUrl = normalizeUrl(parsed.apiBaseUrl) ?? DEFAULT_API_BASE_URL;
-        const apiBaseUrl = envApiBaseUrl ?? storedApiBaseUrl;
-        const wsUrl = envWsUrl
-            ?? (envApiBaseUrl ? deriveWsUrl(apiBaseUrl) : normalizeUrl(parsed.wsUrl) ?? deriveWsUrl(apiBaseUrl));
-        assertAllowedApiOrigin(apiBaseUrl, storedApiBaseUrl, envApiBaseUrl ? API_BASE_URL_ENV_VAR : undefined);
-        if (envWsUrl) {
-            assertAllowedApiOrigin(wsUrl.replace(/^ws/, 'http'), deriveWsUrl(storedApiBaseUrl).replace(/^ws/, 'http'), WS_URL_ENV_VAR);
-        }
-        return {
-            apiKey: parsed.apiKey,
-            apiBaseUrl,
-            wsUrl,
-        };
+        raw = await fs.readFile(getConfigPath(), 'utf-8');
+    }
+    catch {
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
     }
     catch {
         return null;
     }
+    if (!parsed || typeof parsed !== 'object')
+        return null;
+    const record = parsed;
+    if (typeof record.apiKey !== 'string' || record.apiKey.length === 0)
+        return null;
+    const storedApiBaseUrlRaw = typeof record.apiBaseUrl === 'string' ? record.apiBaseUrl : null;
+    const storedWsUrlRaw = typeof record.wsUrl === 'string' ? record.wsUrl : null;
+    const envApiBaseUrl = normalizeUrl(process.env[API_BASE_URL_ENV_VAR]);
+    const envWsUrl = normalizeUrl(process.env[WS_URL_ENV_VAR]);
+    const storedApiBaseUrl = normalizeUrl(storedApiBaseUrlRaw) ?? DEFAULT_API_BASE_URL;
+    const apiBaseUrl = envApiBaseUrl ?? storedApiBaseUrl;
+    const wsUrl = envWsUrl ??
+        (envApiBaseUrl
+            ? deriveWsUrl(apiBaseUrl)
+            : normalizeUrl(storedWsUrlRaw) ?? deriveWsUrl(apiBaseUrl));
+    assertAllowedApiOrigin(apiBaseUrl, storedApiBaseUrl, envApiBaseUrl ? API_BASE_URL_ENV_VAR : undefined);
+    if (envWsUrl) {
+        assertAllowedApiOrigin(wsUrl.replace(/^ws/, 'http'), deriveWsUrl(storedApiBaseUrl).replace(/^ws/, 'http'), WS_URL_ENV_VAR);
+    }
+    return {
+        apiKey: record.apiKey,
+        apiBaseUrl,
+        wsUrl,
+    };
 }
 export async function writeConfig(config) {
     const dir = getConfigDir();
     await fs.mkdir(dir, { recursive: true });
+    if (process.platform !== 'win32') {
+        try {
+            await fs.chmod(dir, 0o700);
+        }
+        catch {
+            // best-effort — the file's 0600 below is the real safety
+        }
+    }
     const configPath = getConfigPath();
     const normalizedConfig = {
         ...config,
         apiBaseUrl: normalizeUrl(config.apiBaseUrl) ?? DEFAULT_API_BASE_URL,
         wsUrl: normalizeUrl(config.wsUrl) ?? deriveWsUrl(config.apiBaseUrl),
     };
-    await fs.writeFile(configPath, JSON.stringify(normalizedConfig, null, 2), 'utf-8');
-    // Restrict file permissions on Unix (NTFS ignores POSIX modes)
-    if (process.platform !== 'win32') {
-        await fs.chmod(dir, 0o700);
-        await fs.chmod(configPath, 0o600);
+    // Atomic write — see packages/core/src/config.ts for the canonical impl.
+    const tmpPath = `${configPath}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`;
+    try {
+        await fs.writeFile(tmpPath, JSON.stringify(normalizedConfig, null, 2), 'utf-8');
+        if (process.platform !== 'win32') {
+            await fs.chmod(tmpPath, 0o600);
+        }
+        await fs.rename(tmpPath, configPath);
+    }
+    catch (err) {
+        await fs.rm(tmpPath, { force: true }).catch(() => undefined);
+        throw err;
     }
 }
 export async function deleteConfig() {
@@ -105,7 +149,7 @@ export async function requireConfig() {
         process.exit(1);
     }
     if (!config) {
-        logger.error(`Not authenticated. Run \`npx autokap@latest init --cli-key <key>\` first, or set ${API_KEY_ENV_VAR} in CI.`);
+        logger.error(`Not authenticated. Authenticate via your IDE's MCP integration (autokap_authenticate) or run \`autokap login <key>\` for CI / Cloud Run. CI may also set ${API_KEY_ENV_VAR} directly.`);
         process.exit(1);
     }
     return config;

package/dist/cli-contract.d.ts

@@ -4,15 +4,29 @@ export interface CliPublicCommandDescriptor {
     summary: string;
     docsDescriptionKey?: string;
 }
-export declare const CLI_KEY_TERM = "CLI key";
+export declare const API_KEY_TERM = "API key";
+/**
+ * Back-compat alias for internal callers that still import `CLI_KEY_TERM`.
+ * Points at the same string as `API_KEY_TERM`.
+ */
+export declare const CLI_KEY_TERM = "API key";
+/** HTTP header sent by the bundled CLI binary on every request. */
 export declare const CLI_VERSION_HEADER = "x-autokap-cli-version";
 export declare const MIN_CLI_VERSION_FOR_SIGNED_PROGRAMS = "1.0.9";
 export declare const MIN_CLI_VERSION_FOR_DIRECT_ARTIFACT_UPLOADS = "1.5.0";
-export declare const CLI_DEFAULT_INSTALL_COMMAND = "npm install -g autokap";
-export declare const CLI_DEFAULT_INSTALLED_SETUP_COMMAND = "autokap init --cli-key <your-cli-key>";
-export declare const CLI_DEFAULT_SETUP_COMMAND = "npx autokap@latest init --cli-key <your-cli-key>";
-export declare const CLI_ADVANCED_SKILL_COMMAND = "autokap skill --agent <agent>";
+export declare const CLI_DEFAULT_INSTALL_COMMAND = "npx -y autokap@latest";
+export declare const CLI_DEFAULT_INSTALLED_SETUP_COMMAND = "autokap login <your-api-key>";
+export declare const CLI_DEFAULT_SETUP_COMMAND = "npx -y autokap@latest login <your-api-key>";
 export declare const CLI_FALLBACK_PROGRAM_COMMAND = "autokap run <preset-id> --program <file>";
+/** Bare MCP runner. Used by generic clients and as the npx command. */
+export declare const MCP_INSTALL_COMMAND = "npx -y @autokap/mcp";
+/** One-shot install command for Claude Code (CLI flag `claude mcp add`). */
+export declare const MCP_CLAUDE_CODE_COMMAND = "claude mcp add autokap -- npx -y @autokap/mcp";
+/**
+ * JSON snippet to merge into the IDE-specific MCP config file (Cursor, Codex,
+ * Windsurf, Cline...). Format follows the shared `mcpServers` schema.
+ */
+export declare const MCP_CONFIG_SNIPPET_JSON: string;
 export declare function buildCliRunCommand(presetId: string, options?: {
     local?: boolean;
     env?: string;

package/dist/cli-contract.js

@@ -1,12 +1,54 @@
-export const CLI_KEY_TERM = "CLI key";
+export const API_KEY_TERM = "API key";
+/**
+ * Back-compat alias for internal callers that still import `CLI_KEY_TERM`.
+ * Points at the same string as `API_KEY_TERM`.
+ */
+export const CLI_KEY_TERM = API_KEY_TERM;
+/** HTTP header sent by the bundled CLI binary on every request. */
 export const CLI_VERSION_HEADER = "x-autokap-cli-version";
 export const MIN_CLI_VERSION_FOR_SIGNED_PROGRAMS = "1.0.9";
 export const MIN_CLI_VERSION_FOR_DIRECT_ARTIFACT_UPLOADS = "1.5.0";
-export const CLI_DEFAULT_INSTALL_COMMAND = "npm install -g autokap";
-export const CLI_DEFAULT_INSTALLED_SETUP_COMMAND = "autokap init --cli-key <your-cli-key>";
-export const CLI_DEFAULT_SETUP_COMMAND = "npx autokap@latest init --cli-key <your-cli-key>";
-export const CLI_ADVANCED_SKILL_COMMAND = "autokap skill --agent <agent>";
+// MCP-first install. The bundled CLI binary ships only for CI / Cloud Run;
+// recommend `npx -y autokap@latest` over a global install to keep version
+// drift contained and avoid the npm supply-chain anxiety the migration was
+// designed to remove. The `CLI_DEFAULT_INSTALL_COMMAND` alias is retained for
+// legacy doc surfaces that still want a single shell snippet.
+export const CLI_DEFAULT_INSTALL_COMMAND = "npx -y autokap@latest";
+// `autokap init` was removed in v2. The setup command now uses the surviving
+// `autokap login` for the same purpose (store the API key in ~/.autokap/config.json).
+// MCP-first workflows should use `autokap_authenticate` from the IDE instead.
+export const CLI_DEFAULT_INSTALLED_SETUP_COMMAND = "autokap login <your-api-key>";
+export const CLI_DEFAULT_SETUP_COMMAND = "npx -y autokap@latest login <your-api-key>";
+// `autokap skill --agent` was removed in v2. The skill ships as the MCP resource
+// `autokap://skill/preset-spec` (or `autokap_get_skill` tool fallback). The
+// legacy `CLI_ADVANCED_SKILL_COMMAND` constant that pointed at the removed
+// command was dropped entirely — it had no consumers and any future doc page
+// surfacing it would mislead users into typing a non-existent command.
 export const CLI_FALLBACK_PROGRAM_COMMAND = "autokap run <preset-id> --program <file>";
+// ── MCP-first install contract ──────────────────────────────────────
+//
+// AutoKap is primarily exposed as a Model Context Protocol server via the
+// `@autokap/mcp` package. Every supported IDE installs the server by adding a
+// single stdio entry that runs `npx -y @autokap/mcp` — the constants below
+// are the canonical shell forms used across onboarding surfaces (wizard,
+// modal, banner, docs). For per-IDE payloads (config paths, snippets, notes),
+// use `getMcpInstallEntries()` from `web/lib/site-discovery.ts`.
+/** Bare MCP runner. Used by generic clients and as the npx command. */
+export const MCP_INSTALL_COMMAND = "npx -y @autokap/mcp";
+/** One-shot install command for Claude Code (CLI flag `claude mcp add`). */
+export const MCP_CLAUDE_CODE_COMMAND = "claude mcp add autokap -- npx -y @autokap/mcp";
+/**
+ * JSON snippet to merge into the IDE-specific MCP config file (Cursor, Codex,
+ * Windsurf, Cline...). Format follows the shared `mcpServers` schema.
+ */
+export const MCP_CONFIG_SNIPPET_JSON = JSON.stringify({
+    mcpServers: {
+        autokap: {
+            command: "npx",
+            args: ["-y", "@autokap/mcp"],
+        },
+    },
+}, null, 2);
 export function buildCliRunCommand(presetId, options = {}) {
     const flags = [
         options.local ? " --local" : "",
@@ -17,170 +59,32 @@ export function buildCliRunCommand(presetId, options = {}) {
     return `autokap run${flags} ${presetId}`;
 }
 export function buildCliInstalledSetupCommand(cliKey) {
-    return `autokap init --cli-key ${cliKey}`;
+    return `autokap login ${cliKey}`;
 }
 export const CLI_PUBLIC_COMMANDS = [
-    {
-        id: "init",
-        command: "autokap init",
-        summary: "Authenticate and install the AI skill in one step",
-        docsDescriptionKey: "cliCmdInit",
-    },
     {
         id: "login",
         command: "autokap login <key>",
-        summary: "Authenticate with your CLI key",
+        summary: "Authenticate with your API key (used by Cloud Run + CI; from the IDE, call autokap_authenticate via MCP instead)",
         docsDescriptionKey: "cliCmdLogin",
     },
-    {
-        id: "logout",
-        command: "autokap logout",
-        summary: "Remove stored credentials",
-        docsDescriptionKey: "cliCmdLogout",
-    },
-    {
-        id: "whoami",
-        command: "autokap whoami",
-        summary: "Show the account linked to the current CLI key",
-        docsDescriptionKey: "cliCmdWhoami",
-    },
-    {
-        id: "ping",
-        command: "autokap ping",
-        summary: "Verify CLI connection and confirm the stored key is still valid",
-        docsDescriptionKey: "cliCmdPing",
-    },
     {
         id: "run",
         command: "autokap run <preset-id> --env local",
-        summary: "Run a preset capture using local Playwright",
+        summary: "Run a preset capture using local Playwright (also spawned by autokap_start_capture from the MCP server)",
         docsDescriptionKey: "cliCmdRun",
     },
     {
         id: "auto-recapture",
         command: "autokap auto-recapture --project <project-id> --env local",
-        summary: "Run every preset enabled for Recapture Cloud in a project",
+        summary: "Run every preset enabled for Recapture Cloud in a project (the canonical surface for Cloud Run + CI; MCP exposes autokap_start_auto_recapture for end users)",
         docsDescriptionKey: "cliCmdAutoRecapture",
     },
     {
-        id: "run-headed",
-        command: "autokap run <preset-id> --headed",
-        summary: "Show the browser window for debugging",
-        docsDescriptionKey: "cliCmdHeaded",
-    },
-    {
-        id: "run-dry",
-        command: "autokap run <preset-id> --dry",
-        summary: "Dry run: execute the opcode program without capturing or uploading (0 credits charged)",
-        docsDescriptionKey: "cliCmdRunDry",
-    },
-    {
-        id: "project-list",
-        command: "autokap project list",
-        summary: "List accessible projects as JSON",
-        docsDescriptionKey: "cliCmdProjectList",
-    },
-    {
-        id: "project-get",
-        command: "autokap project get <project-id>",
-        summary: "Get a single project as JSON",
-        docsDescriptionKey: "cliCmdProjectGet",
-    },
-    {
-        id: "project-create",
-        command: "autokap project create --name <name> --url <url>",
-        summary: "Create a project and print its ID",
-        docsDescriptionKey: "cliCmdProjectCreate",
-    },
-    {
-        id: "preset-info",
-        command: "autokap preset info <preset-id>",
-        summary: "Get structured JSON with endpoints, variants, and URL parameters",
-        docsDescriptionKey: "cliCmdPresetInfo",
-    },
-    {
-        id: "capture-list",
-        command: "autokap capture list",
-        summary: "List captures as JSON",
-        docsDescriptionKey: "cliCmdCaptureList",
-    },
-    {
-        id: "usage",
-        command: "autokap usage",
-        summary: "Show the current billing-period usage as JSON",
-        docsDescriptionKey: "cliCmdUsage",
-    },
-    {
-        id: "endpoints-list",
-        command: "autokap endpoints list --preset <id>",
-        summary: "List dev link endpoints as JSON or table",
-        docsDescriptionKey: "cliCmdEndpointsList",
-    },
-    {
-        id: "endpoints-get",
-        command: "autokap endpoints get <endpoint-id>",
-        summary: "Get a single dev link endpoint as JSON",
-        docsDescriptionKey: "cliCmdEndpointsGet",
-    },
-    {
-        id: "endpoints-export",
-        command: "autokap endpoints export --preset <id>",
-        summary: "Export dev link endpoints as JSON or CSV",
-        docsDescriptionKey: "cliCmdEndpointsExport",
-    },
-    {
-        id: "auth-capture",
-        command: "autokap auth capture <project-id>",
-        summary: "Capture a browser session for a session account",
-        docsDescriptionKey: "cliCmdAuthCapture",
-    },
-    {
-        id: "auth-account-list",
-        command: "autokap auth account list <project-id>",
-        summary: "List project credential accounts as JSON",
-        docsDescriptionKey: "cliCmdAuthAccountList",
-    },
-    {
-        id: "auth-account-create",
-        command: "autokap auth account create <project-id> --name <name>",
-        summary: "Create a project credential account and print its ID",
-        docsDescriptionKey: "cliCmdAuthAccountCreate",
-    },
-    {
-        id: "auth-account-update",
-        command: "autokap auth account update <project-id> --account <name-or-id>",
-        summary: "Update a project credential account",
-        docsDescriptionKey: "cliCmdAuthAccountUpdate",
-    },
-    {
-        id: "auth-account-delete",
-        command: "autokap auth account delete <project-id> --account <name-or-id>",
-        summary: "Delete an unused project credential account",
-        docsDescriptionKey: "cliCmdAuthAccountDelete",
-    },
-    {
-        id: "auth-session-clear",
-        command: "autokap auth session clear <project-id> --account <name-or-id>",
-        summary: "Clear the stored browser session for a session account",
-        docsDescriptionKey: "cliCmdAuthSessionClear",
-    },
-    {
-        id: "proxy-register",
-        command: "autokap proxy register --project <id> --proxy-url <url>",
-        summary: "Register a user-side proxy for dev links",
-        docsDescriptionKey: "cliCmdProxyRegister",
-    },
-    {
-        id: "proxy-verify",
-        command: "autokap proxy verify --project <id>",
-        summary: "Verify the configured proxy for a project",
-        docsDescriptionKey: "cliCmdProxyVerify",
-    },
-    {
-        id: "skill",
-        command: "autokap skill",
-        summary: "Export the AI agent skill bundle",
-        docsDescriptionKey: "cliCmdSkill",
+        id: "doctor",
+        command: "autokap doctor",
+        summary: "Run environment diagnostics (Node version, config, API key validity, Chromium cache, ffmpeg)",
+        docsDescriptionKey: "cliCmdDoctor",
     },
     {
         id: "version",

package/dist/cli-doctor.d.ts

@@ -1,5 +1,4 @@
 export declare function runDoctor(opts: {
     fix: boolean;
-    agent?: string;
     json?: boolean;
 }, currentVersion: string): Promise<void>;

package/dist/cli-doctor.js

@@ -1,21 +1,11 @@
 import { spawn } from 'node:child_process';
 import fs from 'node:fs/promises';
-import path from 'node:path';
 import chalk from 'chalk';
 import { chromium } from 'playwright';
 import { logger } from './logger.js';
 import { ensureFfmpegAvailable } from './clip-postprocess.js';
 import { readConfig, getConfigPath } from './cli-config.js';
-import { getCachedOrFetchLatest, isNewerVersion } from './version-check.js';
-import { writeSkillExport } from './skill-packaging.js';
 const REQUIRED_NODE_MAJOR = 20;
-const AGENT_PATHS = {
-    claude: '.claude/commands/autokap-preset.md',
-    codex: '.agents/skills/autokap-preset/SKILL.md',
-    cursor: '.cursor/rules/autokap-preset.md',
-    windsurf: '.windsurf/rules/autokap-preset.md',
-    copilot: '.github/instructions/autokap-preset.instructions.md',
-};
 async function pathExists(candidate) {
     try {
         await fs.access(candidate);
@@ -108,7 +98,7 @@ async function checkConfig() {
             name: 'CLI configuration',
             status: 'fail',
             message: `Failed to read config: ${err.message}`,
-            fixCommand: 'autokap init --cli-key <key>',
+            fixCommand: 'autokap login <key> # or call autokap_authenticate via your MCP-enabled IDE',
         };
     }
     if (!config) {
@@ -116,7 +106,7 @@ async function checkConfig() {
             name: 'CLI configuration',
             status: 'fail',
             message: `No API key found. Checked AUTOKAP_RUN_TOKEN, AUTOKAP_API_KEY, and ${getConfigPath()}.`,
-            fixCommand: 'autokap init --cli-key <key>',
+            fixCommand: 'autokap login <key> # or call autokap_authenticate via your MCP-enabled IDE',
         };
     }
     if (!config.apiKey) {
@@ -124,7 +114,7 @@ async function checkConfig() {
             name: 'CLI configuration',
             status: 'fail',
             message: 'Config exists but apiKey is empty.',
-            fixCommand: 'autokap init --cli-key <key>',
+            fixCommand: 'autokap login <key>',
         };
     }
     return {
@@ -133,78 +123,6 @@ async function checkConfig() {
         message: `apiBaseUrl=${config.apiBaseUrl}`,
     };
 }
-async function detectAgent() {
-    const detectors = [
-        ['.claude', 'claude'],
-        ['.agents', 'codex'],
-        ['.cursor', 'cursor'],
-        ['.windsurf', 'windsurf'],
-        ['.github/instructions', 'copilot'],
-    ];
-    for (const [dir, key] of detectors) {
-        if (await pathExists(path.join(process.cwd(), dir))) {
-            return key;
-        }
-    }
-    return null;
-}
-async function parseSkillVersion(skillPath) {
-    try {
-        const raw = await fs.readFile(skillPath, 'utf8');
-        const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-        if (!match)
-            return null;
-        const yamlText = match[1];
-        for (const line of yamlText.split(/\r?\n/)) {
-            const m = line.match(/^\s*version\s*:\s*(.+?)\s*$/);
-            if (m) {
-                return m[1].replace(/^["']|["']$/g, '').trim() || null;
-            }
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
-async function checkSkill(extras, agentOverride) {
-    const agent = agentOverride ?? (await detectAgent());
-    extras.agentDetected = agent;
-    if (!agent) {
-        return {
-            name: 'AI agent skill',
-            status: 'warn',
-            message: 'No agent directory detected (.claude, .agents, .cursor, .windsurf, .github/instructions). Skipping skill check.',
-            fixCommand: 'autokap init  # or autokap skill --agent <name> to install',
-        };
-    }
-    const skillPath = path.join(process.cwd(), AGENT_PATHS[agent]);
-    if (await pathExists(skillPath)) {
-        extras.skillPath = AGENT_PATHS[agent];
-        extras.skillVersion = await parseSkillVersion(skillPath);
-        const versionSuffix = extras.skillVersion ? ` (v${extras.skillVersion})` : '';
-        return {
-            name: 'AI agent skill',
-            status: 'ok',
-            message: `${agent}: ${AGENT_PATHS[agent]}${versionSuffix}`,
-        };
-    }
-    extras.skillPath = AGENT_PATHS[agent];
-    return {
-        name: 'AI agent skill',
-        status: 'warn',
-        message: `${agent} agent detected but skill is missing at ${AGENT_PATHS[agent]}.`,
-        fixCommand: `autokap skill --agent ${agent}`,
-        fixFn: async () => {
-            await writeSkillExport({
-                type: 'preset',
-                agent,
-                outputPath: AGENT_PATHS[agent],
-                placeholders: {},
-            });
-        },
-    };
-}
 async function checkCliKeyValid() {
     let config = null;
     try {
@@ -215,68 +133,46 @@ async function checkCliKeyValid() {
     }
     if (!config || !config.apiKey) {
         return {
-            name: 'CLI key valid',
+            name: 'API key valid',
             status: 'warn',
-            message: 'No CLI key configured locally — skipping remote validation.',
-            fixCommand: 'autokap init --cli-key <key>',
+            message: 'No API key configured locally — skipping remote validation.',
+            fixCommand: 'autokap login <key> # or call autokap_authenticate via your MCP-enabled IDE',
         };
     }
     try {
         const res = await fetch(`${config.apiBaseUrl}/api/cli/validate`, {
             headers: { Authorization: `Bearer ${config.apiKey}` },
+            signal: AbortSignal.timeout(15_000),
         });
         if (res.ok) {
             return {
-                name: 'CLI key valid',
+                name: 'API key valid',
                 status: 'ok',
                 message: `Key validated against ${config.apiBaseUrl}.`,
             };
         }
         if (res.status === 401 || res.status === 403) {
             return {
-                name: 'CLI key valid',
+                name: 'API key valid',
                 status: 'fail',
-                message: `Server rejected the CLI key (HTTP ${res.status}). It was likely revoked or rotated.`,
-                fixCommand: 'autokap init --cli-key <new-key>',
+                message: `Server rejected the API key (HTTP ${res.status}). It was likely revoked or rotated.`,
+                fixCommand: 'autokap login <new-key>',
             };
         }
         return {
-            name: 'CLI key valid',
+            name: 'API key valid',
             status: 'warn',
             message: `Validation endpoint returned HTTP ${res.status}.`,
         };
     }
     catch (err) {
         return {
-            name: 'CLI key valid',
+            name: 'API key valid',
             status: 'warn',
             message: `Cannot reach validation endpoint: ${err.message}`,
         };
     }
 }
-async function checkCliVersion(currentVersion) {
-    const latest = await getCachedOrFetchLatest();
-    if (!latest) {
-        return {
-            name: 'CLI version',
-            status: 'warn',
-            message: `${currentVersion} (latest version check unavailable — offline?)`,
-        };
-    }
-    if (isNewerVersion(latest, currentVersion)) {
-        return {
-            name: 'CLI version',
-            status: 'warn',
-            message: `${currentVersion} installed, ${latest} available.`,
-            fixCommand: 'npm install -g autokap@latest',
-        };
-    }
-    return {
-        name: 'CLI version',
-        status: 'ok',
-        message: `${currentVersion} (latest)`,
-    };
-}
 function runCommandStreaming(command, args) {
     return new Promise((resolve, reject) => {
         const child = spawn(command, args, {
@@ -320,15 +216,12 @@ function printCheck(result) {
     }
     console.log('');
 }
-function buildJsonReport(results, extras, currentVersion) {
+function buildJsonReport(results, currentVersion) {
     const ok = results.filter(r => r.status === 'ok').length;
     const warn = results.filter(r => r.status === 'warn').length;
     const fail = results.filter(r => r.status === 'fail').length;
     return {
         cli_version: currentVersion,
-        agent_detected: extras.agentDetected,
-        skill_path: extras.skillPath,
-        skill_version: extras.skillVersion,
         checks: results.map(r => ({
             name: r.name,
             status: r.status,
@@ -340,42 +233,21 @@ function buildJsonReport(results, extras, currentVersion) {
     };
 }
 export async function runDoctor(opts, currentVersion) {
-    const agentOverride = opts.agent
-        ? opts.agent.toLowerCase()
-        : undefined;
     const jsonMode = Boolean(opts.json);
-    if (agentOverride && !(agentOverride in AGENT_PATHS)) {
-        if (jsonMode) {
-            process.stdout.write(JSON.stringify({
-                error: `Unknown agent "${opts.agent}". Supported: ${Object.keys(AGENT_PATHS).join(', ')}`,
-            }) + '\n');
-        }
-        else {
-            logger.error(`Unknown agent "${opts.agent}". Supported: ${Object.keys(AGENT_PATHS).join(', ')}`);
-        }
-        process.exit(1);
-    }
     if (!jsonMode) {
         console.log(chalk.bold('\nautokap doctor'));
         console.log(chalk.gray(`Checking environment for autokap ${currentVersion}...\n`));
     }
-    const extras = {
-        agentDetected: null,
-        skillPath: null,
-        skillVersion: null,
-    };
     const results = [];
     results.push(checkNodeVersion());
     results.push(await checkChromium());
     results.push(await checkFfmpeg());
     results.push(await checkConfig());
     results.push(await checkCliKeyValid());
-    results.push(await checkSkill(extras, agentOverride));
-    results.push(await checkCliVersion(currentVersion));
     const failures = results.filter(r => r.status === 'fail');
     const warnings = results.filter(r => r.status === 'warn');
     if (jsonMode) {
-        const report = buildJsonReport(results, extras, currentVersion);
+        const report = buildJsonReport(results, currentVersion);
         process.stdout.write(JSON.stringify(report, null, 2) + '\n');
         process.exit(failures.length > 0 ? 1 : 0);
     }