feat(mcp): persist MCP enabled state to config file

packages/app/src/context/global-sync/event-reducer.ts

@@ -91,6 +91,13 @@ export function applyDirectoryEvent(input: {
       input.push(input.directory)
       return
     }
+    case "config.changed": {
+      const props = event.properties as { directory: string }
+      if (props.directory === input.directory) {
+        input.push(input.directory)
+      }
+      return
+    }
     case "session.created": {
       const info = (event.properties as { info: Session }).info
       const result = Binary.search(input.store.session, info.id, (s) => s.id)

packages/kilo-vscode/src/KiloProvider.ts

@@ -1,42 +1,42 @@
-import * as path from "path"
-import * as vscode from "vscode"
-import { z } from "zod"
-import { buildPreviewPath, getPreviewCommand, getPreviewDir, parseImage, trimEntries } from "./image-preview"
-import { isAbsolutePath } from "./path-utils"
 import type {
+  Config,
+  Event,
+  FilePartInput,
   KiloClient,
   Session,
   SessionStatus,
-  Event,
   TextPartInput,
-  FilePartInput,
-  Config,
 } from "@kilocode/sdk/v2/client"
-import { type KiloConnectionService, type KilocodeNotification, ServerStartupError } from "./services/cli-backend"
-import type { EditorContext, CloudSessionData } from "./services/cli-backend/types"
-import { FileIgnoreController } from "./services/autocomplete/shims/FileIgnoreController"
-import { handleChatCompletionRequest } from "./services/autocomplete/chat-autocomplete/handleChatCompletionRequest"
+import * as path from "path"
+import * as vscode from "vscode"
+import { z } from "zod"
+import { buildPreviewPath, getPreviewCommand, getPreviewDir, parseImage, trimEntries } from "./image-preview"
+import { isAbsolutePath } from "./path-utils"
 import { handleChatCompletionAccepted } from "./services/autocomplete/chat-autocomplete/handleChatCompletionAccepted"
-import { buildWebviewHtml } from "./utils"
+import { handleChatCompletionRequest } from "./services/autocomplete/chat-autocomplete/handleChatCompletionRequest"
+import { FileIgnoreController } from "./services/autocomplete/shims/FileIgnoreController"
+import { ServerStartupError, type KiloConnectionService } from "./services/cli-backend"
+import type { CloudSessionData, EditorContext } from "./services/cli-backend/types"
 import { TelemetryProxy, type TelemetryPropertiesProvider } from "./services/telemetry"
+import { buildWebviewHtml } from "./utils"
 // legacy-migration start
 import * as MigrationService from "./legacy-migration/migration-service"
 // legacy-migration end
 import {
-  sessionToWebview,
-  indexProvidersById,
-  filterVisibleAgents,
   buildSettingPath,
-  mapSSEEventToWebviewMessage,
+  filterVisibleAgents,
+  flushPendingSessionRefresh as flushPendingSessionRefreshUtil,
   getErrorMessage,
+  indexProvidersById,
   isEventFromForeignProject,
-  mapCloudSessionMessageToWebviewMessage,
   loadSessions as loadSessionsUtil,
-  flushPendingSessionRefresh as flushPendingSessionRefreshUtil,
+  mapCloudSessionMessageToWebviewMessage,
+  mapSSEEventToWebviewMessage,
+  sessionToWebview,
   type SessionRefreshContext,
 } from "./kilo-provider-utils"
-import { MarketplaceService } from "./services/marketplace"
 import { resolveProjectDirectory } from "./project-directory"
+import { MarketplaceService } from "./services/marketplace"
 
 type KiloProviderOptions = {
   projectDirectory?: string | null
@@ -1122,7 +1122,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
    * keyed by their real `provider.id` (e.g. "anthropic", "openai"). We re-key
    * the map here so the rest of the code can use provider.id everywhere.
    */
-  private async fetchAndSendProviders(): Promise<void> {
+  private async fetchAndSendProviders(directory?: string): Promise<void> {
     if (!this.client) {
       // client not ready — serve from cache if available
       if (this.cachedProvidersMessage) {
@@ -1132,7 +1132,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
+      const workspaceDir = directory ?? this.getWorkspaceDirectory()
       const { data: response } = await this.client.provider.list({ directory: workspaceDir }, { throwOnError: true })
 
       const normalized = indexProvidersById(response.all)
@@ -1158,7 +1158,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   /**
    * Fetch agents (modes) from the backend and send to webview.
    */
-  private async fetchAndSendAgents(): Promise<void> {
+  private async fetchAndSendAgents(directory?: string): Promise<void> {
     if (!this.client) {
       if (this.cachedAgentsMessage) {
         this.postMessage(this.cachedAgentsMessage)
@@ -1167,7 +1167,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
+      const workspaceDir = directory ?? this.getWorkspaceDirectory()
       const { data: agents } = await this.client.app.agents({ directory: workspaceDir }, { throwOnError: true })
 
       const { visible, defaultAgent } = filterVisibleAgents(agents)
@@ -1190,7 +1190,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
   }
 
-  private async fetchAndSendSkills(): Promise<void> {
+  private async fetchAndSendSkills(directory?: string): Promise<void> {
     if (!this.client) {
       if (this.cachedSkillsMessage) {
         this.postMessage(this.cachedSkillsMessage)
@@ -1199,7 +1199,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
+      const workspaceDir = directory ?? this.getWorkspaceDirectory()
       const { data: skills } = await this.client.app.skills({ directory: workspaceDir }, { throwOnError: true })
 
       const message = {
@@ -1313,7 +1313,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
   /**
    * Fetch backend config and send to webview.
    */
-  private async fetchAndSendConfig(): Promise<void> {
+  private async fetchAndSendConfig(directory?: string): Promise<void> {
     if (!this.client || this.connectionState !== "connected") {
       if (this.cachedConfigMessage) {
         this.postMessage(this.cachedConfigMessage)
@@ -1322,7 +1322,7 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
     }
 
     try {
-      const workspaceDir = this.getWorkspaceDirectory()
+      const workspaceDir = directory ?? this.getWorkspaceDirectory()
       const { data: config } = await this.client.config.get({ directory: workspaceDir }, { throwOnError: true })
 
       const message = {
@@ -2222,13 +2222,14 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
    * After instance.dispose() clears the server cache, the next request to each
    * endpoint will re-initialize with the current auth state.
    * This mirrors the TUI's sync.bootstrap() pattern.
+   * @param directory - Optional directory to use instead of workspace root (for worktree-specific refreshes)
    */
-  private async reloadAfterAuthChange(): Promise<void> {
+  private async reloadAfterAuthChange(directory?: string): Promise<void> {
     await Promise.all([
-      this.fetchAndSendProviders(),
-      this.fetchAndSendAgents(),
-      this.fetchAndSendSkills(),
-      this.fetchAndSendConfig(),
+      this.fetchAndSendProviders(directory),
+      this.fetchAndSendAgents(directory),
+      this.fetchAndSendSkills(directory),
+      this.fetchAndSendConfig(directory),
       this.fetchAndSendNotifications(),
     ])
   }
@@ -2262,6 +2263,19 @@ export class KiloProvider implements vscode.WebviewViewProvider, TelemetryProper
       return
     }
 
+    // Refresh config and dependent data when the server signals a config change
+    // Only refresh if the change affects the current session's directory, not background worktrees
+    // This prevents a config change in one worktree from overwriting the active panel's state
+    if (event.type === "config.changed") {
+      const currentSessionDir = this.currentSession
+        ? (this.sessionDirectories.get(this.currentSession.id) ?? this.getWorkspaceDirectory())
+        : this.getWorkspaceDirectory()
+      if (event.properties.directory === currentSessionDir) {
+        void this.reloadAfterAuthChange(event.properties.directory)
+        return
+      }
+    }
+
     // Forward relevant events to webview
     // Side effects that must happen before the webview message is sent
     if (event.type === "session.created" && !this.currentSession) {