cliskill 1.1.3 → 1.1.4

package/README.md

@@ -16,7 +16,7 @@
 
 ## Что это
 
-cliskill — CLI-инструмент для работы с LLM прямо из терминала. Подключает любого провайдера через стандартный `/chat/completions` API, даёт 15 встроенных инструментов, мульти-агентную координацию и MCP-интеграцию. Без подписок, без vendor lock-in.
+cliskill — CLI-инструмент для работы с LLM прямо из терминала. Подключает любого провайдера через стандартный `/chat/completions` API, даёт 22 встроенных инструментов, мульти-агентную координацию и MCP-интеграцию. Без подписок, без vendor lock-in.
 
 ## Быстрый старт
 
@@ -224,6 +224,10 @@ ANTHROPIC_BASE_URL="https://api.anthropic.com"
 
 ### Настройка
 
+Поддерживаются два формата конфигурации — **массив** (нативный) и **объект** (Claude/Cursor совместимый):
+
+**Формат массива:**
+
 ```json
 {
   "mcpServers": [
@@ -232,23 +236,36 @@ ANTHROPIC_BASE_URL="https://api.anthropic.com"
       "command": "npx",
       "args": ["-y", "@modelcontextprotocol/server-filesystem", "/home/user/projects"],
       "transport": "stdio"
+    }
+  ]
+}
+```
+
+**Формат объекта (Claude/Cursor совместимый):**
+
+```json
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/home/user/projects"]
     },
-    {
-      "name": "github",
+    "github": {
       "command": "npx",
       "args": ["-y", "@modelcontextprotocol/server-github"],
-      "env": { "GITHUB_PERSONAL_ACCESS_TOKEN": "ghp_token" },
-      "transport": "stdio"
+      "env": { "GITHUB_PERSONAL_ACCESS_TOKEN": "ghp_token" }
     }
-  ]
+  }
 }
 ```
 
+В объектном формате ключ становится `name`, а `transport` по умолчанию `stdio`.
+
 ### Поля
 
 | Поле | Тип | Обязательное | Описание |
 |------|-----|:---:|----------|
-| `name` | string | да | Уникальное имя |
+| `name` | string | да* | Уникальное имя (авто из ключа объекта) |
 | `command` | string | да | Команда запуска |
 | `args` | string[] | нет | Аргументы |
 | `env` | object | нет | Переменные окружения |
@@ -359,6 +376,10 @@ npm run typecheck    # Проверка типов
 
 ## Changelog
 
+### v1.1.4
+
+- MCP config compatibility — поддержка объектного формата `mcpServers` (Claude/Cursor совместимый), автоматическая конвертация в массив через `z.preprocess`
+
 ### v1.1.2
 
 - Anthropic Claude integration — Messages API с streaming, tool use, кастомный Base URL

package/dist/bootstrap/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   runCli
-} from "../chunk-SDHXIBKZ.js";
-import "../chunk-AJENHWD3.js";
+} from "../chunk-V73UZD27.js";
+import "../chunk-S7IQHES2.js";
 export {
   runCli
 };

package/dist/{chunk-AJENHWD3.js → chunk-S7IQHES2.js}

@@ -100,4 +100,4 @@ export {
   resolveConfigPath,
   getConfigSearchPaths
 };
-//# sourceMappingURL=chunk-AJENHWD3.js.map
+//# sourceMappingURL=chunk-S7IQHES2.js.map

