jorgex-stack 1.9.64 → 1.9.65

package/dist/cli.js

@@ -2115,6 +2115,12 @@ function isManagedOptionalStdioServer(server, value) {
   const expectedCommand = [server.command, ...server.args ?? []];
   return Object.keys(current).length === 2 && current.type === "local" && Array.isArray(current.command) && current.command.length === expectedCommand.length && current.command.every((arg, index) => arg === expectedCommand[index]);
 }
+function isOwnedDevtoolsServer(name, server, value, ctx) {
+  if (isManagedOptionalStdioServer(server, value)) return true;
+  if (name !== DEVTOOLS_MCP_SERVER) return false;
+  const template = loadCanonicalMcp(ctx.stackDir).servers[DEVTOOLS_MCP_SERVER];
+  return template !== void 0 && isManagedOptionalStdioServer(materializeCanonicalDevtoolsServerForRemoval(template), value);
+}
 function objectValue(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -2654,16 +2660,14 @@ ${gitReadCommands.map((command) => `- \`${command}\``).join("\n")}
             }
             if (!isCanonicalMcpServerEnabled(name, server, ctx.enabledMcpServers)) {
               if (owned) {
-                if (isManagedOptionalStdioServer(server, existing)) delete mcp[name];
+                if (isOwnedDevtoolsServer(name, server, existing, ctx)) delete mcp[name];
                 mcpOwnership.push({ server: name, owned: false });
               }
               continue;
             }
             if (server.optional && existing !== void 0) {
-              if (!owned || !isManagedOptionalStdioServer(server, existing)) {
-                if (owned) mcpOwnership.push({ server: name, owned: false });
-                ctx.warnings.push(`OpenCode: MCP opcional '${name}' ya pertenece a la configuraci\xF3n del usuario; se conserva.`);
-                continue;
+              if (!owned || !isOwnedDevtoolsServer(name, server, existing, ctx)) {
+                throw new Error(`OpenCode: ${name}: conflicto con servidor MCP existente ajeno o modificado; se conserva. Retira esa entrada expl\xEDcitamente antes de activar DevTools gestionado.`);
               }
             }
             if (server.transport === "stdio") {
@@ -2792,7 +2796,7 @@ ${gitReadCommands.map((command) => `- \`${command}\``).join("\n")}
                   continue;
                 }
                 if (ctx.ownedMcpServers?.has(name) === true) {
-                  if (isManagedOptionalStdioServer(server, mcpBlock[name])) delete mcpBlock[name];
+                  if (isOwnedDevtoolsServer(name, server, mcpBlock[name], ctx)) delete mcpBlock[name];
                   mcpOwnership.push({ server: name, owned: false });
                 }
               }
@@ -2938,6 +2942,12 @@ function isManagedOptionalStdioServer2(server, value) {
   const expectedArgs = server.args ?? [];
   return Object.keys(current).length === 3 && current.type === "stdio" && current.command === server.command && Array.isArray(current.args) && current.args.length === expectedArgs.length && current.args.every((arg, index) => arg === expectedArgs[index]);
 }
+function isOwnedDevtoolsServer2(name, server, value, ctx) {
+  if (isManagedOptionalStdioServer2(server, value)) return true;
+  if (name !== DEVTOOLS_MCP_SERVER) return false;
+  const template = loadCanonicalMcp(ctx.stackDir).servers[DEVTOOLS_MCP_SERVER];
+  return template !== void 0 && isManagedOptionalStdioServer2(materializeCanonicalDevtoolsServerForRemoval(template), value);
+}
 function errnoCodeOf(error) {
   return error instanceof Error && "code" in error && typeof error.code === "string" ? error.code : "UNKNOWN";
 }
@@ -3288,16 +3298,14 @@ ${agent.body}`,
             }
             if (!isCanonicalMcpServerEnabled(name, server, ctx.enabledMcpServers)) {
               if (owned) {
-                if (isManagedOptionalStdioServer2(server, existing)) delete servers[name];
+                if (isOwnedDevtoolsServer2(name, server, existing, ctx)) delete servers[name];
                 mcpOwnership.push({ server: name, owned: false });
               }
               continue;
             }
             if (server.optional && existing !== void 0) {
-              if (!owned || !isManagedOptionalStdioServer2(server, existing)) {
-                if (owned) mcpOwnership.push({ server: name, owned: false });
-                ctx.warnings.push(`Claude Code: MCP opcional '${name}' ya pertenece a la configuraci\xF3n del usuario; se conserva.`);
-                continue;
+              if (!owned || !isOwnedDevtoolsServer2(name, server, existing, ctx)) {
+                throw new Error(`Claude Code: ${name}: conflicto con servidor MCP existente ajeno o modificado; se conserva. Retira esa entrada expl\xEDcitamente antes de activar DevTools gestionado.`);
               }
             }
             if (server.transport === "stdio") {
@@ -3378,7 +3386,7 @@ ${agent.body}`,
                 continue;
               }
               if (ctx.ownedMcpServers?.has(name) === true) {
-                if (isManagedOptionalStdioServer2(server, servers[name])) delete servers[name];
+                if (isOwnedDevtoolsServer2(name, server, servers[name], ctx)) delete servers[name];
                 mcpOwnership.push({ server: name, owned: false });
               }
             }
