move context files to context folders (RooCodeInc#2798)

celestial-vault · web-flow · commit 3a6f0c2fd07c · 2025-04-10T17:50:04.000-07:00
diff --git a/src/core/context/context-management/ContextManager-new.ts b/src/core/context/context-management/ContextManager-new.ts
@@ -1,13 +1,13 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ClineApiReqInfo, ClineMessage } from "../../shared/ExtensionMessage"
-import { ApiHandler } from "../../api"
 import { getContextWindowInfo } from "./context-window-utils"
-import { formatResponse } from "../prompts/responses"
-import { GlobalFileNames } from "../storage/disk"
-import { fileExistsAtPath } from "../../utils/fs"
+import { formatResponse } from "../../prompts/responses"
+import { GlobalFileNames } from "../../storage/disk"
+import { fileExistsAtPath } from "../../../utils/fs"
 import * as path from "path"
 import fs from "fs/promises"
 import cloneDeep from "clone-deep"
+import { ClineApiReqInfo, ClineMessage } from "../../../shared/ExtensionMessage"
+import { ApiHandler } from "../../../api"
+import { Anthropic } from "@anthropic-ai/sdk"
 
 enum EditType {
 	UNDEFINED = 0,
diff --git a/src/core/context/context-management/ContextManager.ts b/src/core/context/context-management/ContextManager.ts
@@ -1,7 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ClineApiReqInfo, ClineMessage } from "../../shared/ExtensionMessage"
-import { ApiHandler } from "../../api"
-import { OpenAiHandler } from "../../api/providers/openai"
+import { ClineApiReqInfo, ClineMessage } from "../../../shared/ExtensionMessage"
+import { ApiHandler } from "../../../api"
 import { getContextWindowInfo } from "./context-window-utils"
 
 export class ContextManager {
diff --git a/src/core/context/context-management/__tests__/ContextManager.test.ts b/src/core/context/context-management/__tests__/ContextManager.test.ts
diff --git a/src/core/context/context-management/context-error-handling.ts b/src/core/context/context-management/context-error-handling.ts
diff --git a/src/core/context/context-management/context-window-utils.ts b/src/core/context/context-management/context-window-utils.ts
@@ -1,5 +1,5 @@
-import { ApiHandler } from "../../api"
-import { OpenAiHandler } from "../../api/providers/openai"
+import { ApiHandler } from "../../../api"
+import { OpenAiHandler } from "../../../api/providers/openai"
 
 /**
  * Gets context window information for the given API handler
diff --git a/src/core/context/context-tracking/ContextTrackerTypes.ts b/src/core/context/context-tracking/ContextTrackerTypes.ts
diff --git a/src/core/context/context-tracking/FileContextTracker.test.ts b/src/core/context/context-tracking/FileContextTracker.test.ts
@@ -4,7 +4,7 @@ import * as sinon from "sinon"
 import * as vscode from "vscode"
 import * as path from "path"
 import { FileContextTracker } from "./FileContextTracker"
-import * as diskModule from "../storage/disk"
+import * as diskModule from "../../storage/disk"
 import type { TaskMetadata, ControllerLike, FileMetadataEntry } from "./ContextTrackerTypes"
 
 describe("FileContextTracker", () => {
diff --git a/src/core/context/context-tracking/FileContextTracker.ts b/src/core/context/context-tracking/FileContextTracker.ts
@@ -1,6 +1,6 @@
 import * as path from "path"
 import * as vscode from "vscode"
-import { getTaskMetadata, saveTaskMetadata } from "../storage/disk"
+import { getTaskMetadata, saveTaskMetadata } from "../../storage/disk"
 import type { FileMetadataEntry, ControllerLike } from "./ContextTrackerTypes"
 
 // This class is responsible for tracking file operations that may result in stale context.
diff --git a/src/core/context/context-tracking/ModelContextTracker.test.ts b/src/core/context/context-tracking/ModelContextTracker.test.ts
@@ -3,7 +3,7 @@ import { expect } from "chai"
 import * as sinon from "sinon"
 import * as vscode from "vscode"
 import { ModelContextTracker } from "./ModelContextTracker"
-import * as diskModule from "../storage/disk"
+import * as diskModule from "../../storage/disk"
 import type { TaskMetadata, ControllerLike } from "./ContextTrackerTypes"
 
 describe("ModelContextTracker", () => {
diff --git a/src/core/context/context-tracking/ModelContextTracker.ts b/src/core/context/context-tracking/ModelContextTracker.ts
@@ -1,5 +1,5 @@
 import * as vscode from "vscode"
-import { getTaskMetadata, saveTaskMetadata } from "../storage/disk"
+import { getTaskMetadata, saveTaskMetadata } from "../../storage/disk"
 import type { ControllerLike } from "./ContextTrackerTypes"
 
 export class ModelContextTracker {
diff --git a/src/core/mentions/index.ts b/src/core/mentions/index.ts
@@ -10,7 +10,7 @@ import { diagnosticsToProblemsString } from "../../integrations/diagnostics"
 import { getLatestTerminalOutput } from "../../integrations/terminal/get-latest-output"
 import { getCommitInfo } from "../../utils/git"
 import { getWorkingState } from "../../utils/git"
-import { FileContextTracker } from "../context-tracking/FileContextTracker"
+import { FileContextTracker } from "../context/context-tracking/FileContextTracker"
 
 export function openMention(mention?: string): void {
 	if (!mention) {
diff --git a/src/core/storage/disk.ts b/src/core/storage/disk.ts
@@ -4,8 +4,7 @@ import fs from "fs/promises"
 import { Anthropic } from "@anthropic-ai/sdk"
 import { fileExistsAtPath } from "../../utils/fs"
 import { ClineMessage } from "../../shared/ExtensionMessage"
-import type { TaskMetadata } from "../context-tracking/ContextTrackerTypes"
-
+import { TaskMetadata } from "../context/context-tracking/ContextTrackerTypes"
 export const GlobalFileNames = {
 	apiConversationHistory: "api_conversation_history.json",
 	contextHistory: "context_history.json",
diff --git a/src/core/task/index.ts b/src/core/task/index.ts
@@ -13,7 +13,7 @@ import { ApiHandler, buildApiHandler } from "../../api"
 import { AnthropicHandler } from "../../api/providers/anthropic"
 import { ClineHandler } from "../../api/providers/cline"
 import { OpenRouterHandler } from "../../api/providers/openrouter"
-import { getContextWindowInfo } from "../context-management/context-window-utils"
+import { getContextWindowInfo } from "../context/context-management/context-window-utils"
 import { ApiStream } from "../../api/transform/stream"
 import CheckpointTracker from "../../integrations/checkpoints/CheckpointTracker"
 import { DIFF_VIEW_URI_SCHEME, DiffViewProvider } from "../../integrations/editor/DiffViewProvider"
@@ -60,18 +60,18 @@ import { arePathsEqual, getReadablePath } from "../../utils/path"
 import { fixModelHtmlEscaping, removeInvalidChars } from "../../utils/string"
 import { AssistantMessageContent, parseAssistantMessage, ToolParamName, ToolUseName } from ".././assistant-message"
 import { constructNewFileContent } from ".././assistant-message/diff"
-import { ContextManager } from ".././context-management/ContextManager"
+import { ContextManager } from "../context/context-management/ContextManager"
 import { ClineIgnoreController } from ".././ignore/ClineIgnoreController"
 import { parseMentions } from ".././mentions"
 import { formatResponse } from ".././prompts/responses"
 import { addUserInstructions, SYSTEM_PROMPT } from ".././prompts/system"
-import { FileContextTracker } from "../context-tracking/FileContextTracker"
-import { ModelContextTracker } from "../context-tracking/ModelContextTracker"
+import { FileContextTracker } from "../context/context-tracking/FileContextTracker"
+import { ModelContextTracker } from "../context/context-tracking/ModelContextTracker"
 
 import {
 	checkIsAnthropicContextWindowError,
 	checkIsOpenRouterContextWindowError,
-} from "../context-management/context-error-handling"
+} from "../context/context-management/context-error-handling"
 import { Controller } from "../controller"
 import {
 	ensureTaskDirectoryExists,