package/dist/chunk-S7IQHES2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/config/paths.ts"],"sourcesContent":["import { join } from 'node:path'\r\nimport { homedir } from 'node:os'\r\nimport { existsSync, mkdirSync, renameSync, readFileSync, writeFileSync } from 'node:fs'\r\n\r\n/**\r\n * Centralized path management for all cliskill data.\r\n *\r\n * All user data is stored under ~/.cliskill/:\r\n *   config.json              — main configuration\r\n *   sessions/                — conversation session history\r\n *   skills/                  — global user skills\r\n *   history.jsonl            — command history\r\n *   scheduled_tasks.json     — cron/scheduled tasks\r\n *   keybindings.json         — custom keybindings\r\n *   Info.plist               — macOS URL scheme registration\r\n *   tmp/                     — temporary files\r\n *   memory/                  — global memory store\r\n */\r\n\r\nconst DATA_DIR_NAME = '.cliskill'\r\nconst CONFIG_FILENAME = 'config.json'\r\nconst LEGACY_CONFIG_FILENAME = '.cliskillrc.json'\r\n\r\n/** Known legacy/alternate directory names to migrate from */\r\nconst LEGACY_DIR_NAMES = ['.cliskill11', '.cliskill-dev', '.cliskill_old']\r\n\r\n/** Get the base data directory: ~/.cliskill */\r\nexport function getDataDir(): string {\r\n  return join(homedir(), DATA_DIR_NAME)\r\n}\r\n\r\n/** Ensure the data directory exists and return its path */\r\nexport function ensureDataDir(): string {\r\n  const dir = getDataDir()\r\n  if (!existsSync(dir)) {\r\n    mkdirSync(dir, { recursive: true })\r\n  }\r\n  return dir\r\n}\r\n\r\n/** Path to the main config file: ~/.cliskill/config.json */\r\nexport function getConfigPath(): string {\r\n  return join(getDataDir(), CONFIG_FILENAME)\r\n}\r\n\r\n/** Path to the legacy config file: ~/.cliskillrc.json */\r\nexport function getLegacyConfigPath(): string {\r\n  return join(homedir(), LEGACY_CONFIG_FILENAME)\r\n}\r\n\r\n/** Path to sessions directory: ~/.cliskill/sessions/ */\r\nexport function getSessionsDir(): string {\r\n  return join(getDataDir(), 'sessions')\r\n}\r\n\r\n/** Path to global skills directory: ~/.cliskill/skills/ */\r\nexport function getGlobalSkillsDir(): string {\r\n  return join(getDataDir(), 'skills')\r\n}\r\n\r\n/** Path to command history: ~/.cliskill/history.jsonl */\r\nexport function getHistoryPath(): string {\r\n  return join(getDataDir(), 'history.jsonl')\r\n}\r\n\r\n/** Path to scheduled tasks: ~/.cliskill/scheduled_tasks.json */\r\nexport function getScheduledTasksPath(): string {\r\n  return join(getDataDir(), 'scheduled_tasks.json')\r\n}\r\n\r\n/** Path to custom keybindings: ~/.cliskill/keybindings.json */\r\nexport function getKeybindingsPath(): string {\r\n  return join(getDataDir(), 'keybindings.json')\r\n}\r\n\r\n/** Path to macOS URL scheme plist: ~/.cliskill/Info.plist */\r\nexport function getPlistPath(): string {\r\n  return join(getDataDir(), 'Info.plist')\r\n}\r\n\r\n/** Path to temp directory: ~/.cliskill/tmp/ */\r\nexport function getTmpDir(): string {\r\n  return join(getDataDir(), 'tmp')\r\n}\r\n\r\n/** Path to global memory directory: ~/.cliskill/memory/ */\r\nexport function getGlobalMemoryDir(): string {\r\n  return join(getDataDir(), 'memory')\r\n}\r\n\r\n/** Path to history subdirectory: ~/.cliskill/history/ */\r\nexport function getHistoryDir(): string {\r\n  return join(getDataDir(), 'history')\r\n}\r\n\r\n/** Path to disk space check file: ~/.cliskill/history.json */\r\nexport function getDiskHistoryPath(): string {\r\n  return join(getDataDir(), 'history.json')\r\n}\r\n\r\n/**\r\n * Migrate legacy config (~/.cliskillrc.json) to new location (~/.cliskill/config.json).\r\n * Returns true if migration was performed.\r\n */\r\nexport function migrateLegacyConfig(): boolean {\r\n  const legacyPath = getLegacyConfigPath()\r\n  const newPath = getConfigPath()\r\n\r\n  if (!existsSync(legacyPath)) return false\r\n  if (existsSync(newPath)) return false\r\n\r\n  try {\r\n    // Validate the legacy config is valid JSON before migrating\r\n    const content = readFileSync(legacyPath, 'utf-8')\r\n    JSON.parse(content)\r\n\r\n    ensureDataDir()\r\n    renameSync(legacyPath, newPath)\r\n    return true\r\n  } catch {\r\n    return false\r\n  }\r\n}\r\n\r\n/**\r\n * Get config path, checking both new and legacy locations.\r\n * Returns the path that exists, preferring the new location.\r\n */\r\nexport function resolveConfigPath(): string {\r\n  const newPath = getConfigPath()\r\n  if (existsSync(newPath)) return newPath\r\n\r\n  const legacyPath = getLegacyConfigPath()\r\n  if (existsSync(legacyPath)) return legacyPath\r\n\r\n  return newPath\r\n}\r\n\r\n/**\r\n * Get all config search paths in priority order.\r\n * Used by doctor and loader to find config files.\r\n */\r\nexport function getConfigSearchPaths(): string[] {\r\n  return [\r\n    getConfigPath(),\r\n    getLegacyConfigPath(),\r\n    join(process.cwd(), '.cliskillrc.json'),\r\n  ]\r\n}\r\n"],"mappings":";AAAA,SAAS,YAAY;AACrB,SAAS,eAAe;AACxB,SAAS,YAAY,WAAW,YAAY,oBAAmC;AAiB/E,IAAM,gBAAgB;AACtB,IAAM,kBAAkB;AACxB,IAAM,yBAAyB;AAMxB,SAAS,aAAqB;AACnC,SAAO,KAAK,QAAQ,GAAG,aAAa;AACtC;AAGO,SAAS,gBAAwB;AACtC,QAAM,MAAM,WAAW;AACvB,MAAI,CAAC,WAAW,GAAG,GAAG;AACpB,cAAU,KAAK,EAAE,WAAW,KAAK,CAAC;AAAA,EACpC;AACA,SAAO;AACT;AAGO,SAAS,gBAAwB;AACtC,SAAO,KAAK,WAAW,GAAG,eAAe;AAC3C;AAGO,SAAS,sBAA8B;AAC5C,SAAO,KAAK,QAAQ,GAAG,sBAAsB;AAC/C;AAGO,SAAS,iBAAyB;AACvC,SAAO,KAAK,WAAW,GAAG,UAAU;AACtC;AAGO,SAAS,qBAA6B;AAC3C,SAAO,KAAK,WAAW,GAAG,QAAQ;AACpC;AAGO,SAAS,iBAAyB;AACvC,SAAO,KAAK,WAAW,GAAG,eAAe;AAC3C;AAGO,SAAS,wBAAgC;AAC9C,SAAO,KAAK,WAAW,GAAG,sBAAsB;AAClD;AAGO,SAAS,qBAA6B;AAC3C,SAAO,KAAK,WAAW,GAAG,kBAAkB;AAC9C;AAGO,SAAS,eAAuB;AACrC,SAAO,KAAK,WAAW,GAAG,YAAY;AACxC;AAGO,SAAS,YAAoB;AAClC,SAAO,KAAK,WAAW,GAAG,KAAK;AACjC;AAGO,SAAS,qBAA6B;AAC3C,SAAO,KAAK,WAAW,GAAG,QAAQ;AACpC;AAGO,SAAS,gBAAwB;AACtC,SAAO,KAAK,WAAW,GAAG,SAAS;AACrC;AAGO,SAAS,qBAA6B;AAC3C,SAAO,KAAK,WAAW,GAAG,cAAc;AAC1C;AAMO,SAAS,sBAA+B;AAC7C,QAAM,aAAa,oBAAoB;AACvC,QAAM,UAAU,cAAc;AAE9B,MAAI,CAAC,WAAW,UAAU,EAAG,QAAO;AACpC,MAAI,WAAW,OAAO,EAAG,QAAO;AAEhC,MAAI;AAEF,UAAM,UAAU,aAAa,YAAY,OAAO;AAChD,SAAK,MAAM,OAAO;AAElB,kBAAc;AACd,eAAW,YAAY,OAAO;AAC9B,WAAO;AAAA,EACT,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAMO,SAAS,oBAA4B;AAC1C,QAAM,UAAU,cAAc;AAC9B,MAAI,WAAW,OAAO,EAAG,QAAO;AAEhC,QAAM,aAAa,oBAAoB;AACvC,MAAI,WAAW,UAAU,EAAG,QAAO;AAEnC,SAAO;AACT;AAMO,SAAS,uBAAiC;AAC/C,SAAO;AAAA,IACL,cAAc;AAAA,IACd,oBAAoB;AAAA,IACpB,KAAK,QAAQ,IAAI,GAAG,kBAAkB;AAAA,EACxC;AACF;","names":[]}

package/dist/{chunk-SDHXIBKZ.js → chunk-V73UZD27.js}

@@ -8,7 +8,7 @@ import {
   getSessionsDir,
   migrateLegacyConfig,
   resolveConfigPath
-} from "./chunk-AJENHWD3.js";
+} from "./chunk-S7IQHES2.js";
 
 // src/bootstrap/cli.ts
 import { Command } from "commander";
@@ -149,8 +149,22 @@ var appConfigSchema = z.object({
     maxMemorySize: z.number().default(50),
     idleThreshold: z.number().default(3e5)
   }).default({}),
-  /** MCP servers — external tool providers via Model Context Protocol */
-  mcpServers: z.array(mcpServerSchema).default([])
+  /** MCP servers — external tool providers via Model Context Protocol.
+   *  Accepts both array format (our native) and object/map format (Claude/Cursor compat).
+   *  Object format: { "server-name": { command, args, env, transport } }
+   *  Array format:  [{ name, command, args, env, transport }]
+   */
+  mcpServers: z.preprocess(
+    (val) => {
+      if (val && typeof val === "object" && !Array.isArray(val)) {
+        return Object.entries(val).map(
+          ([name, cfg]) => ({ name, ...cfg })
+        );
+      }
+      return val;
+    },
+    z.array(mcpServerSchema).default([])
+  )
 });
 
 // src/config/constants.ts
