Revert "feat: 第一个可以用的 ink 组件抽象 (#158)" (#175)

This reverts commit c445f43f8d.

src/components/agents/AgentDetail.tsx

@@ -1,6 +1,7 @@
 import figures from 'figures'
 import * as React from 'react'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../ink.js'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import type { Tools } from '../../Tool.js'
 import { getAgentColor } from '../../tools/AgentTool/agentColorManager.js'

src/components/agents/AgentEditor.tsx

@@ -3,7 +3,8 @@ import figures from 'figures'
 import * as React from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useSetAppState } from 'src/state/AppState.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../ink.js'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import type { Tools } from '../../Tool.js'
 import {

src/components/agents/AgentNavigationFooter.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
+import { Box, Text } from '../../ink.js'
 
 type Props = {
   instructions?: string

src/components/agents/AgentsList.tsx

@@ -1,7 +1,8 @@
 import figures from 'figures'
 import * as React from 'react'
 import type { SettingSource } from 'src/utils/settings/constants.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../ink.js'
 import type { ResolvedAgent } from '../../tools/AgentTool/agentDisplay.js'
 import {
   AGENT_SOURCE_GROUPS,
@@ -11,7 +12,8 @@ import {
 } from '../../tools/AgentTool/agentDisplay.js'
 import type { AgentDefinition } from '../../tools/AgentTool/loadAgentsDir.js'
 import { count } from '../../utils/array.js'
-import { Dialog, Divider } from '@anthropic/ink'
+import { Dialog } from '../design-system/Dialog.js'
+import { Divider } from '../design-system/Divider.js'
 import { getAgentSourceDisplayName } from './utils.js'
 
 type Props = {

src/components/agents/AgentsMenu.tsx

@@ -5,7 +5,7 @@ import type { SettingSource } from 'src/utils/settings/constants.js'
 import type { CommandResultDisplay } from '../../commands.js'
 import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
 import { useMergedTools } from '../../hooks/useMergedTools.js'
-import { Box, Text } from '@anthropic/ink'
+import { Box, Text } from '../../ink.js'
 import { useAppState, useSetAppState } from '../../state/AppState.js'
 import type { Tools } from '../../Tool.js'
 import {
@@ -19,7 +19,7 @@ import {
 import { toError } from '../../utils/errors.js'
 import { logError } from '../../utils/log.js'
 import { Select } from '../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
+import { Dialog } from '../design-system/Dialog.js'
 import { AgentDetail } from './AgentDetail.js'
 import { AgentEditor } from './AgentEditor.js'
 import { AgentNavigationFooter } from './AgentNavigationFooter.js'

src/components/agents/ColorPicker.tsx

@@ -1,7 +1,7 @@
 import figures from 'figures'
 import React, { useState } from 'react'
-import type { KeyboardEvent } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../ink.js'
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   AGENT_COLORS,

src/components/agents/ModelSelector.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import { Box, Text } from '../../ink.js'
 import { getAgentModelOptions } from '../../utils/model/agent.js'
 import { Select } from '../CustomSelect/select.js'
 

src/components/agents/ToolSelector.tsx

@@ -21,11 +21,12 @@ import { TodoWriteTool } from 'src/tools/TodoWriteTool/TodoWriteTool.js'
 import { TungstenTool } from 'src/tools/TungstenTool/TungstenTool.js'
 import { WebFetchTool } from 'src/tools/WebFetchTool/WebFetchTool.js'
 import { WebSearchTool } from 'src/tools/WebSearchTool/WebSearchTool.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../ink.js'
 import { useKeybinding } from '../../keybindings/useKeybinding.js'
 import { count } from '../../utils/array.js'
 import { plural } from '../../utils/stringUtils.js'
-import { Divider } from '@anthropic/ink'
+import { Divider } from '../design-system/Divider.js'
 
 type Props = {
   tools: Tools

src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx

@@ -1,8 +1,10 @@
 import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import { Box } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import type { AgentColorName } from '../../../../tools/AgentTool/agentColorManager.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import { ColorPicker } from '../../ColorPicker.js'

src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx

@@ -1,5 +1,6 @@
 import React, { type ReactNode } from 'react'
-import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
+import type { KeyboardEvent } from '../../../../ink/events/keyboard-event.js'
+import { Box, Text } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
 import type { Tools } from '../../../../Tool.js'
@@ -8,6 +9,8 @@ import type { AgentDefinition } from '../../../../tools/AgentTool/loadAgentsDir.
 import { truncateToWidth } from '../../../../utils/format.js'
 import { getAgentModelDisplay } from '../../../../utils/model/agent.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import { getNewRelativeAgentFilePath } from '../../agentFileUtils.js'

src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx

@@ -1,8 +1,10 @@
 import React, { type ReactNode, useCallback, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
+import { Box, Text } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { editPromptInEditor } from '../../../../utils/promptEditor.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import TextInput from '../../../TextInput.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'

src/components/agents/new-agent-creation/wizard-steps/GenerateStep.tsx

@@ -1,11 +1,12 @@
 import { APIUserAbortError } from '@anthropic-ai/sdk'
 import React, { type ReactNode, useCallback, useRef, useState } from 'react'
 import { useMainLoopModel } from '../../../../hooks/useMainLoopModel.js'
-import { Box, Byline, Text } from '@anthropic/ink'
+import { Box, Text } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { createAbortController } from '../../../../utils/abortController.js'
 import { editPromptInEditor } from '../../../../utils/promptEditor.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
 import { Spinner } from '../../../Spinner.js'
 import TextInput from '../../../TextInput.js'
 import { useWizard } from '../../../wizard/index.js'

src/components/agents/new-agent-creation/wizard-steps/LocationStep.tsx

@@ -1,8 +1,10 @@
 import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import { Box } from '../../../../ink.js'
 import type { SettingSource } from '../../../../utils/settings/constants.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import { Select } from '../../../CustomSelect/select.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import type { AgentWizardData } from '../types.js'

src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx

@@ -1,5 +1,5 @@
 import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import { Box } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
 import {
@@ -8,6 +8,8 @@ import {
 } from '../../../../tools/AgentTool/agentMemory.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import { Select } from '../../../CustomSelect/select.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import type { AgentWizardData } from '../types.js'

src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx

@@ -1,7 +1,9 @@
 import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import { Box } from '../../../../ink.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
 import { Select } from '../../../CustomSelect/select.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import type { AgentWizardData } from '../types.js'

src/components/agents/new-agent-creation/wizard-steps/ModelStep.tsx

@@ -1,6 +1,7 @@
 import React, { type ReactNode } from 'react'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import { ModelSelector } from '../../ModelSelector.js'

src/components/agents/new-agent-creation/wizard-steps/PromptStep.tsx

@@ -1,8 +1,10 @@
 import React, { type ReactNode, useCallback, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
+import { Box, Text } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import { editPromptInEditor } from '../../../../utils/promptEditor.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import TextInput from '../../../TextInput.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'

src/components/agents/new-agent-creation/wizard-steps/ToolsStep.tsx

@@ -1,7 +1,8 @@
 import React, { type ReactNode } from 'react'
 import type { Tools } from '../../../../Tool.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
 import { ToolSelector } from '../../ToolSelector.js'

src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx

@@ -1,8 +1,10 @@
 import React, { type ReactNode, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
+import { Box, Text } from '../../../../ink.js'
 import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
 import type { AgentDefinition } from '../../../../tools/AgentTool/loadAgentsDir.js'
 import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
+import { Byline } from '../../../design-system/Byline.js'
+import { KeyboardShortcutHint } from '../../../design-system/KeyboardShortcutHint.js'
 import TextInput from '../../../TextInput.js'
 import { useWizard } from '../../../wizard/index.js'
 import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'