@otakit/cli 1.3.0 → 1.5.0

package/README.md

@@ -1,5 +1,7 @@
 # @otakit/cli
 
+<!-- mcp-name: io.github.otakit/otakit -->
+
 Upload and release CLI for OtaKit.
 
 ## What it does
@@ -64,7 +66,7 @@ Resolution order:
 Main rules:
 
 1. `appId`: `--app-id` -> `OTAKIT_APP_ID` -> `plugins.OtaKit.appId`
-2. `serverUrl`: `--server` -> `OTAKIT_SERVER_URL` -> `plugins.OtaKit.serverUrl` -> `https://otakit.app/api/v1`
+2. `serverUrl`: `--server` -> `OTAKIT_SERVER_URL` -> `plugins.OtaKit.serverUrl` -> `https://console.otakit.app`
 3. `outputDir`: upload path arg -> `OTAKIT_BUILD_DIR` / `OTAKIT_OUTPUT_DIR` -> `webDir`
 4. release channel: `--release` -> unnamed channel, `--release <channel>` -> named channel
 
@@ -73,6 +75,13 @@ Auth precedence:
 1. `OTAKIT_TOKEN`
 2. stored token from `otakit login`
 
+Organization rules:
+
+1. organization API keys stay bound to their organization
+2. app-scoped commands use the organization that owns the app
+3. app-less commands use the default chosen during login; automation can set `OTAKIT_ORGANIZATION_ID`
+4. `otakit organization select` changes the local default without changing the dashboard workspace
+
 Version precedence:
 
 1. `--version`
@@ -90,16 +99,18 @@ Version precedence:
 - `otakit release <bundleId> --channel staging`
   promote an existing bundle later
 
-Releases are append-only. The newest release for `(appId, channel)` is what
-devices see on manifest checks.
+Releases are append-only. The newest release for
+`(appId, channel, runtimeVersion)` is what devices see on manifest checks.
 
 ## Common commands
 
 - `otakit login`
 - `otakit logout`
 - `otakit whoami`
+- `otakit organization select`
 - `otakit register --slug <slug>`
 - `otakit upload [path] [--release [channel]]`
+- `otakit upload --release --auto-revert [--auto-revert-rate <1-95>] [--auto-revert-min-sample <10-100000>]` — server reverts the release if too many devices roll back within 24h (defaults: 20% of ≥50)
 - `otakit release [bundleId] [--channel <channel>]`
 - `otakit releases [--channel <channel> | --base]`
 - `otakit list`
@@ -107,6 +118,34 @@ devices see on manifest checks.
 - `otakit config validate`
 - `otakit config resolve --json`
 - `otakit generate-signing-key`