@@ -10873,7 +10887,7 @@ var DeepLinkHandler = class {
 </dict>
 </plist>`;
     const { writeFile: writeFile5 } = await import("fs/promises");
-    const { getPlistPath } = await import("./paths-OODUHG6V.js");
+    const { getPlistPath } = await import("./paths-FVFXSRUD.js");
     const plistPath = getPlistPath();
     await writeFile5(plistPath, plistContent, "utf-8");
     try {
@@ -10888,7 +10902,7 @@ var DeepLinkHandler = class {
   }
   async unregisterMacOS() {
     const { unlink: unlink4 } = await import("fs/promises");
-    const { getPlistPath } = await import("./paths-OODUHG6V.js");
+    const { getPlistPath } = await import("./paths-FVFXSRUD.js");
     const plistPath = getPlistPath();
     try {
       await unlink4(plistPath);
@@ -10898,7 +10912,7 @@ var DeepLinkHandler = class {
   async checkMacOS() {
     try {
       const { stat: stat5 } = await import("fs/promises");
-      const { getPlistPath } = await import("./paths-OODUHG6V.js");
+      const { getPlistPath } = await import("./paths-FVFXSRUD.js");
       const plistPath = getPlistPath();
       await stat5(plistPath);
       return true;
@@ -12180,4 +12194,4 @@ export {
   MCPConnectionManager,
   runCli
 };
-//# sourceMappingURL=chunk-SDHXIBKZ.js.map
+//# sourceMappingURL=chunk-V73UZD27.js.map