refactor(ui): 重构代码结构，调整文件路径和导入引用

hqwlkj · hqwlkj · commit 2dd9794ffa3b · 2026-05-25T20:24:27.000+08:00
- 将多个 UI 组件和模块从 src/ui 目录移动到 src/ui/views 目录
- 更新所有相关文件中的导入路径，确保引用正确
- 修改多个类型导入路径，从 session-types 改为 session/types
- 统一调整 hooks 和核心模块的导入路径，修正导入命名和位置
- 维护代码一致性，避免因路径更改导致的引用错误
- 重命名 session.ts 为 session/index.ts，并修改相关导入
- 更新测试用例中的类型导入路径以匹配新的文件结构
- 将多处核心或公共模块导入路径调整为模块根目录的对应位置
diff --git a/src/prompt.ts b/src/prompt.ts
@@ -4,7 +4,7 @@ import * as os from "os";
 import * as path from "path";
 import { fileURLToPath } from "url";
 import ejs from "ejs";
-import type { SessionMessage } from "./session-types";
+import type { SessionMessage } from "./session/types";
 import { findGitBashPath, resolveShellPath } from "./common/system/shell-utils";
 import { supportsMultimodal } from "./common/model-capabilities";
 
diff --git a/src/session/index.ts b/src/session/index.ts
@@ -6,32 +6,32 @@ import { fileURLToPath } from "url";
 import matter from "gray-matter";
 import ejs from "ejs";
 import type { ChatCompletionContentPart, ChatCompletionMessageParam } from "openai/resources/chat/completions";
-import { launchNotifyScript } from "./common/notify";
-import { buildThinkingRequestOptions } from "./common/openai-thinking";
-import { supportsMultimodal } from "./common/model-capabilities";
+import { launchNotifyScript } from "../common/notify";
+import { buildThinkingRequestOptions } from "../common/openai-thinking";
+import { supportsMultimodal } from "../common/model-capabilities";
 import {
   getCompactPrompt,
   getDefaultSkillPrompt,
   getRuntimeContext,
   getSystemPrompt,
   getTools,
   type ToolDefinition,
-} from "./prompt";
+} from "../prompt";
 import {
   type CreateOpenAIClient,
   type ProcessTimeoutControl,
   type ProcessTimeoutInfo,
   type ToolCallExecution,
   type ToolExecutionHooks,
   ToolExecutor,
-} from "./tools/executor";
-import { McpManager } from "./mcp/mcp-manager";
-import type { McpServerConfig, PermissionSettings } from "./settings";
-import { logApiError } from "./common/logging/error-logger";
-import { logOpenAIChatCompletionDebug, normalizeDebugError } from "./common/logging/debug-logger";
-import { killProcessTree } from "./common/system/process-tree";
-import { GitFileHistory } from "./common/runtime/file-history";
-import { getSnippet } from "./common/runtime/state";
+} from "../tools/executor";
+import { McpManager } from "../mcp/mcp-manager";
+import type { McpServerConfig, PermissionSettings } from "../settings";
+import { logApiError } from "../common/logging/error-logger";
+import { logOpenAIChatCompletionDebug, normalizeDebugError } from "../common/logging/debug-logger";
+import { killProcessTree } from "../common/system/process-tree";
+import { GitFileHistory } from "../common/runtime/file-history";
+import { getSnippet } from "../common/runtime/state";
 import {
   appendProjectPermissionAllows,
   buildPermissionToolExecution,
@@ -42,9 +42,9 @@ import {
   parseToolCallForPermissions,
   type PermissionToolCall,
   type UserToolPermission,
-} from "./common/permissions";
+} from "../common/permissions";
 
-import { getCompactPromptTokenThreshold, getTotalTokens } from "./session/utils";
+import { getCompactPromptTokenThreshold, getTotalTokens } from "./utils";
 import {
   type BashTimeoutAdjustment,
   type LlmStreamProgress,
@@ -59,7 +59,7 @@ import {
   type SkillInfo,
   type UndoTarget,
   type UserPromptContent,
-} from "./session-types";
+} from "./types";
 
 const MAX_SESSION_ENTRIES = 50;
 const DEFAULT_NEW_PROMPT_API_URL = "https://deepcode.vegamo.cn/api/plugin/new";