+- `otakit mcp [--project-root <path>]`
+
+## MCP server
+
+Run the local stdio server from the Capacitor project it should access:
+
+```bash
+npx -y @otakit/cli@latest mcp
+```
+
+The project root and organization are fixed when the server starts. For a configured
+project, the CLI uses `plugins.OtaKit.appId` to select its owning organization and
+the server verifies current membership. An organization key is already fixed to its
+owning organization. For app-less projects, `otakit login` stores a named default;
+change it with `otakit organization select` and restart the MCP connection. Users do
+not need an organization ID for interactive setup.
+
+Do not put an OtaKit token in tool arguments. The server reuses `OTAKIT_TOKEN` or the
+stored `otakit login` session and honors `OTAKIT_SERVER_URL` for self-hosted
+installations. App-less automation may set `OTAKIT_ORGANIZATION_ID`; the
+`--organization-id` flag remains an advanced per-process override.
+
+The hosted remote server is `https://console.otakit.app/mcp`. It is a separate,
+deployment-enabled surface for account operations and cannot read or upload files
+from your local project. A deployment that has not enabled it returns a clear
+`503` response; local stdio MCP continues to work independently. See the
+[MCP and Agent Skills guide](https://otakit.app/docs/agents) for Claude Code, Codex,
+OAuth scopes, and remote setup.
 
 ## CI
 

package/dist/commands/connect.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare const connectCommand: Command;
+//# sourceMappingURL=connect.d.ts.map

package/dist/commands/connect.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkGpC,eAAO,MAAM,cAAc,SAiKvB,CAAC"}

package/dist/commands/connect.js

@@ -0,0 +1,216 @@
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdirSync } from 'node:fs';
+import { dirname, join, relative, resolve } from 'node:path';
+import { Command } from 'commander';
+import { ApiClient, OtaKitApiError } from '../lib/api.js';
+import { resolveAuthToken, resolveConfigSnapshot, resolveOrganizationOverride, } from '../lib/config.js';
+import { CliError, runCommand } from '../lib/errors.js';
+import { signInWithEmailOtp } from '../lib/login-flow.js';
+import { fetchAccount, initialOrganizationId, promptForOrganization } from '../lib/organization.js';
+import { confirm } from '../lib/prompt.js';
+import { storeAuthProfile } from '../lib/token-store.js';
+import { CLI_VERSION } from '../lib/version.js';
+const SERVER_NAME = 'otakit';
+/**
+ * Which agent this repository is set up for. Detection only ever picks the
+ * default shown in the plan; `--client` overrides it and the plan states what
+ * was chosen, so nothing is configured behind the user's back.
+ */
+function detectClient(projectRoot) {
+    if (existsSync(join(projectRoot, '.claude')) || existsSync(join(projectRoot, 'CLAUDE.md'))) {
+        return 'claude';
+    }
+    if (existsSync(join(projectRoot, '.codex')) || existsSync(join(projectRoot, 'AGENTS.md'))) {
+        return 'codex';
+    }
+    if (existsSync(join(projectRoot, '.vscode')))
+        return 'vscode';
+    return 'claude';
+}
+function parseClient(value, projectRoot) {
+    if (!value)
+        return detectClient(projectRoot);
+    const normalized = value.trim().toLowerCase();
+    if (normalized === 'claude' || normalized === 'claude-code')
+        return 'claude';
+    if (normalized === 'codex')
+        return 'codex';
+    if (normalized === 'vscode' || normalized === 'vs-code')
+        return 'vscode';
+    throw new CliError(`Unknown client "${value}". Use claude, codex, or vscode.`);
+}
+const CLIENT_LABELS = {
+    claude: 'Claude Code',
+    codex: 'Codex',
+    vscode: 'VS Code',
+};
+function serverEntry(serverUrl, isHosted, projectRootToken) {
+    const args = ['-y', '@otakit/cli@latest', 'mcp', '--project-root', projectRootToken];
+    if (!isHosted)
+        args.push('--server', serverUrl);
+    return { type: 'stdio', command: 'npx', args };
+}
+function configTargetFor(client, projectRoot) {
+    if (client === 'claude')
+        return join(projectRoot, '.mcp.json');
+    if (client === 'vscode')
+        return join(projectRoot, '.vscode', 'mcp.json');
+    // Codex keeps servers in ~/.codex/config.toml. Hand-editing someone's global
+    // TOML is not something to do quietly, so print its own command instead.
+    return null;
+}
+function readExisting(path) {
+    if (!existsSync(path))
+        return {};
+    try {
+        const parsed = JSON.parse(readFileSync(path, 'utf8'));
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+            ? parsed
+            : {};
+    }
+    catch {
+        // VS Code allows comments in mcp.json. Rewriting the file would drop them
+        // anyway, so stop rather than silently discarding someone's notes.
+        throw new CliError(`${path} could not be parsed as JSON (comments are not supported here). Add the server by hand, or move the file and run again.`);
+    }
+}
+function row(label, value) {
+    return `  ${label.padEnd(14)}${value}`;
+}
+export const connectCommand = new Command('connect')
+    .description('Connect this project to your coding agent')
+    .option('--client <client>', 'claude, codex, or vscode (default: detected)')
+    .option('--project-root <path>', 'Project to connect (default: current directory)')
+    .option('--server <url>', 'OtaKit console URL override')
+    .option('--dry-run', 'Show what would be written and exit')
+    .option('--yes', 'Skip the confirmation prompt')
+    .action(async (options) => {
+    await runCommand(async () => {
+        const projectRoot = resolve(options.projectRoot ?? process.cwd());
+        if (!existsSync(projectRoot)) {
+            throw new CliError(`Project root does not exist: ${projectRoot}`);
+        }
+        const client = parseClient(options.client, projectRoot);
+        // Resolve the project first: a self-hosted capacitor.config sets the
+        // console this project belongs to, and signing in against the hosted
+        // default instead would configure a server the project never uses.
+        const snapshot = await resolveConfigSnapshot({
+            cwd: projectRoot,
+            serverUrl: options.server,
+        });
+        const serverUrl = snapshot.serverUrl.value;
+        const isHosted = serverUrl.replace(/\/+$/, '') === 'https://console.otakit.app';
+        // Sign in first if needed, so this really is one command.
+        let auth = await resolveAuthToken(serverUrl);
+        if (!auth) {
+            console.log(`Not signed in to ${serverUrl}.`);
+            const { token } = await signInWithEmailOtp(serverUrl);
+            // Store the same context `otakit login` does. Without the chosen
+            // organization, an app-less project would sign in and then immediately
+            // fail with ORGANIZATION_SELECTION_REQUIRED.
+            const account = await fetchAccount(serverUrl, token);
+            const selected = snapshot.appId.value
+                ? undefined
+                : await promptForOrganization(account.memberships, {
+                    initialOrganizationId: initialOrganizationId(account),
+                });
+            const stored = await storeAuthProfile(serverUrl, {
+                token,
+                userId: account.user.id,
+                ...(selected ? { organizationId: selected.organizationId } : {}),
+            });
+            if (!stored.ok) {
+                throw new CliError(stored.reason ?? 'Could not store the access token.');
+            }
+            auth = await resolveAuthToken(serverUrl);
+            console.log('');
+        }
+        if (!auth)
+            throw new CliError('Not authenticated. Run `otakit login`, or set OTAKIT_TOKEN.');
+        // OTAKIT_ORGANIZATION_ID has to win here too, or CI that works with
+        // `otakit mcp` fails with the same variables set.
+        const organizationId = snapshot.appId.value
+            ? undefined
+            : (resolveOrganizationOverride() ?? auth.organizationId ?? undefined);
+        const probe = new ApiClient({
+            appId: snapshot.appId.value ?? '00000000-0000-0000-0000-000000000000',
+            serverUrl,
+            authToken: auth.token,
+            authSource: auth.source,
+        }, CLI_VERSION, { organizationId });
+        let context;
+        try {
+            context = await probe.request(snapshot.appId.value
+                ? `/api/v1/context?${new URLSearchParams({ appId: snapshot.appId.value })}`
+                : '/api/v1/context');
+        }
+        catch (error) {
+            if (error instanceof OtaKitApiError && error.nextStep) {
+                throw new CliError(`${error.message}\n${error.nextStep}`);
+            }
+            throw error;
+        }
+        const target = configTargetFor(client, projectRoot);
+        const projectRootToken = client === 'claude'
+            ? '${CLAUDE_PROJECT_DIR:-.}'
+            : client === 'vscode'
+                ? '${workspaceFolder}'
+                : '.';
+        const entry = serverEntry(serverUrl, isHosted, projectRootToken);
+        // Everything that is about to happen, before any of it happens.
+        console.log(`Connecting ${CLIENT_LABELS[client]}${options.client ? '' : ' (detected)'}.`);
+        console.log('');
+        console.log(row('console', serverUrl));
+        console.log(row('organization', context.organization.name));
+        console.log(row('signed in as', context.actor.label));
+        console.log(row('project', projectRoot));
+        console.log(row('app', snapshot.appId.value
+            ? `${context.app?.slug ?? snapshot.appId.value} (from ${snapshot.appId.source})`
+            : 'none configured — set plugins.OtaKit.appId in capacitor.config.*'));
+        console.log('');
+        if (!target) {
+            const command = `codex mcp add ${SERVER_NAME} -- ${entry.command} ${entry.args.join(' ')}`;
+            console.log('Codex stores MCP servers in ~/.codex/config.toml. Run:');
+            console.log('');
+            console.log(`  ${command}`);
+            console.log('');
+            console.log('Then restart Codex and ask it to inspect this project.');
+            return;
+        }
+        const existing = readExisting(target);
+        // VS Code's mcp.json uses "servers"; Claude Code's .mcp.json uses
+        // "mcpServers". The client decides, not whatever happens to be in the file.
+        const key = client === 'vscode' ? 'servers' : 'mcpServers';
+        const servers = (existing[key] ?? {});
+        const replacing = Object.prototype.hasOwnProperty.call(servers, SERVER_NAME);
+        const relativeTarget = relative(projectRoot, target) || target;
+        console.log(`Will ${replacing ? 'replace' : 'add'} server "${SERVER_NAME}" in ${relativeTarget}:`);
+        console.log('');
+        for (const line of JSON.stringify({ [SERVER_NAME]: entry }, null, 2).split('\n')) {
+            console.log(`  ${line}`);
+        }
+        console.log('');
+        if (options.dryRun) {
+            console.log('Dry run: nothing was written.');
+            return;
+        }
+        if (!options.yes) {
+            if (!process.stdin.isTTY) {
+                throw new CliError('Confirmation needs an interactive terminal. Re-run with --yes.');
+            }
+            if (!(await confirm('Write it?'))) {
+                console.log('Cancelled. Nothing was written.');
+                return;
+            }
+        }
+        const next = { ...existing, [key]: { ...servers, [SERVER_NAME]: entry } };
+        mkdirSync(dirname(target), { recursive: true });
+        writeFileSync(target, `${JSON.stringify(next, null, 2)}\n`, 'utf8');
+        console.log('');
+        console.log(`Wrote ${relativeTarget}.`);
+        console.log(client === 'claude'
+            ? 'Restart Claude Code, run /mcp to confirm "otakit" is connected, then ask it to inspect this project.'
+            : 'Run "MCP: List Servers" in VS Code to trust and start the server.');
+    });
+});
+//# sourceMappingURL=connect.js.map

