feat: add mcp and skills command while bumping libs

Plopix · Plopix · commit 568ef210625d · 2026-04-03T12:31:48.000-07:00
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: ⬇️ Checkout repo
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
               with:
                   fetch-depth: 0
                   fetch-tags: false
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
@@ -1,4 +1,6 @@
 {
+    "$schema": "./node_modules/oxfmt/configuration_schema.json",
+    "ignorePatterns": ["node_modules", "dist", "build"],
     "tabWidth": 4,
     "semi": true,
     "useTabs": false,
diff --git a/.prettierignore b/.prettierignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.22.0]
+
+- added `add-mcp` command to add the Crystallize MCP server to your environment
+- added `add-skills` command to add Crystallize AI skills
+- added `update-skills` command to update Crystallize AI skills
+- added bash completion for `serve`, `add-mcp`, `add-skills`, `update-skills` commands
+- bumped `@crystallize/schema` to 6.11.0
+- updated libraries (awilix, commander, ink, jotai, marked, meow, tar, zod, TypeScript 6)
+- moved from prettier to `oxfmt` for code formatting
+
 ## [5.21.1]
 
 - update the version checker to fetch the remote changelog file instead and get proper changes.
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -9,7 +9,7 @@ make run ARGS="<command>"          # Run CLI locally (e.g. ARGS="whoami")
 make staging-run ARGS="<command>"  # Run against staging environment
 make build                         # Build single-platform binary
 make build-all                     # Build all platform binaries
