reafector: re-architecture tui directory

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@memo-code/memo",
-    "version": "0.8.60",
+    "version": "0.8.61",
     "private": false,
     "type": "module",
     "description": "A lightweight coding agent that runs in your terminal",

packages/tui/src/App.tsx → packages/tui/src/app/App.tsx

@@ -16,33 +16,33 @@ import {
     type ModelProfileOverride,
     type ProviderConfig,
 } from '@memo/core'
-import type { ApprovalDecision, ApprovalRequest } from '@memo/tools/approval'
-import { ChatWidget } from './chatwidget/ChatWidget'
-import { Composer } from './bottom_pane/Composer'
-import { Footer } from './bottom_pane/Footer'
-import { ApprovalOverlay } from './overlays/ApprovalOverlay'
-import { McpActivationOverlay } from './overlays/McpActivationOverlay'
-import { notifyApprovalRequested } from './notifications/approval_notification'
-import { SetupWizard } from './setup/SetupWizard'
-import { parseHistoryLog } from './controllers/history_parser'
+import { useApproval } from './hooks/useApproval'
+import { ChatWidget } from '../features/timeline/ChatWidget'
+import { Composer } from '../features/composer/Composer'
+import { Footer } from '../shared/ui/Footer'
+import { ApprovalOverlay } from '../features/approval/ApprovalOverlay'
+import { McpActivationOverlay } from '../features/mcp/McpActivationOverlay'
+import { notifyApprovalRequested } from '../features/approval/approvalNotification'
+import { SetupWizard } from '../features/setup/SetupWizard'
+import { parseHistoryLog } from '../features/session/historyParser'
 import {
     chatTimelineReducer,
     createInitialTimelineState,
     type ChatTimelineAction,
-} from './state/chat_timeline'
-import { calculateContextPercent, inferParallelToolStatuses, inferToolStatus } from './utils'
-import { checkForUpdate, findLocalPackageInfoSync } from './version'
-import type { SessionHistoryEntry } from './controllers/session_history'
-import { loadTaskPrompt } from './task_prompt'
-import { resolveReviewBackend } from './review/backend'
+} from '../features/timeline/chatTimeline'
+import { calculateContextPercent, inferParallelToolStatuses, inferToolStatus } from '../shared/lib/utils'
+import { checkForUpdate, findLocalPackageInfoSync } from '../shared/lib/version'
+import type { SessionHistoryEntry } from '../features/session/sessionHistory'
+import { loadTaskPrompt } from '../shared/lib/taskPrompt'
+import { resolveReviewBackend } from '../features/review/backend'
 import {
     formatSlashCommand,
     PLAIN_EXIT_COMMAND,
     SLASH_COMMANDS,
     TOOL_PERMISSION_MODES,
     type ToolPermissionMode,
-} from './constants'
-import type { ParsedHistoryLog } from './controllers/history_parser'
+} from '../shared/lib/constants'
+import type { ParsedHistoryLog } from '../features/session/historyParser'
 
 export type AppProps = {
     sessionOptions: AgentSessionOptions
@@ -147,10 +147,7 @@ export function App({
         toolPermissionMode: defaultToolPermissionMode,
     })
 
-    const [busy, setBusy] = useState(false)
     const [inputHistory, setInputHistory] = useState<string[]>([])
-    const [sessionLogPath, setSessionLogPath] = useState<string | null>(null)
-    const [pendingHistoryMessages, setPendingHistoryMessages] = useState<ChatMessage[] | null>(null)
 
     const [contextLimit, setContextLimit] = useState<number>(
         resolveContextLimit({ name: providerName, model }),
@@ -165,14 +162,16 @@ export function App({
         useState<string[]>(initialActiveMcpServers)
     const [exitMessage, setExitMessage] = useState<string | null>(null)
 
+    const [busy, setBusy] = useState(false)
+    const [sessionLogPath, setSessionLogPath] = useState<string | null>(null)
+    const [pendingHistoryMessages, setPendingHistoryMessages] = useState<ChatMessage[] | null>(null)
     const [session, setSession] = useState<AgentSession | null>(null)
     const sessionRef = useRef<AgentSession | null>(null)
-
     const currentTurnRef = useRef<number | null>(null)
     const nextUserInputOverrideRef = useRef<string | null>(null)
 
-    const [pendingApproval, setPendingApproval] = useState<ApprovalRequest | null>(null)
-    const approvalResolverRef = useRef<((decision: ApprovalDecision) => void) | null>(null)
+    const { pendingApproval, setPendingApproval, approvalResolverRef, handleApprovalDecision } =
+        useApproval()
 
     const localPackageInfo = useMemo(() => findLocalPackageInfoSync(), [])
 
@@ -223,7 +222,7 @@ export function App({
                 toolPermissionMode === TOOL_PERMISSION_MODES.FULL ||
                 toolPermissionMode === TOOL_PERMISSION_MODES.NONE
                     ? undefined
-                    : (request: ApprovalRequest) =>
+                    : (request) =>
                           new Promise((resolve) => {
                               void notifyApprovalRequested(request)
                               setPendingApproval(request)
@@ -374,6 +373,14 @@ export function App({
         }
     }, [appendSystemMessage, deps, mcpSelectionPending, sessionOptionsState, setupPending])
 
+    useEffect(() => {
+        return () => {
+            if (sessionRef.current) {
+                void sessionRef.current.close()
+            }
+        }
+    }, [])
+
     useEffect(() => {
         let cancelled = false
         ;(async () => {
@@ -390,14 +397,6 @@ export function App({
         }
     }, [appendSystemMessage])
 
-    useEffect(() => {
-        return () => {
-            if (sessionRef.current) {
-                void sessionRef.current.close()
-            }
-        }
-    }, [])
-
     const handleExit = useCallback(async () => {
         const resolver = approvalResolverRef.current
         if (resolver) {
@@ -835,15 +834,6 @@ export function App({
         setPendingHistoryMessages(null)
     }, [pendingHistoryMessages, session])
 
-    const handleApprovalDecision = useCallback((decision: ApprovalDecision) => {
-        const resolver = approvalResolverRef.current
-        if (resolver) {
-            resolver(decision)
-            approvalResolverRef.current = null
-        }
-        setPendingApproval(null)
-    }, [])
-
     const contextPercent = calculateContextPercent(currentContextTokens, contextLimit)
     const chatHeader = useMemo(
         () => ({

packages/tui/src/app/hooks/useApproval.ts

@@ -0,0 +1,18 @@
+import { useState, useRef, useCallback } from 'react'
+import type { ApprovalDecision, ApprovalRequest } from '@memo/tools/approval'
+
+export function useApproval() {
+    const [pendingApproval, setPendingApproval] = useState<ApprovalRequest | null>(null)
+    const approvalResolverRef = useRef<((decision: ApprovalDecision) => void) | null>(null)
+
+    const handleApprovalDecision = useCallback((decision: ApprovalDecision) => {
+        const resolver = approvalResolverRef.current
+        if (resolver) {
+            resolver(decision)
+            approvalResolverRef.current = null
+        }
+        setPendingApproval(null)
+    }, [])
+
+    return { pendingApproval, setPendingApproval, approvalResolverRef, handleApprovalDecision }
+}

packages/tui/src/commands/index.tsx

@@ -16,9 +16,9 @@ import {
     type AgentSessionOptions,
     type MemoConfig,
 } from '@memo/core'
-import { App } from '../App'
-import { parseHistoryLog } from '../controllers/history_parser'
-import { loadSessionHistoryEntries } from '../controllers/session_history'
+import { App } from '../app/App'
+import { parseHistoryLog } from '../features/session/historyParser'
+import { loadSessionHistoryEntries } from '../features/session/sessionHistory'
 
 export const options = zod.object({
     once: zod
@@ -40,6 +40,7 @@ export const options = zod.object({
 
 export const args = zod
     .array(zod.string())
+    .default([])
     .describe(argument({ name: 'question', description: 'Your question' }))
 
 async function ensureProviderConfig(mode: 'plain' | 'tui') {

packages/tui/src/commands/mcp/add.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import zod from 'zod'
 import { option, argument } from 'pastel'
 import { loadMemoConfig, writeMemoConfig, type MCPServerConfig } from '@memo/core'
-import { parseEnvAssignment } from '../../mcp_helpers'
+import { parseEnvAssignment } from '../../features/mcp/mcpHelpers'
 
 export const options = zod.object({
     url: zod

packages/tui/src/commands/mcp/get.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import zod from 'zod'
 import { option, argument } from 'pastel'
 import { loadMemoConfig } from '@memo/core'
-import { formatServer } from '../../mcp_helpers'
+import { formatServer } from '../../features/mcp/mcpHelpers'
 
 export const options = zod.object({
     json: zod

packages/tui/src/commands/mcp/list.tsx

@@ -3,7 +3,7 @@ import zod from 'zod'
 import { option } from 'pastel'
 import { loadMemoConfig } from '@memo/core'
 import { getMcpAuthStatus } from '@memo/tools/router/mcp/oauth'
-import { formatServer, oauthSettingsFromLoaded } from '../../mcp_helpers'
+import { formatServer, oauthSettingsFromLoaded } from '../../features/mcp/mcpHelpers'
 import type { McpAuthStatus } from '@memo/tools/router/mcp/oauth'
 
 export const options = zod.object({

packages/tui/src/commands/mcp/login.tsx

@@ -3,7 +3,7 @@ import zod from 'zod'
 import { option, argument } from 'pastel'
 import { loadMemoConfig } from '@memo/core'
 import { loginMcpServerOAuth } from '@memo/tools/router/mcp/oauth'
-import { getErrorMessage, oauthSettingsFromLoaded } from '../../mcp_helpers'
+import { getErrorMessage, oauthSettingsFromLoaded } from '../../features/mcp/mcpHelpers'
 
 export const options = zod.object({
     scopes: zod

packages/tui/src/commands/mcp/logout.tsx

@@ -3,7 +3,7 @@ import zod from 'zod'
 import { argument } from 'pastel'
 import { loadMemoConfig } from '@memo/core'
 import { logoutMcpServerOAuth } from '@memo/tools/router/mcp/oauth'
-import { getErrorMessage, oauthSettingsFromLoaded } from '../../mcp_helpers'
+import { getErrorMessage, oauthSettingsFromLoaded } from '../../features/mcp/mcpHelpers'
 
 export const args = zod
     .array(zod.string())

packages/tui/src/notifications/approval_notification.test.ts → packages/tui/src/features/approval/approvalNotification.test.ts

@@ -1,6 +1,6 @@
 import type { ApprovalRequest } from '@memo/tools/approval'
 import { describe, expect, test, vi } from 'vitest'
-import { buildDesktopNotificationCommand, notifyApprovalRequested } from './approval_notification'
+import { buildDesktopNotificationCommand, notifyApprovalRequested } from './approvalNotification'
 
 const REQUEST: ApprovalRequest = {
     toolName: 'exec_command',