package/dist/commands/connect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":"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"}

package/dist/commands/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA6BpC,eAAO,MAAM,YAAY,SAsFrB,CAAC"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsBpC,eAAO,MAAM,YAAY,SAiFrB,CAAC"}

package/dist/commands/login.js

@@ -1,14 +1,9 @@
 import { Command } from 'commander';
-import ora from 'ora';
 import { resolveServerUrl } from '../lib/config.js';
-import { CliError, runCommand } from '../lib/errors.js';
-import { fetchCli, parseApiError } from '../lib/http.js';
-import { ask } from '../lib/prompt.js';
-import { storeAccessToken } from '../lib/token-store.js';
-const OTP_REGEX = /^\d{6}$/;
-function toShellLiteral(value) {
-    return `'${value.replace(/'/g, `'"'"'`)}'`;
-}
+import { runCommand } from '../lib/errors.js';
+import { fetchAccount, initialOrganizationId, organizationById, organizationDisplayLabel, promptForOrganization, shellLiteral, } from '../lib/organization.js';
+import { signInWithEmailOtp } from '../lib/login-flow.js';
+import { readStoredAuthProfile, storeAuthProfile } from '../lib/token-store.js';
 export const loginCommand = new Command('login')
     .description('Sign in with email OTP and store access token')
     .option('--email <email>', 'Email address')
