diff --git a/src/api/providers/bedrock.ts b/src/api/providers/bedrock.ts index b388748440f..fe3b5c09e01 100644 --- a/src/api/providers/bedrock.ts +++ b/src/api/providers/bedrock.ts @@ -4,6 +4,8 @@ import { ConverseCommand, BedrockRuntimeClientConfig, ContentBlock, + Message, + SystemContentBlock, } from "@aws-sdk/client-bedrock-runtime" import { fromIni } from "@aws-sdk/credential-providers" import { Anthropic } from "@anthropic-ai/sdk" @@ -19,7 +21,6 @@ import { ProviderSettings } from "../../schemas" import { ApiStream } from "../transform/stream" import { BaseProvider } from "./base-provider" import { logger } from "../../utils/logging" -import { Message, SystemContentBlock } from "@aws-sdk/client-bedrock-runtime" // New cache-related imports import { MultiPointStrategy } from "../transform/cache-strategy/multi-point-strategy" import { ModelInfo as CacheModelInfo } from "../transform/cache-strategy/types" diff --git a/src/api/transform/cache-strategy/__tests__/cache-strategy.test.ts b/src/api/transform/cache-strategy/__tests__/cache-strategy.test.ts index 6a490aac2c1..0682db9216f 100644 --- a/src/api/transform/cache-strategy/__tests__/cache-strategy.test.ts +++ b/src/api/transform/cache-strategy/__tests__/cache-strategy.test.ts @@ -1,6 +1,5 @@ -import { ContentBlock, SystemContentBlock } from "@aws-sdk/client-bedrock-runtime" +import { ContentBlock, SystemContentBlock, BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime" import { Anthropic } from "@anthropic-ai/sdk" -import { BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime" import { MultiPointStrategy } from "../multi-point-strategy" import { CacheStrategyConfig, ModelInfo, CachePointPlacement } from "../types" diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts index 92eba6bdc7c..0fce1765a9c 100644 --- a/src/core/prompts/system.ts +++ b/src/core/prompts/system.ts @@ -8,7 +8,7 @@ import { getModeBySlug, getGroupName, } from "../../shared/modes" -import { PromptVariables } from "./sections/custom-system-prompt" +import { PromptVariables, loadSystemPromptFile } from "./sections/custom-system-prompt" import { DiffStrategy } from "../../shared/tools" import { McpHub } from "../../services/mcp/McpHub" import { getToolDescriptionsForMode } from "./tools" @@ -26,7 +26,6 @@ import { addCustomInstructions, markdownFormattingSection, } from "./sections" -import { loadSystemPromptFile } from "./sections/custom-system-prompt" import { formatLanguage } from "../../shared/language" async function generatePrompt( diff --git a/src/core/tools/applyDiffTool.ts b/src/core/tools/applyDiffTool.ts index 9fbe1e1de1a..19d17c81c4f 100644 --- a/src/core/tools/applyDiffTool.ts +++ b/src/core/tools/applyDiffTool.ts @@ -4,9 +4,8 @@ import fs from "fs/promises" import { ClineSayTool } from "../../shared/ExtensionMessage" import { getReadablePath } from "../../utils/path" import { Task } from "../task/Task" -import { ToolUse, RemoveClosingTag } from "../../shared/tools" +import { ToolUse, RemoveClosingTag, AskApproval, HandleError, PushToolResult } from "../../shared/tools" import { formatResponse } from "../prompts/responses" -import { AskApproval, HandleError, PushToolResult } from "../../shared/tools" import { fileExistsAtPath } from "../../utils/fs" import { addLineNumbers } from "../../integrations/misc/extract-text" import { RecordSource } from "../context-tracking/FileContextTrackerTypes" diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 9c8b90ea8a9..4313ae1df71 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -4,7 +4,7 @@ import pWaitFor from "p-wait-for" import * as vscode from "vscode" import { ClineProvider } from "./ClineProvider" -import { Language, ProviderSettings } from "../../schemas" +import { Language, ProviderSettings, GlobalState } from "../../schemas" import { changeLanguage, t } from "../../i18n" import { RouterName, toRouterName } from "../../shared/api" import { supportPrompt } from "../../shared/support-prompt" @@ -33,7 +33,6 @@ import { telemetryService } from "../../services/telemetry/TelemetryService" import { TelemetrySetting } from "../../shared/TelemetrySetting" import { getWorkspacePath } from "../../utils/path" import { Mode, defaultModeSlug } from "../../shared/modes" -import { GlobalState } from "../../schemas" import { getModels, flushModels } from "../../api/providers/fetchers/modelCache" import { generateSystemPrompt } from "./generateSystemPrompt" diff --git a/src/exports/api.ts b/src/exports/api.ts index 6e050ee227d..05080cb89f0 100644 --- a/src/exports/api.ts +++ b/src/exports/api.ts @@ -13,8 +13,11 @@ import { ProviderSettings, ProviderSettingsEntry, isSecretStateKey, + IpcOrigin, + IpcMessageType, + TaskCommandName, + TaskEvent, } from "../schemas" -import { IpcOrigin, IpcMessageType, TaskCommandName, TaskEvent } from "../schemas" import { RooCodeAPI } from "./interface" import { IpcServer } from "./ipc" diff --git a/src/integrations/misc/line-counter.ts b/src/integrations/misc/line-counter.ts index 9a3d7654665..c59736f1bee 100644 --- a/src/integrations/misc/line-counter.ts +++ b/src/integrations/misc/line-counter.ts @@ -1,5 +1,4 @@ -import fs from "fs" -import { createReadStream } from "fs" +import fs, { createReadStream } from "fs" import { createInterface } from "readline" /** diff --git a/src/integrations/terminal/__tests__/TerminalProcessExec.pwsh.test.ts b/src/integrations/terminal/__tests__/TerminalProcessExec.pwsh.test.ts index 0c84646cc0c..9f3ee804ab8 100644 --- a/src/integrations/terminal/__tests__/TerminalProcessExec.pwsh.test.ts +++ b/src/integrations/terminal/__tests__/TerminalProcessExec.pwsh.test.ts @@ -7,8 +7,7 @@ import { TerminalProcess } from "../TerminalProcess" import { Terminal } from "../Terminal" import { TerminalRegistry } from "../TerminalRegistry" import { createPowerShellStream } from "./streamUtils/pwshStream" -import { createPowerShellMockStream } from "./streamUtils" -import { isPowerShellCoreAvailable } from "./streamUtils" +import { createPowerShellMockStream, isPowerShellCoreAvailable } from "./streamUtils" // Skip this test if PowerShell Core is not available const hasPwsh = isPowerShellCoreAvailable() diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts index 6c3b7e2a662..9b792fe509c 100644 --- a/src/integrations/workspace/WorkspaceTracker.ts +++ b/src/integrations/workspace/WorkspaceTracker.ts @@ -3,8 +3,7 @@ import * as path from "path" import { listFiles } from "../../services/glob/list-files" import { ClineProvider } from "../../core/webview/ClineProvider" -import { toRelativePath } from "../../utils/path" -import { getWorkspacePath } from "../../utils/path" +import { toRelativePath, getWorkspacePath } from "../../utils/path" const MAX_INITIAL_FILES = 1_000 diff --git a/src/services/mcp/__tests__/McpHub.test.ts b/src/services/mcp/__tests__/McpHub.test.ts index ffd98ff6bda..182802e7dfa 100644 --- a/src/services/mcp/__tests__/McpHub.test.ts +++ b/src/services/mcp/__tests__/McpHub.test.ts @@ -1,7 +1,6 @@ -import type { McpHub as McpHubType } from "../McpHub" +import type { McpHub as McpHubType, McpConnection } from "../McpHub" import type { ClineProvider } from "../../../core/webview/ClineProvider" import type { ExtensionContext, Uri } from "vscode" -import type { McpConnection } from "../McpHub" import { ServerConfigSchema } from "../McpHub" const fs = require("fs/promises") diff --git a/webview-ui/src/components/settings/__tests__/ApiOptions.test.tsx b/webview-ui/src/components/settings/__tests__/ApiOptions.test.tsx index b9b1d1d21e1..d9d8ff2a66f 100644 --- a/webview-ui/src/components/settings/__tests__/ApiOptions.test.tsx +++ b/webview-ui/src/components/settings/__tests__/ApiOptions.test.tsx @@ -3,10 +3,9 @@ import { render, screen, fireEvent } from "@testing-library/react" import { QueryClient, QueryClientProvider } from "@tanstack/react-query" -import { ProviderSettings } from "@roo/shared/api" +import { ProviderSettings, openAiModelInfoSaneDefaults } from "@roo/shared/api" import { ExtensionStateContextProvider } from "@/context/ExtensionStateContext" -import { openAiModelInfoSaneDefaults } from "@roo/shared/api" import ApiOptions, { ApiOptionsProps } from "../ApiOptions"