diff --git a/src/api/providers/bedrock.ts b/src/api/providers/bedrock.ts index 342ef84..7dd90e8 100644 --- a/src/api/providers/bedrock.ts +++ b/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 { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "../shared/api" +import { ApiHandler, ApiHandlerMessageResponse } from "../" +import { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "../../shared/api" // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock export class AwsBedrockHandler implements ApiHandler { diff --git a/src/api/providers/gemini.ts b/src/api/providers/gemini.ts index 2739345..e1a7f63 100644 --- a/src/api/providers/gemini.ts +++ b/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 { ApiHandlerOptions, geminiDefaultModelId, GeminiModelId, geminiModels, ModelInfo } from "../shared/api" +import { ApiHandler, ApiHandlerMessageResponse } from "../" +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 diff --git a/src/api/providers/ollama.ts b/src/api/providers/ollama.ts index 377dd40..ecce564 100644 --- a/src/api/providers/ollama.ts +++ b/src/api/providers/ollama.ts @@ -1,8 +1,8 @@ import { Anthropic } from "@anthropic-ai/sdk" import OpenAI from "openai" -import { ApiHandler, ApiHandlerMessageResponse } from "." -import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../shared/api" -import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format" +import { ApiHandler, ApiHandlerMessageResponse } from "../" +import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api" +import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format" export class OllamaHandler implements ApiHandler { private options: ApiHandlerOptions diff --git a/src/api/providers/openai-native.ts b/src/api/providers/openai-native.ts index edbeb9b..aa1d334 100644 --- a/src/api/providers/openai-native.ts +++ b/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" -import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format" -import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "./transform/o1-format" +} from "../../shared/api" +import { convertToAnthropicMessage, convertToOpenAiMessages } from "../transform/openai-format" +import { convertO1ResponseToAnthropicMessage, convertToO1Messages } from "../transform/o1-format" export class OpenAiNativeHandler implements ApiHandler { private options: ApiHandlerOptions diff --git a/src/api/providers/openrouter.ts b/src/api/providers/openrouter.ts index 31d5af0..c8c842a 100644 --- a/src/api/providers/openrouter.ts +++ b/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" -import { convertToAnthropicMessage, convertToOpenAiMessages } from "./transform/openai-format" +} from "../../shared/api" +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 diff --git a/src/api/providers/vertex.ts b/src/api/providers/vertex.ts index 3073e1e..e368883 100644 --- a/src/api/providers/vertex.ts +++ b/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 { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vertexModels } from "../shared/api" +import { ApiHandler, ApiHandlerMessageResponse } from "../" +import { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vertexModels } from "../../shared/api" // https://docs.anthropic.com/en/api/claude-on-vertex-ai export class VertexHandler implements ApiHandler { diff --git a/src/core/webview/ClaudeDevProvider.ts b/src/core/webview/ClaudeDevProvider.ts index d8feeba..a999a1e 100644 --- a/src/core/webview/ClaudeDevProvider.ts +++ b/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" diff --git a/src/integrations/terminal/TerminalManager.ts b/src/integrations/terminal/TerminalManager.ts index 5508a15..d86a451 100644 --- a/src/integrations/terminal/TerminalManager.ts +++ b/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: diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts index b3782ff..fd169d7 100644 --- a/src/integrations/workspace/WorkspaceTracker.ts +++ b/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 { ClaudeDevProvider } from "../core/webviews/ClaudeDevProvider" +import { listFiles } from "../../services/glob/list-files" +import { ClaudeDevProvider } from "../../core/webview/ClaudeDevProvider" const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)