mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-21 07:45:52 +00:00
* feat: 删除垃圾更改
* fix: 消除生产代码中的 as any 类型不安全模式
- API 兼容层(openai/grok/gemini): 利用 BetaRawMessageStreamEvent 的
discriminated union 在 switch/case 中直接属性访问,消除 ~29 个 as any
- ConsoleOAuthFlow: 用 as unknown as Parameters<typeof> 替代 as any
- performanceShim: 用 Record<string, unknown> 和显式类型断言替代 as any
- companionReact/auth: 直接访问已有类型属性消除 as any
- sliceAnsi/textHighlighting: 用 as Char 替代 as any(Token 联合类型收窄)
- ccrClient: 利用 RequestResult 类型收窄直接访问 retryAfterMs
- outputsScanner: 用 TurnStartTime.turnStartTime 属性访问替代双重断言
- plans: 用显式数组类型替代 as any[]
- FeedbackSurvey: 用 in 操作符和 Parameters<typeof> 替代 as any
- messageQueueManager: 用 Record<string, unknown> 替代 as any
- mcp.ts: 用 in 操作符类型守卫替代 as any
precheck 通过: typecheck 零错误 + 5420 测试全部通过 + lint 通过
* fix: 将 pipeIpc 添加到 AppState 类型声明,消除 4 个 as any
- AppStateStore: 添加 pipeIpc?: PipeIpcState 可选字段
- PromptInputFooter: 直接访问 s.pipeIpc
- useBackgroundTaskNavigation: 直接访问 s.pipeIpc
- usePipeRouter: 直接访问 store.getState().pipeIpc
- REPL.tsx: 移除 getPipeIpc(s as any) 中的 as any
precheck 通过
* fix: 消除 UltraplanChoiceDialog 中的 wheelDown/wheelUp as any
Ink Key 类型已包含 wheelDown/wheelUp 属性,直接访问即可。
* fix: 消除 sideQuestion.ts 中的 2 个 as any
- toolUse.name: 使用 as unknown as { name: string } 双重断言
- apiErr.error: 使用 as Parameters<typeof formatAPIError>[0] 类型参数
* fix: 为 auto dream 添加 maxTurns: 20 限制,防止单次执行消耗过多 token
* fix: 补充 SAFE_ENV_VARS 中缺失的 OpenAI/Gemini/Grok provider 环境变量
项目级 settings.local.json 的 env 字段在 trust dialog 之前只有
SAFE_ENV_VARS 白名单中的变量会被应用到 process.env。
OPENAI_API_KEY、OPENAI_BASE_URL 等关键变量不在白名单中,
导致容器中通过 settings.local.json 配置 OpenAI 协议时认证失败。
* fix: 修复 goalState.js 模块不存在的类型错误
* fix: 增强 providers 测试的环境变量隔离,防止 mock 污染
* fix: 内联 providers 测试逻辑,彻底隔离 mock 污染
测试不再 import providers.ts(其默认参数触发 getInitialSettings 全链),
改为内联纯函数逻辑,从根源消除 CI 上其他测试 mock.module 污染。
* fix: 添加 goalState 模块存根,修复 CI 构建打包解析失败
CI 中的 autonomy-lifecycle-user-flow 集成测试会执行 build.ts 打包 CLI。
此前 PromptInputFooterLeftSide.tsx 中 require('../../services/goal/goalState.js')
的路径在源码中不存在,打包器报 Could not resolve,导致 (unnamed) 测试失败。
新增 src/services/goal/goalState.ts 存根模块(getGoal 返回 null,组件不渲染),
让打包器在构建期可以解析该 require 路径。同时把 PromptInputFooterLeftSide.tsx
里两处 as unknown as 内联类型签名换成 as typeof import(...),让类型直接来自
存根模块,避免类型定义重复。
262 lines
8.8 KiB
TypeScript
262 lines
8.8 KiB
TypeScript
import { useEffect, useRef } from 'react'
|
|
import { KeyboardEvent, useInput } from '@anthropic/ink'
|
|
// backward-compat bridge until REPL wires handleKeyDown to <Box onKeyDown>
|
|
import {
|
|
type AppState,
|
|
useAppState,
|
|
useSetAppState,
|
|
} from '../state/AppState.js'
|
|
import {
|
|
enterTeammateView,
|
|
exitTeammateView,
|
|
} from '../state/teammateViewHelpers.js'
|
|
import {
|
|
getRunningTeammatesSorted,
|
|
InProcessTeammateTask,
|
|
} from '../tasks/InProcessTeammateTask/InProcessTeammateTask.js'
|
|
import {
|
|
type InProcessTeammateTaskState,
|
|
isInProcessTeammateTask,
|
|
} from '../tasks/InProcessTeammateTask/types.js'
|
|
import { isBackgroundTask } from '../tasks/types.js'
|
|
|
|
// Step teammate selection by delta, wrapping across leader(-1)..teammates(0..n-1)..hide(n).
|
|
// First step from a collapsed tree expands it and parks on leader.
|
|
function stepTeammateSelection(
|
|
delta: 1 | -1,
|
|
setAppState: (updater: (prev: AppState) => AppState) => void,
|
|
): void {
|
|
setAppState(prev => {
|
|
const currentCount = getRunningTeammatesSorted(prev.tasks).length
|
|
if (currentCount === 0) return prev
|
|
|
|
if (prev.expandedView !== 'teammates') {
|
|
return {
|
|
...prev,
|
|
expandedView: 'teammates' as const,
|
|
viewSelectionMode: 'selecting-agent',
|
|
selectedIPAgentIndex: -1,
|
|
}
|
|
}
|
|
|
|
const maxIdx = currentCount // hide row
|
|
const cur = prev.selectedIPAgentIndex
|
|
const next =
|
|
delta === 1
|
|
? cur >= maxIdx
|
|
? -1
|
|
: cur + 1
|
|
: cur <= -1
|
|
? maxIdx
|
|
: cur - 1
|
|
return {
|
|
...prev,
|
|
selectedIPAgentIndex: next,
|
|
viewSelectionMode: 'selecting-agent',
|
|
}
|
|
})
|
|
}
|
|
|
|
/**
|
|
* Custom hook that handles Shift+Up/Down keyboard navigation for background tasks.
|
|
* When teammates (swarm) are present, navigates between leader and teammates.
|
|
* When only non-teammate background tasks exist, opens the background tasks dialog.
|
|
* When pipe IPC is active (UDS_INBOX), Shift+Down toggles the pipe selector panel.
|
|
* Also handles Enter to confirm selection, 'f' to view transcript, and 'k' to kill.
|
|
*/
|
|
export function useBackgroundTaskNavigation(options?: {
|
|
onOpenBackgroundTasks?: () => void
|
|
onTogglePipeSelector?: () => void
|
|
}): { handleKeyDown: (e: KeyboardEvent) => void } {
|
|
const tasks = useAppState(s => s.tasks)
|
|
const viewSelectionMode = useAppState(s => s.viewSelectionMode)
|
|
const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
|
|
const selectedIPAgentIndex = useAppState(s => s.selectedIPAgentIndex)
|
|
const pipeIpc = useAppState(s => s.pipeIpc)
|
|
const setAppState = useSetAppState()
|
|
|
|
// Filter to running teammates and sort alphabetically to match TeammateSpinnerTree display
|
|
const teammateTasks = getRunningTeammatesSorted(tasks)
|
|
const teammateCount = teammateTasks.length
|
|
|
|
// Check for non-teammate background tasks (local_agent, local_bash, etc.)
|
|
const hasNonTeammateBackgroundTasks = Object.values(tasks).some(
|
|
t => isBackgroundTask(t) && t.type !== 'in_process_teammate',
|
|
)
|
|
|
|
// Track previous teammate count to detect when teammates are removed
|
|
const prevTeammateCountRef = useRef<number>(teammateCount)
|
|
|
|
// Clamp selection index if teammates are removed or reset when count becomes 0
|
|
useEffect(() => {
|
|
const prevCount = prevTeammateCountRef.current
|
|
prevTeammateCountRef.current = teammateCount
|
|
|
|
setAppState(prev => {
|
|
const currentTeammates = getRunningTeammatesSorted(prev.tasks)
|
|
const currentCount = currentTeammates.length
|
|
|
|
// When teammates are removed (count goes from >0 to 0), reset selection
|
|
// Only reset if we previously had teammates (not on initial mount with 0)
|
|
// Don't clobber viewSelectionMode if actively viewing a teammate transcript —
|
|
// the user may be reviewing a completed teammate and needs escape to exit
|
|
if (
|
|
currentCount === 0 &&
|
|
prevCount > 0 &&
|
|
prev.selectedIPAgentIndex !== -1
|
|
) {
|
|
if (prev.viewSelectionMode === 'viewing-agent') {
|
|
return {
|
|
...prev,
|
|
selectedIPAgentIndex: -1,
|
|
}
|
|
}
|
|
return {
|
|
...prev,
|
|
selectedIPAgentIndex: -1,
|
|
viewSelectionMode: 'none',
|
|
}
|
|
}
|
|
|
|
// Clamp if index is out of bounds
|
|
// Max valid index is currentCount (the "hide" row) when spinner tree is shown
|
|
const maxIndex =
|
|
prev.expandedView === 'teammates' ? currentCount : currentCount - 1
|
|
if (currentCount > 0 && prev.selectedIPAgentIndex > maxIndex) {
|
|
return {
|
|
...prev,
|
|
selectedIPAgentIndex: maxIndex,
|
|
}
|
|
}
|
|
|
|
return prev
|
|
})
|
|
}, [teammateCount, setAppState])
|
|
|
|
// Get the selected teammate's task info
|
|
const getSelectedTeammate = (): {
|
|
taskId: string
|
|
task: InProcessTeammateTaskState
|
|
} | null => {
|
|
if (teammateCount === 0) return null
|
|
const selectedIndex = selectedIPAgentIndex
|
|
const task = teammateTasks[selectedIndex]
|
|
if (!task) return null
|
|
|
|
return { taskId: task.id, task }
|
|
}
|
|
|
|
const handleKeyDown = (e: KeyboardEvent): void => {
|
|
// Escape in viewing mode:
|
|
// - If teammate is running: abort current work only (stops current turn, teammate stays alive)
|
|
// - If teammate is not running (completed/killed/failed): exit the view back to leader
|
|
if (e.key === 'escape' && viewSelectionMode === 'viewing-agent') {
|
|
e.preventDefault()
|
|
const taskId = viewingAgentTaskId
|
|
if (taskId) {
|
|
const task = tasks[taskId]
|
|
if (isInProcessTeammateTask(task) && task.status === 'running') {
|
|
// Abort currentWorkAbortController (stops current turn) NOT abortController (kills teammate)
|
|
task.currentWorkAbortController?.abort()
|
|
return
|
|
}
|
|
}
|
|
// Teammate is not running or task doesn't exist — exit the view
|
|
exitTeammateView(setAppState)
|
|
return
|
|
}
|
|
|
|
// Escape in selection mode: exit selection without aborting leader
|
|
if (e.key === 'escape' && viewSelectionMode === 'selecting-agent') {
|
|
e.preventDefault()
|
|
setAppState(prev => ({
|
|
...prev,
|
|
viewSelectionMode: 'none',
|
|
selectedIPAgentIndex: -1,
|
|
}))
|
|
return
|
|
}
|
|
|
|
// Shift+Up/Down for teammate transcript switching (with wrapping)
|
|
// Index -1 represents the leader, 0+ are teammates
|
|
// When showSpinnerTree is true, index === teammateCount is the "hide" row
|
|
// Third case: when pipe IPC is active and no teammates/background tasks, toggle pipe selector
|
|
if (e.shift && (e.key === 'up' || e.key === 'down')) {
|
|
e.preventDefault()
|
|
if (teammateCount > 0) {
|
|
stepTeammateSelection(e.key === 'down' ? 1 : -1, setAppState)
|
|
} else if (hasNonTeammateBackgroundTasks) {
|
|
options?.onOpenBackgroundTasks?.()
|
|
} else if (
|
|
e.key === 'down' &&
|
|
pipeIpc?.statusVisible &&
|
|
options?.onTogglePipeSelector
|
|
) {
|
|
// Shift+Down opens pipe selector when pipe IPC is active and no other navigation targets
|
|
options.onTogglePipeSelector()
|
|
}
|
|
return
|
|
}
|
|
|
|
// 'f' to view selected teammate's transcript (only in selecting mode)
|
|
if (
|
|
e.key === 'f' &&
|
|
viewSelectionMode === 'selecting-agent' &&
|
|
teammateCount > 0
|
|
) {
|
|
e.preventDefault()
|
|
const selected = getSelectedTeammate()
|
|
if (selected) {
|
|
enterTeammateView(selected.taskId, setAppState)
|
|
}
|
|
return
|
|
}
|
|
|
|
// Enter to confirm selection (only when in selecting mode)
|
|
if (e.key === 'return' && viewSelectionMode === 'selecting-agent') {
|
|
e.preventDefault()
|
|
if (selectedIPAgentIndex === -1) {
|
|
exitTeammateView(setAppState)
|
|
} else if (selectedIPAgentIndex >= teammateCount) {
|
|
// "Hide" row selected - collapse the spinner tree
|
|
setAppState(prev => ({
|
|
...prev,
|
|
expandedView: 'none' as const,
|
|
viewSelectionMode: 'none',
|
|
selectedIPAgentIndex: -1,
|
|
}))
|
|
} else {
|
|
const selected = getSelectedTeammate()
|
|
if (selected) {
|
|
enterTeammateView(selected.taskId, setAppState)
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
// k to kill selected teammate (only in selecting mode)
|
|
if (
|
|
e.key === 'k' &&
|
|
viewSelectionMode === 'selecting-agent' &&
|
|
selectedIPAgentIndex >= 0
|
|
) {
|
|
e.preventDefault()
|
|
const selected = getSelectedTeammate()
|
|
if (selected && selected.task.status === 'running') {
|
|
void InProcessTeammateTask.kill(selected.taskId, setAppState)
|
|
}
|
|
return
|
|
}
|
|
}
|
|
|
|
// Backward-compat bridge: REPL.tsx doesn't yet wire handleKeyDown to
|
|
// <Box onKeyDown>. Subscribe via useInput and adapt InputEvent →
|
|
// KeyboardEvent until the consumer is migrated (separate PR).
|
|
// TODO(onKeyDown-migration): remove once REPL passes handleKeyDown.
|
|
useInput((_input, _key, event) => {
|
|
handleKeyDown(new KeyboardEvent(event.keypress))
|
|
})
|
|
|
|
return { handleKeyDown }
|
|
}
|