Merge remote-tracking branch 'upstream/main' into fix/robust-image-url-parsing

Author: dcs-soni

core/config/markdown/loadMarkdownRules.ts

@@ -3,12 +3,13 @@ import {
   markdownToRule,
 } from "@continuedev/config-yaml";
 import { IDE, RuleWithSource } from "../..";
+import { PROMPTS_DIR_NAME, RULES_DIR_NAME } from "../../promptFiles";
 import { joinPathsToUri } from "../../util/uri";
 import { getAllDotContinueDefinitionFiles } from "../loadLocalAssistants";
 
 export const SUPPORTED_AGENT_FILES = ["AGENTS.md", "AGENT.md", "CLAUDE.md"];
 /**
- * Loads rules from markdown files in the .continue/rules directory
+ * Loads rules from markdown files in the .continue/rules and .continue/prompts directories
  * and agent files (AGENTS.md, AGENT.md, CLAUDE.md) at workspace root
  */
 export async function loadMarkdownRules(ide: IDE): Promise<{
@@ -53,37 +54,45 @@ export async function loadMarkdownRules(ide: IDE): Promise<{
     }
   }
 
-  try {
-    // Get all .md files from .continue/rules
-    const markdownFiles = await getAllDotContinueDefinitionFiles(
-      ide,
-      { includeGlobal: true, includeWorkspace: true, fileExtType: "markdown" },
-      "rules",
-    );
+  // Load markdown files from both .continue/rules and .continue/prompts
+  const dirsToCheck = [RULES_DIR_NAME, PROMPTS_DIR_NAME];
 
-    // Filter to just .md files
-    const mdFiles = markdownFiles.filter((file) => file.path.endsWith(".md"));
+  for (const dirName of dirsToCheck) {
+    try {
+      const markdownFiles = await getAllDotContinueDefinitionFiles(
+        ide,
+        {
+          includeGlobal: true,
+          includeWorkspace: true,
+          fileExtType: "markdown",
+        },
+        dirName,
+      );
 
-    // Process each markdown file
-    for (const file of mdFiles) {
-      try {
-        const rule = markdownToRule(file.content, {
-          uriType: "file",
-          fileUri: file.path,
-        });
-        rules.push({ ...rule, source: "rules-block", sourceFile: file.path });
-      } catch (e) {
-        errors.push({
-          fatal: false,
-          message: `Failed to parse markdown rule file ${file.path}: ${e instanceof Error ? e.message : e}`,
-        });
+      // Filter to just .md files
+      const mdFiles = markdownFiles.filter((file) => file.path.endsWith(".md"));
+
+      // Process each markdown file
+      for (const file of mdFiles) {
+        try {
+          const rule = markdownToRule(file.content, {
+            uriType: "file",
+            fileUri: file.path,
+          });
+          rules.push({ ...rule, source: "rules-block", sourceFile: file.path });
+        } catch (e) {
+          errors.push({
+            fatal: false,
+            message: `Failed to parse markdown rule file ${file.path}: ${e instanceof Error ? e.message : e}`,
+          });
+        }
       }
+    } catch (e) {
+      errors.push({
+        fatal: false,
+        message: `Error loading markdown rule files from ${dirName}: ${e instanceof Error ? e.message : e}`,
+      });
     }
-  } catch (e) {
-    errors.push({
-      fatal: false,
-      message: `Error loading markdown rule files: ${e instanceof Error ? e.message : e}`,
-    });
   }
 
   return { rules, errors };

core/context/mcp/MCPConnection.ts

@@ -1,12 +1,14 @@
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { fileURLToPath } from "url";
+
 import {
   SSEClientTransport,
   SseError,
 } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { WebSocketClientTransport } from "@modelcontextprotocol/sdk/client/websocket.js";
-import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import { Agent as HttpsAgent } from "https";
 import {
   IDE,
@@ -22,6 +24,7 @@ import {
   MCPServerStatus,
   MCPTool,
 } from "../..";
+import { resolveRelativePathInDir } from "../../util/ideUtils";
 import { getEnvPathFromUserShell } from "../../util/shellPath";
 import { getOauthToken } from "./MCPOauth";
 
@@ -38,6 +41,8 @@ const WINDOWS_BATCH_COMMANDS = [
   "bunx",
 ];
 
+const COMMONS_ENV_VARS = ["HOME", "USER", "USERPROFILE", "LOGNAME", "USERNAME"];
+
 function is401Error(error: unknown) {
   return (
     (error instanceof SseError && error.code === 401) ||
@@ -411,6 +416,44 @@ class MCPConnection {
     };
   }
 
+  /**
+   * Resolves the current working directory of the current workspace.
+   * @param cwd The cwd parameter provided by user.
+   * @returns Current working directory (user-provided cwd or workspace root).
+   */
+  private async resolveCwd(cwd?: string) {
+    if (!cwd) {
+      return this.resolveWorkspaceCwd(undefined);
+    }
+
+    if (cwd.startsWith("file://")) {
+      return fileURLToPath(cwd);
+    }
+
+    // Return cwd if cwd is an absolute path.
+    if (cwd.charAt(0) === "/") {
+      return cwd;
+    }
+
+    return this.resolveWorkspaceCwd(cwd);
+  }
+
+  private async resolveWorkspaceCwd(cwd: string | undefined) {
+    const IDE = this.extras?.ide;
+    if (IDE) {
+      const target = cwd ?? ".";
+      const resolved = await resolveRelativePathInDir(target, IDE);
+      if (resolved) {
+        if (resolved.startsWith("file://")) {
+          return fileURLToPath(resolved);
+        }
+        return resolved;
+      }
+      return resolved;
+    }
+    return cwd;
+  }
+
   private constructWebsocketTransport(
     options: InternalWebsocketMcpOptions,
   ): WebSocketClientTransport {
@@ -464,7 +507,16 @@ class MCPConnection {
   private async constructStdioTransport(
     options: InternalStdioMcpOptions,
   ): Promise<StdioClientTransport> {
-    const env: Record<string, string> = options.env ? { ...options.env } : {};
+    const commonEnvVars: Record<string, string> = Object.fromEntries(
+      COMMONS_ENV_VARS.filter((key) => process.env[key] !== undefined).map(
+        (key) => [key, process.env[key] as string],
+      ),
+    );
+
+    const env = {
+      ...commonEnvVars,
+      ...(options.env ?? {}),
+    };
 
     if (process.env.PATH !== undefined) {
       // Set the initial PATH from process.env
@@ -488,11 +540,13 @@ class MCPConnection {
       options.args || [],
     );
 
+    const cwd = await this.resolveCwd(options.cwd);
+
     const transport = new StdioClientTransport({
       command,
       args,
       env,
-      cwd: options.cwd,
+      cwd,
       stderr: "pipe",
     });
 

core/context/mcp/MCPConnection.vitest.ts

@@ -5,6 +5,7 @@ import {
   InternalStdioMcpOptions,
   InternalWebsocketMcpOptions,
 } from "../..";
+import * as ideUtils from "../../util/ideUtils";
 import MCPConnection from "./MCPConnection";
 
 // Mock the shell path utility
@@ -145,6 +146,37 @@ describe("MCPConnection", () => {
     });
   });
 
+  describe("resolveCwd", () => {
+    const baseOptions = {
+      name: "test-mcp",
+      id: "test-id",
+      type: "stdio" as const,
+      command: "test-cmd",
+      args: [],
+    };
+
+    it("should return absolute cwd unchanged", async () => {
+      const conn = new MCPConnection(baseOptions);
+
+      await expect((conn as any).resolveCwd("/tmp/project")).resolves.toBe(
+        "/tmp/project",
+      );
+    });
+
+    it("should resolve relative cwd using IDE workspace", async () => {
+      const ide = {} as any;
+      const mockResolve = vi
+        .spyOn(ideUtils, "resolveRelativePathInDir")
+        .mockResolvedValue("file:///workspace/src");
+      const conn = new MCPConnection(baseOptions, { ide });
+
+      await expect((conn as any).resolveCwd("src")).resolves.toBe(
+        "/workspace/src",
+      );
+      expect(mockResolve).toHaveBeenCalledWith("src", ide);
+    });
+  });
+
   describe("connectClient", () => {
     const options: InternalStdioMcpOptions = {
       name: "test-mcp",

core/index.d.ts

@@ -1875,6 +1875,16 @@ export interface CompiledMessagesResult {
   contextPercentage: number;
 }
 
+export interface AddToChatPayload {
+  data: AddToChatPayloadItem[];
+}
+
+interface AddToChatPayloadItem {
+  type: "file" | "folder";
+  fullPath: string;
+  name: string;
+}
+
 export interface MessageOption {
   precompiled: boolean;
 }

core/promptFiles/getPromptFiles.ts

@@ -1,11 +1,15 @@
-import { DEFAULT_PROMPTS_FOLDER_V1 } from ".";
+import path from "path";
+import {
+  DEFAULT_PROMPTS_FOLDER_V1,
+  DEFAULT_PROMPTS_FOLDER_V2,
+  DEFAULT_RULES_FOLDER,
+  RULES_DIR_NAME,
+} from ".";
 import { IDE } from "..";
 import { walkDir } from "../indexing/walkDir";
-import { readAllGlobalPromptFiles } from "../util/paths";
+import { getContinueGlobalPath, readAllGlobalPromptFiles } from "../util/paths";
 import { joinPathsToUri } from "../util/uri";
 
-export const DEFAULT_PROMPTS_FOLDER_V2 = ".continue/prompts";
-
 export async function getPromptFilesFromDir(
   ide: IDE,
   dir: string,
@@ -40,7 +44,7 @@ export async function getAllPromptFiles(
   const workspaceDirs = await ide.getWorkspaceDirs();
   let promptFiles: { path: string; content: string }[] = [];
 
-  let dirsToCheck = [DEFAULT_PROMPTS_FOLDER_V2];
+  let dirsToCheck = [DEFAULT_PROMPTS_FOLDER_V2, DEFAULT_RULES_FOLDER];
   if (checkV1DefaultFolder) {
     dirsToCheck.push(DEFAULT_PROMPTS_FOLDER_V1);
   }
@@ -56,9 +60,14 @@ export async function getAllPromptFiles(
     await Promise.all(fullDirs.map((dir) => getPromptFilesFromDir(ide, dir)))
   ).flat();
 
-  // Also read from ~/.continue/prompts
+  // Also read from ~/.continue/prompts and ~/.continue/rules
   promptFiles.push(...readAllGlobalPromptFiles());
 
+  const promptFilesFromRulesDirectory = readAllGlobalPromptFiles(
+    path.join(getContinueGlobalPath(), RULES_DIR_NAME),
+  );
+  promptFiles.push(...promptFilesFromRulesDirectory);
+
   return await Promise.all(
     promptFiles.map(async (file) => {
       const content = await ide.readFile(file.path);

core/promptFiles/index.ts

@@ -2,6 +2,11 @@ import { ContextProviderName } from "..";
 
 export const DEFAULT_PROMPTS_FOLDER_V1 = ".prompts";
 export const DEFAULT_PROMPTS_FOLDER_V2 = ".continue/prompts";
+export const DEFAULT_RULES_FOLDER = ".continue/rules";
+
+// Subdirectory names (without .continue/ prefix)
+export const RULES_DIR_NAME = "rules";
+export const PROMPTS_DIR_NAME = "prompts";
 
 export const SUPPORTED_PROMPT_CONTEXT_PROVIDERS: ContextProviderName[] = [
   "file",

core/protocol/ideWebview.ts

@@ -3,6 +3,7 @@ import { ToWebviewFromIdeOrCoreProtocol } from "./webview";
 
 import {
   AcceptOrRejectDiffPayload,
+  AddToChatPayload,
   ApplyState,
   ApplyToFilePayload,
   HighlightedCodePayload,
@@ -78,4 +79,5 @@ export type ToWebviewFromIdeProtocol = ToWebviewFromIdeOrCoreProtocol & {
   exitEditMode: [undefined, void];
   focusEdit: [undefined, void];
   generateRule: [undefined, void];
+  addToChat: [AddToChatPayload, void];
 };

docs/docs.json

@@ -262,9 +262,11 @@
               "guides/posthog-github-continuous-ai",
               "guides/continue-docs-mcp-cookbook",
               "guides/sanity-mcp-continue-cookbook",
+              "guides/sentry-mcp-error-monitoring",
               "guides/snyk-mcp-continue-cookbook",
               "guides/dlt-mcp-continue-cookbook",
-              "guides/netlify-mcp-continuous-deployment"
+              "guides/netlify-mcp-continuous-deployment",
+              "guides/chrome-devtools-mcp-performance"
             ]
           }
         ]