@basegrid_tech/mcp 0.18.12 → 0.18.13

package/dist/index.js

@@ -162,6 +162,32 @@ var DEFAULT_NO_PROXY_HOSTS = [
 ];
 var DEFAULT_NO_PROXY = DEFAULT_NO_PROXY_HOSTS.join(",");
 
+// ../shared/src/connector-identity.ts
+var IDENTITY_FIELDS = [
+  "owner",
+  // github
+  "repo",
+  // github
+  "orgId",
+  // yandex tracker
+  "queue",
+  // yandex tracker
+  "teamKey"
+  // linear
+];
+function connectionIdentityKey(connectorId, filters) {
+  if (!filters) return "";
+  const parts = [];
+  for (const key of IDENTITY_FIELDS) {
+    const value = filters[key];
+    if (typeof value !== "string") continue;
+    const normalized = value.trim().toLowerCase();
+    if (!normalized) continue;
+    parts.push(`${key}=${normalized}`);
+  }
+  return parts.length > 0 ? `${connectorId}:${parts.join("&")}` : "";
+}
+
 // ../shared/src/quick-commands.ts
 function normalizeQuickCommands(input) {
   if (!Array.isArray(input)) return [];
@@ -185,8 +211,13 @@ function normalizeOne(raw, seenIds) {
   const label = clampString(obj.label, QUICK_COMMAND_LIMITS.maxLabel);
   if (!label) return null;
   const scope = normalizeScope(obj.scope);
-  const kind = obj.kind === "terminal" ? "terminal" : obj.kind === "agent" ? "agent" : null;
+  const kind = obj.kind === "terminal" || obj.kind === "agent" || obj.kind === "snippet" ? obj.kind : null;
   if (!kind) return null;
+  if (kind === "snippet") {
+    const text2 = clampString(obj.text, QUICK_COMMAND_LIMITS.maxBody);
+    if (!text2) return null;
+    return { id, label, scope, kind, text: text2 };
+  }
   if (kind === "agent") {
     const prompt = clampString(obj.prompt, QUICK_COMMAND_LIMITS.maxBody);
     if (!prompt) return null;
@@ -485,7 +516,8 @@ function createSchema() {
     );
 
     -- Quick commands (\u043F\u043E\u0440\u0442 \u0444\u0438\u0447\u0438 \u0438\u0437 orca): \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u0441\u043A\u0438\u0435 \u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u043A\u043E\u043C\u0430\u043D\u0434\u044B.
-    -- kind='agent' \u2192 \u0437\u0430\u043F\u0443\u0441\u043A \u0430\u0433\u0435\u043D\u0442\u0430 \u0441 \u043F\u0440\u043E\u043C\u043F\u0442\u043E\u043C; kind='terminal' \u2192 \u0448\u0435\u043B\u043B-\u043A\u043E\u043C\u0430\u043D\u0434\u0430.
+    -- kind='agent' \u2192 \u0437\u0430\u043F\u0443\u0441\u043A \u0430\u0433\u0435\u043D\u0442\u0430 \u0441 \u043F\u0440\u043E\u043C\u043F\u0442\u043E\u043C; kind='terminal' \u2192 \u0448\u0435\u043B\u043B-\u043A\u043E\u043C\u0430\u043D\u0434\u0430;
+    -- kind='snippet' \u2192 \u0433\u043E\u0442\u043E\u0432\u044B\u0439 \u0442\u0435\u043A\u0441\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0432\u0441\u0442\u0430\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0432 \u0438\u043D\u043F\u0443\u0442 \u0441\u0435\u0441\u0441\u0438\u0438.
     -- scope \u0445\u0440\u0430\u043D\u0438\u0442\u0441\u044F JSON-\u0441\u0442\u0440\u043E\u043A\u043E\u0439 \u0434\u043B\u044F \u0431\u0443\u0434\u0443\u0449\u0435\u0439 \u043F\u0440\u0438\u0432\u044F\u0437\u043A\u0438 \u043A \u043F\u0440\u043E\u0435\u043A\u0442\u0443 (\u0441\u0435\u0439\u0447\u0430\u0441 global).
     CREATE TABLE IF NOT EXISTS quick_commands (
       id TEXT PRIMARY KEY,
@@ -498,7 +530,8 @@ function createSchema() {
       command TEXT,
       append_enter INTEGER NOT NULL DEFAULT 1,
       position INTEGER NOT NULL DEFAULT 0,
-      shell TEXT
+      shell TEXT,
+      snippet_text TEXT
     );
 
     CREATE TABLE IF NOT EXISTS remote_hosts (
@@ -1608,6 +1641,120 @@ function migrateSchema(d) {
     })();
     logger_default.info("[database] migrated schema to version 37 (session_activity timestamp index)");
   }
+  if (version < 38) {
+    d.transaction(() => {
+      const cols = d.prepare("PRAGMA table_info(quick_commands)").all();
+      if (!cols.some((c) => c.name === "snippet_text")) {
+        d.exec("ALTER TABLE quick_commands ADD COLUMN snippet_text TEXT");
+      }
+      d.prepare(
+        "INSERT OR REPLACE INTO schema_meta (key, value) VALUES ('schema_version', '38')"
+      ).run();
+    })();
+    logger_default.info("[database] migrated schema to version 38 (quick command snippets)");
+  }
+  if (version < 39) {
+    d.transaction(() => {
+      const cols = d.prepare("PRAGMA table_info(source_connections)").all();
+      if (cols.length === 0) {
+        d.prepare(
+          "INSERT OR REPLACE INTO schema_meta (key, value) VALUES ('schema_version', '39')"
+        ).run();
+        return;
+      }
+      if (!cols.some((c) => c.name === "identity_key")) {
+        d.exec("ALTER TABLE source_connections ADD COLUMN identity_key TEXT NOT NULL DEFAULT ''");
+      }
+      const rows = d.prepare(
+        `SELECT c.id, c.connector_id, c.filters, c.created_at, c.sync_cursor,
+                  c.status_mapping, c.sync_interval_minutes, c.execution_project,
+                  (SELECT count(*) FROM task_source_links l WHERE l.connection_id = c.id) AS link_count
+             FROM source_connections c`
+      ).all();
+      const setIdentity = d.prepare("UPDATE source_connections SET identity_key = ? WHERE id = ?");
+      const setFilters = d.prepare("UPDATE source_connections SET filters = ? WHERE id = ?");
+      const groups = /* @__PURE__ */ new Map();
+      for (const row2 of rows) {
+        let filters;
+        try {
+          filters = JSON.parse(row2.filters);
+        } catch {
+          filters = {};
+        }
+        if (row2.connector_id === "github" && "state" in filters) {
+          delete filters.state;
+          setFilters.run(JSON.stringify(filters), row2.id);
+        }
+        const key = connectionIdentityKey(row2.connector_id, filters);
+        setIdentity.run(key, row2.id);
+        if (!key) continue;
+        const bucket = groups.get(key) ?? [];
+        bucket.push({ ...row2, parsedFilters: filters });
+        groups.set(key, bucket);
+      }
+      const relinkLinks = d.prepare(
+        "UPDATE OR IGNORE task_source_links SET connection_id = ? WHERE connection_id = ?"
+      );
+      const relinkHistory = d.prepare(
+        "UPDATE sync_history SET connection_id = ? WHERE connection_id = ?"
+      );
+      const adoptSettings = d.prepare(
+        `UPDATE source_connections
+            SET filters = ?, status_mapping = ?, sync_interval_minutes = ?,
+                execution_project = ?, sync_cursor = ?
+          WHERE id = ?`
+      );
+      const dropConn = d.prepare("DELETE FROM source_connections WHERE id = ?");
+      let collapsed = 0;
+      let strandedLinks = 0;
+      for (const bucket of groups.values()) {
+        if (bucket.length < 2) continue;
+        const byWeight = [...bucket].sort(
+          (a, b) => b.link_count - a.link_count || a.created_at.localeCompare(b.created_at)
+        );
+        const keep = byWeight[0];
+        const dupes = byWeight.slice(1);
+        const newest = [...bucket].sort((a, b) => b.created_at.localeCompare(a.created_at))[0];
+        const cursors = bucket.map((c) => c.sync_cursor).filter((c) => !!c);
+        const earliest = cursors.length > 0 ? cursors.sort()[0] : null;
+        for (const dupe of dupes) {
+          const moved = Number(relinkLinks.run(keep.id, dupe.id).changes);
+          strandedLinks += dupe.link_count - moved;
+          relinkHistory.run(keep.id, dupe.id);
+          dropConn.run(dupe.id);
+          collapsed++;
+        }
+        adoptSettings.run(
+          JSON.stringify(newest.parsedFilters),
+          newest.status_mapping,
+          newest.sync_interval_minutes,
+          newest.execution_project,
+          earliest,
+          keep.id
+        );
+      }
+      const catchUpFrom = new Date(Date.now() - 30 * 24 * 60 * 60 * 1e3).toISOString();
+      d.prepare(
+        `UPDATE source_connections
+            SET sync_cursor = CASE WHEN created_at > ? THEN created_at ELSE ? END
+          WHERE sync_cursor IS NOT NULL AND sync_cursor > ?`
+      ).run(catchUpFrom, catchUpFrom, catchUpFrom);
+      d.exec(`
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_source_connections_identity
+          ON source_connections(identity_key)
+          WHERE identity_key <> ''
+      `);
+      d.prepare(
+        "INSERT OR REPLACE INTO schema_meta (key, value) VALUES ('schema_version', '39')"
+      ).run();
+      if (collapsed > 0) {
+        logger_default.warn(
+          `[database] collapsed ${collapsed} duplicate source connection(s)` + (strandedLinks > 0 ? `; ${strandedLinks} duplicate task link(s) dropped` : "")
+        );
+      }
+    })();
+    logger_default.info("[database] migrated schema to version 39 (source_connections.identity_key)");
+  }
 }
 function verifySchema(d) {
   const expectedTables = [
@@ -1634,7 +1781,8 @@ function verifySchema(d) {
         last_sync_at TEXT,
         last_sync_error TEXT,
         sync_cursor TEXT,
-        created_at TEXT NOT NULL
+        created_at TEXT NOT NULL,
+        identity_key TEXT NOT NULL DEFAULT ''
       )`
     },
     {
@@ -1804,8 +1952,17 @@ function verifySchema(d) {
         ddl: "ALTER TABLE external_worktree_settings ADD COLUMN hidden_paths TEXT NOT NULL DEFAULT '[]'"
       }
     ],
-    quick_commands: [{ column: "shell", ddl: "ALTER TABLE quick_commands ADD COLUMN shell TEXT" }],
-    account: [{ column: "member_since", ddl: "ALTER TABLE account ADD COLUMN member_since TEXT" }]
+    quick_commands: [
+      { column: "shell", ddl: "ALTER TABLE quick_commands ADD COLUMN shell TEXT" },
+      { column: "snippet_text", ddl: "ALTER TABLE quick_commands ADD COLUMN snippet_text TEXT" }
+    ],
+    account: [{ column: "member_since", ddl: "ALTER TABLE account ADD COLUMN member_since TEXT" }],
+    source_connections: [
+      {
+        column: "identity_key",
+        ddl: "ALTER TABLE source_connections ADD COLUMN identity_key TEXT NOT NULL DEFAULT ''"
+      }
+    ]
   };
   for (const [table, columns] of Object.entries(expectedByTable)) {
     const existing = new Set(
@@ -1821,6 +1978,15 @@ function verifySchema(d) {
       }
     }
   }
+  try {
+    d.exec(`
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_source_connections_identity
+        ON source_connections(identity_key)
+        WHERE identity_key <> ''
+    `);
+  } catch (err) {
+    logger_default.error({ err }, "[database] self-heal: failed to ensure source connection identity index");
+  }
 }
 function loadConfig() {
   const d = getDb();
@@ -1975,7 +2141,8 @@ function loadQuickCommands(d) {
     model: r.model ?? void 0,
     command: r.command ?? void 0,
     appendEnter: r.append_enter !== 0,
-    shell: r.shell ?? void 0
+    shell: r.shell ?? void 0,
+    text: r.snippet_text ?? void 0
   }));
   return normalizeQuickCommands(raw);
 }
@@ -2084,8 +2251,8 @@ function saveConfig(config) {
     }
     d.prepare("DELETE FROM quick_commands").run();
     const insertQuickCommand = d.prepare(
-      `INSERT INTO quick_commands (id, label, kind, scope, agent_type, prompt, model, command, append_enter, position, shell)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      `INSERT INTO quick_commands (id, label, kind, scope, agent_type, prompt, model, command, append_enter, position, shell, snippet_text)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     );
     const normalizedQuickCommands = normalizeQuickCommands(config.quickCommands ?? []);
     normalizedQuickCommands.forEach((q, index) => {
@@ -2100,7 +2267,8 @@ function saveConfig(config) {
         q.kind === "terminal" ? q.command : null,
         q.kind === "terminal" && q.appendEnter ? 1 : 0,
         index,
-        q.kind === "terminal" ? q.shell ?? null : null
+        q.kind === "terminal" ? q.shell ?? null : null,
+        q.kind === "snippet" ? q.text : null
       );
     });
     d.prepare("DELETE FROM agent_commands").run();
@@ -4084,7 +4252,10 @@ import { z as z7 } from "zod";
 var ASK_TIMEOUT_MS = 60 * 60 * 1e3;
 var questionSchema = z7.object({
   question: z7.string().min(1).max(1e3).describe("The question to ask the user."),
-  header: z7.string().max(40).optional().describe("Very short label/chip shown above the question (max 40 chars)."),
+  // 12 символов — потолок «чипа» в карточке (как у встроенного
+  // AskUserQuestion). Обрезаем, а не отвергаем: завалить схему из-за косметики
+  // значит не задать вопрос вовсе, и модель узнает об этом только по ошибке.
+  header: z7.string().max(200).optional().transform((value) => value?.slice(0, 12)).describe("Very short label/chip shown above the question (kept to 12 chars)."),
   multiSelect: z7.boolean().optional().describe("Allow multiple options to be selected. Defaults to single-select."),
   options: z7.array(z7.string().min(1).max(200)).min(2).max(4).describe(
     'Available choices (2\u20134). Do NOT include "Other" yourself \u2014 the UI adds it automatically when supported.'
@@ -4587,7 +4758,7 @@ console.warn = (...args) => _origError("[mcp:warn]", ...args);
 console.error = (...args) => _origError("[mcp:error]", ...args);
 async function main() {
   configManager.init();
-  const version = true ? "0.18.12" : createRequire(import.meta.url)("../package.json").version;
+  const version = true ? "0.18.13" : createRequire(import.meta.url)("../package.json").version;
   const server = createMcpServer(version);
   const transport = new StdioServerTransport();
   await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basegrid_tech/mcp",
-  "version": "0.18.12",
+  "version": "0.18.13",
   "description": "BaseGrid MCP server — task management, git, and workflow tools for AI coding agents",
   "type": "module",
   "license": "MIT",
@@ -42,8 +42,8 @@
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@basegrid/server": "0.18.12",
-    "@basegrid/shared": "0.18.12",
+    "@basegrid/server": "0.18.13",
+    "@basegrid/shared": "0.18.13",
     "tsup": "^8.5.1",
     "tsx": "^4.21.0",
     "typescript": "^6.0.3"