@@ -17,47 +12,38 @@ export const loginCommand = new Command('login')
     .action(async (options) => {
     await runCommand(async () => {
         const serverUrl = resolveServerUrl(process.cwd(), options.server);
-        const emailInput = options.email?.trim().toLowerCase() || (await ask('Email: ')).trim().toLowerCase();
-        if (!emailInput) {
-            throw new CliError('Email is required.');
+        const { token, email: signedInEmail } = await signInWithEmailOtp(serverUrl, options.email);
+        const previousProfile = await readStoredAuthProfile(serverUrl);
+        let account;
+        try {
+            account = await fetchAccount(serverUrl, token);
         }
-        const sendSpinner = ora('Sending verification code...').start();
-        const sendOtpResponse = await fetchCli(`${serverUrl}/api/auth/email-otp/send-verification-otp`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ email: emailInput, type: 'sign-in' }),
-        });
-        if (!sendOtpResponse.ok) {
-            sendSpinner.fail('Could not send verification code');
-            throw new CliError(await parseApiError(sendOtpResponse));
-        }
-        sendSpinner.succeed('Verification code sent');
-        const otp = (await ask('Verification code: ')).trim();
-        if (!OTP_REGEX.test(otp)) {
-            throw new CliError('Invalid verification code. Enter the 6-digit code.');
+        catch (error) {
+            if (!options.tokenOnly)
+                throw error;
+            const storeResult = await storeAuthProfile(serverUrl, { token });
+            process.stdout.write(`${token}\n`);
+            if (!storeResult.ok) {
+                console.error(`Warning: could not store token locally (${storeResult.reason ?? 'unknown reason'}).`);
+            }
+            return;
         }
-        const verifySpinner = ora('Verifying code...').start();
-        const signInResponse = await fetchCli(`${serverUrl}/api/auth/sign-in/email-otp`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ email: emailInput, otp }),
-        });
-        if (!signInResponse.ok) {
-            verifySpinner.fail('Sign-in failed');
-            throw new CliError(await parseApiError(signInResponse));
+        let selectedOrganization = account.memberships.length === 1 ? account.memberships[0] : undefined;
+        if (!selectedOrganization &&
+            options.tokenOnly &&
+            previousProfile?.userId === account.user.id) {
+            selectedOrganization = organizationById(account.memberships, previousProfile.organizationId);
         }
-        const payload = (await signInResponse.json());
-        const token = typeof payload.token === 'string' ? payload.token.trim() : '';
-        if (!token) {
-            verifySpinner.fail('Sign-in failed');
-            throw new CliError('Server returned an invalid auth response.');
+        if (!selectedOrganization && !options.tokenOnly) {
+            selectedOrganization = await promptForOrganization(account.memberships, {
+                initialOrganizationId: initialOrganizationId(account, previousProfile),
+            });
         }
-        const storeResult = await storeAccessToken(serverUrl, token);
-        verifySpinner.succeed('Signed in');
+        const storeResult = await storeAuthProfile(serverUrl, {
+            token,
+            userId: account.user.id,
+            ...(selectedOrganization ? { organizationId: selectedOrganization.organizationId } : {}),
+        });
         if (options.tokenOnly) {
             process.stdout.write(`${token}\n`);
             if (!storeResult.ok) {
@@ -66,14 +52,20 @@ export const loginCommand = new Command('login')
             return;
         }
         if (storeResult.ok) {
-            const signedInAs = typeof payload.user?.email === 'string' ? ` as ${payload.user.email}` : '';
+            const signedInAs = ` as ${account.user.email || signedInEmail}`;
             console.log(`Logged in${signedInAs}.`);
+            if (selectedOrganization) {
+                console.log(`Default organization: ${organizationDisplayLabel(selectedOrganization, account.memberships)}.`);
+            }
             console.log(`Token stored locally for ${serverUrl}.`);
             return;
         }
         console.warn(`Could not store token locally: ${storeResult.reason ?? 'unknown reason'}.`);
         console.log('Use env fallback in this shell:');
-        console.log(`export OTAKIT_TOKEN=${toShellLiteral(token)}`);
+        console.log(`export OTAKIT_TOKEN=${shellLiteral(token)}`);
+        if (selectedOrganization) {
+            console.log(`export OTAKIT_ORGANIZATION_ID=${shellLiteral(selectedOrganization.organizationId)}`);
+        }
     });
 });
 //# sourceMappingURL=login.js.map

