@basegrid_tech/mcp 0.18.12 → 0.18.14-beta.1

package/dist/index.js

@@ -69,6 +69,8 @@ var DEFAULT_WORKSPACE = {
   iconColor: "#6b7280",
   order: 0
 };
+var MCP_ASK_TIMEOUT_MS = 60 * 60 * 1e3;
+var MCP_TOOL_TIMEOUT_MS = MCP_ASK_TIMEOUT_MS + 6e4;
 var QUICK_COMMAND_LIMITS = {
   maxCommands: 40,
   maxLabel: 80,
@@ -102,6 +104,29 @@ var DEFAULT_AGENT_COMMANDS = {
   }
 };
 
+// ../shared/src/config-save-mutation.ts
+function applyTaskConfigMutation(currentTasks, mutation) {
+  if (!mutation) return currentTasks;
+  if (mutation.kind === "create") {
+    if (currentTasks.some((task) => task.id === mutation.task.id)) return currentTasks;
+    return [...currentTasks, mutation.task];
+  }
+  if (mutation.kind === "delete") {
+    const doomed = new Set(mutation.ids);
+    return currentTasks.filter((task) => !doomed.has(task.id));
+  }
+  const patches = new Map(mutation.patches.map((patch) => [patch.id, patch]));
+  return currentTasks.map((task) => {
+    const patch = patches.get(task.id);
+    if (!patch) return task;
+    const next = { ...task, ...patch.updates };
+    for (const key of patch.clear ?? []) {
+      delete next[key];
+    }
+    return next;
+  });
+}
+
 // ../server/src/database.ts
 import Database from "libsql";
 import path3 from "path";