-make codeclean                     # Format with prettier
+make codeclean                     # Format with oxfmt
 ```
 
 The runtime is **Bun** (>=1.3). No test framework is configured.
@@ -52,6 +52,6 @@ Resolved in priority order: env vars (`CRYSTALLIZE_ACCESS_TOKEN_ID`/`SECRET`) 
 
 ## Code Style
 
-- Prettier: 4-space indent, single quotes, trailing commas, semicolons, 120 char width
+- oxfmt: 4-space indent, single quotes, trailing commas, semicolons, 120 char width
 - Commit messages: conventional commits (feat, fix, chore, refactor, etc.)
 - TypeScript strict mode with `verbatimModuleSyntax`
diff --git a/Makefile b/Makefile
@@ -17,7 +17,8 @@ list:
 
 .PHONY: codeclean
 codeclean: ## Code Clean
-	@$(BUN) prettier --write .
+	@$(BUN) oxfmt .
+	@$(BUN) oxfmt --check .
 
 .PHONY: run
 run: ## Run ARGS=""
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,50 +1,50 @@
 {
     "name": "@crystallize/cli",
-    "version": "5.21.1",
+    "version": "5.22.0",
     "description": "Crystallize CLI",
-    "module": "src/index.ts",
-    "repository": "https://github.com/CrystallizeAPI/crystallize-cli",
     "license": "MIT",
     "contributors": [
         "Sébastien Morel <sebastien@crystallize.com>"
     ],
+    "repository": "https://github.com/CrystallizeAPI/crystallize-cli",
     "type": "module",
-    "peerDependencies": {
-        "typescript": "^5"
-    },
-    "engines": {
-        "bun": ">=1.3"
-    },
-    "devDependencies": {
-        "@commitlint/cli": "^20.3.0",
-        "@commitlint/config-conventional": "^20.3.0",
-        "@types/bun": "latest",
-        "@types/marked": "^6.0.0",
-        "@types/marked-terminal": "^6.1.1",
-        "@types/react": "^19.2.10",
-        "@types/signale": "^1.4.7",
-        "react-devtools-core": "^7.0.1"
-    },
+    "module": "src/index.ts",
     "dependencies": {
         "@crystallize/js-api-client": "^5.3.0",
-        "@crystallize/schema": "^6.9.0",
-        "awilix": "^12.0.5",
+        "@crystallize/schema": "^6.11.0",
+        "awilix": "^13.0.3",
         "cli-spinners": "^3.4.0",
-        "commander": "^14.0.2",
-        "ink": "^6.6.0",
+        "commander": "^14.0.3",
+        "ink": "^6.8.0",
         "ink-link": "^5.0.0",
         "ink-text-input": "^6.0.0",
-        "jotai": "^2.17.0",
+        "jotai": "^2.19.0",
         "json-to-graphql-query": "^2.3.0",
-        "marked": "^17.0.1",
+        "marked": "^17.0.5",
         "marked-terminal": "^7.3.0",
-        "meow": "^14.0.0",
+        "meow": "^14.1.0",
         "missive.js": "^0.5.0",
         "picocolors": "^1.1.1",
-        "prettier": "^3.8.1",
         "react": "^19.2.4",
         "signale": "^1.4.0",
-        "tar": "^7.5.7",
+        "tar": "^7.5.13",
         "zod": "^4.3.6"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "^20.5.0",
+        "@commitlint/config-conventional": "^20.5.0",
+        "@types/bun": "^1.3.11",
+        "@types/marked": "^6.0.0",
+        "@types/marked-terminal": "^6.1.1",
+        "@types/react": "^19.2.14",
+        "@types/signale": "^1.4.7",
+        "oxfmt": "^0.43.0",
+        "react-devtools-core": "^7.0.1"
+    },
+    "peerDependencies": {
+        "typescript": "^6.0.2"
+    },
+    "engines": {
+        "bun": ">=1.3"
     }
 }
diff --git a/src/command/add-mcp.ts b/src/command/add-mcp.ts
@@ -0,0 +1,63 @@
+import type { CredentialRetriever } from '../domain/contracts/credential-retriever';
+import type { Logger } from '../domain/contracts/logger';
+import { Command } from 'commander';
+import { addInteractiveAndTokenOption } from '../core/helpers/add-iteractive-and-token-option';
+import pc from 'picocolors';
+
+type Deps = {
+    credentialsRetriever: CredentialRetriever;
+    logger: Logger;
+};
+
+export const createAddMcpCommand = ({ credentialsRetriever, logger }: Deps): Command => {
+    const command = new Command('add-mcp');
+    command.description('Add the Crystallize MCP server to your environment.');
+    addInteractiveAndTokenOption(command);
+    command.action(async (options) => {
+        const credentials = await credentialsRetriever.getCredentials({
+            token_id: options.token_id,
+            token_secret: options.token_secret,
+        });
+
+        if (!credentials.ACCESS_TOKEN_ID || !credentials.ACCESS_TOKEN_SECRET) {
+            logger.error('Access token credentials are required to add the MCP server. Please login first.');
+            process.exit(1);
+        }
+
+        logger.info(`Adding Crystallize MCP server...`);
+
+        const proc = Bun.spawn(
+            [
+                process.execPath,
+                'x',
+                'add-mcp',
+                'https://mcp.crystallize.com/mcp',
+                '--header',
+                `X-Crystallize-Access-Token-Id: ${credentials.ACCESS_TOKEN_ID}`,
+                '--header',
+                `X-Crystallize-Access-Token-Secret: ${credentials.ACCESS_TOKEN_SECRET}`,
+            ],
+            {
+                env: { ...process.env, BUN_BE_BUN: '1' },
+                stdin: 'inherit',
+                stdout: 'inherit',
+                stderr: 'inherit',
+            },
+        );
+
+        await proc.exited;
+
+        if (proc.exitCode === 0) {
+            logger.info(pc.green('Crystallize MCP server added successfully!'));
+            logger.warn(
+                pc.yellow(
+                    'The MCP configuration file now contains your access tokens. Make sure you do not commit this file to version control.',
+                ),
+            );
+        } else {
+            logger.error('Failed to add Crystallize MCP server.');
+            process.exit(proc.exitCode || 1);
+        }
+    });
+    return command;
+};
diff --git a/src/command/add-skills.ts b/src/command/add-skills.ts
@@ -0,0 +1,32 @@
+import type { Logger } from '../domain/contracts/logger';
+import { Command } from 'commander';
+import pc from 'picocolors';
+
+type Deps = {
+    logger: Logger;
+};
+
+export const createAddSkillsCommand = ({ logger }: Deps): Command => {
+    const command = new Command('add-skills');
+    command.description('Add Crystallize AI skills to your environment.');
+    command.action(async () => {
+        logger.info(`Adding Crystallize AI skills...`);
+
+        const proc = Bun.spawn([process.execPath, 'x', 'skills', 'add', 'https://github.com/crystallizeapi/ai'], {
+            env: { ...process.env, BUN_BE_BUN: '1' },
+            stdin: 'inherit',
+            stdout: 'inherit',
+            stderr: 'inherit',
+        });
+
+        await proc.exited;
+
+        if (proc.exitCode === 0) {
+            logger.info(pc.green('Crystallize AI skills added successfully!'));
+        } else {
+            logger.error('Failed to add Crystallize AI skills.');
+            process.exit(proc.exitCode || 1);
+        }
+    });
+    return command;
+};
diff --git a/src/command/update-skills.ts b/src/command/update-skills.ts
@@ -0,0 +1,32 @@
+import type { Logger } from '../domain/contracts/logger';
+import { Command } from 'commander';
+import pc from 'picocolors';
+
+type Deps = {
+    logger: Logger;
+};
+
+export const createUpdateSkillsCommand = ({ logger }: Deps): Command => {
+    const command = new Command('update-skills');
+    command.description('Update Crystallize AI skills in your environment.');
+    command.action(async () => {
+        logger.info(`Updating Crystallize AI skills...`);
+
+        const proc = Bun.spawn([process.execPath, 'x', 'skills', 'update', 'https://github.com/crystallizeapi/ai'], {
+            env: { ...process.env, BUN_BE_BUN: '1' },
+            stdin: 'inherit',
+            stdout: 'inherit',
+            stderr: 'inherit',
+        });
+
+        await proc.exited;
+
+        if (proc.exitCode === 0) {
+            logger.info(pc.green('Crystallize AI skills updated successfully!'));
+        } else {
+            logger.error('Failed to update Crystallize AI skills.');
+            process.exit(proc.exitCode || 1);
+        }
+    });
+    return command;
+};
diff --git a/src/content/completion_file.bash b/src/content/completion_file.bash
@@ -4,7 +4,7 @@ _crystallize_completions() {
   local subcmd="${COMP_WORDS[2]}"    
   local subsubcmd="${COMP_WORDS[3]}"
   
-  local commands="help changelog doc boilerplate tenant login whoami mass-operation token image file"
+  local commands="help changelog doc boilerplate tenant login whoami mass-operation token image file serve add-mcp add-skills update-skills"
   local program_options="--version"
   local default_options="--help"
   local i_login_options="--no-interactive --token_id= --token_secret="
@@ -17,11 +17,16 @@ _crystallize_completions() {
   fi
 
   case "${cmd}" in
-    login|whoami)
+    login|whoami|serve|add-skills|update-skills)
         local options="${default_options}"
         COMPREPLY=($(compgen -W "${options}" -- "${cur}"))
         return 0
         ;;
+    add-mcp)
+        local options="${i_login_options} ${default_options}"
+        COMPREPLY=($(compgen -W "${options}" -- "${cur}"))
+        return 0
+        ;;
     boilerplate)
         if [[ "${COMP_CWORD}" -eq 2 ]]; then
             local options="install ${default_options}"
diff --git a/src/core/di.ts b/src/core/di.ts
@@ -52,6 +52,9 @@ import { createServeCommand } from '../command/serve';
 import type { FeedbackPiper } from '../domain/contracts/feedback-piper';
 import { createFeedbackPiper } from '../domain/core/create-feedback-piper';
 import { createFileUploadCommand } from '../command/files/upload';
+import { createAddMcpCommand } from '../command/add-mcp';
+import { createAddSkillsCommand } from '../command/add-skills';
+import { createUpdateSkillsCommand } from '../command/update-skills';
 
 export const buildServices = () => {
     const logLevels = (
@@ -111,6 +114,9 @@ export const buildServices = () => {
         addOperationMassOperationCommand: Command;
         enrollTenantCommand: Command;
         serveCommand: Command;
+        addMcpCommand: Command;
+        addSkillsCommand: Command;
+        updateSkillsCommand: Command;
     }>({
         injectionMode: InjectionMode.PROXY,
         strict: true,
@@ -174,6 +180,9 @@ export const buildServices = () => {
         addOperationMassOperationCommand: asFunction(createAddOperationMassOperationCommand).singleton(),
         enrollTenantCommand: asFunction(createEnrollTenantCommand).singleton(),
         serveCommand: asFunction(createServeCommand).singleton(),
+        addMcpCommand: asFunction(createAddMcpCommand).singleton(),
+        addSkillsCommand: asFunction(createAddSkillsCommand).singleton(),
+        updateSkillsCommand: asFunction(createUpdateSkillsCommand).singleton(),
     });
     container.cradle.commandBus.register('CreateCleanTenant', container.cradle.createCleanTenant);
     container.cradle.queryBus.register('DownloadBoilerplateArchive', container.cradle.downloadBoilerplateArchive);
@@ -216,6 +225,9 @@ export const buildServices = () => {
                     container.cradle.changeLogCommand,
                     container.cradle.docCommand,
                     container.cradle.serveCommand,
+                    container.cradle.addMcpCommand,
+                    container.cradle.addSkillsCommand,
+                    container.cradle.updateSkillsCommand,
                 ],
             },
             boilerplate: {
diff --git a/src/core/helpers/add-iteractive-and-token-option.ts b/src/core/helpers/add-iteractive-and-token-option.ts
@@ -1,4 +1,4 @@
-import { Command, Option } from 'commander';
+import { type Command, Option } from 'commander';
 
 export const addInteractiveAndTokenOption = (command: Command) => {
     command.addOption(new Option('--token_id <token_id>', 'Your access token id.'));
diff --git a/src/domain/core/fetch-shop-api-token.ts b/src/domain/core/fetch-shop-api-token.ts
@@ -9,8 +9,8 @@ export const createFetchShopApiToken =
             headers: {
                 'Content-Type': 'application/json',
                 Accept: 'application/json',
-                'x-crystallize-access-token-id': credentials.ACCESS_TOKEN_ID,
-                'x-crystallize-access-token-secret': credentials.ACCESS_TOKEN_SECRET,
+                'x-crystallize-access-token-id': `${credentials.ACCESS_TOKEN_ID}`,
+                'x-crystallize-access-token-secret': `${credentials.ACCESS_TOKEN_SECRET}`,
             },
             body: JSON.stringify({
                 scopes,
diff --git a/src/index.ts b/src/index.ts
@@ -16,7 +16,7 @@ program.allowUnknownOption(false);
 program.version(packageJson.version);
 program.name('crystallize');
 program.addOption(new Option('--install-completion', 'Install the completion').hideHelp());
-program.addOption(new Option('--uninstall-completion', 'Install the completion').hideHelp());
+program.addOption(new Option('--uninstall-completion', 'Uninstall the completion').hideHelp());
 
 const helpStyling = {
     styleTitle: (str: string) => pc.bold(str),
diff --git a/src/ui/components/select.tsx b/src/ui/components/select.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, type JSX } from 'react';
 import { Text, useInput, Box, Newline } from 'ink';
 import { colors } from '../../core/styles';
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,6 +14,7 @@
         "noImplicitAny": true,
         "verbatimModuleSyntax": true,
         "noEmit": true,
+        "types": ["bun"],
 
         // Best practices
         "strict": true,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "./node_modules/oxfmt/configuration_schema.json",`
	`3`	`+ "ignorePatterns": ["node_modules", "dist", "build"],`
`2`	`4`	`"tabWidth": 4,`
`3`	`5`	`"semi": true,`
`4`	`6`	`"useTabs": false,`