package/dist/commands/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,YAAY,EACZ,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACxB,qBAAqB,EACrB,YAAY,GAEb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAQhF,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KAC7C,WAAW,CAAC,+CAA+C,CAAC;KAC5D,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC;KAC1C,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC;KACtC,MAAM,CAAC,cAAc,EAAE,gCAAgC,CAAC;KACxD,MAAM,CAAC,KAAK,EAAE,OAAqB,EAAE,EAAE;IACtC,MAAM,UAAU,CAAC,KAAK,IAAI,EAAE;QAC1B,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAClE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAE3F,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAC/D,IAAI,OAAwB,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,OAAO,CAAC,SAAS;gBAAE,MAAM,KAAK,CAAC;YACpC,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CACX,2CAA2C,WAAW,CAAC,MAAM,IAAI,gBAAgB,IAAI,CACtF,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,oBAAoB,GACtB,OAAO,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxE,IACE,CAAC,oBAAoB;YACrB,OAAO,CAAC,SAAS;YACjB,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,EAC3C,CAAC;YACD,oBAAoB,GAAG,gBAAgB,CACrC,OAAO,CAAC,WAAW,EACnB,eAAe,CAAC,cAAc,CAC/B,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,oBAAoB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAChD,oBAAoB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,WAAW,EAAE;gBACtE,qBAAqB,EAAE,qBAAqB,CAAC,OAAO,EAAE,eAAe,CAAC;aACvE,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE;YACpD,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,oBAAoB,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzF,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CACX,2CAA2C,WAAW,CAAC,MAAM,IAAI,gBAAgB,IAAI,CACtF,CAAC;YACJ,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,WAAW,CAAC,EAAE,EAAE,CAAC;YACnB,MAAM,UAAU,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,aAAa,EAAE,CAAC;YAChE,OAAO,CAAC,GAAG,CAAC,YAAY,UAAU,GAAG,CAAC,CAAC;YACvC,IAAI,oBAAoB,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CACT,yBAAyB,wBAAwB,CAAC,oBAAoB,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAChG,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,4BAA4B,SAAS,GAAG,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,kCAAkC,WAAW,CAAC,MAAM,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAC1F,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,uBAAuB,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,oBAAoB,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CACT,iCAAiC,YAAY,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CACrF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/commands/mcp.d.ts

