@kenkaiiii/ggcoder 5.41.1 → 5.42.0

package/dist/app-sidecar.js

@@ -47,7 +47,7 @@ import { loginGemini } from "./core/oauth/gemini.js";
 import { loginKimi } from "./core/oauth/kimi.js";
 import { loginXai } from "./core/oauth/xai.js";
 import { AUTH_PROVIDERS, authPriorityNote, describeAuthMethods, } from "./core/auth-providers.js";
-import { ensureAppDirs, loadSavedSettings } from "./config.js";
+import { ensureAppDirs, loadSavedSettings, projectScopeAllowed } from "./config.js";
 import { SettingsManager } from "./core/settings-manager.js";
 import { installPlugin, listInstalledPlugins, removePlugin, } from "./core/extensions/plugin-bundles.js";
 import { getModel, getDefaultThinkingLevel, getContextWindow, getAllModels, clearRuntimeModels, registerRuntimeModels, } from "./core/model-registry.js";
@@ -396,9 +396,10 @@ async function buildMcpRows(cwd, settingsFile) {
     const scoped = await loadServers(cwd);
     if (scoped.length === 0)
         return [];
-    const trustProject = loadSavedSettings(settingsFile).trustProjectMcpServers;
-    const connectable = scoped.filter((s) => trustProject || s.scope !== "project");
-    const blocked = scoped.filter((s) => !trustProject && s.scope === "project");
+    const settings = loadSavedSettings(settingsFile);
+    const allowProject = projectScopeAllowed(settings.trustProjectMcpServers, settings.trustedProjects, cwd);
+    const connectable = scoped.filter((s) => allowProject || s.scope !== "project");
+    const blocked = scoped.filter((s) => !allowProject && s.scope === "project");
     const manager = new MCPClientManager();
     try {
         const results = connectable.length > 0
@@ -424,7 +425,8 @@ async function buildMcpRows(cwd, settingsFile) {
                 ok: false,
                 toolCount: 0,
                 error: "Project-scope server not connected — this repo's .gg/mcp.json runs " +
-                    "repo-controlled commands. Enable trustProjectMcpServers only if you trust it.",
+                    "repo-controlled commands. Add or re-add a server in this project via " +
+                    "the MCP modal to trust it.",
                 kind: (s.config.url ? "http" : "stdio"),
                 summary: mcpRowSummary(s.config),
             })),
@@ -4517,6 +4519,12 @@ async function createSession(deps, opts) {
                         json(res, 400, { error: saved.error });
                         return;
                     }
+                    // Adding a project-scope server is an explicit trust signal — the
+                    // user chose to put a server in this repo's .gg/mcp.json. Auto-trust
+                    // the project so all project-scope servers connect on next load.
+                    if (scope === "project") {
+                        await session.trustProject(targetCwd);
+                    }
                     json(res, 200, {
                         ok: true,
                         name: config.name,