@@ -3427,6 +3435,12 @@ args = [${args}]`;
 function isManagedOptionalStdioServer3(server, section) {
   return server.optional === true && server.transport === "stdio" && section?.trim() === stdioMcpSection(server);
 }
+function isOwnedDevtoolsServer3(name, server, section, ctx) {
+  if (isManagedOptionalStdioServer3(server, section)) return true;
+  if (name !== DEVTOOLS_MCP_SERVER) return false;
+  const template = loadCanonicalMcp(ctx.stackDir).servers[DEVTOOLS_MCP_SERVER];
+  return template !== void 0 && isManagedOptionalStdioServer3(materializeCanonicalDevtoolsServerForRemoval(template), section);
+}
 function hasActiveEngramPlugin(configDir) {
   const config = readTextIfExists(path14.join(configDir, "config.toml"));
   if (config === null) return false;
@@ -3953,16 +3967,14 @@ ${body}`
           }
           if (!isCanonicalMcpServerEnabled(name, server, ctx.enabledMcpServers)) {
             if (owned) {
-              if (isManagedOptionalStdioServer3(server, existing)) content = removeTomlSection(content, section);
+              if (isOwnedDevtoolsServer3(name, server, existing, ctx)) content = removeTomlSection(content, section);
               mcpOwnership.push({ server: name, owned: false });
             }
             continue;
           }
           if (server.optional && existing !== null) {
-            if (!owned || !isManagedOptionalStdioServer3(server, existing)) {
-              if (owned) mcpOwnership.push({ server: name, owned: false });
-              ctx.warnings.push(`Codex: MCP opcional '${name}' ya pertenece a la configuraci\xF3n del usuario; se conserva.`);
-              continue;
+            if (!owned || !isOwnedDevtoolsServer3(name, server, existing, ctx)) {
+              throw new Error(`Codex: ${name}: conflicto con servidor MCP existente ajeno o modificado; se conserva. Retira esa entrada expl\xEDcitamente antes de activar DevTools gestionado.`);
             }
           }
           if (server.transport === "stdio") {
@@ -4054,7 +4066,7 @@ args = [${(server.args ?? []).map(tomlString).join(", ")}]`);
               continue;
             }
             if (ctx.ownedMcpServers?.has(name) === true) {
-              if (isManagedOptionalStdioServer3(server, readTomlSection(content, section))) {
+              if (isOwnedDevtoolsServer3(name, server, readTomlSection(content, section), ctx)) {
                 content = removeTomlSection(content, section);
               }
               mcpOwnership.push({ server: name, owned: false });
@@ -7568,10 +7580,16 @@ function enabledMcpServers(runtime, explicitDevtoolsEnabled, useBrowserPreferenc
   const devtoolsEnabled = explicitDevtoolsEnabled ?? (useBrowserPreferences && loadDevtoolsMcpPreference(devtoolsMcpPreferenceFile(), runtime));
   return devtoolsEnabled ? /* @__PURE__ */ new Set([DEVTOOLS_MCP_SERVER]) : /* @__PURE__ */ new Set();
 }
-function ownedMcpServers(runtime, useBrowserPreferences = true) {
+function ownedMcpServers(runtime, configDir, useBrowserPreferences = true) {
   if (!useBrowserPreferences) return /* @__PURE__ */ new Set();
   const file = devtoolsMcpPreferenceFile();
-  return new Set([DEVTOOLS_MCP_SERVER, "context7"].filter((server) => loadDevtoolsMcpOwnership(file, runtime, server)));
+  const marked = [DEVTOOLS_MCP_SERVER, "context7"].filter((server) => loadDevtoolsMcpOwnership(file, runtime, server));
+  if (marked.length === 0) return /* @__PURE__ */ new Set();
+  const recordedDir = readManifest().runtimes[runtime]?.configDir;
+  if (typeof recordedDir !== "string" || !samePath(recordedDir, configDir)) {
+    throw new Error(`${runtime}: MCP ownership configDir no coincide con el perfil actual; se conserva la configuraci\xF3n. Vuelve al perfil anterior o revisa el estado gestionado antes de reintentar.`);
+  }
+  return new Set(marked);
 }
 function persistConfigurationOwnershipChanges(runtime, configDir, plan) {
   const latest = /* @__PURE__ */ new Map();
@@ -7600,7 +7618,7 @@ function makeContext(adapter, configDir, mode = DEFAULT_INSTALL_MODE_PREFERENCE,
   const models = loadModelMap()[adapter.id];
   if (!models) return null;
   const enabled = enabledMcpServers(adapter.id, void 0, useBrowserPreferences);
-  const owned = ownedMcpServers(adapter.id, useBrowserPreferences);
+  const owned = ownedMcpServers(adapter.id, configDir, useBrowserPreferences);
   let devtoolsMcpObservedVersion;
   let devtoolsMcpInvocation;
   if (useBrowserPreferences && (enabled.has(DEVTOOLS_MCP_SERVER) || owned.has(DEVTOOLS_MCP_SERVER))) {
@@ -7849,7 +7867,12 @@ async function runInstall(opts) {
     }
   }
   const anyDevtoolsEnabled = opts.runtimes.some((id) => enabledMcpServers(id, opts.devtoolsMcpSelection?.[id], useManifest).has(DEVTOOLS_MCP_SERVER));
-  const anyDevtoolsOwned = useManifest && opts.runtimes.some((id) => ownedMcpServers(id, true).has(DEVTOOLS_MCP_SERVER));
+  const anyDevtoolsOwned = useManifest && opts.runtimes.some((id) => {
+    const adapter = ADAPTERS[id];
+    if (adapter === void 0) return false;
+    const detection = adapter.detect();
+    return detection.installed && ownedMcpServers(id, detection.configDir, true).has(DEVTOOLS_MCP_SERVER);
+  });
   if (anyDevtoolsEnabled && devtoolsManagedInvocation === void 0) {
     const observed = isDevtoolsTargetDir ? devtoolsTargetDirObserved : devtoolsPersistedObserved;
     try {
@@ -7955,7 +7978,7 @@ async function runInstall(opts) {
       }
     }
     const enabledForRuntime = enabledMcpServers(id, opts.devtoolsMcpSelection?.[id], useManifest);
-    const ownedForRuntime = ownedMcpServers(id, useManifest);
+    const ownedForRuntime = ownedMcpServers(id, configDir, useManifest);
     let devtoolsObservedForRuntime;
     if (isDevtoolsTargetDir) {
       if (enabledForRuntime.has(DEVTOOLS_MCP_SERVER)) {
@@ -8114,7 +8137,15 @@ async function runInstall(opts) {
     const backup = useManifest ? createBackup([...updates.map((c) => c.action.target), ...orphans], `install-${id}`) : null;
     if (backup) p.log.info(`Backup: ${backup.id} (${backup.files.length} archivos)`);
     applyChanges(changes, useManifest ? (action) => persistConfigurationOwnershipChanges(id, configDir, [action]) : void 0);
-    const verifyCtx = { ...ctx, warnings: [] };
+    const verifiedOwnedMcpServers = new Set(ctx.ownedMcpServers ?? []);
+    for (const action of plan) {
+      if (action.kind !== "write") continue;
+      for (const change of action.mcpOwnership ?? []) {
+        if (change.owned) verifiedOwnedMcpServers.add(change.server);
+        else verifiedOwnedMcpServers.delete(change.server);
+      }
+    }
+    const verifyCtx = { ...ctx, warnings: [], ownedMcpServers: verifiedOwnedMcpServers };
     const dirty = diffPlan(buildPlan(adapter, verifyCtx)).filter((d) => d.status !== "unchanged");
     if (dirty.length > 0) {
       p.log.error(`${adapter.name}: verificaci\xF3n de idempotencia FALL\xD3 (${dirty.length} acciones inestables).`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jorgex-stack",
-  "version": "1.9.64",
+  "version": "1.9.65",
   "description": "Harness multi-agente portable: instala la config JorgeX (agentes, skills, hooks, Engram, MCPs) en Claude Code, Codex CLI, OpenCode y Pi",
   "type": "module",
   "license": "MIT",