@@ -0,0 +1,4 @@
+import { Command } from 'commander';
+export declare function localMcpContextPath(appId: string | null): string;
+export declare const mcpCommand: Command;
+//# sourceMappingURL=mcp.d.ts.map

package/dist/commands/mcp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA4BpC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAIhE;AAED,eAAO,MAAM,UAAU,SAoHnB,CAAC"}

package/dist/commands/mcp.js

@@ -0,0 +1,122 @@
+import { realpathSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { createOtaKitMcpServer } from '@otakit/mcp-core';
+import { serveStdio } from '@modelcontextprotocol/server/stdio';
+import { Command } from 'commander';
+import { ApiClient, OtaKitApiError } from '../lib/api.js';
+import { readProjectConfig, resolveConfigSnapshot, resolveOrganizationOverride, } from '../lib/config.js';
+import { CliError, runCommand } from '../lib/errors.js';
+import { CLI_VERSION } from '../lib/version.js';
+import { createLocalToolAuthorization, LocalOtaKitToolAdapter, } from '../mcp/local-adapter.js';
+export function localMcpContextPath(appId) {
+    const normalizedAppId = appId?.trim();
+    if (!normalizedAppId)
+        return '/api/v1/context';
+    return `/api/v1/context?${new URLSearchParams({ appId: normalizedAppId }).toString()}`;
+}
+export const mcpCommand = new Command('mcp')
+    .description('Run the local OtaKit MCP server over stdio')
+    .option('--project-root <path>', 'Project root available to local tools (default: current directory)')
+    .option('--server <url>', 'OtaKit console URL override')
+    .option('--app-id <id>', 'Default app ID override for project configuration')
+    .option('--organization-id <id>', 'Organization override for app-less automation')
+    .action(async (options) => {
+    await runCommand(async () => {
+        const selectedRoot = resolve(options.projectRoot ?? process.cwd());
+        let projectRoot;
+        try {
+            projectRoot = realpathSync(selectedRoot);
+            if (!statSync(projectRoot).isDirectory())
+                throw new Error('not a directory');
+        }
+        catch {
+            throw new CliError(`Project root is not a readable directory: ${selectedRoot}`);
+        }
+        const snapshot = await resolveConfigSnapshot({
+            cwd: projectRoot,
+            appId: options.appId,
+            serverUrl: options.server,
+        });
+        if (!snapshot.authToken.value || !snapshot.authSource) {
+            throw new CliError('Not authenticated. Run `otakit login`, or set OTAKIT_TOKEN.');
+        }
+        const explicitOrganizationId = options.organizationId?.trim();
+        if (snapshot.appId.value && explicitOrganizationId) {
+            throw new CliError('`--organization-id` is only valid for app-less projects. Remove it; the configured app selects its owning organization.');
+        }
+        const organizationId = snapshot.appId.value
+            ? undefined
+            : (resolveOrganizationOverride(explicitOrganizationId) ??
+                snapshot.authOrganizationId ??
+                undefined);
+        const probe = new ApiClient({
+            appId: snapshot.appId.value ?? '00000000-0000-0000-0000-000000000000',
+            serverUrl: snapshot.serverUrl.value,
+            authToken: snapshot.authToken.value,
+            authSource: snapshot.authSource,
+        }, CLI_VERSION, { organizationId });
+        let fixed;
+        try {
+            fixed = await probe.request(localMcpContextPath(snapshot.appId.value));
+        }
+        catch (error) {
+            if (error instanceof OtaKitApiError) {
+                if (!snapshot.appId.value && organizationId && error.status === 404) {
+                    throw new CliError('The selected organization is unavailable. Run `otakit organization select`, then restart this MCP server.');
+                }
+                if (error.nextStep)
+                    throw new CliError(`${error.message}\n${error.nextStep}`);
+            }
+            throw error;
+        }
+        const projectConfig = await readProjectConfig(projectRoot);
+        const connection = {
+            serverUrl: snapshot.serverUrl.value,
+            authToken: snapshot.authToken.value,
+            authSource: snapshot.authSource,
+            organization: fixed.organization,
+            actor: fixed.actor,
+            capabilities: fixed.capabilities,
+            projectRoot,
+            defaultApp: snapshot.appId.value
+                ? {
+                    id: snapshot.appId.value,
+                    slug: fixed.app?.slug ?? null,
+                    channel: projectConfig?.channel ?? null,
+                    runtimeVersion: projectConfig?.runtimeVersion ?? null,
+                }
+                : null,
+        };
+        const adapter = new LocalOtaKitToolAdapter(connection);
+        const handle = serveStdio(() => createOtaKitMcpServer({
+            mode: 'local',
+            version: CLI_VERSION,
+            binding: {
+                serverOrigin: connection.serverUrl,
+                organizationName: connection.organization.name,
+                projectRoot: connection.projectRoot,
+                isProject: projectConfig !== null || Boolean(snapshot.appId.value),
+                appId: connection.defaultApp?.id ?? null,
+                appSlug: connection.defaultApp?.slug ?? null,
+                channel: connection.defaultApp?.channel ?? null,
+                runtimeVersion: connection.defaultApp?.runtimeVersion ?? null,
+                releaseWritesEnabled: connection.capabilities.releaseReliability,
+            },
+            adapter,
+            authorization: createLocalToolAuthorization(connection),
+            onError: (error, tool) => {
+                if (error instanceof Error && error.name === 'PublicToolError')
+                    return;
+                console.error(`[OtaKit MCP] ${tool} failed`, error);
+            },
+        }), {
+            onerror: (error) => console.error('[OtaKit MCP] transport error', error),
+        });
+        const close = async () => {
+            await handle.close();
+        };
+        process.once('SIGINT', close);
+        process.once('SIGTERM', close);
+    });
+});
+//# sourceMappingURL=mcp.js.map

package/dist/commands/mcp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/commands/mcp.ts"],"names":[],"mappings":"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"}

package/dist/commands/organization.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export declare const organizationCommand: Command;
+//# sourceMappingURL=organization.d.ts.map

package/dist/commands/organization.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization.d.ts","sourceRoot":"","sources":["../../src/commands/organization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkEpC,eAAO,MAAM,mBAAmB,SAGJ,CAAC"}