@@ -162,6 +187,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 +236,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 +541,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 +555,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 (
@@ -571,6 +629,7 @@ function createSchema() {
       agent_session_id TEXT,
       branch TEXT,
       use_worktree INTEGER DEFAULT 0,
+      worktree_path TEXT,
       created_at TEXT NOT NULL,
       updated_at TEXT NOT NULL,
       completed_at TEXT
@@ -756,12 +815,39 @@ function createSchema() {
       updated_at    INTEGER NOT NULL
     );
 
+    -- \u0427\u0435\u0440\u043D\u043E\u0432\u0438\u043A \u0438\u043D\u043F\u0443\u0442\u0430 \u0441\u0435\u0441\u0441\u0438\u0438: \u043D\u0430\u0431\u0440\u0430\u043D\u043D\u044B\u0439, \u043D\u043E \u043D\u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442 (HTML
+    -- \u0440\u0435\u0434\u0430\u043A\u0442\u043E\u0440\u0430 PromptInput) \u0438 \u043C\u0435\u0442\u0430\u0434\u0430\u043D\u043D\u044B\u0435 \u0435\u0433\u043E \u0447\u0438\u043F\u043E\u0432. \u041A\u043B\u044E\u0447 \u2014 terminal_id,
+    -- \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A \u043F\u0435\u0440\u0435\u0436\u0438\u0432\u0430\u0435\u0442 \u043F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F (issue #921). \u0421\u0442\u0440\u043E\u043A\u0430
+    -- \u0436\u0438\u0432\u0451\u0442 \u0440\u043E\u0432\u043D\u043E \u0441\u0442\u043E\u043B\u044C\u043A\u043E \u0436\u0435, \u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0441\u0442\u0440\u043E\u043A\u0430 \u0441\u0435\u0441\u0441\u0438\u0438: \u0435\u0451 \u0443\u0434\u0430\u043B\u044F\u044E\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441
+    -- \u0441\u0435\u0441\u0441\u0438\u0435\u0439 (deleteSessionById \u0438 \u0441\u043E\u0441\u0435\u0434\u0438) \u0438 \u043F\u043E\u0434\u0447\u0438\u0449\u0430\u044E\u0442 \u043D\u0430 \u0441\u0442\u0430\u0440\u0442\u0435
+    -- (pruneOrphanInputDrafts).
+    CREATE TABLE IF NOT EXISTS session_input_drafts (
+      terminal_id TEXT PRIMARY KEY,
+      html        TEXT NOT NULL,
+      attachments TEXT NOT NULL DEFAULT '[]',
+      updated_at  INTEGER NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS worktree_notes (
       worktree_path TEXT PRIMARY KEY,
       body          TEXT NOT NULL,
       updated_at    INTEGER NOT NULL
     );
 
+    -- \u0421\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u0440\u0430\u0431\u043E\u0442\u044B \u0432 \u0432\u043E\u0440\u043A\u0442\u0440\u0438: \u0433\u0434\u0435 \u043C\u044B \u0432 \u0446\u0435\u043F\u043E\u0447\u043A\u0435 \xAB\u043E\u0431\u0441\u0443\u0436\u0434\u0435\u043D\u0438\u0435 \u2192 \u0440\u0435\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F \u2192
+    -- \u043F\u0440\u0438\u0451\u043C\u043A\u0430\xBB \u0438 \u0447\u0442\u043E \u043F\u0435\u0440\u0435\u0434\u0430\u0451\u0442\u0441\u044F \u0434\u0430\u043B\u044C\u0448\u0435. \u0416\u0438\u0432\u0451\u0442 \u043D\u0430 \u0432\u043E\u0440\u043A\u0442\u0440\u0438, \u0430 \u043D\u0435 \u043D\u0430 \u0441\u0435\u0441\u0441\u0438\u0438
+    -- (\u0438\u0445 \u0432 \u043E\u0434\u043D\u043E\u0439 \u0432\u043E\u0440\u043A\u0442\u0440\u0438 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E, \u0438 \u043E\u043D\u0438 \u0440\u0430\u0437\u043E\u0448\u043B\u0438\u0441\u044C \u0431\u044B) \u0438 \u043D\u0435 \u043D\u0430 \u0437\u0430\u0434\u0430\u0447\u0435
+    -- (\u0437\u0430\u0434\u0430\u0447 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0438\u043B\u0438 \u043D\u0438 \u043E\u0434\u043D\u043E\u0439). \u0423\u043C\u0438\u0440\u0430\u0435\u0442 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u0432\u043E\u0440\u043A\u0442\u0440\u0438 \u2014
+    -- \u0441\u043C. deleteWorktreeListEntry.
+    CREATE TABLE IF NOT EXISTS worktree_flow (
+      worktree_path     TEXT PRIMARY KEY,
+      step              TEXT NOT NULL,
+      criteria          TEXT NOT NULL DEFAULT '[]',
+      work_session_id   TEXT,
+      accept_session_id TEXT,
+      updated_at        INTEGER NOT NULL
+    );
+
     CREATE TABLE IF NOT EXISTS worktree_view_modes (
       worktree_path TEXT PRIMARY KEY,
       view_mode     TEXT NOT NULL,
@@ -852,6 +938,17 @@ function createSchema() {
 function migrateSchema(d) {
   const row = d.prepare("SELECT value FROM schema_meta WHERE key = 'schema_version'").get();
   const version = row ? parseInt(row.value, 10) : 0;
+  {
+    const flowCols = d.prepare("PRAGMA table_info(worktree_flow)").all();
+    if (flowCols.length > 0) {
+      if (!flowCols.some((c) => c.name === "work_session_id")) {
+        d.exec("ALTER TABLE worktree_flow ADD COLUMN work_session_id TEXT");
+      }
+      if (!flowCols.some((c) => c.name === "accept_session_id")) {
+        d.exec("ALTER TABLE worktree_flow ADD COLUMN accept_session_id TEXT");
+      }
+    }
+  }
   if (version < 1) {
     d.transaction(() => {
       const projectCols = d.prepare("PRAGMA table_info(projects)").all();
@@ -1608,6 +1705,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 +1845,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 ''
       )`
     },
     {
@@ -1767,6 +1979,10 @@ function verifySchema(d) {
       {
         column: "source_external_id",
         ddl: "ALTER TABLE tasks ADD COLUMN source_external_id TEXT"
+      },
+      {
+        column: "worktree_path",
+        ddl: "ALTER TABLE tasks ADD COLUMN worktree_path TEXT"
       }
     ],
     task_source_links: [
@@ -1804,8 +2020,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 +2046,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();
@@ -1876,6 +2110,7 @@ var DEFAULTS_KEYS_MAP = {
   claudeDefaultEffort: true,
   codexDefaultModel: true,
   codexDefaultEffort: true,
+  geminiDefaultModel: true,
   language: true,
   hasSeededDefaultTaskWorkflow: true,
   defaultSpinnerVariant: true,
@@ -1892,6 +2127,7 @@ var DEFAULTS_KEYS_MAP = {
   reviewClaudeModel: true,
   reviewCodexModel: true,
   reviewCodexEffort: true,
+  reviewGeminiModel: true,
   aiCommitModel: true,
   aiCommitThinkingLevel: true,
   aiCommitCustomPrompt: true,
@@ -1975,7 +2211,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 +2321,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 +2337,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();
@@ -2139,17 +2377,17 @@ function saveConfig(config) {
         h.sshOptions ?? null
       );
     }
-    const nextTaskIds = new Set((config.tasks ?? []).map((t) => t.id));
-    const existingTaskIds = d.prepare("SELECT id FROM tasks").all().map(
-      (r) => r.id
-    );
-    const deleteTask = d.prepare("DELETE FROM tasks WHERE id = ?");
-    for (const id of existingTaskIds) {
-      if (!nextTaskIds.has(id)) deleteTask.run(id);
+    if (config.tasks) {
+      const nextTaskIds = new Set(config.tasks.map((t) => t.id));
+      const existingTaskIds = d.prepare("SELECT id FROM tasks").all().map((r) => r.id);
+      const deleteTask = d.prepare("DELETE FROM tasks WHERE id = ?");
+      for (const id of existingTaskIds) {
+        if (!nextTaskIds.has(id)) deleteTask.run(id);
+      }
     }
     const insertTask = d.prepare(
-      `INSERT INTO tasks (id, project_name, title, description, status, "order", assigned_session_id, assigned_agent, agent_session_id, branch, use_worktree, created_at, updated_at, completed_at, source_connector_id, source_external_url, source_external_id)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `INSERT INTO tasks (id, project_name, title, description, status, "order", assigned_session_id, assigned_agent, agent_session_id, branch, use_worktree, worktree_path, created_at, updated_at, completed_at, source_connector_id, source_external_url, source_external_id)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(id) DO UPDATE SET
          project_name = excluded.project_name,
          title = excluded.title,
@@ -2161,6 +2399,7 @@ function saveConfig(config) {
          agent_session_id = excluded.agent_session_id,
          branch = excluded.branch,
          use_worktree = excluded.use_worktree,
+         worktree_path = excluded.worktree_path,
          created_at = excluded.created_at,
          updated_at = excluded.updated_at,
          completed_at = excluded.completed_at,
@@ -2181,6 +2420,7 @@ function saveConfig(config) {
         t.agentSessionId ?? null,
         t.branch ?? null,
         t.useWorktree ? 1 : 0,
+        t.worktreePath ?? null,
         t.createdAt,
         t.updatedAt,
         t.completedAt ?? null,
@@ -2223,8 +2463,8 @@ function dbGetTask(id) {
 }
 function dbInsertTask(task) {
   getDb().prepare(
-    `INSERT INTO tasks (id, project_name, title, description, status, "order", assigned_session_id, assigned_agent, agent_session_id, branch, use_worktree, created_at, updated_at, completed_at, source_connector_id, source_external_url, source_external_id)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+    `INSERT INTO tasks (id, project_name, title, description, status, "order", assigned_session_id, assigned_agent, agent_session_id, branch, use_worktree, worktree_path, created_at, updated_at, completed_at, source_connector_id, source_external_url, source_external_id)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
   ).run(
     task.id,
     task.projectName,
@@ -2237,6 +2477,7 @@ function dbInsertTask(task) {
     task.agentSessionId ?? null,
     task.branch ?? null,
     task.useWorktree ? 1 : 0,
+    task.worktreePath ?? null,
     task.createdAt,
     task.updatedAt,
     task.completedAt ?? null,
@@ -2259,6 +2500,7 @@ function dbUpdateTask(id, updates) {
   addSet(sets, params, "status", updates.status);
   addSet(sets, params, '"order"', updates.order);
   addSet(sets, params, "branch", updates.branch);
+  addSet(sets, params, "worktree_path", updates.worktreePath);
   if (updates.useWorktree !== void 0) {
     sets.push("use_worktree = ?");
     params.push(updates.useWorktree ? 1 : 0);
@@ -2473,6 +2715,7 @@ function rowToTask(r) {
     ...r.agent_session_id != null && { agentSessionId: r.agent_session_id },
     ...r.branch != null && { branch: r.branch },
     ...r.use_worktree != null && r.use_worktree !== 0 && { useWorktree: true },
+    ...r.worktree_path != null && { worktreePath: r.worktree_path },
     createdAt: r.created_at,
     updatedAt: r.updated_at,
     ...r.completed_at != null && { completedAt: r.completed_at },
@@ -2749,9 +2992,40 @@ var ConfigManager = class {
     }
     return seeded;
   }
+  /** Авторитетный список задач читаем прямо из БД, минуя `cachedConfig`:
+   *  задачи пишутся и мимо ConfigManager (backfill коннектора, MCP
+   *  stdio-процесс), а кэш инвалидируется только собственными
+   *  saveConfig/notifyChanged. Сохранение поверх тёплого кэша означало бы
+   *  «удалить всё, что появилось после последней записи».
+   *
+   *  Возвращает null, если чтение упало: подставлять сюда fallback из
+   *  loadConfig() нельзя — он отдаёт `tasks: []`, что для dbSaveConfig
+   *  равносильно «удалить все задачи». */
+  readPersistedTasks() {
+    try {
+      return loadConfig().tasks ?? [];
+    } catch (err) {
+      logger_default.error({ err }, "[config-manager] failed to read tasks before save");
+      return null;
+    }
+  }
   saveConfig(config) {
     try {
-      saveConfig(config);
+      const mutation = config.__taskMutation;
+      const persisted = { ...config };
+      delete persisted.__taskMutation;
+      delete config.__taskMutation;
+      const currentTasks = this.readPersistedTasks();
+      if (currentTasks === null) {
+        delete persisted.tasks;
+      } else {
+        const tasks = applyTaskConfigMutation(currentTasks, mutation);
+        if (config.tasks !== void 0 || currentTasks.length || mutation) {
+          persisted.tasks = tasks;
+          config.tasks = tasks;
+        }
+      }
+      saveConfig(persisted);
       this.cachedConfig = null;
     } catch (err) {
       logger_default.error({ err }, "[config-manager] saveConfig failed");
@@ -4081,10 +4355,12 @@ function registerWorkspaceTools(server) {
 
 // src/tools/ask-user-question.ts
 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.'
@@ -4131,7 +4407,7 @@ function registerAskUserQuestionTool(server) {
         const res = await rpcCall(
           "mcp:askUserQuestion",
           { terminalId, questions: normalized },
-          { timeoutMs: ASK_TIMEOUT_MS }
+          { timeoutMs: MCP_ASK_TIMEOUT_MS }
         );
         if (res.skipped || !res.answers) {
           return {
@@ -4564,6 +4840,74 @@ function registerEmulatorTools(server) {
   );
 }
 
+// src/tools/flow.ts
+import { z as z9 } from "zod";
+function registerFlowTools(server) {
+  server.tool(
+    "set_acceptance_criteria",
+    "Record the acceptance criteria for the work in this worktree: what a person will do and what they should see. Call this at the end of a discussion, before any code is written \u2014 the criteria are handed to the session that implements the work and to the one that accepts it. Replaces the list you recorded before, but never the criteria the human added by hand. Requires the BaseGrid app to be running.",
+    {
+      worktree_path: V.absolutePath.describe(
+        "Absolute path of the worktree you are working in (your cwd)"
+      ),
+      criteria: z9.array(
+        z9.object({
+          text: V.title.describe("One checkable criterion, phrased as a user would"),
+          task_id: V.id.optional().describe("Task this criterion comes from, if any")
+        })
+      ).min(1).max(30).describe("The full list \u2014 it replaces whatever was recorded before")
+    },
+    async (args) => {
+      const flow = await rpcCall("worktree:flow:setCriteria", {
+        cwd: args.worktree_path,
+        // Пункты, дописанные человеком в полосе, вызов не трогает.
+        fromAgent: true,
+        criteria: args.criteria.map((c) => ({
+          text: c.text,
+          ...c.task_id ? { taskId: c.task_id } : {}
+        }))
+      });
+      return { content: [{ type: "text", text: JSON.stringify(flow, null, 2) }] };
+    }
+  );
+  server.tool(
+    "set_criterion_status",
+    "Record the verdict for ONE acceptance criterion during an acceptance pass, by its 1-based number as shown in the list. Only the acceptance tab may record verdicts \u2014 from the work tab the call is rejected. Call it as soon as you close a criterion, not in a batch at the end: the bar above the tabs is the scoreboard the human watches while you work. A verdict left only in your reply dies with the session \u2014 this one survives it. Requires the BaseGrid app to be running.",
+    {
+      worktree_path: V.absolutePath.describe(
+        "Absolute path of the worktree you are working in (your cwd)"
+      ),
+      index: z9.number().int().min(1).max(30).describe("1-based position of the criterion in the recorded list"),
+      status: z9.enum(["passed", "failed"]).describe("passed only when you actually ran it \u2014 never for something you only read"),
+      evidence: V.title.optional().describe("What closed it: the command you ran, the file, the behaviour you saw")
+    },
+    async (args) => {
+      const terminalId = process.env.BASEGRID_TERMINAL_ID;
+      const flow = await rpcCall("worktree:flow:setCriterionStatus", {
+        cwd: args.worktree_path,
+        index: args.index,
+        status: args.status,
+        ...args.evidence ? { evidence: args.evidence } : {},
+        ...terminalId ? { terminalId } : {}
+      });
+      return { content: [{ type: "text", text: JSON.stringify(flow, null, 2) }] };
+    }
+  );
+  server.tool(
+    "get_acceptance_criteria",
+    "Read the acceptance criteria and current step recorded for a worktree. Returns null when nothing has been recorded yet.",
+    {
+      worktree_path: V.absolutePath.describe("Absolute path of the worktree (your cwd)")
+    },
+    async (args) => {
+      const flow = await rpcCall("worktree:flow:get", {
+        cwd: args.worktree_path
+      });
+      return { content: [{ type: "text", text: JSON.stringify(flow, null, 2) }] };
+    }
+  );
+}
+
 // src/server.ts
 function createMcpServer(version) {
   const server = new McpServer({ name: "basegrid", version }, { capabilities: { tools: {} } });
@@ -4575,6 +4919,7 @@ function createMcpServer(version) {
   registerWorkspaceTools(server);
   registerAskUserQuestionTool(server);
   registerEmulatorTools(server);
+  registerFlowTools(server);
   return server;
 }
 
@@ -4587,7 +4932,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.14-beta.1" : 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.14-beta.1",
   "description": "BaseGrid MCP server — task management, git, and workflow tools for AI coding agents",
   "type": "module",
   "license": "MIT",
@@ -35,17 +35,17 @@
     "dev": "tsx src/index.ts"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "libsql": "^0.5.29",
-    "pino": "^10.3.1",
-    "ws": "^8.20.0",
-    "zod": "^4.3.6"
+    "@modelcontextprotocol/sdk": "1.29.0",
+    "libsql": "0.5.29",
+    "pino": "10.3.1",
+    "ws": "8.21.0",
+    "zod": "4.3.6"
   },
   "devDependencies": {
-    "@basegrid/server": "0.18.12",
-    "@basegrid/shared": "0.18.12",
-    "tsup": "^8.5.1",
-    "tsx": "^4.21.0",
-    "typescript": "^6.0.3"
+    "@basegrid/server": "workspace:*",
+    "@basegrid/shared": "workspace:*",
+    "tsup": "8.5.1",
+    "tsx": "4.21.0",
+    "typescript": "6.0.3"
   }
-}
+}