@minhpnq1807/contextos 0.5.42 → 0.5.45

package/plugins/ctx/lib/toml-config.js

@@ -0,0 +1,116 @@
+import { parse } from "smol-toml";
+
+export function readMcpServersFromToml(content) {
+  const config = parseToml(content);
+  const servers = config.mcp_servers && typeof config.mcp_servers === "object"
+    ? config.mcp_servers
+    : {};
+
+  return Object.entries(servers)
+    .filter(([, server]) => server && typeof server.command === "string")
+    .map(([name, server]) => ({
+      name,
+      command: server.command,
+      args: Array.isArray(server.args) ? server.args.map(String) : []
+    }));
+}
+
+export function updateMcpServerFields(content, name, fields) {
+  parseToml(content);
+  const lines = String(content || "").split(/\r?\n/);
+  const section = findMcpServerSection(lines, name);
+  if (!section) return content;
+
+  let body = lines.slice(section.start + 1, section.end);
+  for (const [key, value] of Object.entries(fields)) {
+    body = replaceOrInsertField(body, key, formatTomlValue(value));
+  }
+  lines.splice(section.start + 1, section.end - section.start - 1, ...body);
+  return lines.join("\n");
+}
+
+export function formatTomlValue(value) {
+  if (Array.isArray(value)) return `[${value.map((item) => JSON.stringify(String(item))).join(", ")}]`;
+  return JSON.stringify(String(value));
+}
+
+function parseToml(content) {
+  return parse(String(content || ""));
+}
+
+function findMcpServerSection(lines, name) {
+  for (let index = 0; index < lines.length; index += 1) {
+    const sectionName = mcpServerNameFromHeader(lines[index]);
+    if (sectionName !== name) continue;
+    let end = lines.length;
+    for (let cursor = index + 1; cursor < lines.length; cursor += 1) {
+      if (/^\s*\[/.test(lines[cursor])) {
+        end = cursor;
+        break;
+      }
+    }
+    return { start: index, end };
+  }
+  return null;
+}
+
+function mcpServerNameFromHeader(line) {
+  const match = String(line || "").match(/^\s*\[mcp_servers\.([^\]]+)\]\s*(?:#.*)?$/);
+  if (!match || match[1].includes(".tools.")) return null;
+  const raw = match[1].trim();
+  if (!raw.startsWith('"')) return raw;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+
+function replaceOrInsertField(body, key, value) {
+  const next = [...body];
+  const start = next.findIndex((line) => new RegExp(`^\\s*${escapeRegExp(key)}\\s*=`).test(line));
+  const line = `${key} = ${value}`;
+  if (start < 0) {
+    next.unshift(line);
+    return next;
+  }
+
+  let end = start + 1;
+  if (valueForField(next[start]).trimStart().startsWith("[")) {
+    while (end < next.length && !isBalancedTomlArray(next.slice(start, end).join("\n"))) end += 1;
+  }
+  next.splice(start, Math.max(1, end - start), line);
+  return next;
+}
+
+function valueForField(line) {
+  return String(line || "").slice(String(line || "").indexOf("=") + 1);
+}
+
+function isBalancedTomlArray(value) {
+  let depth = 0;
+  let quoted = false;
+  let escaped = false;
+  for (const char of String(value || "")) {
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (char === "\\" && quoted) {
+      escaped = true;
+      continue;
+    }
+    if (char === '"') {
+      quoted = !quoted;
+      continue;
+    }
+    if (quoted) continue;
+    if (char === "[") depth += 1;
+    if (char === "]") depth -= 1;
+  }
+  return depth <= 0;
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

package/plugins/ctx/mcp/server.js

@@ -6,7 +6,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 
 import { isModelCacheReady, modelCacheDir } from "../lib/embedding-scorer.js";
 import { scoreContext } from "../lib/score-context.js";
-import { ctxMcpSocketPath } from "../lib/ctx-mcp-client.js";
+import { CTX_MCP_BRIDGE_REVISION, ctxMcpSocketPath } from "../lib/ctx-mcp-client.js";
 import { defaultDataRoot } from "../lib/workspace-data.js";
 import { createContextOSMcpServer } from "./contextos-server.js";
 
@@ -33,6 +33,9 @@ function startBridge() {
   fs.rmSync(socketPath, { force: true });
   const bridge = net.createServer((socket) => {
     let raw = "";
+    socket.on("error", () => {
+      // Clients may time out and close while scoring is still in progress.
+    });
     socket.on("data", (chunk) => {
       raw += chunk.toString("utf8");
       if (raw.includes("\n")) handleBridgeRequest(socket, raw);
@@ -68,9 +71,10 @@ async function handleBridgeRequest(socket, raw) {
       skills: payload.skills,
       workflows: payload.workflows
     });
-    socket.end(JSON.stringify(result));
+    socket.end(JSON.stringify({ ...result, bridgeRevision: CTX_MCP_BRIDGE_REVISION }));
   } catch (error) {
     socket.end(JSON.stringify({
+      bridgeRevision: CTX_MCP_BRIDGE_REVISION,
       error: error?.message || String(error),
       scoredRules: [],
       suggestedFiles: [],