Fix imports

src/api/providers/bedrock.ts

@@ -1,7 +1,7 @@
 import AnthropicBedrock from "@anthropic-ai/bedrock-sdk"
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
-import { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "../shared/api"
+import { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "../../shared/api"
 
 // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock
 export class AwsBedrockHandler implements ApiHandler {

src/api/providers/gemini.ts

@@ -1,12 +1,12 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { FunctionCallingMode, GoogleGenerativeAI } from "@google/generative-ai"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
-import { ApiHandlerOptions, geminiDefaultModelId, GeminiModelId, geminiModels, ModelInfo } from "../shared/api"
+import { ApiHandlerOptions, geminiDefaultModelId, GeminiModelId, geminiModels, ModelInfo } from "../../shared/api"
 import {
 	convertAnthropicMessageToGemini,
 	convertAnthropicToolToGemini,
 	convertGeminiResponseToAnthropic,
-} from "./transform/gemini-format"
+} from "../transform/gemini-format"
 
 export class GeminiHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/ollama.ts

@@ -1,8 +1,8 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
-import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../shared/api"
+import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format"
 
 export class OllamaHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/openai-native.ts

@@ -1,15 +1,15 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
 import {
 	ApiHandlerOptions,
 	ModelInfo,
 	openAiNativeDefaultModelId,
 	OpenAiNativeModelId,
 	openAiNativeModels,
-} from "../shared/api"
+} from "../../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format"
-import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "./transform/o1-format"
+import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "../transform/o1-format"
 
 export class OpenAiNativeHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/openrouter.ts

@@ -1,16 +1,16 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
 import {
 	ApiHandlerOptions,
 	ModelInfo,
 	openRouterDefaultModelId,
 	OpenRouterModelId,
 	openRouterModels,
-} from "../shared/api"
+} from "../../shared/api"
-import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format"
+import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format"
 import axios from "axios"
-import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "./transform/o1-format"
+import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "../transform/o1-format"
 
 export class OpenRouterHandler implements ApiHandler {
 	private options: ApiHandlerOptions

src/api/providers/vertex.ts

@@ -1,7 +1,7 @@
 import { AnthropicVertex } from "@anthropic-ai/vertex-sdk"
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandler, ApiHandlerMessageResponse } from "."
+import { ApiHandler, ApiHandlerMessageResponse } from "../"
-import { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vertexModels } from "../shared/api"
+import { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vertexModels } from "../../shared/api"
 
 // https://docs.anthropic.com/en/api/claude-on-vertex-ai
 export class VertexHandler implements ApiHandler {

src/core/webview/ClaudeDevProvider.ts

@@ -4,7 +4,11 @@ import { ClaudeDev } from "../ClaudeDev"
 import { ApiProvider } from "../../shared/api"
 import { ExtensionMessage } from "../../shared/ExtensionMessage"
 import { WebviewMessage } from "../../shared/WebviewMessage"
-import { downloadTask, findLast, getNonce, getUri, selectImages } from "../../utils"
+import { findLast } from "../../utils/array"
+import { getNonce } from "./getNonce"
+import { getUri } from "./getUri"
+import { selectImages } from "../../integrations/misc/process-images"
+import { downloadTask } from "../../integrations/misc/export-markdown"
 import * as path from "path"
 import fs from "fs/promises"
 import { HistoryItem } from "../../shared/HistoryItem"

src/integrations/terminal/TerminalManager.ts

@@ -2,7 +2,7 @@ import { EventEmitter } from "events"
 import pWaitFor from "p-wait-for"
 import stripAnsi from "strip-ansi"
 import * as vscode from "vscode"
-import { arePathsEqual } from "../utils/path-helpers"
+import { arePathsEqual } from "../../utils/path"
 
 /*
 TerminalManager:

src/integrations/workspace/WorkspaceTracker.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode"
 import * as path from "path"
-import { listFiles } from "../services/glob/list-files"
+import { listFiles } from "../../services/glob/list-files"
-import { ClaudeDevProvider } from "../core/webviews/ClaudeDevProvider"
+import { ClaudeDevProvider } from "../../core/webview/ClaudeDevProvider"
 
 const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)