Refactor out of utils

src/core/ClaudeDev.ts

@@ -13,7 +13,7 @@ import { ApiHandler, buildApiHandler } from "../api"
 import { TerminalManager } from "../integrations/terminal/TerminalManager"
 import { parseSourceCodeForDefinitionsTopLevel } from "../services/tree-sitter"
 import { listFiles } from "../services/glob/list-files"
-import { ClaudeDevProvider } from "./webviews/ClaudeDevProvider"
+import { ClaudeDevProvider } from "./webview/ClaudeDevProvider"
 import { ApiConfiguration } from "../shared/api"
 import { ClaudeRequestResult } from "../shared/ClaudeRequestResult"
 import { combineApiRequests } from "../shared/combineApiRequests"
@@ -25,11 +25,11 @@ import { Tool, ToolName } from "../shared/Tool"
 import { ClaudeAskResponse } from "../shared/WebviewMessage"
 import { findLast, findLastIndex, formatContentBlockToMarkdown } from "../utils"
 import { truncateHalfConversation } from "../utils/context-management"
-import { extractTextFromFile } from "../utils/extract-text"
+import { extractTextFromFile } from "../integrations/misc/extract-text"
 import { regexSearchFiles } from "../services/ripgrep"
-import { parseMentions } from "../utils/context-mentions"
+import { parseMentions } from "./mentions/context-mentions"
 import { UrlContentFetcher } from "../services/browser/UrlContentFetcher"
-import { diagnosticsToProblemsString, getNewDiagnostics } from "../utils/diagnostics"
+import { diagnosticsToProblemsString, getNewDiagnostics } from "../integrations/diagnostics"
 import { arePathsEqual } from "../utils/path-helpers"
 
 const SYSTEM_PROMPT = async (

src/core/mentions/context-mentions.ts

@@ -1,12 +1,12 @@
 import * as vscode from "vscode"
 import * as path from "path"
-import { openFile } from "./open-file"
-import { UrlContentFetcher } from "../services/browser/UrlContentFetcher"
-import { mentionRegexGlobal } from "../shared/context-mentions"
+import { openFile } from "../../integrations/misc/open-file"
+import { UrlContentFetcher } from "../../services/browser/UrlContentFetcher"
+import { mentionRegexGlobal } from "../../shared/context-mentions"
 import fs from "fs/promises"
-import { extractTextFromFile } from "./extract-text"
+import { extractTextFromFile } from "../../integrations/misc/extract-text"
 import { isBinaryFile } from "isbinaryfile"
-import { diagnosticsToProblemsString } from "./diagnostics"
+import { diagnosticsToProblemsString } from "../../integrations/diagnostics"
 
 export function openMention(mention?: string): void {
 	if (!mention) {

src/core/webview/ClaudeDevProvider.ts

@@ -10,9 +10,9 @@ import fs from "fs/promises"
 import { HistoryItem } from "../../shared/HistoryItem"
 import axios from "axios"
 import { getTheme } from "../../integrations/theme/getTheme"
-import { openFile, openImage } from "../../utils/open-file"
+import { openFile, openImage } from "../../integrations/misc/open-file"
 import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker"
-import { openMention } from "../../utils/context-mentions"
+import { openMention } from "../mentions/context-mentions"
 
 /*
 https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts

src/exports/index.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode"
-import { ClaudeDevProvider } from "../core/webviews/ClaudeDevProvider"
+import { ClaudeDevProvider } from "../core/webview/ClaudeDevProvider"
 import { ClaudeDevAPI } from "./claude-dev"
 
 export function createClaudeDevAPI(

src/extension.ts

@@ -1,7 +1,7 @@
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from "vscode"
-import { ClaudeDevProvider } from "./core/webviews/ClaudeDevProvider"
+import { ClaudeDevProvider } from "./core/webview/ClaudeDevProvider"
 import delay from "delay"
 import { createClaudeDevAPI } from "./exports"
 import "./utils/path-helpers" // necessary to have access to String.prototype.toPosix

src/integrations/misc/open-file.ts

@@ -1,7 +1,7 @@
 import * as path from "path"
 import * as os from "os"
 import * as vscode from "vscode"
-import { arePathsEqual } from "./path-helpers"
+import { arePathsEqual } from "../../utils/path-helpers"
 
 export async function openImage(dataUri: string) {
 	const matches = dataUri.match(/^data:image\/([a-zA-Z]+);base64,(.+)$/)

src/utils/index.ts

@@ -1,5 +1,5 @@
-export * from "./getNonce"
-export * from "./getUri"
-export * from "./process-images"
-export * from "./export-markdown"
+export * from "../core/webview/getNonce"
+export * from "../core/webview/getUri"
+export * from "../integrations/misc/process-images"
+export * from "../integrations/misc/export-markdown"
 export * from "./array-helpers"