@@ -135,11 +135,11 @@ function accumulateUsagePerModel(
 
 function getExtensionRoot(): string {
   if (typeof __dirname !== "undefined") {
-    return path.resolve(__dirname, "..");
+    return path.resolve(__dirname, "../..");
   }
 
   const currentFilePath = fileURLToPath(import.meta.url);
-  return path.resolve(path.dirname(currentFilePath), "..");
+  return path.resolve(path.dirname(currentFilePath), "../..");
 }
 
 export class SessionManager {
diff --git a/src/session/types.ts b/src/session/types.ts
@@ -1,6 +1,6 @@
-import type { McpServerConfig, PermissionScope, PermissionSettings } from "./settings";
-import type { AskPermissionRequest, MessageToolPermission, UserToolPermission } from "./common/permissions";
-import type { CreateOpenAIClient } from "./tools/executor";
+import type { McpServerConfig, PermissionScope, PermissionSettings } from "../settings";
+import type { AskPermissionRequest, MessageToolPermission, UserToolPermission } from "../common/permissions";
+import type { CreateOpenAIClient } from "../tools/executor";
 
 export type SessionStatus =
   | "failed"
diff --git a/src/session/utils.ts b/src/session/utils.ts
@@ -1,5 +1,5 @@
 import { DEEPSEEK_V4_MODELS } from "../common/model-capabilities";
-import type { ModelUsage } from "../session-types";
+import type { ModelUsage } from "./types";
 
 const DEFAULT_COMPACT_PROMPT_TOKEN_THRESHOLD = 128 * 1024;
 const DEEPSEEK_V4_COMPACT_PROMPT_TOKEN_THRESHOLD = 512 * 1024;
diff --git a/src/tests/askUserQuestion.test.ts b/src/tests/askUserQuestion.test.ts
@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { findPendingAskUserQuestion, formatAskUserQuestionAnswers, formatAskUserQuestionDecline } from "../ui";
-import type { SessionMessage } from "../session-types";
+import type { SessionMessage } from "../session/types";
 
 function message(content: unknown): SessionMessage {
   const now = "2026-04-29T00:00:00.000Z";
diff --git a/src/tests/exitSummary.test.ts b/src/tests/exitSummary.test.ts
@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { buildExitSummaryText } from "../ui";
-import type { ModelUsage, SessionEntry } from "../session-types";
+import type { ModelUsage, SessionEntry } from "../session/types";
 
 const stripAnsi = (text: string): string => text.replace(/\u001b\[[0-9;]*m/g, "");
 
diff --git a/src/tests/messageView.test.ts b/src/tests/messageView.test.ts
@@ -8,7 +8,7 @@ import {
   parseToolPayload,
 } from "../ui/components/MessageView/utils";
 import { RawMode } from "../ui/contexts";
-import type { SessionMessage } from "../session-types";
+import type { SessionMessage } from "../session/types";
 import type { ToolSummary } from "../ui/components/MessageView/types";
 
 test("parseDiffPreview removes headers and classifies lines", () => {
diff --git a/src/tests/permission-prompt.test.ts b/src/tests/permission-prompt.test.ts
@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { getScopeRiskColor } from "../ui/PermissionPrompt";
+import { getScopeRiskColor } from "../ui/views/PermissionPrompt";
 
 test("getScopeRiskColor maps permission scopes by risk", () => {
   assert.equal(getScopeRiskColor("read-in-cwd"), "#22c55e");
diff --git a/src/tests/promptInputKeys.test.ts b/src/tests/promptInputKeys.test.ts
@@ -14,20 +14,19 @@ import {
   getPromptCursorPlacement,
   getPromptReturnKeyAction,
   isClearImageAttachmentsShortcut,
-  parseTerminalInput,
   removeCurrentSlashToken,
   toggleSkillSelection,
   renderBufferWithCursor,
   buildInitPromptSubmission,
   buildPromptDraftFromSessionMessage,
-  dispatchTerminalInput,
   disableTerminalExtendedKeys,
   enableTerminalExtendedKeys,
   EMPTY_BUFFER,
   insertText,
   backspace,
 } from "../ui";
-import type { SessionMessage, SkillInfo } from "../session-types";
+import type { SessionMessage, SkillInfo } from "../session/types";
+import { dispatchTerminalInput, parseTerminalInput } from "../ui/hooks";
 
 function collectDispatchedInput(data: string) {
   const events: ReturnType<typeof parseTerminalInput>[] = [];
diff --git a/src/tests/session.test.ts b/src/tests/session.test.ts
@@ -5,7 +5,7 @@ import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
 import { GitFileHistory } from "../common/runtime/file-history";
-import { type SessionMessage } from "../session-types";
+import { type SessionMessage } from "../session/types";
 import { SessionManager } from "../session";
 
 const originalFetch = globalThis.fetch;
diff --git a/src/tests/sessionList.test.ts b/src/tests/sessionList.test.ts
@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { formatSessionTitle, filterSessions, formatSessionStatus } from "../ui";
-import type { SessionEntry } from "../session-types";
+import type { SessionEntry } from "../session/types";
 
 test("formatSessionTitle replaces newlines with spaces", () => {
   assert.equal(formatSessionTitle("first line\nsecond line\r\nthird"), "first line second line third");
diff --git a/src/tests/slashCommands.test.ts b/src/tests/slashCommands.test.ts
@@ -7,7 +7,7 @@ import {
   formatSlashCommandDescription,
   formatSlashCommandLabel,
 } from "../ui";
-import type { SkillInfo } from "../session-types";
+import type { SkillInfo } from "../session/types";
 
 const skills: SkillInfo[] = [
   { name: "skill-writer", path: "~/.agents/skills/skill-writer/SKILL.md", description: "Write a SKILL.md" },
diff --git a/src/tests/thinkingState.test.ts b/src/tests/thinkingState.test.ts
@@ -1,7 +1,7 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import { findExpandedThinkingId } from "../ui";
-import type { SessionMessage } from "../session-types";
+import type { SessionMessage } from "../session/types";
 
 function buildMessage(
   id: string,
diff --git a/src/ui/components/MessageView/types.ts b/src/ui/components/MessageView/types.ts
@@ -1,4 +1,4 @@
-import type { SessionMessage } from "../../../session-types";
+import type { SessionMessage } from "../../../session/types";
 
 export type MessageViewProps = {
   message: SessionMessage;
diff --git a/src/ui/components/MessageView/utils.ts b/src/ui/components/MessageView/utils.ts
@@ -1,5 +1,5 @@
 import type { DiffPreviewLine, ToolSummary } from "./types";
-import type { SessionMessage } from "../../../session-types";
+import type { SessionMessage } from "../../../session/types";
 import { RawMode } from "../../contexts";
 import chalk from "chalk";
 
diff --git a/src/ui/components/SkillsDropdown/index.tsx b/src/ui/components/SkillsDropdown/index.tsx
@@ -1,8 +1,8 @@
 import Index from "../DropdownMenu";
 import React, { useEffect, useState } from "react";
-import type { SkillInfo } from "../../../session-types";
+import type { SkillInfo } from "../../../session/types";
 import { useInput } from "ink";
-import { isSkillSelected } from "../../SlashCommandMenu";
+import { isSkillSelected } from "../../views/SlashCommandMenu";
 
 const SkillsDropdown: React.FC<{
   open: boolean;
diff --git a/src/ui/core/askUserQuestion.ts b/src/ui/core/askUserQuestion.ts
@@ -1,4 +1,4 @@
-import type { SessionMessage, SessionStatus } from "../../session-types";
+import type { SessionMessage, SessionStatus } from "../../session/types";
 
 export type AskUserQuestionOption = {
   label: string;
diff --git a/src/ui/core/loadingText.ts b/src/ui/core/loadingText.ts
@@ -1,4 +1,4 @@
-import type { LlmStreamProgress, SessionEntry } from "../../session-types";
+import type { LlmStreamProgress, SessionEntry } from "../../session/types";
 
 type RunningProcesses = SessionEntry["processes"];
 
diff --git a/src/ui/core/slashCommands.ts b/src/ui/core/slashCommands.ts
@@ -1,4 +1,4 @@
-import type { SkillInfo } from "../../session-types";
+import type { SkillInfo } from "../../session/types";
 
 export type SlashCommandKind =
   | "skill"
diff --git a/src/ui/core/thinkingState.ts b/src/ui/core/thinkingState.ts
@@ -1,4 +1,4 @@
-import type { SessionMessage } from "../../session-types";
+import type { SessionMessage } from "../../session/types";
 
 /**
  * Returns the message id of the assistant "thinking" message that should stay
diff --git a/src/ui/exitSummary.ts b/src/ui/exitSummary.ts
@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import gradientString from "gradient-string";
-import type { ModelUsage, SessionEntry } from "../session-types";
+import type { ModelUsage, SessionEntry } from "../session/types";
 
 type ExitSummaryInput = {
   session: SessionEntry | null;
diff --git a/src/ui/hooks/index.ts b/src/ui/hooks/index.ts
@@ -10,8 +10,8 @@ export {
   getPromptCursorPlacement,
 } from "./cursor";
 
-export { usePasteHandling } from "./paste-handling";
-export type { PasteRegion, PasteHandlingState, PasteHandlingActions } from "./paste-handling";
+export { usePasteHandling } from "./usePasteHandling";
+export type { PasteRegion, PasteHandlingState, PasteHandlingActions } from "./usePasteHandling";
 
-export { useHistoryNavigation } from "./history-navigation";
-export type { HistoryNavigationState, HistoryNavigationActions } from "./history-navigation";
+export { useHistoryNavigation } from "./useHistoryNavigation";
+export type { HistoryNavigationState, HistoryNavigationActions } from "./useHistoryNavigation";
diff --git a/src/ui/hooks/useHistoryNavigation.ts b/src/ui/hooks/useHistoryNavigation.ts
diff --git a/src/ui/hooks/usePasteHandling.ts b/src/ui/hooks/usePasteHandling.ts
diff --git a/src/ui/index.ts b/src/ui/index.ts
@@ -7,8 +7,8 @@ import {
 export { getThinkingOptionIndex, MODEL_COMMAND_MODELS, MODEL_COMMAND_THINKING_OPTIONS };
 export { buildPromptDraftFromSessionMessage } from "./utils";
 export { disableTerminalExtendedKeys, enableTerminalExtendedKeys, getPromptCursorPlacement } from "./hooks/cursor";
-export { default as AppContainer } from "./AppContainer";
-export { AskUserQuestionPrompt } from "./AskUserQuestionPrompt";
+export { default as AppContainer } from "./views/AppContainer";
+export { AskUserQuestionPrompt } from "./views/AskUserQuestionPrompt";
 export { MessageView } from "./components";
 export { parseDiffPreview } from "./components/MessageView/utils";
 export {
@@ -23,17 +23,13 @@ export {
   getPromptReturnKeyAction,
   renderBufferWithCursor,
   buildInitPromptSubmission,
-  useTerminalInput,
-  parseTerminalInput,
-  dispatchTerminalInput,
   type PromptSubmission,
   type PromptDraft,
-  type InputKey,
-} from "./PromptInput";
-export { SessionList, formatSessionTitle, filterSessions, formatSessionStatus } from "./SessionList";
-export { ThemedGradient } from "./ThemedGradient";
-export { UpdatePrompt, type UpdatePromptChoice } from "./UpdatePrompt";
-export { WelcomeScreen, formatHomeRelativePath, buildWelcomeTips } from "./WelcomeScreen";
+} from "./views/PromptInput";
+export { SessionList, formatSessionTitle, filterSessions, formatSessionStatus } from "./views/SessionList";
+export { ThemedGradient } from "./views/ThemedGradient";
+export { UpdatePrompt, type UpdatePromptChoice } from "./views/UpdatePrompt";
+export { WelcomeScreen, formatHomeRelativePath, buildWelcomeTips } from "./views/WelcomeScreen";
 export {
   findPendingAskUserQuestion,
   formatAskUserQuestionAnswers,
diff --git a/src/ui/utils/index.ts b/src/ui/utils/index.ts
@@ -1,9 +1,9 @@
 import chalk from "chalk";
 import { renderMessageToStdout } from "../components/MessageView/utils";
 import type { RawMode } from "../contexts";
-import type { PromptDraft } from "../PromptInput";
+import type { PromptDraft } from "../views/PromptInput";
 import type { ModelConfigSelection } from "../../settings";
-import type { SessionEntry, SessionMessage } from "../../session-types";
+import type { SessionEntry, SessionMessage } from "../../session/types";
 import type { SessionManager } from "../../session";
 
 /**
diff --git a/src/ui/views/App.tsx b/src/ui/views/App.tsx
@@ -1,15 +1,15 @@
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Box, Static, Text, useApp, useStdout, useWindowSize } from "ink";
 import chalk from "chalk";
-import { createOpenAIClient } from "../common/openai-client";
-import type { PermissionScope } from "../settings";
-import { type ModelConfigSelection } from "../settings";
+import { createOpenAIClient } from "../../common/openai-client";
+import type { PermissionScope } from "../../settings";
+import { type ModelConfigSelection } from "../../settings";
 import { type PromptDraft, PromptInput, type PromptSubmission } from "./PromptInput";
-import { MessageView, RawModeExitPrompt } from "./components";
+import { MessageView, RawModeExitPrompt } from "../components";
 import { SessionList } from "./SessionList";
 import { type UndoRestoreMode, UndoSelector } from "./UndoSelector";
-import { buildLoadingText } from "./core/loadingText";
-import { findExpandedThinkingId } from "./core/thinkingState";
+import { buildLoadingText } from "../core/loadingText";
+import { findExpandedThinkingId } from "../core/thinkingState";
 import { WelcomeScreen } from "./WelcomeScreen";
 import { AskUserQuestionPrompt } from "./AskUserQuestionPrompt";
 import { McpStatusList } from "./McpStatusList";
@@ -18,22 +18,22 @@ import {
   type AskUserQuestionAnswers,
   findPendingAskUserQuestion,
   formatAskUserQuestionAnswers,
-} from "./core/askUserQuestion";
+} from "../core/askUserQuestion";
 import { PermissionPrompt, type PermissionPromptResult } from "./PermissionPrompt";
-import { buildExitSummaryText } from "./exitSummary";
-import { RawMode, useRawModeContext } from "./contexts";
-import { renderMessageToStdout } from "./components/MessageView/utils";
+import { buildExitSummaryText } from "../exitSummary";
+import { RawMode, useRawModeContext } from "../contexts";
+import { renderMessageToStdout } from "../components/MessageView/utils";
 import {
   buildPromptDraftFromSessionMessage,
   buildStatusLine,
   buildSyntheticUserMessage,
   formatModelConfig,
   isCurrentSessionEmpty,
   renderRawModeMessages,
-} from "./utils";
-import { resolveCurrentSettings, writeModelConfigSelection } from "../settings";
-import { isCollapsedThinking } from "./core/thinkingState";
-import { ANSI_CLEAR_SCREEN } from "./constants";
+} from "../utils";
+import { resolveCurrentSettings, writeModelConfigSelection } from "../../settings";
+import { isCollapsedThinking } from "../core/thinkingState";
+import { ANSI_CLEAR_SCREEN } from "../constants";
 import type {
   LlmStreamProgress,
   MessageMeta,
@@ -43,8 +43,8 @@ import type {
   SkillInfo,
   UndoTarget,
   UserPromptContent,
-} from "../session-types";
-import { SessionManager } from "../session";
+} from "../../session/types";
+import { SessionManager } from "../../session";
 
 type View = "chat" | "session-list" | "undo" | "mcp-status";
 
diff --git a/src/ui/views/AppContainer.tsx b/src/ui/views/AppContainer.tsx
@@ -1,7 +1,7 @@
 import React from "react";
-import { AppContext } from "./contexts";
+import { AppContext } from "../contexts";
 import App from "./App";
-import { RawModeProvider } from "./contexts";
+import { RawModeProvider } from "../contexts";
 
 const AppContainer: React.FC<{
   projectRoot: string;
diff --git a/src/ui/views/AskUserQuestionPrompt.tsx b/src/ui/views/AskUserQuestionPrompt.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { Box, Text } from "ink";
-import type { AskUserQuestionAnswers, AskUserQuestionItem } from "./core/askUserQuestion";
-import { useTerminalInput } from "./hooks";
+import type { AskUserQuestionAnswers, AskUserQuestionItem } from "../core/askUserQuestion";
+import { useTerminalInput } from "../hooks";
 
 type Props = {
   questions: AskUserQuestionItem[];
diff --git a/src/ui/views/McpStatusList.tsx b/src/ui/views/McpStatusList.tsx
diff --git a/src/ui/views/PermissionPrompt.tsx b/src/ui/views/PermissionPrompt.tsx
diff --git a/src/ui/views/ProcessStdoutView.tsx b/src/ui/views/ProcessStdoutView.tsx
diff --git a/src/ui/views/PromptInput.tsx b/src/ui/views/PromptInput.tsx
diff --git a/src/ui/views/SessionList.tsx b/src/ui/views/SessionList.tsx
diff --git a/src/ui/views/SlashCommandMenu.tsx b/src/ui/views/SlashCommandMenu.tsx
diff --git a/src/ui/views/ThemedGradient.tsx b/src/ui/views/ThemedGradient.tsx
diff --git a/src/ui/views/UndoSelector.tsx b/src/ui/views/UndoSelector.tsx
diff --git a/src/ui/views/UpdatePrompt.tsx b/src/ui/views/UpdatePrompt.tsx
diff --git a/src/ui/views/WelcomeScreen.tsx b/src/ui/views/WelcomeScreen.tsx
