mirror of
https://github.com/claude-code-best/claude-code.git
synced 2026-06-21 07:45:52 +00:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
5895362178 | ||
|
|
8cfe9b6dc3 | ||
|
|
12f5aedf99 | ||
|
|
c7efac6b8d | ||
|
|
2f150d3ecd | ||
|
|
68c7ebb242 | ||
|
|
9e299a7208 | ||
|
|
941bcbd240 | ||
|
|
fd66ddc45f | ||
|
|
5c107e5f8c | ||
|
|
c4e9efb7a8 | ||
|
|
26ddbda849 | ||
|
|
872ee280e3 | ||
|
|
f5c9880d7d | ||
|
|
3f1c8468bf | ||
|
|
0ad6349434 | ||
|
|
1ac18aec0d | ||
|
|
fcbc882232 | ||
|
|
87b96199f9 |
8
build.ts
8
build.ts
@@ -21,7 +21,13 @@ const result = await Bun.build({
|
|||||||
outdir,
|
outdir,
|
||||||
target: 'bun',
|
target: 'bun',
|
||||||
splitting: true,
|
splitting: true,
|
||||||
define: getMacroDefines(),
|
define: {
|
||||||
|
...getMacroDefines(),
|
||||||
|
// React production mode — eliminates _debugStack Error objects
|
||||||
|
// (6,889 objects × ~1.7KB = 12MB in development builds) and removes
|
||||||
|
// prop-type / key warnings not useful in a production CLI tool.
|
||||||
|
'process.env.NODE_ENV': JSON.stringify('production'),
|
||||||
|
},
|
||||||
features,
|
features,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
225
docs/features/background-agent-selector.md
Normal file
225
docs/features/background-agent-selector.md
Normal file
@@ -0,0 +1,225 @@
|
|||||||
|
# Background Agent Selector — 底部统一后台 Agent 切换器
|
||||||
|
|
||||||
|
> Feature Flag: 无（直接启用）
|
||||||
|
> 实现状态：完整可用
|
||||||
|
> 依赖：`viewingAgentTaskId` / `enterTeammateView` / `exitTeammateView` 已有机制
|
||||||
|
|
||||||
|
## 一、功能概述
|
||||||
|
|
||||||
|
Background Agent Selector 是渲染在 PromptInput 下方的常驻状态条，列出当前所有 **backgrounded 的 local_agent 任务**（包括 `/fork` 派生的 fork agent 和 Task/AgentTool 调用 `run_in_background: true` 派生的子 agent）。用户可以用 ↑/↓ 方向键在 `main` 和各 agent 之间切换焦点，按 Enter 把 REPL 主视图替换为所选 agent 的实时 transcript，再按 Enter 选中 `main` 即可回到主对话。
|
||||||
|
|
||||||
|
整个机制完全复用官方已有的 teammate transcript 查看基础设施，不引入新的视图层 / 数据流，仅新增一条 footer pill 类型。
|
||||||
|
|
||||||
|
### 核心特性
|
||||||
|
|
||||||
|
- **统一入口**：`/fork`、Task 派生的 subagent、所有 `run_in_background: true` 的 agent 都在同一栏显示
|
||||||
|
- **就地切换**：prompt 为空时按 ↓ 溢出进入底部 selector，↑↓ 选中某行，Enter 即切主视图
|
||||||
|
- **实时状态**：每行显示 agent 类型 + 描述 + 运行时长 + 已消耗 token；running 时圆点为绿色
|
||||||
|
- **Keep-alive 视图**：agent 完成后在 `evictAfter` grace 窗口内保留一段时间，用户可回看
|
||||||
|
- **零界面侵入**：tasks 数为 0 时 selector 完全不渲染，不占屏幕高度
|
||||||
|
- **与旧 Dialog 共存**：Shift+↓ 打开的 `BackgroundTasksDialog` 原有行为保留，selector 只作为展示 + 快捷切换
|
||||||
|
|
||||||
|
## 二、用户交互
|
||||||
|
|
||||||
|
### 触发方式
|
||||||
|
|
||||||
|
有任何 background agent 时，selector 自动出现在 `bypass permissions on` 行下方：
|
||||||
|
|
||||||
|
```
|
||||||
|
claude-code | Opus 4.7 (1M context) | ctx:4%
|
||||||
|
▶▶ bypass permissions on (shift+tab to cycle)
|
||||||
|
|
||||||
|
○ main ↑/↓ to select · Enter to view
|
||||||
|
● Explore Research src/hooks 23s · ↓ 10.9k tokens
|
||||||
|
○ Explore Research src/components 22s · ↓ 9.5k tokens
|
||||||
|
○ Explore Research src/utils 21s · ↓ 13.6k tokens
|
||||||
|
```
|
||||||
|
|
||||||
|
### 键盘路由
|
||||||
|
|
||||||
|
| 位置 / 状态 | 按键 | 行为 |
|
||||||
|
|---|---|---|
|
||||||
|
| PromptInput 非空 | ↑↓ | 光标移动 / 翻历史（不变） |
|
||||||
|
| PromptInput 空 + 历史底部 | ↓ | 焦点下放到 selector，高亮到 `● main` |
|
||||||
|
| Selector 聚焦（`footerSelection === 'bg_agent'`） | ↓ | 高亮下移，-1 → 0 → ... → N-1 |
|
||||||
|
| Selector 聚焦 | ↑ | 高亮上移；在 `main` 再 ↑ → 焦点回 PromptInput |
|
||||||
|
| Selector 聚焦 | Enter | `-1` → `exitTeammateView`；`>=0` → `enterTeammateView(agentId)`。焦点保留在 pill |
|
||||||
|
| Selector 聚焦 | Esc | `footer:clearSelection`，焦点回 PromptInput |
|
||||||
|
|
||||||
|
### 视觉规则
|
||||||
|
|
||||||
|
- `● main` / `● <agent>`：当前被**查看**（viewingAgentTaskId 指向）或被**光标聚焦**（pill focused 时以光标为准）的一行
|
||||||
|
- running 状态的 agent：圆点渲染为 `success` 色（绿色），与 `BackgroundTasksDialog` 状态语义对齐
|
||||||
|
- 右上角 hint 随状态变化：
|
||||||
|
- pill 聚焦：`↑/↓ to select · Enter to view`
|
||||||
|
- 已选中 running agent：`shift+↓ to manage · x to stop`
|
||||||
|
- 已选中 terminal agent：`shift+↓ to manage · x to clear`
|
||||||
|
- 未选中任何 agent：`shift+↓ to manage background agents`
|
||||||
|
|
||||||
|
## 三、实现架构
|
||||||
|
|
||||||
|
### 3.1 数据层：`useBackgroundAgentTasks`
|
||||||
|
|
||||||
|
文件：`src/hooks/useBackgroundAgentTasks.ts`
|
||||||
|
|
||||||
|
封装对 `useAppState(s => s.tasks)` 的过滤：
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export function useBackgroundAgentTasks(): LocalAgentTaskState[] {
|
||||||
|
const tasks = useAppState(s => s.tasks)
|
||||||
|
return useMemo(() => {
|
||||||
|
const now = Date.now()
|
||||||
|
return Object.values(tasks)
|
||||||
|
.filter(isLocalAgentTask)
|
||||||
|
.filter(t => t.agentType !== 'main-session')
|
||||||
|
.filter(t => t.isBackgrounded !== false)
|
||||||
|
.filter(t => t.evictAfter === undefined || t.evictAfter > now)
|
||||||
|
.sort((a, b) => a.startTime - b.startTime)
|
||||||
|
}, [tasks])
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`/fork` 和 `AgentTool` 的 `run_in_background: true` 底层都走 `registerAsyncAgent → runAsyncAgentLifecycle`，最终写入同一个 `appState.tasks` Map；此 hook 是唯一数据源，Selector 和 PromptInput 的 `bgAgentList` 都消费它。
|
||||||
|
|
||||||
|
### 3.2 状态层：新增两个字段
|
||||||
|
|
||||||
|
文件：`src/state/AppStateStore.ts`
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export type FooterItem =
|
||||||
|
| 'tasks' | 'tmux' | 'bagel' | 'teams' | 'bridge' | 'companion'
|
||||||
|
| 'bg_agent' // ← 新增
|
||||||
|
|
||||||
|
export type AppState = DeepImmutable<{
|
||||||
|
// ...
|
||||||
|
selectedBgAgentIndex: number // -1 = main, 0..N-1 = 选中的 agent
|
||||||
|
}>
|
||||||
|
```
|
||||||
|
|
||||||
|
- `'bg_agent'` 作为 `FooterItem` 加入 footer pill 体系，享受既有的 `footer:up` / `footer:down` / `footer:openSelected` keybinding 路由
|
||||||
|
- `selectedBgAgentIndex` 记录 selector 的光标位置，与 `viewingAgentTaskId`（"正在看什么"）独立；它不可从 `viewingAgentTaskId` 派生——Enter 后光标留在 pill 继续导航，查看目标才变
|
||||||
|
|
||||||
|
### 3.3 键盘路由：PromptInput footer pill 分支
|
||||||
|
|
||||||
|
文件：`src/components/PromptInput/PromptInput.tsx`
|
||||||
|
|
||||||
|
1. **`bg_agent` 进入 footerItems[0]**：保证 prompt ↓ 溢出时（`handleHistoryDown` → `selectFooterItem(footerItems[0])`）直接进入 selector，而不是 `tasks` 等其他 pill
|
||||||
|
2. **`footer:up` 分支**：`bgAgentSelected` 时 `selectedBgAgentIndex > -1` 则递减；在 -1 → `selectFooterItem(null)` 退出 pill
|
||||||
|
3. **`footer:down` 分支**：`selectedBgAgentIndex < bgAgentList.length - 1` 则递增，到底 clamp
|
||||||
|
4. **`footer:openSelected` 分支**：index === -1 → `exitTeammateView`；否则 `enterTeammateView(bgAgentList[i].agentId)`。**不清理 pill 焦点**，光标留在 selector 上继续导航
|
||||||
|
5. **`selectFooterItem('bg_agent')`**：入 pill 时重置 `selectedBgAgentIndex = -1`（光标落到 `main`）
|
||||||
|
|
||||||
|
### 3.4 渲染层：`BackgroundAgentSelector`
|
||||||
|
|
||||||
|
文件：`src/components/tasks/BackgroundAgentSelector.tsx`
|
||||||
|
|
||||||
|
纯展示组件，不订阅键盘：
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const tasks = useBackgroundAgentTasks()
|
||||||
|
const viewingId = useAppState(s => s.viewingAgentTaskId)
|
||||||
|
const footerSelection = useAppState(s => s.footerSelection)
|
||||||
|
const selectedBgIndex = useAppState(s => s.selectedBgAgentIndex)
|
||||||
|
|
||||||
|
if (tasks.length === 0) return null
|
||||||
|
|
||||||
|
const pillFocused = footerSelection === 'bg_agent'
|
||||||
|
const highlightedId = pillFocused
|
||||||
|
? (selectedBgIndex === -1 ? null : tasks[selectedBgIndex]?.agentId ?? null)
|
||||||
|
: (viewingId ?? null)
|
||||||
|
```
|
||||||
|
|
||||||
|
**高亮派生规则**：pill 聚焦 → 跟 `selectedBgAgentIndex`；未聚焦 → 镜像 `viewingAgentTaskId`。这样当用户通过 Shift+↓ Dialog 或 `enterTeammateView` 其它途径切换视图时，selector 也会正确反映。
|
||||||
|
|
||||||
|
### 3.5 主视图切换：复用 `viewingAgentTaskId`
|
||||||
|
|
||||||
|
REPL.tsx 主体仍复用原有查看逻辑：
|
||||||
|
|
||||||
|
```ts
|
||||||
|
const viewedTask = viewingAgentTaskId ? tasks[viewingAgentTaskId] : undefined
|
||||||
|
const viewedAgentTask = ... (isLocalAgentTask(viewedTask) ? viewedTask : undefined)
|
||||||
|
const displayedMessages = viewedAgentTask ? displayedAgentMessages : messages
|
||||||
|
```
|
||||||
|
|
||||||
|
当 `enterTeammateView(agentId)` 把 `viewingAgentTaskId` 设成某个 local_agent 的 id：
|
||||||
|
|
||||||
|
- `viewedAgentTask` 解析成该 agent
|
||||||
|
- `displayedMessages` 切换到 agent 的 messages
|
||||||
|
- 消息列表、spinner、unseen divider 等一整套组件自动用 agent transcript 重渲染
|
||||||
|
- 主对话流被"暂停"（并非销毁，回到 `main` 时仍在原处）
|
||||||
|
|
||||||
|
`enterTeammateView` 同步负责：设 `retain: true` 阻止 eviction、清 `evictAfter`、触发 disk bootstrap 从 `agent-<id>.jsonl` 加载完整 transcript 到 `task.messages`。
|
||||||
|
|
||||||
|
#### Fork agent prompt 归一化
|
||||||
|
|
||||||
|
`/fork` agent 的 transcript 和普通 subagent 不同：它继承 main agent 的上下文，真实初始消息形态是：
|
||||||
|
|
||||||
|
```text
|
||||||
|
...parent messages
|
||||||
|
assistant([...tool_use])
|
||||||
|
user([tool_result..., text("<fork-boilerplate>...Your directive: <prompt>")])
|
||||||
|
...fork live messages
|
||||||
|
```
|
||||||
|
|
||||||
|
这里的 prompt 文本混在 `[tool_result..., text]` 多 block user message 里。消息渲染管线会优先把这条 user message 当作 tool-result plumbing 来处理，导致 `<fork-boilerplate>` 里的用户 prompt 不稳定可见。为保证切换到 fork agent 时总能看到用户发起的 fork prompt，REPL.tsx 对 fork 视图做一次展示层归一化：
|
||||||
|
|
||||||
|
1. 仅当 `viewedAgentTask.agentType === 'fork'` 时启用，不影响普通 Explore / Task subagent。
|
||||||
|
2. 从原始 messages 中识别包含 `<fork-boilerplate>` 的 carrier message。
|
||||||
|
3. 剥离 carrier message 里的 boilerplate text block，但保留 `tool_result` blocks，避免破坏父 assistant `tool_use` 的承接关系。
|
||||||
|
4. 强制插入一条独立 `createUserMessage({ content: viewedAgentTask.prompt })` 作为可见用户 prompt。
|
||||||
|
5. 插入位置优先为 boilerplate carrier 后；如果 sidechain bootstrap 还没读到 carrier，则插到最后一条 inherited `assistant tool_use` 后面，确保 prompt 接在 main 上下文之后，而不是跑到视图顶部。
|
||||||
|
|
||||||
|
这个归一化只影响 UI 展示用的 `displayedAgentMessages`，不回写 `task.messages`，也不改变发送给模型的 fork transcript。
|
||||||
|
|
||||||
|
### 3.6 生命周期
|
||||||
|
|
||||||
|
完全复用官方既有机制：
|
||||||
|
|
||||||
|
- **运行中**：`isBackgroundTask()` 谓词为真，selector 列出
|
||||||
|
- **完成 / 失败 / 中止**：`completeAgentTask` / `failAgentTask` / `killAsyncAgent` 设 `status` 为 terminal
|
||||||
|
- **回访后退出**：`exitTeammateView` 调 `release(task)`——清 `retain`、清 `messages`、terminal 状态下设 `evictAfter = now + PANEL_GRACE_MS (30s)`
|
||||||
|
- **evictAfter 过期**：`useBackgroundAgentTasks` 过滤时自然剔除，selector 行消失
|
||||||
|
- **手动清除**：`stopOrDismissAgent(taskId)` 设 `evictAfter = 0`，立即消失
|
||||||
|
|
||||||
|
## 四、设计决策
|
||||||
|
|
||||||
|
1. **数据源单一**：`useBackgroundAgentTasks` 是唯一过滤点，PromptInput 也复用，避免过滤条件散落
|
||||||
|
2. **pill 聚焦保留**：Enter 切视图后不松焦，让 ↑↓ 连续导航，贴近官方体验
|
||||||
|
3. **`bg_agent` 放 footerItems[0]**：确保 ↓ 溢出直接进入 selector 而非其它 pill
|
||||||
|
4. **selector 不订阅键盘**：所有按键路由集中在 PromptInput 的 `footer:*` 分支，避免 selector 组件和 PromptInput 双重 `useInput` 的冲突
|
||||||
|
5. **`selectedBgAgentIndex` 存 AppState 而非局部 state**：selector 和 PromptInput 分别在两棵不同子树，需要全局字段协调；该值不能从 `viewingAgentTaskId` 派生
|
||||||
|
6. **与 `BackgroundTasksDialog` 共存**：Shift+↓ 行为完全不变，selector 是补充快捷入口；Dialog 仍管 shell / workflow / monitor_mcp 等 selector 不显示的 task 类型
|
||||||
|
7. **fork prompt 展示层兜底**：fork prompt 不依赖 boilerplate 自身渲染，统一在 `displayedAgentMessages` 中合成独立用户消息；普通 subagent 不走该分支，避免 prompt 重复
|
||||||
|
|
||||||
|
## 五、关键 API 复用
|
||||||
|
|
||||||
|
| 官方已有能力 | selector 如何使用 |
|
||||||
|
|---|---|
|
||||||
|
| `AppState.tasks` | 单一数据源，无需 file watcher / output JSONL 订阅 |
|
||||||
|
| `registerAsyncAgent` | `/fork` 和 AgentTool 共用，selector 不区分来源 |
|
||||||
|
| `enterTeammateView(id)` | Enter 时调用，负责 retain + disk bootstrap |
|
||||||
|
| `exitTeammateView` | Enter 选中 `main` 时调用 |
|
||||||
|
| `release(task)` + `PANEL_GRACE_MS` | 30s keep-alive，selector 自动生效 |
|
||||||
|
| `useElapsedTime` | 每行时长显示，非 running 自动停 interval |
|
||||||
|
| `formatTokens` (`utils/format.ts`) | token 数 1k 缩写 |
|
||||||
|
| `footer:up` / `footer:down` / `footer:openSelected` keybinding | 键盘路由复用 Footer context |
|
||||||
|
|
||||||
|
## 六、文件索引
|
||||||
|
|
||||||
|
| 文件 | 职责 |
|
||||||
|
|------|------|
|
||||||
|
| `src/hooks/useBackgroundAgentTasks.ts` | 数据过滤 hook（backgrounded local_agent + evictAfter 过滤 + startTime 排序） |
|
||||||
|
| `src/components/tasks/BackgroundAgentSelector.tsx` | 底部 selector UI，纯展示 |
|
||||||
|
| `src/components/PromptInput/PromptInput.tsx` | 新增 `'bg_agent'` footer pill + 对应的 `footer:up/down/openSelected` 分支 |
|
||||||
|
| `src/state/AppStateStore.ts` | `FooterItem` 加 `'bg_agent'`；新增 `selectedBgAgentIndex` 字段 |
|
||||||
|
| `src/main.tsx` | `getDefaultAppState` 同步初始化 `selectedBgAgentIndex: -1` |
|
||||||
|
| `src/screens/REPL.tsx` | 在 PromptInput + SessionBackgroundHint 之后挂载 `<BackgroundAgentSelector />`；切换 agent 主视图；对 fork transcript 做 prompt 归一化 |
|
||||||
|
| `src/components/messages/AssistantToolUseMessage.tsx` | 新增 `defaultCollapsed?: boolean` prop，为后续详情视图默认折叠工具块预留 |
|
||||||
|
| `src/components/messages/UserTextMessage.tsx` | 识别 `<fork-boilerplate>`，交给 fork 专用 renderer 处理 |
|
||||||
|
| `src/components/messages/UserForkBoilerplateMessage.tsx` | 将 fork boilerplate text 折叠为纯用户 prompt；作为 transcript 中原位渲染的兼容路径 |
|
||||||
|
|
||||||
|
## 七、已知限制
|
||||||
|
|
||||||
|
- `Date.now()` 在 `useBackgroundAgentTasks` 的 useMemo 里冻结于 `[tasks]` 触发时：若长时间没有新 task 变更事件，某个 terminal agent 的 grace 期过期后不会立即从 selector 消失，要等下一次 tasks 变化才刷新。在典型使用（主对话一直在产生消息）下感知不到，暂不额外加 interval。
|
||||||
|
- Selector 当前不处理 Shell Task / Workflow / Monitor MCP 等类型——这些仍走 `BackgroundTasksDialog`（Shift+↓）管理。
|
||||||
|
- `AssistantToolUseMessage` 的 `defaultCollapsed` prop 目前无调用方传值，保留作为后续"agent 详情视图内工具块默认折叠"扩展点。
|
||||||
275
docs/features/status-line.mdx
Normal file
275
docs/features/status-line.mdx
Normal file
@@ -0,0 +1,275 @@
|
|||||||
|
---
|
||||||
|
title: "StatusLine 底部状态栏 - 自定义 shell 渲染管线"
|
||||||
|
description: "从源码角度解析 Claude Code 底部状态栏：自定义 shell 脚本 + JSON stdin 协议、三种触发源（event / settings / time）、debounce + abort、信任与 hook 开关、以及本仓库 refreshInterval 缺失修复。"
|
||||||
|
keywords: ["statusLine", "状态栏", "自定义提示符", "refreshInterval", "Hooks"]
|
||||||
|
---
|
||||||
|
|
||||||
|
{/* 本章目标：完整讲清 StatusLine 的渲染管线、触发模型、协议契约与安全网关，并记录本仓库相对官方版本的已知缺口与修复 */}
|
||||||
|
|
||||||
|
## 概述
|
||||||
|
|
||||||
|
StatusLine 是 Claude Code REPL 底部显示的一行自定义文本，由**用户提供的 shell 命令**渲染。主进程把运行时状态（模型、工作目录、token、限流、会话元数据等）打包成 JSON 通过 stdin 喂给脚本，脚本在 stdout 输出一行字符串，Ink 侧以 ANSI 转义渲染到 footer。
|
||||||
|
|
||||||
|
核心设计哲学：**语言无关 + 进程隔离 + Unix 管道**。用户可用 bash / python / node / 任意语言写脚本；脚本崩溃不影响主进程；输入输出都是纯文本，可以离线测试（`echo '{...}' | ./script.sh`）。
|
||||||
|
|
||||||
|
## 配置
|
||||||
|
|
||||||
|
`~/.claude/settings.json` 里添加 `statusLine` 字段：
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"statusLine": {
|
||||||
|
"type": "command",
|
||||||
|
"command": "bash ~/.claude/statusline-command.sh",
|
||||||
|
"refreshInterval": 1,
|
||||||
|
"padding": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
| 字段 | 类型 | 作用 |
|
||||||
|
|------|------|------|
|
||||||
|
| `type` | `"command"` | 目前仅支持 command 型 |
|
||||||
|
| `command` | `string` | shell 命令字符串；主进程用系统 shell 解释执行 |
|
||||||
|
| `refreshInterval` | `number` (秒) | 定时刷新周期；缺省/0 表示不定时刷新 |
|
||||||
|
| `padding` | `number` | 左右 padding，单位为 Ink cell |
|
||||||
|
|
||||||
|
Schema 定义在 `src/utils/settings/types.ts:550`（`statusLine` Zod object）。
|
||||||
|
|
||||||
|
## 渲染管线（整体图）
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────── Ink 侧 ───────────────────────┐ ┌──────── 用户侧 ────────┐
|
||||||
|
│ │ │ │
|
||||||
|
│ buildStatusLineCommandInput() ──┐ │ │ ~/.claude/ │
|
||||||
|
│ 收集运行时状态 │ │ │ statusline-*.sh │
|
||||||
|
│ ▼ │ │ │
|
||||||
|
│ executeStatusLineCommand() ─── JSON via stdin ────────────► jq '.model...' │
|
||||||
|
│ execCommandHook() 拉起 shell │ │ 计算、格式化 │
|
||||||
|
│ ▲ │ │ │
|
||||||
|
│ stdout ◄──────────────────── 一行文本 ──────────────── printf '...' │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ setAppState({ statusLineText }) ─┘ │ └────────────────────────┘
|
||||||
|
│ zustand 存字段，组件 memo 订阅 │
|
||||||
|
│ │
|
||||||
|
│ <StatusLine /> → <Text><Ansi>{text}</Ansi></Text> │
|
||||||
|
│ │
|
||||||
|
└──────────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Input 协议：主进程 → 脚本
|
||||||
|
|
||||||
|
`buildStatusLineCommandInput`（`src/components/StatusLine.tsx:53`）构造的 JSON 对象字段如下，**这是脚本可以 `jq` 读取的全部内容**：
|
||||||
|
|
||||||
|
| 字段 | 来源 | 备注 |
|
||||||
|
|------|------|------|
|
||||||
|
| `session_id` | `getSessionId()` | UUID，用于脚本侧 per-session 状态隔离 |
|
||||||
|
| `session_name` | `getCurrentSessionTitle(sessionId)` | 用户命名的会话标题（可选） |
|
||||||
|
| `model.id` / `model.display_name` | `getRuntimeMainLoopModel()` | 运行时真实模型（经 permission mode 降级/200k 升级） |
|
||||||
|
| `workspace.current_dir` / `project_dir` / `added_dirs` | `getCwd()` / `getOriginalCwd()` / permission context | current_dir 随 `cd` 变化 |
|
||||||
|
| `version` | `MACRO.VERSION` | 构建注入，如 `2.1.888` |
|
||||||
|
| `output_style.name` | `settings.outputStyle` | 缺省 `DEFAULT_OUTPUT_STYLE_NAME` |
|
||||||
|
| `cost.total_cost_usd` / `total_duration_ms` / `total_api_duration_ms` / `total_lines_added` / `total_lines_removed` | `cost-tracker.js` 聚合 | 会话累计 |
|
||||||
|
| `context_window.total_input_tokens` / `total_output_tokens` | 同上 | 累计 token |
|
||||||
|
| `context_window.context_window_size` | `getContextWindowForModel()` | 模型上下文上限 |
|
||||||
|
| `context_window.current_usage` | `getCurrentUsage(messages)` | **最新一次 assistant message 的 usage**；含 `input_tokens` / `cache_creation_input_tokens` / `cache_read_input_tokens` / `output_tokens` |
|
||||||
|
| `context_window.used_percentage` / `remaining_percentage` | `calculateContextPercentages()` | 0-100 浮点 |
|
||||||
|
| `exceeds_200k_tokens` | 检查最近 assistant message | 用于 1M 上下文模型的展示 |
|
||||||
|
| `rate_limits.five_hour` / `seven_day` | `getRawUtilization()` | `{ used_percentage, resets_at }`，来自 Claude.ai 限流 API |
|
||||||
|
| `vim.mode` | 启用 vim 模式时 | `INSERT` / `NORMAL` / ... |
|
||||||
|
| `agent.name` | 主线程 agent 类型 | 子 agent fork 时非空 |
|
||||||
|
| `remote.session_id` | Bridge / Remote Control 模式 | 远程会话 |
|
||||||
|
| `worktree` | 当前 worktree 元信息 | `name` / `path` / `branch` / `original_cwd` / `original_branch` |
|
||||||
|
|
||||||
|
类型签名目前在 `src/types/statusLine.ts` 是 `any` 的 stub（反编译残留），实际字段以上表为准。
|
||||||
|
|
||||||
|
## Output 协议：脚本 → 主进程
|
||||||
|
|
||||||
|
`executeStatusLineCommand`（`src/utils/hooks.ts:4752`）对脚本 stdout 做如下处理：
|
||||||
|
|
||||||
|
1. `trim()` 首尾空白
|
||||||
|
2. 按 `\n` 拆行，每行再 `trim()`
|
||||||
|
3. 空行丢弃，剩余用 `\n` 重新拼接
|
||||||
|
|
||||||
|
多行输出会被**保留为多行**（Ink 渲染时 `<Text>` 允许换行），但设计推荐**单行**——多行会挤占 REPL 高度，fullscreen 模式下可能挤掉 ScrollBox 行。
|
||||||
|
|
||||||
|
状态码约定：
|
||||||
|
- `exit 0` + 有 stdout → 显示
|
||||||
|
- `exit 0` + 空 stdout → 清空 statusLine（显示为空）
|
||||||
|
- 非 0 → 忽略，保留上次内容；`logResult=true` 时 warn 级日志
|
||||||
|
- 超时（默认 5000ms） → 忽略
|
||||||
|
- 被 AbortController 取消 → 忽略
|
||||||
|
|
||||||
|
ANSI 颜色可用，Ink 通过 `<Ansi>{text}</Ansi>` 组件解析 SGR 序列。
|
||||||
|
|
||||||
|
## 三种触发源
|
||||||
|
|
||||||
|
StatusLine 的重算由**三类事件**驱动，全部经同一个 debounce 队列：
|
||||||
|
|
||||||
|
### 1. Event-driven（`src/components/StatusLine.tsx:275`）
|
||||||
|
|
||||||
|
监听这些状态变化，触发 `scheduleUpdate()`：
|
||||||
|
|
||||||
|
- `lastAssistantMessageId` — 新助手回复出现
|
||||||
|
- `permissionMode` — `/mode` 切换权限模式
|
||||||
|
- `vimMode` — vim insert/normal 切换
|
||||||
|
- `mainLoopModel` — `/model` 切换
|
||||||
|
|
||||||
|
### 2. Settings-driven（`src/components/StatusLine.tsx:294`）
|
||||||
|
|
||||||
|
`settings.statusLine.command` 字符串变化时（热重载 settings.json），标记下一次结果 log 并立即 `doUpdate()`。
|
||||||
|
|
||||||
|
### 3. Time-driven（`src/components/StatusLine.tsx:292`，本仓库补丁）
|
||||||
|
|
||||||
|
读取 `settings.statusLine.refreshInterval`（秒），`setInterval` 每到点走一次 `scheduleUpdate()`。配置为 0 或缺省时不启定时器（零开销）。
|
||||||
|
|
||||||
|
> **本仓库历史缺口**：反编译出的 `StatusLine.tsx` 最初没有 Time-driven 触发路径，`refreshInterval` 字段也不在 Zod schema 里。导致脚本里 TTL 倒计时、时钟类动态内容不会秒刷，只有助手回复出现时才重算。已在 2026-05-06 补齐，细节见下方"已知缺口与修复"。
|
||||||
|
|
||||||
|
## Debounce + Abort
|
||||||
|
|
||||||
|
三种触发源都走 `scheduleUpdate`（`src/components/StatusLine.tsx:259`）：
|
||||||
|
|
||||||
|
```
|
||||||
|
scheduleUpdate() → setTimeout(300ms) → doUpdate()
|
||||||
|
│
|
||||||
|
└─ 再次 schedule 会 clearTimeout 前次
|
||||||
|
```
|
||||||
|
|
||||||
|
300ms debounce 合并抖动事件（例如短时间连续切 vim/permission）。
|
||||||
|
|
||||||
|
`doUpdate()` 里：
|
||||||
|
|
||||||
|
```
|
||||||
|
abortControllerRef.current?.abort() // 取消上一次 in-flight shell
|
||||||
|
controller = new AbortController()
|
||||||
|
executeStatusLineCommand(..., controller.signal, ...)
|
||||||
|
```
|
||||||
|
|
||||||
|
**单飞（single-flight）语义**：任何新触发都会 abort 上一次未完成的 shell 调用，保证同一时刻最多一个子进程。这对 `refreshInterval: 1` 尤其关键——若脚本执行 > 1 秒，新 tick 到来时老进程被 kill，不会堆积。
|
||||||
|
|
||||||
|
## 安全网关
|
||||||
|
|
||||||
|
`executeStatusLineCommand`（`src/utils/hooks.ts:4752`）在执行前有**三层拦截**：
|
||||||
|
|
||||||
|
1. `shouldDisableAllHooksIncludingManaged()` → managed settings 全局禁用 hooks 时直接返回
|
||||||
|
2. `shouldSkipHookDueToTrust()` → **工作区未接受信任对话框时跳过**，避免打开未知仓库时执行任意 shell 命令（RCE 防护）
|
||||||
|
3. `shouldAllowManagedHooksOnly()` → 非 managed settings 禁用 hooks 但 managed 未禁用时，只读取 policySettings 源的 statusLine
|
||||||
|
|
||||||
|
组件侧配合（`src/components/StatusLine.tsx:318`）：未接受 trust 时在通知中心提示 `"statusline skipped · restart to fix"`。
|
||||||
|
|
||||||
|
另外，`statusLineShouldDisplay`（`src/components/StatusLine.tsx:46`）在 **Kairos assistant mode** 下直接返回 false——因为那时 statusline 字段反映的是 REPL/daemon 进程状态，不是 agent 子进程在跑的东西，显示出来会误导用户。
|
||||||
|
|
||||||
|
## 渲染细节
|
||||||
|
|
||||||
|
### memo 隔离
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
export const StatusLine = memo(StatusLineInner)
|
||||||
|
```
|
||||||
|
|
||||||
|
父组件 `PromptInputFooter` 每次 `setMessages` 都 rerender，但 `StatusLine` 的 props 只有 `lastAssistantMessageId` 会变，`memo` 阻断了无意义的重渲染。此前（未 memo 版本）一个 session 内大约 18 次冗余渲染。
|
||||||
|
|
||||||
|
### 订阅粒度
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const statusLineText = useAppState(s => s.statusLineText)
|
||||||
|
```
|
||||||
|
|
||||||
|
`useAppState` 是选择器订阅，仅在 `statusLineText` 字段变化时触发 rerender；`doUpdate()` 里还做了幂等检查（`prev.statusLineText === text` 则直接返回原 state），**文本不变就不更新 zustand**，连一次 notify 都省掉。
|
||||||
|
|
||||||
|
### Fullscreen 占位
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
{statusLineText ? (
|
||||||
|
<Text dimColor wrap="truncate"><Ansi>{statusLineText}</Ansi></Text>
|
||||||
|
) : isFullscreenEnvEnabled() ? (
|
||||||
|
<Text> </Text> // 占位一行
|
||||||
|
) : null}
|
||||||
|
```
|
||||||
|
|
||||||
|
Fullscreen 模式下 footer `flexShrink:0`，statusline 从 0 行变 1 行会挤掉 ScrollBox 一行内容导致抖动。首次脚本还没返回时，用空格文本占住一行高度，脚本返回后原位替换。
|
||||||
|
|
||||||
|
## 内置 `/statusline` slash command
|
||||||
|
|
||||||
|
`src/commands/statusline.tsx` 定义了一个 **prompt 型 command**，展开成自然语言指令喂给主 Agent：
|
||||||
|
|
||||||
|
```
|
||||||
|
Create an AgentTool with subagent_type "statusline-setup" and the prompt "<user-args>"
|
||||||
|
```
|
||||||
|
|
||||||
|
默认 prompt 是 `"Configure my statusLine from my shell PS1 configuration"`。主 Agent 收到后会调用内置子 agent `statusline-setup`。该子 agent 权限极小：
|
||||||
|
|
||||||
|
- **Tools**: 仅 `Read`、`Edit`
|
||||||
|
- **Allowed paths**: `Read(~/**)`、`Edit(~/.claude/settings.json)`
|
||||||
|
|
||||||
|
也就是说它**不能 Write 新文件、不能跑 Bash**。典型工作是读用户的 shell 配置、读/改 `settings.json`、增量编辑已有的 statusline 脚本。
|
||||||
|
|
||||||
|
## 编写自定义脚本的要点
|
||||||
|
|
||||||
|
1. **脚本必须无状态** — 每次 tick 主进程 fork 一次新 shell，进程内变量不跨调用保留。需要跨 tick 的状态（上次时间戳、上次 token 数）用 `~/.claude/statusline-state/<hash>.state` 文件持久化。
|
||||||
|
2. **按 `session_id` 哈希隔离状态文件** — 多会话同时开着时共享一个 state 文件会串。典型做法：`md5(session_id) | head -c 16` 作为文件名。
|
||||||
|
3. **防御性读取** — state 文件可能损坏/被截断，按行 read + 字段校验（数字字段用 `case "$var" in ''|*[!0-9]*) invalid ;;`）。
|
||||||
|
4. **`refreshInterval` 不等于"脚本秒级调用"** — tick 和事件触发（新消息、模式切换）都走同一 debounce 队列，脚本实际被调用的频率介于"每 N 秒"和"每 N+0.3 秒"之间；且 abort 机制下，上一次没跑完会被 kill。
|
||||||
|
5. **执行时间预算** — 默认 5000ms 超时；为避免 `refreshInterval=1` 时频繁超时，脚本热路径应在 100ms 内完成。重计算（curl、git log 拉取）需缓存。
|
||||||
|
6. **颜色用 ANSI 转义** — 不要依赖 TERM 环境变量；Ink 的 `<Ansi>` 组件独立解析 SGR。
|
||||||
|
7. **不要输出多行** — 单行文本，否则挤占 REPL 布局。
|
||||||
|
8. **处理 `current_usage` 为 null 的情况** — 首次响应之前 `context_window.current_usage` 可能为 null，脚本应有 fallback（如读 state 里上次命中率）。
|
||||||
|
|
||||||
|
### 示例：Cache 命中率 + TTL 倒计时
|
||||||
|
|
||||||
|
本仓库默认安装了一个示例脚本 `~/.claude/statusline-command.sh`（用户侧），输出格式 `<dir> | <model> | ctx:N% | Cache 97% 59:43`：
|
||||||
|
|
||||||
|
- **命中率** = `cache_read / (input + cache_creation + cache_read)`（取自 `current_usage`）
|
||||||
|
- **TTL** 从上次响应倒数 60 分钟，**只在 token signature 变化时重置时间戳**，避免秒级 tick 把 TTL 一直锁在 60:00
|
||||||
|
- **颜色分段** — 命中率 ≥50% 绿 / <50% 灰；TTL 0-20m 绿 / 20-40m 黄 / 40-55m 红 / 最后 5m 闪红 / 过期 `exp` 灰
|
||||||
|
- **Per-session state** — `~/.claude/statusline-state/<md5(session_id)[:16]>.state` 三行（signature、timestamp、hit），读前做 numeric 校验
|
||||||
|
- **Fallback** — `current_usage` 为 null 时读 state 显示上次命中率
|
||||||
|
|
||||||
|
> 该脚本配合 `refreshInterval: 1` 即可秒刷 TTL，前提是 `refreshInterval` 触发路径已实现（见下节）。
|
||||||
|
|
||||||
|
## 已知缺口与修复（本仓库）
|
||||||
|
|
||||||
|
反编译版的 `StatusLine.tsx` 存在一处功能缺口：
|
||||||
|
|
||||||
|
| 项 | 官方 Claude Code | 本仓库原始 | 本仓库现状 |
|
||||||
|
|----|-----------------|-----------|-----------|
|
||||||
|
| `refreshInterval` Zod 字段 | ✅ 有 | ❌ 无 | ✅ 已补 |
|
||||||
|
| Time-driven `setInterval` 触发 | ✅ 有 | ❌ 无 | ✅ 已补 |
|
||||||
|
| Event-driven 触发 | ✅ 有 | ✅ 有 | — |
|
||||||
|
| Settings-driven 触发 | ✅ 有 | ✅ 有 | — |
|
||||||
|
| Debounce + Abort | ✅ 有 | ✅ 有 | — |
|
||||||
|
| Trust 网关 | ✅ 有 | ✅ 有 | — |
|
||||||
|
|
||||||
|
修复（2026-05-06）：
|
||||||
|
|
||||||
|
**1. `src/utils/settings/types.ts:554`** — statusLine schema 新增 `refreshInterval: z.number().optional()`，让字段进入类型系统而非被当未知键忽略。
|
||||||
|
|
||||||
|
**2. `src/components/StatusLine.tsx:292`** — 新增 Time-driven useEffect：
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const refreshIntervalMs = (settings?.statusLine?.refreshInterval ?? 0) * 1000;
|
||||||
|
useEffect(() => {
|
||||||
|
if (refreshIntervalMs <= 0) return;
|
||||||
|
const id = setInterval(() => scheduleUpdate(), refreshIntervalMs);
|
||||||
|
return () => clearInterval(id);
|
||||||
|
}, [refreshIntervalMs, scheduleUpdate]);
|
||||||
|
```
|
||||||
|
|
||||||
|
关键点：
|
||||||
|
- 走 `scheduleUpdate`（非 `doUpdate`）复用 300ms debounce，interval + event 双触发不会双跑
|
||||||
|
- `refreshIntervalMs <= 0` 时不启定时器，对未启用该字段的用户零开销
|
||||||
|
- 依赖数组含 `refreshIntervalMs`，settings 热重载会自动清理旧 interval 重建新的
|
||||||
|
|
||||||
|
**静默失效特征**：修复前 settings.json 写 `refreshInterval: 1` 无任何报错——JSON 解析通过，Zod schema 默认 strip 多余字段，官方文档又说支持这个字段，用户很容易以为生效了而没意识到 TTL/时钟类输出根本没秒刷。这是反编译版本的典型"文档与实现不一致"。
|
||||||
|
|
||||||
|
## 相关源码
|
||||||
|
|
||||||
|
| 文件 | 作用 |
|
||||||
|
|------|------|
|
||||||
|
| `src/components/StatusLine.tsx` | UI 组件、触发逻辑、buildStatusLineCommandInput |
|
||||||
|
| `src/utils/hooks.ts:4752` | `executeStatusLineCommand`：shell 执行、输出处理、安全网关 |
|
||||||
|
| `src/utils/settings/types.ts:550` | `statusLine` Zod schema |
|
||||||
|
| `src/types/statusLine.ts` | `StatusLineCommandInput` 类型（当前为 stub） |
|
||||||
|
| `src/commands/statusline.tsx` | `/statusline` slash command 定义 |
|
||||||
|
| `src/state/AppStateStore.ts:95` | `statusLineText` 字段声明 |
|
||||||
|
| `src/components/PromptInput/PromptInputFooter.tsx:159` | StatusLine 组件挂载点 |
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "claude-code-best",
|
"name": "claude-code-best",
|
||||||
"version": "2.0.5",
|
"version": "2.2.0",
|
||||||
"description": "Reverse-engineered Anthropic Claude Code CLI — interactive AI coding assistant in the terminal",
|
"description": "Reverse-engineered Anthropic Claude Code CLI — interactive AI coding assistant in the terminal",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"author": "claude-code-best <claude-code-best@proton.me>",
|
"author": "claude-code-best <claude-code-best@proton.me>",
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
||||||
|
import type { StructuredPatchHunk } from 'diff';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
import { Suspense, use, useState } from 'react';
|
||||||
import { FileEditToolUseRejectedMessage } from 'src/components/FileEditToolUseRejectedMessage.js';
|
import { FileEditToolUseRejectedMessage } from 'src/components/FileEditToolUseRejectedMessage.js';
|
||||||
import { MessageResponse } from 'src/components/MessageResponse.js';
|
import { MessageResponse } from 'src/components/MessageResponse.js';
|
||||||
import { extractTag } from 'src/utils/messages.js';
|
import { extractTag } from 'src/utils/messages.js';
|
||||||
@@ -10,10 +12,15 @@ import { Text } from '@anthropic/ink';
|
|||||||
import { FilePathLink } from 'src/components/FilePathLink.js';
|
import { FilePathLink } from 'src/components/FilePathLink.js';
|
||||||
import type { Tools } from 'src/Tool.js';
|
import type { Tools } from 'src/Tool.js';
|
||||||
import type { Message, ProgressMessage } from 'src/types/message.js';
|
import type { Message, ProgressMessage } from 'src/types/message.js';
|
||||||
|
import { adjustHunkLineNumbers, CONTEXT_LINES } from 'src/utils/diff.js';
|
||||||
import { FILE_NOT_FOUND_CWD_NOTE, getDisplayPath } from 'src/utils/file.js';
|
import { FILE_NOT_FOUND_CWD_NOTE, getDisplayPath } from 'src/utils/file.js';
|
||||||
|
import { logError } from 'src/utils/log.js';
|
||||||
import { getPlansDirectory } from 'src/utils/plans.js';
|
import { getPlansDirectory } from 'src/utils/plans.js';
|
||||||
|
import { readEditContext } from 'src/utils/readEditContext.js';
|
||||||
|
import { firstLineOf } from 'src/utils/stringUtils.js';
|
||||||
import type { ThemeName } from 'src/utils/theme.js';
|
import type { ThemeName } from 'src/utils/theme.js';
|
||||||
import type { FileEditOutput } from './types.js';
|
import type { FileEditOutput } from './types.js';
|
||||||
|
import { findActualString, getPatchForEdit, preserveQuoteStyle } from './utils.js';
|
||||||
|
|
||||||
export function userFacingName(
|
export function userFacingName(
|
||||||
input:
|
input:
|
||||||
@@ -84,6 +91,8 @@ export function renderToolResultMessage(
|
|||||||
<FileEditToolUpdatedMessage
|
<FileEditToolUpdatedMessage
|
||||||
filePath={filePath}
|
filePath={filePath}
|
||||||
structuredPatch={structuredPatch}
|
structuredPatch={structuredPatch}
|
||||||
|
firstLine={originalFile.split('\n')[0] ?? null}
|
||||||
|
fileContent={originalFile}
|
||||||
style={style}
|
style={style}
|
||||||
verbose={verbose}
|
verbose={verbose}
|
||||||
previewHint={isPlanFile ? '/plan to preview' : undefined}
|
previewHint={isPlanFile ? '/plan to preview' : undefined}
|
||||||
@@ -99,7 +108,7 @@ export function renderToolUseRejectedMessage(
|
|||||||
replace_all?: boolean;
|
replace_all?: boolean;
|
||||||
edits?: unknown[];
|
edits?: unknown[];
|
||||||
},
|
},
|
||||||
_options: {
|
options: {
|
||||||
columns: number;
|
columns: number;
|
||||||
messages: Message[];
|
messages: Message[];
|
||||||
progressMessagesForMessage: ProgressMessage[];
|
progressMessagesForMessage: ProgressMessage[];
|
||||||
@@ -109,14 +118,40 @@ export function renderToolUseRejectedMessage(
|
|||||||
verbose: boolean;
|
verbose: boolean;
|
||||||
},
|
},
|
||||||
): React.ReactElement {
|
): React.ReactElement {
|
||||||
const { style, verbose } = _options;
|
const { style, verbose } = options;
|
||||||
const filePath = input.file_path;
|
const filePath = input.file_path;
|
||||||
const isNewFile = input.old_string === '';
|
const oldString = input.old_string ?? '';
|
||||||
|
const newString = input.new_string ?? '';
|
||||||
|
const replaceAll = input.replace_all ?? false;
|
||||||
|
|
||||||
|
// Defensive: if input has an unexpected shape, show a simple rejection message
|
||||||
|
if ('edits' in input && input.edits != null) {
|
||||||
|
return (
|
||||||
|
<FileEditToolUseRejectedMessage file_path={filePath} operation="update" firstLine={null} verbose={verbose} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const isNewFile = oldString === '';
|
||||||
|
|
||||||
|
// For new file creation, show content preview instead of diff
|
||||||
|
if (isNewFile) {
|
||||||
|
return (
|
||||||
|
<FileEditToolUseRejectedMessage
|
||||||
|
file_path={filePath}
|
||||||
|
operation="write"
|
||||||
|
content={newString}
|
||||||
|
firstLine={firstLineOf(newString)}
|
||||||
|
verbose={verbose}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FileEditToolUseRejectedMessage
|
<EditRejectionDiff
|
||||||
file_path={filePath}
|
filePath={filePath}
|
||||||
operation={isNewFile ? 'write' : 'update'}
|
oldString={oldString}
|
||||||
|
newString={newString}
|
||||||
|
replaceAll={replaceAll}
|
||||||
style={style}
|
style={style}
|
||||||
verbose={verbose}
|
verbose={verbose}
|
||||||
/>
|
/>
|
||||||
@@ -149,3 +184,103 @@ export function renderToolUseErrorMessage(
|
|||||||
}
|
}
|
||||||
return <FallbackToolUseErrorMessage result={result} verbose={verbose} />;
|
return <FallbackToolUseErrorMessage result={result} verbose={verbose} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type RejectionDiffData = {
|
||||||
|
patch: StructuredPatchHunk[];
|
||||||
|
firstLine: string | null;
|
||||||
|
fileContent: string | undefined;
|
||||||
|
};
|
||||||
|
|
||||||
|
function EditRejectionDiff({
|
||||||
|
filePath,
|
||||||
|
oldString,
|
||||||
|
newString,
|
||||||
|
replaceAll,
|
||||||
|
style,
|
||||||
|
verbose,
|
||||||
|
}: {
|
||||||
|
filePath: string;
|
||||||
|
oldString: string;
|
||||||
|
newString: string;
|
||||||
|
replaceAll: boolean;
|
||||||
|
style?: 'condensed';
|
||||||
|
verbose: boolean;
|
||||||
|
}): React.ReactNode {
|
||||||
|
const [dataPromise] = useState(() => loadRejectionDiff(filePath, oldString, newString, replaceAll));
|
||||||
|
return (
|
||||||
|
<Suspense
|
||||||
|
fallback={
|
||||||
|
<FileEditToolUseRejectedMessage file_path={filePath} operation="update" firstLine={null} verbose={verbose} />
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<EditRejectionBody promise={dataPromise} filePath={filePath} style={style} verbose={verbose} />
|
||||||
|
</Suspense>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function EditRejectionBody({
|
||||||
|
promise,
|
||||||
|
filePath,
|
||||||
|
style,
|
||||||
|
verbose,
|
||||||
|
}: {
|
||||||
|
promise: Promise<RejectionDiffData>;
|
||||||
|
filePath: string;
|
||||||
|
style?: 'condensed';
|
||||||
|
verbose: boolean;
|
||||||
|
}): React.ReactNode {
|
||||||
|
const { patch, firstLine, fileContent } = use(promise);
|
||||||
|
return (
|
||||||
|
<FileEditToolUseRejectedMessage
|
||||||
|
file_path={filePath}
|
||||||
|
operation="update"
|
||||||
|
patch={patch}
|
||||||
|
firstLine={firstLine}
|
||||||
|
fileContent={fileContent}
|
||||||
|
style={style}
|
||||||
|
verbose={verbose}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadRejectionDiff(
|
||||||
|
filePath: string,
|
||||||
|
oldString: string,
|
||||||
|
newString: string,
|
||||||
|
replaceAll: boolean,
|
||||||
|
): Promise<RejectionDiffData> {
|
||||||
|
try {
|
||||||
|
// Chunked read — context window around the first occurrence. replaceAll
|
||||||
|
// still shows matches *within* the window via getPatchForEdit; we accept
|
||||||
|
// losing the all-occurrences view to keep the read bounded.
|
||||||
|
const ctx = await readEditContext(filePath, oldString, CONTEXT_LINES);
|
||||||
|
if (ctx === null || ctx.truncated || ctx.content === '') {
|
||||||
|
// ENOENT / not found / truncated — diff just the tool inputs.
|
||||||
|
const { patch } = getPatchForEdit({
|
||||||
|
filePath,
|
||||||
|
fileContents: oldString,
|
||||||
|
oldString,
|
||||||
|
newString,
|
||||||
|
});
|
||||||
|
return { patch, firstLine: null, fileContent: undefined };
|
||||||
|
}
|
||||||
|
const actualOld = findActualString(ctx.content, oldString) || oldString;
|
||||||
|
const actualNew = preserveQuoteStyle(oldString, actualOld, newString);
|
||||||
|
const { patch } = getPatchForEdit({
|
||||||
|
filePath,
|
||||||
|
fileContents: ctx.content,
|
||||||
|
oldString: actualOld,
|
||||||
|
newString: actualNew,
|
||||||
|
replaceAll,
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
patch: adjustHunkLineNumbers(patch, ctx.lineOffset - 1),
|
||||||
|
firstLine: ctx.lineOffset === 1 ? firstLineOf(ctx.content) : null,
|
||||||
|
fileContent: ctx.content,
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
// User may have manually applied the change while the diff was shown.
|
||||||
|
logError(e as Error);
|
||||||
|
return { patch: [], firstLine: null, fileContent: undefined };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
||||||
import { relative } from 'path';
|
import type { StructuredPatchHunk } from 'diff';
|
||||||
|
import { isAbsolute, relative, resolve } from 'path';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
import { Suspense, use, useState } from 'react';
|
||||||
import { MessageResponse } from 'src/components/MessageResponse.js';
|
import { MessageResponse } from 'src/components/MessageResponse.js';
|
||||||
import { extractTag } from 'src/utils/messages.js';
|
import { extractTag } from 'src/utils/messages.js';
|
||||||
import { CtrlOToExpand } from 'src/components/CtrlOToExpand.js';
|
import { CtrlOToExpand } from 'src/components/CtrlOToExpand.js';
|
||||||
@@ -15,8 +17,11 @@ import { FilePathLink } from 'src/components/FilePathLink.js';
|
|||||||
import type { ToolProgressData } from 'src/Tool.js';
|
import type { ToolProgressData } from 'src/Tool.js';
|
||||||
import type { ProgressMessage } from 'src/types/message.js';
|
import type { ProgressMessage } from 'src/types/message.js';
|
||||||
import { getCwd } from 'src/utils/cwd.js';
|
import { getCwd } from 'src/utils/cwd.js';
|
||||||
|
import { getPatchForDisplay } from 'src/utils/diff.js';
|
||||||
import { getDisplayPath } from 'src/utils/file.js';
|
import { getDisplayPath } from 'src/utils/file.js';
|
||||||
|
import { logError } from 'src/utils/log.js';
|
||||||
import { getPlansDirectory } from 'src/utils/plans.js';
|
import { getPlansDirectory } from 'src/utils/plans.js';
|
||||||
|
import { openForScan, readCapped } from 'src/utils/readEditContext.js';
|
||||||
import type { Output } from './FileWriteTool.js';
|
import type { Output } from './FileWriteTool.js';
|
||||||
|
|
||||||
const MAX_LINES_TO_RENDER = 10;
|
const MAX_LINES_TO_RENDER = 10;
|
||||||
@@ -122,10 +127,115 @@ export function renderToolUseMessage(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function renderToolUseRejectedMessage(
|
export function renderToolUseRejectedMessage(
|
||||||
{ file_path }: { file_path: string; content: string },
|
{ file_path, content }: { file_path: string; content: string },
|
||||||
{ style, verbose }: { style?: 'condensed'; verbose: boolean },
|
{ style, verbose }: { style?: 'condensed'; verbose: boolean },
|
||||||
): React.ReactNode {
|
): React.ReactNode {
|
||||||
return <FileEditToolUseRejectedMessage file_path={file_path} operation="write" style={style} verbose={verbose} />;
|
return <WriteRejectionDiff filePath={file_path} content={content} style={style} verbose={verbose} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
type RejectionDiffData =
|
||||||
|
| { type: 'create' }
|
||||||
|
| { type: 'update'; patch: StructuredPatchHunk[]; oldContent: string }
|
||||||
|
| { type: 'error' };
|
||||||
|
|
||||||
|
function WriteRejectionDiff({
|
||||||
|
filePath,
|
||||||
|
content,
|
||||||
|
style,
|
||||||
|
verbose,
|
||||||
|
}: {
|
||||||
|
filePath: string;
|
||||||
|
content: string;
|
||||||
|
style?: 'condensed';
|
||||||
|
verbose: boolean;
|
||||||
|
}): React.ReactNode {
|
||||||
|
const [dataPromise] = useState(() => loadRejectionDiff(filePath, content));
|
||||||
|
const firstLine = content.split('\n')[0] ?? null;
|
||||||
|
const createFallback = (
|
||||||
|
<FileEditToolUseRejectedMessage
|
||||||
|
file_path={filePath}
|
||||||
|
operation="write"
|
||||||
|
content={content}
|
||||||
|
firstLine={firstLine}
|
||||||
|
verbose={verbose}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
return (
|
||||||
|
<Suspense fallback={createFallback}>
|
||||||
|
<WriteRejectionBody
|
||||||
|
promise={dataPromise}
|
||||||
|
filePath={filePath}
|
||||||
|
firstLine={firstLine}
|
||||||
|
createFallback={createFallback}
|
||||||
|
style={style}
|
||||||
|
verbose={verbose}
|
||||||
|
/>
|
||||||
|
</Suspense>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function WriteRejectionBody({
|
||||||
|
promise,
|
||||||
|
filePath,
|
||||||
|
firstLine,
|
||||||
|
createFallback,
|
||||||
|
style,
|
||||||
|
verbose,
|
||||||
|
}: {
|
||||||
|
promise: Promise<RejectionDiffData>;
|
||||||
|
filePath: string;
|
||||||
|
firstLine: string | null;
|
||||||
|
createFallback: React.ReactNode;
|
||||||
|
style?: 'condensed';
|
||||||
|
verbose: boolean;
|
||||||
|
}): React.ReactNode {
|
||||||
|
const data = use(promise);
|
||||||
|
if (data.type === 'create') return createFallback;
|
||||||
|
if (data.type === 'error') {
|
||||||
|
return (
|
||||||
|
<MessageResponse>
|
||||||
|
<Text>(No changes)</Text>
|
||||||
|
</MessageResponse>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<FileEditToolUseRejectedMessage
|
||||||
|
file_path={filePath}
|
||||||
|
operation="update"
|
||||||
|
patch={data.patch}
|
||||||
|
firstLine={firstLine}
|
||||||
|
fileContent={data.oldContent}
|
||||||
|
style={style}
|
||||||
|
verbose={verbose}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadRejectionDiff(filePath: string, content: string): Promise<RejectionDiffData> {
|
||||||
|
try {
|
||||||
|
const fullFilePath = isAbsolute(filePath) ? filePath : resolve(getCwd(), filePath);
|
||||||
|
const handle = await openForScan(fullFilePath);
|
||||||
|
if (handle === null) return { type: 'create' };
|
||||||
|
let oldContent: string | null;
|
||||||
|
try {
|
||||||
|
oldContent = await readCapped(handle);
|
||||||
|
} finally {
|
||||||
|
await handle.close();
|
||||||
|
}
|
||||||
|
// File exceeds MAX_SCAN_BYTES — fall back to the create view rather than
|
||||||
|
// OOMing on a diff of a multi-GB file.
|
||||||
|
if (oldContent === null) return { type: 'create' };
|
||||||
|
const patch = getPatchForDisplay({
|
||||||
|
filePath,
|
||||||
|
fileContents: oldContent,
|
||||||
|
edits: [{ old_string: oldContent, new_string: content, replace_all: false }],
|
||||||
|
});
|
||||||
|
return { type: 'update', patch, oldContent };
|
||||||
|
} catch (e) {
|
||||||
|
// User may have manually applied the change while the diff was shown.
|
||||||
|
logError(e as Error);
|
||||||
|
return { type: 'error' };
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function renderToolUseErrorMessage(
|
export function renderToolUseErrorMessage(
|
||||||
@@ -179,6 +289,8 @@ export function renderToolResultMessage(
|
|||||||
<FileEditToolUpdatedMessage
|
<FileEditToolUpdatedMessage
|
||||||
filePath={filePath}
|
filePath={filePath}
|
||||||
structuredPatch={structuredPatch}
|
structuredPatch={structuredPatch}
|
||||||
|
firstLine={content.split('\n')[0] ?? null}
|
||||||
|
fileContent={originalFile ?? undefined}
|
||||||
style={style}
|
style={style}
|
||||||
verbose={verbose}
|
verbose={verbose}
|
||||||
previewHint={isPlanFile ? '/plan to preview' : undefined}
|
previewHint={isPlanFile ? '/plan to preview' : undefined}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ export const DEFAULT_BUILD_FEATURES = [
|
|||||||
// 'FORK_SUBAGENT', // 已禁用：显式 `fork: true` 参数触发 fork 路径（继承父级上下文和模型），不影响 forceAsync 和探索任务模型选择
|
// 'FORK_SUBAGENT', // 已禁用：显式 `fork: true` 参数触发 fork 路径（继承父级上下文和模型），不影响 forceAsync 和探索任务模型选择
|
||||||
// 'UDS_INBOX', // inbox 数组只增不减（非 GB 级主因）
|
// 'UDS_INBOX', // inbox 数组只增不减（非 GB 级主因）
|
||||||
'KAIROS', // Kairos 定时任务系统核心
|
'KAIROS', // Kairos 定时任务系统核心
|
||||||
// 'COORDINATOR_MODE', // 已禁用：AgentSummary 30s fork 循环，GB 级泄露主因
|
'COORDINATOR_MODE', // 多 worker 编排模式（AgentSummary 泄露已在 52b61c2c 修复）
|
||||||
// 'LAN_PIPES', // 依赖 UDS_INBOX（已随 UDS_INBOX 恢复）
|
// 'LAN_PIPES', // 依赖 UDS_INBOX（已随 UDS_INBOX 恢复）
|
||||||
'BG_SESSIONS', // 后台会话管理（ps/logs/attach/kill）
|
'BG_SESSIONS', // 后台会话管理（ps/logs/attach/kill）
|
||||||
'TEMPLATES', // 模板任务（new/list/reply 子命令）
|
'TEMPLATES', // 模板任务（new/list/reply 子命令）
|
||||||
|
|||||||
@@ -14,7 +14,12 @@ const __dirname = dirname(__filename)
|
|||||||
const projectRoot = join(__dirname, '..')
|
const projectRoot = join(__dirname, '..')
|
||||||
const cliPath = join(projectRoot, 'src/entrypoints/cli.tsx')
|
const cliPath = join(projectRoot, 'src/entrypoints/cli.tsx')
|
||||||
|
|
||||||
const defines = getMacroDefines()
|
const defines = {
|
||||||
|
...getMacroDefines(),
|
||||||
|
// React production mode — prevents 6,889+ _debugStack Error objects
|
||||||
|
// (12MB) from accumulating during long-running sessions.
|
||||||
|
'process.env.NODE_ENV': JSON.stringify('production'),
|
||||||
|
}
|
||||||
|
|
||||||
const defineArgs = Object.entries(defines).flatMap(([k, v]) => [
|
const defineArgs = Object.entries(defines).flatMap(([k, v]) => [
|
||||||
'-d',
|
'-d',
|
||||||
|
|||||||
@@ -41,11 +41,7 @@ import { type Tools, type ToolUseContext, toolMatchesName } from './Tool.js'
|
|||||||
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
|
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
|
||||||
import { SYNTHETIC_OUTPUT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js'
|
import { SYNTHETIC_OUTPUT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js'
|
||||||
import type { APIError } from '@anthropic-ai/sdk'
|
import type { APIError } from '@anthropic-ai/sdk'
|
||||||
import type {
|
import type { Message, SystemCompactBoundaryMessage } from './types/message.js'
|
||||||
CompactMetadata,
|
|
||||||
Message,
|
|
||||||
SystemCompactBoundaryMessage,
|
|
||||||
} from './types/message.js'
|
|
||||||
import type { OrphanedPermission } from './types/textInputTypes.js'
|
import type { OrphanedPermission } from './types/textInputTypes.js'
|
||||||
import { createAbortController } from './utils/abortController.js'
|
import { createAbortController } from './utils/abortController.js'
|
||||||
import type { AttributionState } from './utils/commitAttribution.js'
|
import type { AttributionState } from './utils/commitAttribution.js'
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { feature } from 'bun:bundle'
|
import { feature } from 'bun:bundle'
|
||||||
import { getKairosActive } from '../bootstrap/state.js'
|
|
||||||
import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
|
import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import {
|
|||||||
logEvent,
|
logEvent,
|
||||||
logEventAsync,
|
logEventAsync,
|
||||||
} from '../services/analytics/index.js'
|
} from '../services/analytics/index.js'
|
||||||
import { isInBundledMode } from '../utils/bundledMode.js'
|
|
||||||
import { getBootstrapArgs, getScriptPath } from '../utils/cliLaunch.js'
|
import { getBootstrapArgs, getScriptPath } from '../utils/cliLaunch.js'
|
||||||
import { logForDebugging } from '../utils/debug.js'
|
import { logForDebugging } from '../utils/debug.js'
|
||||||
import { rcLog } from './rcDebugLog.js'
|
import { rcLog } from './rcDebugLog.js'
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ import type {
|
|||||||
SDKControlResponse,
|
SDKControlResponse,
|
||||||
} from '../entrypoints/sdk/controlTypes.js'
|
} from '../entrypoints/sdk/controlTypes.js'
|
||||||
import type { StdoutMessage } from '../entrypoints/sdk/controlTypes.js'
|
import type { StdoutMessage } from '../entrypoints/sdk/controlTypes.js'
|
||||||
import type { SDKResultSuccess } from '../entrypoints/sdk/coreTypes.js'
|
|
||||||
import type { PermissionMode } from '../utils/permissions/PermissionMode.js'
|
import type { PermissionMode } from '../utils/permissions/PermissionMode.js'
|
||||||
import { setSessionMetadataChangedListener } from '../utils/sessionState.js'
|
import { setSessionMetadataChangedListener } from '../utils/sessionState.js'
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ import type {
|
|||||||
SDKControlResponse,
|
SDKControlResponse,
|
||||||
} from '../entrypoints/sdk/controlTypes.js'
|
} from '../entrypoints/sdk/controlTypes.js'
|
||||||
import type { StdoutMessage } from '../entrypoints/sdk/controlTypes.js'
|
import type { StdoutMessage } from '../entrypoints/sdk/controlTypes.js'
|
||||||
import type { SDKResultSuccess } from '../entrypoints/sdk/coreTypes.js'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* StdoutMessage with optional session_id. The transport layer accepts
|
* StdoutMessage with optional session_id. The transport layer accepts
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
* Companion display card — shown by /buddy (no args).
|
* Companion display card — shown by /buddy (no args).
|
||||||
* Mirrors official vc8 component: bordered box with sprite, stats, last reaction.
|
* Mirrors official vc8 component: bordered box with sprite, stats, last reaction.
|
||||||
*/
|
*/
|
||||||
import React from 'react';
|
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { useInput } from '@anthropic/ink';
|
import { useInput } from '@anthropic/ink';
|
||||||
import { renderSprite } from './sprites.js';
|
import { renderSprite } from './sprites.js';
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
import { stat } from 'fs/promises';
|
import { stat } from 'fs/promises';
|
||||||
import pMap from 'p-map';
|
import pMap from 'p-map';
|
||||||
import { cwd } from 'process';
|
import { cwd } from 'process';
|
||||||
import React from 'react';
|
|
||||||
import { MCPServerDesktopImportDialog } from '../../components/MCPServerDesktopImportDialog.js';
|
import { MCPServerDesktopImportDialog } from '../../components/MCPServerDesktopImportDialog.js';
|
||||||
import { wrappedRender as render } from '@anthropic/ink';
|
import { wrappedRender as render } from '@anthropic/ink';
|
||||||
import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
|
import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
|
||||||
|
|||||||
@@ -112,7 +112,6 @@ import type {
|
|||||||
ModelInfo,
|
ModelInfo,
|
||||||
SDKMessage,
|
SDKMessage,
|
||||||
SDKUserMessage,
|
SDKUserMessage,
|
||||||
SDKUserMessageReplay,
|
|
||||||
PermissionResult,
|
PermissionResult,
|
||||||
McpServerConfigForProcessTransport,
|
McpServerConfigForProcessTransport,
|
||||||
McpServerStatus,
|
McpServerStatus,
|
||||||
@@ -5477,7 +5476,7 @@ function getStructuredIO(
|
|||||||
*/
|
*/
|
||||||
export async function handleOrphanedPermissionResponse({
|
export async function handleOrphanedPermissionResponse({
|
||||||
message,
|
message,
|
||||||
setAppState,
|
setAppState: _setAppState,
|
||||||
onEnqueued,
|
onEnqueued,
|
||||||
handledToolUseIds,
|
handledToolUseIds,
|
||||||
}: {
|
}: {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { useEffect, useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { resolve } from 'path';
|
import { resolve } from 'path';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { Dialog } from '../../components/design-system/Dialog.js';
|
import { Dialog } from '../../components/design-system/Dialog.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { Settings } from '../../components/Settings/Settings.js';
|
import { Settings } from '../../components/Settings/Settings.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
export const call: LocalJSXCommandCall = async (onDone, context) => {
|
export const call: LocalJSXCommandCall = async (onDone, context) => {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Doctor } from '../../screens/Doctor.js';
|
import { Doctor } from '../../screens/Doctor.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
|
|||||||
@@ -43,8 +43,12 @@ export async function call(
|
|||||||
// Omitting subagent_type triggers implicit fork.
|
// Omitting subagent_type triggers implicit fork.
|
||||||
const input = {
|
const input = {
|
||||||
prompt: directive,
|
prompt: directive,
|
||||||
|
fork: true, // 触发 AgentTool 的 fork 路径：继承父会话上下文 + system prompt + 模型
|
||||||
run_in_background: true, // fork always runs async
|
run_in_background: true, // fork always runs async
|
||||||
description: `Fork: ${directive.slice(0, 30)}${directive.length > 30 ? '...' : ''}`,
|
// description 只显示在底部 selector / BackgroundTasksDialog，保持简短标签
|
||||||
|
// 即可；用户输入的 prompt 会作为第一条用户消息呈现在主视图里，这里不要
|
||||||
|
// 重复显示。
|
||||||
|
description: 'forked from main',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Call AgentTool with proper parameters:
|
// Call AgentTool with proper parameters:
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { HelpV2 } from '../../components/HelpV2/HelpV2.js';
|
import { HelpV2 } from '../../components/HelpV2/HelpV2.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { HooksConfigMenu } from '../../components/hooks/HooksConfigMenu.js';
|
import { HooksConfigMenu } from '../../components/hooks/HooksConfigMenu.js';
|
||||||
import { logEvent } from '../../services/analytics/index.js';
|
import { logEvent } from '../../services/analytics/index.js';
|
||||||
import { getTools } from '../../tools.js';
|
import { getTools } from '../../tools.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useState } from 'react';
|
import { useCallback, useState } from 'react';
|
||||||
import TextInput from '../../components/TextInput.js';
|
import TextInput from '../../components/TextInput.js';
|
||||||
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
||||||
import { Box, color, Text, useTheme } from '@anthropic/ink';
|
import { Box, color, Text, useTheme } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useState } from 'react';
|
import { useCallback, useState } from 'react';
|
||||||
import TextInput from '../../components/TextInput.js';
|
import TextInput from '../../components/TextInput.js';
|
||||||
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
||||||
import { Box, color, Text, useTheme } from '@anthropic/ink';
|
import { Box, color, Text, useTheme } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
|
|
||||||
export function CheckGitHubStep() {
|
export function CheckGitHubStep() {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useState } from 'react';
|
import { useCallback, useState } from 'react';
|
||||||
import TextInput from '../../components/TextInput.js';
|
import TextInput from '../../components/TextInput.js';
|
||||||
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import type { Workflow } from './types.js';
|
import type { Workflow } from './types.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react';
|
|
||||||
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Select } from 'src/components/CustomSelect/index.js';
|
import { Select } from 'src/components/CustomSelect/index.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import figures from 'figures';
|
import figures from 'figures';
|
||||||
import React from 'react';
|
|
||||||
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../keybindings/useKeybinding.js';
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import figures from 'figures';
|
import figures from 'figures';
|
||||||
import React from 'react';
|
|
||||||
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../keybindings/useKeybinding.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { feature } from 'bun:bundle';
|
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { resetCostState } from '../../bootstrap/state.js';
|
import { resetCostState } from '../../bootstrap/state.js';
|
||||||
import { clearTrustedDeviceToken, enrollTrustedDevice } from '../../bridge/trustedDevice.js';
|
import { clearTrustedDeviceToken, enrollTrustedDevice } from '../../bridge/trustedDevice.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { PermissionRuleList } from '../../components/permissions/rules/PermissionRuleList.js';
|
import { PermissionRuleList } from '../../components/permissions/rules/PermissionRuleList.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
import { createPermissionRetryMessage } from '../../utils/messages.js';
|
import { createPermissionRetryMessage } from '../../utils/messages.js';
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ function getMergedEnv(): Record<string, string> {
|
|||||||
return merged
|
return merged
|
||||||
}
|
}
|
||||||
|
|
||||||
const call: LocalCommandCall = async (args, context) => {
|
const call: LocalCommandCall = async (args, _context) => {
|
||||||
const arg = args.trim().toLowerCase()
|
const arg = args.trim().toLowerCase()
|
||||||
|
|
||||||
// No argument: show current provider
|
// No argument: show current provider
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { type ChildProcess } from 'child_process';
|
|||||||
import { resolve } from 'path';
|
import { resolve } from 'path';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { getBridgeDisabledReason, isBridgeEnabled } from '../../bridge/bridgeEnabled.js';
|
import { getBridgeDisabledReason } from '../../bridge/bridgeEnabled.js';
|
||||||
import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js';
|
import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js';
|
||||||
import { BRIDGE_LOGIN_INSTRUCTION } from '../../bridge/types.js';
|
import { BRIDGE_LOGIN_INSTRUCTION } from '../../bridge/types.js';
|
||||||
import { Dialog } from '../../components/design-system/Dialog.js';
|
import { Dialog } from '../../components/design-system/Dialog.js';
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js';
|
import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js';
|
||||||
import React from 'react';
|
|
||||||
import type { LocalJSXCommandCall, LocalJSXCommandOnDone } from '../../types/command.js';
|
import type { LocalJSXCommandCall, LocalJSXCommandOnDone } from '../../types/command.js';
|
||||||
import { checkOverageGate, confirmOverage, launchRemoteReview } from './reviewRemote.js';
|
import { checkOverageGate, confirmOverage, launchRemoteReview } from './reviewRemote.js';
|
||||||
import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js';
|
import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js';
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import {
|
|||||||
exportInstincts,
|
exportInstincts,
|
||||||
findPromotionCandidates,
|
findPromotionCandidates,
|
||||||
generateSkillCandidates,
|
generateSkillCandidates,
|
||||||
importInstincts,
|
|
||||||
ingestTranscript,
|
ingestTranscript,
|
||||||
listKnownProjects,
|
listKnownProjects,
|
||||||
loadInstincts,
|
loadInstincts,
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { Stats } from '../../components/Stats.js';
|
import { Stats } from '../../components/Stats.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { readFileSync } from 'fs';
|
|
||||||
import { REMOTE_CONTROL_DISCONNECTED_MSG } from '../bridge/types.js';
|
import { REMOTE_CONTROL_DISCONNECTED_MSG } from '../bridge/types.js';
|
||||||
import type { Command } from '../commands.js';
|
import type { Command } from '../commands.js';
|
||||||
import { DIAMOND_OPEN } from '../constants/figures.js';
|
import { DIAMOND_OPEN } from '../constants/figures.js';
|
||||||
@@ -21,7 +20,6 @@ import { logForDebugging } from '../utils/debug.js';
|
|||||||
import { errorMessage } from '../utils/errors.js';
|
import { errorMessage } from '../utils/errors.js';
|
||||||
import { logError } from '../utils/log.js';
|
import { logError } from '../utils/log.js';
|
||||||
import { enqueuePendingNotification } from '../utils/messageQueueManager.js';
|
import { enqueuePendingNotification } from '../utils/messageQueueManager.js';
|
||||||
import { ALL_MODEL_CONFIGS } from '../utils/model/configs.js';
|
|
||||||
import { updateTaskState } from '../utils/task/framework.js';
|
import { updateTaskState } from '../utils/task/framework.js';
|
||||||
import { archiveRemoteSession, teleportToRemote } from '../utils/teleport.js';
|
import { archiveRemoteSession, teleportToRemote } from '../utils/teleport.js';
|
||||||
import { pollForApprovedExitPlanMode, UltraplanPollError } from '../utils/ultraplan/ccrSession.js';
|
import { pollForApprovedExitPlanMode, UltraplanPollError } from '../utils/ultraplan/ccrSession.js';
|
||||||
@@ -36,13 +34,6 @@ import { registerCleanup } from '../utils/cleanupRegistry.js';
|
|||||||
// TODO(prod-hardening): OAuth token may go stale over the 30min poll;
|
// TODO(prod-hardening): OAuth token may go stale over the 30min poll;
|
||||||
// consider refresh.
|
// consider refresh.
|
||||||
|
|
||||||
/**
|
|
||||||
* Multi-agent exploration is slow; 30min timeout.
|
|
||||||
*
|
|
||||||
* @deprecated use getUltraplanTimeoutMs()
|
|
||||||
*/
|
|
||||||
const ULTRAPLAN_TIMEOUT_MS = 30 * 60 * 1000;
|
|
||||||
|
|
||||||
export const CCR_TERMS_URL = 'https://code.claude.com/docs/en/claude-code-on-the-web';
|
export const CCR_TERMS_URL = 'https://code.claude.com/docs/en/claude-code-on-the-web';
|
||||||
|
|
||||||
export function getUltraplanTimeoutMs(): number {
|
export function getUltraplanTimeoutMs(): number {
|
||||||
@@ -61,15 +52,6 @@ export function isUltraplanEnabled(): boolean {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// CCR runs against the first-party API — use the canonical ID, not the
|
|
||||||
// provider-specific string getModelStrings() would return (which may be a
|
|
||||||
// Bedrock ARN or Vertex ID on the local CLI). Read at call time, not module
|
|
||||||
// load: the GrowthBook cache is empty at import and `/config` Gates can flip
|
|
||||||
// it between invocations.
|
|
||||||
function getUltraplanModel(): string {
|
|
||||||
return getFeatureValue_CACHED_MAY_BE_STALE('tengu_ultraplan_model', ALL_MODEL_CONFIGS.opus47.firstParty);
|
|
||||||
}
|
|
||||||
|
|
||||||
// prompt.txt is wrapped in <system-reminder> so the CCR browser hides
|
// prompt.txt is wrapped in <system-reminder> so the CCR browser hides
|
||||||
// scaffolding (CLI_BLOCK_TAGS dropped by stripSystemNotifications)
|
// scaffolding (CLI_BLOCK_TAGS dropped by stripSystemNotifications)
|
||||||
// while the model still sees full text.
|
// while the model still sees full text.
|
||||||
@@ -84,19 +66,6 @@ const _rawPrompt = require('../utils/ultraplan/prompt.txt');
|
|||||||
/* eslint-enable @typescript-eslint/no-require-imports */
|
/* eslint-enable @typescript-eslint/no-require-imports */
|
||||||
const DEFAULT_INSTRUCTIONS: string = (typeof _rawPrompt === 'string' ? _rawPrompt : _rawPrompt.default).trimEnd();
|
const DEFAULT_INSTRUCTIONS: string = (typeof _rawPrompt === 'string' ? _rawPrompt : _rawPrompt.default).trimEnd();
|
||||||
|
|
||||||
// Dev-only prompt override resolved eagerly at module load.
|
|
||||||
// Gated to ant builds (USER_TYPE is a build-time define,
|
|
||||||
// so the override path is DCE'd from external builds).
|
|
||||||
// Shell-set env only, so top-level process.env read is fine
|
|
||||||
// — settings.env never injects this.
|
|
||||||
// @deprecated use buildUltraplanPrompt()
|
|
||||||
/* eslint-disable custom-rules/no-process-env-top-level, custom-rules/no-sync-fs -- ant-only dev override; eager top-level read is the point (crash at startup, not silently inside the slash-command try/catch) */
|
|
||||||
const ULTRAPLAN_INSTRUCTIONS: string =
|
|
||||||
process.env.USER_TYPE === 'ant' && process.env.ULTRAPLAN_PROMPT_FILE
|
|
||||||
? readFileSync(process.env.ULTRAPLAN_PROMPT_FILE, 'utf8').trimEnd()
|
|
||||||
: DEFAULT_INSTRUCTIONS;
|
|
||||||
/* eslint-enable custom-rules/no-process-env-top-level, custom-rules/no-sync-fs */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Assemble the initial CCR user message. seedPlan and blurb stay outside the
|
* Assemble the initial CCR user message. seedPlan and blurb stay outside the
|
||||||
* system-reminder so the browser renders them; scaffolding is hidden.
|
* system-reminder so the browser renders them; scaffolding is hidden.
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { Settings } from '../../components/Settings/Settings.js';
|
import { Settings } from '../../components/Settings/Settings.js';
|
||||||
import type { LocalJSXCommandCall } from '../../types/command.js';
|
import type { LocalJSXCommandCall } from '../../types/command.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,151 +0,0 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import { formatCost } from '../cost-tracker.js';
|
|
||||||
import { Box, Text, ProgressBar } from '@anthropic/ink';
|
|
||||||
import { formatTokens } from '../utils/format.js';
|
|
||||||
import { useTerminalSize } from '../hooks/useTerminalSize.js';
|
|
||||||
|
|
||||||
type RateLimitBucket = {
|
|
||||||
utilization: number;
|
|
||||||
resets_at: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
type BuiltinStatusLineProps = {
|
|
||||||
modelName: string;
|
|
||||||
contextUsedPct: number;
|
|
||||||
usedTokens: number;
|
|
||||||
contextWindowSize: number;
|
|
||||||
totalCostUsd: number;
|
|
||||||
rateLimits: {
|
|
||||||
five_hour?: RateLimitBucket;
|
|
||||||
seven_day?: RateLimitBucket;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Format a countdown from now until the given epoch time (in seconds).
|
|
||||||
* Returns a compact human-readable string like "3h12m", "5d20h", "45m", or "now".
|
|
||||||
*/
|
|
||||||
export function formatCountdown(epochSeconds: number): string {
|
|
||||||
const diff = epochSeconds - Date.now() / 1000;
|
|
||||||
if (diff <= 0) return 'now';
|
|
||||||
|
|
||||||
const days = Math.floor(diff / 86400);
|
|
||||||
const hours = Math.floor((diff % 86400) / 3600);
|
|
||||||
const minutes = Math.floor((diff % 3600) / 60);
|
|
||||||
|
|
||||||
if (days >= 1) return `${days}d${hours}h`;
|
|
||||||
if (hours >= 1) return `${hours}h${minutes}m`;
|
|
||||||
return `${minutes}m`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function Separator() {
|
|
||||||
return <Text dimColor>{' \u2502 '}</Text>;
|
|
||||||
}
|
|
||||||
|
|
||||||
function BuiltinStatusLineInner({
|
|
||||||
modelName,
|
|
||||||
contextUsedPct,
|
|
||||||
usedTokens,
|
|
||||||
contextWindowSize,
|
|
||||||
totalCostUsd,
|
|
||||||
rateLimits,
|
|
||||||
}: BuiltinStatusLineProps) {
|
|
||||||
const { columns } = useTerminalSize();
|
|
||||||
|
|
||||||
// Force re-render every 60s so countdowns stay current
|
|
||||||
const [tick, setTick] = useState(0);
|
|
||||||
useEffect(() => {
|
|
||||||
const hasResetTime = (rateLimits.five_hour?.resets_at ?? 0) || (rateLimits.seven_day?.resets_at ?? 0);
|
|
||||||
if (!hasResetTime) return;
|
|
||||||
const id = setInterval(() => setTick(t => t + 1), 60_000);
|
|
||||||
return () => clearInterval(id);
|
|
||||||
}, [rateLimits.five_hour?.resets_at, rateLimits.seven_day?.resets_at]);
|
|
||||||
|
|
||||||
// Suppress unused-variable lint for tick (it exists only to trigger re-renders)
|
|
||||||
void tick;
|
|
||||||
|
|
||||||
// Model display: use first two words (e.g. "Opus 4.6") instead of just first word
|
|
||||||
const modelParts = modelName.split(' ');
|
|
||||||
const shortModel = modelParts.length >= 2 ? `${modelParts[0]} ${modelParts[1]}` : modelName;
|
|
||||||
|
|
||||||
const wide = columns >= 100;
|
|
||||||
const narrow = columns < 60;
|
|
||||||
|
|
||||||
const hasFiveHour = rateLimits.five_hour != null;
|
|
||||||
const hasSevenDay = rateLimits.seven_day != null;
|
|
||||||
|
|
||||||
const fiveHourPct = hasFiveHour ? Math.round(rateLimits.five_hour!.utilization * 100) : 0;
|
|
||||||
const sevenDayPct = hasSevenDay ? Math.round(rateLimits.seven_day!.utilization * 100) : 0;
|
|
||||||
|
|
||||||
// Token display: "50k/1M"
|
|
||||||
const tokenDisplay = `${formatTokens(usedTokens)}/${formatTokens(contextWindowSize)}`;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box>
|
|
||||||
{/* Model name */}
|
|
||||||
<Text>{shortModel}</Text>
|
|
||||||
|
|
||||||
{/* Context usage with token counts */}
|
|
||||||
<Separator />
|
|
||||||
<Text dimColor>Context </Text>
|
|
||||||
<Text>{contextUsedPct}%</Text>
|
|
||||||
{!narrow && <Text dimColor> ({tokenDisplay})</Text>}
|
|
||||||
|
|
||||||
{/* 5-hour session rate limit */}
|
|
||||||
{hasFiveHour && (
|
|
||||||
<>
|
|
||||||
<Separator />
|
|
||||||
<Text dimColor>Session </Text>
|
|
||||||
{wide && (
|
|
||||||
<>
|
|
||||||
<ProgressBar
|
|
||||||
ratio={rateLimits.five_hour!.utilization}
|
|
||||||
width={10}
|
|
||||||
fillColor="rate_limit_fill"
|
|
||||||
emptyColor="rate_limit_empty"
|
|
||||||
/>
|
|
||||||
<Text> </Text>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<Text>{fiveHourPct}%</Text>
|
|
||||||
{!narrow && rateLimits.five_hour!.resets_at > 0 && (
|
|
||||||
<Text dimColor> {formatCountdown(rateLimits.five_hour!.resets_at)}</Text>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* 7-day weekly rate limit */}
|
|
||||||
{hasSevenDay && (
|
|
||||||
<>
|
|
||||||
<Separator />
|
|
||||||
<Text dimColor>Weekly </Text>
|
|
||||||
{wide && (
|
|
||||||
<>
|
|
||||||
<ProgressBar
|
|
||||||
ratio={rateLimits.seven_day!.utilization}
|
|
||||||
width={10}
|
|
||||||
fillColor="rate_limit_fill"
|
|
||||||
emptyColor="rate_limit_empty"
|
|
||||||
/>
|
|
||||||
<Text> </Text>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<Text>{sevenDayPct}%</Text>
|
|
||||||
{!narrow && rateLimits.seven_day!.resets_at > 0 && (
|
|
||||||
<Text dimColor> {formatCountdown(rateLimits.seven_day!.resets_at)}</Text>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{/* Cost */}
|
|
||||||
{totalCostUsd > 0 && (
|
|
||||||
<>
|
|
||||||
<Separator />
|
|
||||||
<Text>{formatCost(totalCostUsd)}</Text>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export const BuiltinStatusLine = React.memo(BuiltinStatusLineInner);
|
|
||||||
@@ -11,12 +11,12 @@ import { getSSLErrorHint } from '@ant/model-provider';
|
|||||||
import { sendNotification } from '../services/notifier.js';
|
import { sendNotification } from '../services/notifier.js';
|
||||||
import { OAuthService } from '../services/oauth/index.js';
|
import { OAuthService } from '../services/oauth/index.js';
|
||||||
import { getOauthAccountInfo, validateForceLoginOrg } from '../utils/auth.js';
|
import { getOauthAccountInfo, validateForceLoginOrg } from '../utils/auth.js';
|
||||||
|
|
||||||
import { logError } from '../utils/log.js';
|
import { logError } from '../utils/log.js';
|
||||||
import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js';
|
import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js';
|
||||||
import { Select } from './CustomSelect/select.js';
|
import { Select } from './CustomSelect/select.js';
|
||||||
import { Spinner } from './Spinner.js';
|
import { Spinner } from './Spinner.js';
|
||||||
import TextInput from './TextInput.js';
|
import TextInput from './TextInput.js';
|
||||||
import { fi } from 'zod/v4/locales';
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
onDone(): void;
|
onDone(): void;
|
||||||
@@ -596,7 +596,7 @@ function OAuthStatusMessage({
|
|||||||
[activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
|
[activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
|
||||||
);
|
);
|
||||||
|
|
||||||
const switchTo = useCallback(
|
const _switchTo = useCallback(
|
||||||
(target: Field) => {
|
(target: Field) => {
|
||||||
setOAuthStatus(buildState(activeField, inputValue, target));
|
setOAuthStatus(buildState(activeField, inputValue, target));
|
||||||
setInputValue(displayValues[target] ?? '');
|
setInputValue(displayValues[target] ?? '');
|
||||||
|
|||||||
@@ -1,11 +1,16 @@
|
|||||||
|
import type { StructuredPatchHunk } from 'diff';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { Text } from '@anthropic/ink';
|
import { useTerminalSize } from '../hooks/useTerminalSize.js';
|
||||||
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { count } from '../utils/array.js';
|
import { count } from '../utils/array.js';
|
||||||
import { MessageResponse } from './MessageResponse.js';
|
import { MessageResponse } from './MessageResponse.js';
|
||||||
|
import { StructuredDiffList } from './StructuredDiffList.js';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
filePath: string;
|
filePath: string;
|
||||||
structuredPatch: { lines: string[] }[];
|
structuredPatch: StructuredPatchHunk[];
|
||||||
|
firstLine: string | null;
|
||||||
|
fileContent?: string;
|
||||||
style?: 'condensed';
|
style?: 'condensed';
|
||||||
verbose: boolean;
|
verbose: boolean;
|
||||||
previewHint?: string;
|
previewHint?: string;
|
||||||
@@ -14,10 +19,13 @@ type Props = {
|
|||||||
export function FileEditToolUpdatedMessage({
|
export function FileEditToolUpdatedMessage({
|
||||||
filePath,
|
filePath,
|
||||||
structuredPatch,
|
structuredPatch,
|
||||||
|
firstLine,
|
||||||
|
fileContent,
|
||||||
style,
|
style,
|
||||||
verbose,
|
verbose,
|
||||||
previewHint,
|
previewHint,
|
||||||
}: Props): React.ReactNode {
|
}: Props): React.ReactNode {
|
||||||
|
const { columns } = useTerminalSize();
|
||||||
const numAdditions = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('+')), 0);
|
const numAdditions = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('+')), 0);
|
||||||
const numRemovals = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('-')), 0);
|
const numRemovals = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('-')), 0);
|
||||||
|
|
||||||
@@ -39,7 +47,7 @@ export function FileEditToolUpdatedMessage({
|
|||||||
|
|
||||||
// Plan files: invert condensed behavior
|
// Plan files: invert condensed behavior
|
||||||
// - Regular mode: just show the hint (user can type /plan to see full content)
|
// - Regular mode: just show the hint (user can type /plan to see full content)
|
||||||
// - Condensed mode (subagent view): show the text
|
// - Condensed mode (subagent view): show the diff
|
||||||
if (previewHint) {
|
if (previewHint) {
|
||||||
if (style !== 'condensed' && !verbose) {
|
if (style !== 'condensed' && !verbose) {
|
||||||
return (
|
return (
|
||||||
@@ -52,5 +60,19 @@ export function FileEditToolUpdatedMessage({
|
|||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
return <MessageResponse>{text}</MessageResponse>;
|
return (
|
||||||
|
<MessageResponse>
|
||||||
|
<Box flexDirection="column">
|
||||||
|
<Text>{text}</Text>
|
||||||
|
<StructuredDiffList
|
||||||
|
hunks={structuredPatch}
|
||||||
|
dim={false}
|
||||||
|
width={columns - 12}
|
||||||
|
filePath={filePath}
|
||||||
|
firstLine={firstLine}
|
||||||
|
fileContent={fileContent}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
</MessageResponse>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,39 @@
|
|||||||
|
import type { StructuredPatchHunk } from 'diff';
|
||||||
import { relative } from 'path';
|
import { relative } from 'path';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
|
||||||
import { getCwd } from 'src/utils/cwd.js';
|
import { getCwd } from 'src/utils/cwd.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
|
import { HighlightedCode } from './HighlightedCode.js';
|
||||||
import { MessageResponse } from './MessageResponse.js';
|
import { MessageResponse } from './MessageResponse.js';
|
||||||
|
import { StructuredDiffList } from './StructuredDiffList.js';
|
||||||
|
|
||||||
|
const MAX_LINES_TO_RENDER = 10;
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
file_path: string;
|
file_path: string;
|
||||||
operation: 'write' | 'update';
|
operation: 'write' | 'update';
|
||||||
|
// For updates - show diff
|
||||||
|
patch?: StructuredPatchHunk[];
|
||||||
|
firstLine: string | null;
|
||||||
|
fileContent?: string;
|
||||||
|
// For new file creation - show content preview
|
||||||
|
content?: string;
|
||||||
style?: 'condensed';
|
style?: 'condensed';
|
||||||
verbose: boolean;
|
verbose: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function FileEditToolUseRejectedMessage({ file_path, operation, style, verbose }: Props): React.ReactNode {
|
export function FileEditToolUseRejectedMessage({
|
||||||
|
file_path,
|
||||||
|
operation,
|
||||||
|
patch,
|
||||||
|
firstLine,
|
||||||
|
fileContent,
|
||||||
|
content,
|
||||||
|
style,
|
||||||
|
verbose,
|
||||||
|
}: Props): React.ReactNode {
|
||||||
|
const { columns } = useTerminalSize();
|
||||||
const text = (
|
const text = (
|
||||||
<Box flexDirection="row">
|
<Box flexDirection="row">
|
||||||
<Text color="subtle">User rejected {operation} to </Text>
|
<Text color="subtle">User rejected {operation} to </Text>
|
||||||
@@ -26,5 +48,42 @@ export function FileEditToolUseRejectedMessage({ file_path, operation, style, ve
|
|||||||
return <MessageResponse>{text}</MessageResponse>;
|
return <MessageResponse>{text}</MessageResponse>;
|
||||||
}
|
}
|
||||||
|
|
||||||
return <MessageResponse>{text}</MessageResponse>;
|
// For new file creation, show content preview (dimmed)
|
||||||
|
if (operation === 'write' && content !== undefined) {
|
||||||
|
const lines = content.split('\n');
|
||||||
|
const numLines = lines.length;
|
||||||
|
const plusLines = numLines - MAX_LINES_TO_RENDER;
|
||||||
|
const truncatedContent = verbose ? content : lines.slice(0, MAX_LINES_TO_RENDER).join('\n');
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MessageResponse>
|
||||||
|
<Box flexDirection="column">
|
||||||
|
{text}
|
||||||
|
<HighlightedCode code={truncatedContent || '(No content)'} filePath={file_path} width={columns - 12} dim />
|
||||||
|
{!verbose && plusLines > 0 && <Text dimColor>… +{plusLines} lines</Text>}
|
||||||
|
</Box>
|
||||||
|
</MessageResponse>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// For updates, show diff
|
||||||
|
if (!patch || patch.length === 0) {
|
||||||
|
return <MessageResponse>{text}</MessageResponse>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MessageResponse>
|
||||||
|
<Box flexDirection="column">
|
||||||
|
{text}
|
||||||
|
<StructuredDiffList
|
||||||
|
hunks={patch}
|
||||||
|
dim
|
||||||
|
width={columns - 12}
|
||||||
|
filePath={file_path}
|
||||||
|
firstLine={firstLine}
|
||||||
|
fileContent={fileContent}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
</MessageResponse>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { type ReactNode, useEffect } from 'react';
|
import { type ReactNode, useEffect } from 'react';
|
||||||
import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
|
import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
|
||||||
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ import {
|
|||||||
incrementOverageCreditUpsellSeenCount,
|
incrementOverageCreditUpsellSeenCount,
|
||||||
createOverageCreditFeed,
|
createOverageCreditFeed,
|
||||||
} from './OverageCreditUpsell.js';
|
} from './OverageCreditUpsell.js';
|
||||||
import { plural } from '../../utils/stringUtils.js';
|
|
||||||
import { useAppState } from '../../state/AppState.js';
|
import { useAppState } from '../../state/AppState.js';
|
||||||
import { getEffortSuffix } from '../../utils/effort.js';
|
import { getEffortSuffix } from '../../utils/effort.js';
|
||||||
import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
|
import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import figures from 'figures';
|
import figures from 'figures';
|
||||||
import { homedir } from 'os';
|
import { homedir } from 'os';
|
||||||
import * as React from 'react';
|
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import type { Step } from '../../projectOnboardingState.js';
|
import type { Step } from '../../projectOnboardingState.js';
|
||||||
import { formatCreditAmount, getCachedReferrerReward } from '../../services/api/referral.js';
|
import { formatCreditAmount, getCachedReferrerReward } from '../../services/api/referral.js';
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
|
|||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|
||||||
const preflightStep = <PreflightStep onSuccess={goToNextStep} />;
|
const _preflightStep = <PreflightStep onSuccess={goToNextStep} />;
|
||||||
// Create the steps array - determine which steps to include based on reAuth and oauthEnabled
|
// Create the steps array - determine which steps to include based on reAuth and oauthEnabled
|
||||||
const apiKeyNeedingApproval = useMemo(() => {
|
const apiKeyNeedingApproval = useMemo(() => {
|
||||||
// Add API key step if needed
|
// Add API key step if needed
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import { setEnvHookNotifier } from '../../utils/hooks/fileChangedWatcher.js';
|
|||||||
import { toIDEDisplayName } from '../../utils/ide.js';
|
import { toIDEDisplayName } from '../../utils/ide.js';
|
||||||
import { getMessagesAfterCompactBoundary } from '../../utils/messages.js';
|
import { getMessagesAfterCompactBoundary } from '../../utils/messages.js';
|
||||||
import { tokenCountFromLastAPIResponse } from '../../utils/tokens.js';
|
import { tokenCountFromLastAPIResponse } from '../../utils/tokens.js';
|
||||||
import { AutoUpdaterWrapper } from '../AutoUpdaterWrapper.js';
|
|
||||||
import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
|
||||||
import { IdeStatusIndicator } from '../IdeStatusIndicator.js';
|
import { IdeStatusIndicator } from '../IdeStatusIndicator.js';
|
||||||
import { MemoryUsageIndicator } from '../MemoryUsageIndicator.js';
|
import { MemoryUsageIndicator } from '../MemoryUsageIndicator.js';
|
||||||
@@ -57,13 +56,13 @@ type Props = {
|
|||||||
|
|
||||||
export function Notifications({
|
export function Notifications({
|
||||||
apiKeyStatus,
|
apiKeyStatus,
|
||||||
autoUpdaterResult,
|
autoUpdaterResult: _autoUpdaterResult,
|
||||||
debug,
|
debug,
|
||||||
isAutoUpdating,
|
isAutoUpdating: _isAutoUpdating,
|
||||||
verbose,
|
verbose,
|
||||||
messages,
|
messages,
|
||||||
onAutoUpdaterResult,
|
onAutoUpdaterResult: _onAutoUpdaterResult,
|
||||||
onChangeIsUpdating,
|
onChangeIsUpdating: _onChangeIsUpdating,
|
||||||
ideSelection,
|
ideSelection,
|
||||||
mcpClients,
|
mcpClients,
|
||||||
isInputWrapped = false,
|
isInputWrapped = false,
|
||||||
@@ -102,9 +101,6 @@ export function Notifications({
|
|||||||
const shouldShowIdeSelection =
|
const shouldShowIdeSelection =
|
||||||
ideStatus === 'connected' && (ideSelection?.filePath || (ideSelection?.text && ideSelection.lineCount > 0));
|
ideStatus === 'connected' && (ideSelection?.filePath || (ideSelection?.text && ideSelection.lineCount > 0));
|
||||||
|
|
||||||
// Hide update installed message when showing IDE selection
|
|
||||||
const shouldShowAutoUpdater = !shouldShowIdeSelection || isAutoUpdating || autoUpdaterResult?.status !== 'success';
|
|
||||||
|
|
||||||
// Check if we're in overage mode for UI indicators
|
// Check if we're in overage mode for UI indicators
|
||||||
const isInOverageMode = claudeAiLimits.isUsingOverage;
|
const isInOverageMode = claudeAiLimits.isUsingOverage;
|
||||||
const subscriptionType = getSubscriptionType();
|
const subscriptionType = getSubscriptionType();
|
||||||
@@ -157,12 +153,6 @@ export function Notifications({
|
|||||||
verbose={verbose}
|
verbose={verbose}
|
||||||
tokenUsage={tokenUsage}
|
tokenUsage={tokenUsage}
|
||||||
mainLoopModel={mainLoopModel}
|
mainLoopModel={mainLoopModel}
|
||||||
shouldShowAutoUpdater={shouldShowAutoUpdater}
|
|
||||||
autoUpdaterResult={autoUpdaterResult}
|
|
||||||
isAutoUpdating={isAutoUpdating}
|
|
||||||
isShowingCompactMessage={isShowingCompactMessage}
|
|
||||||
onAutoUpdaterResult={onAutoUpdaterResult}
|
|
||||||
onChangeIsUpdating={onChangeIsUpdating}
|
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</SentryErrorBoundary>
|
</SentryErrorBoundary>
|
||||||
@@ -180,12 +170,6 @@ function NotificationContent({
|
|||||||
verbose,
|
verbose,
|
||||||
tokenUsage,
|
tokenUsage,
|
||||||
mainLoopModel,
|
mainLoopModel,
|
||||||
shouldShowAutoUpdater,
|
|
||||||
autoUpdaterResult,
|
|
||||||
isAutoUpdating,
|
|
||||||
isShowingCompactMessage,
|
|
||||||
onAutoUpdaterResult,
|
|
||||||
onChangeIsUpdating,
|
|
||||||
}: {
|
}: {
|
||||||
ideSelection: IDESelection | undefined;
|
ideSelection: IDESelection | undefined;
|
||||||
mcpClients?: MCPServerConnection[];
|
mcpClients?: MCPServerConnection[];
|
||||||
@@ -200,12 +184,6 @@ function NotificationContent({
|
|||||||
verbose: boolean;
|
verbose: boolean;
|
||||||
tokenUsage: number;
|
tokenUsage: number;
|
||||||
mainLoopModel: string;
|
mainLoopModel: string;
|
||||||
shouldShowAutoUpdater: boolean;
|
|
||||||
autoUpdaterResult: AutoUpdaterResult | null;
|
|
||||||
isAutoUpdating: boolean;
|
|
||||||
isShowingCompactMessage: boolean;
|
|
||||||
onAutoUpdaterResult: (result: AutoUpdaterResult) => void;
|
|
||||||
onChangeIsUpdating: (isUpdating: boolean) => void;
|
|
||||||
}): ReactNode {
|
}): ReactNode {
|
||||||
// Poll apiKeyHelper inflight state to show slow-helper notice.
|
// Poll apiKeyHelper inflight state to show slow-helper notice.
|
||||||
// Gated on configuration — most users never set apiKeyHelper, so the
|
// Gated on configuration — most users never set apiKeyHelper, so the
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import { useSetPromptOverlayDialog } from '../../context/promptOverlayContext.js
|
|||||||
import { formatImageRef, formatPastedTextRef, getPastedTextRefNumLines, parseReferences } from '../../history.js';
|
import { formatImageRef, formatPastedTextRef, getPastedTextRefNumLines, parseReferences } from '../../history.js';
|
||||||
import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js';
|
import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js';
|
||||||
import { type HistoryMode, useArrowKeyHistory } from '../../hooks/useArrowKeyHistory.js';
|
import { type HistoryMode, useArrowKeyHistory } from '../../hooks/useArrowKeyHistory.js';
|
||||||
|
import { useBackgroundAgentTasks } from '../../hooks/useBackgroundAgentTasks.js';
|
||||||
import { useDoublePress } from '../../hooks/useDoublePress.js';
|
import { useDoublePress } from '../../hooks/useDoublePress.js';
|
||||||
import { useHistorySearch } from '../../hooks/useHistorySearch.js';
|
import { useHistorySearch } from '../../hooks/useHistorySearch.js';
|
||||||
import type { IDESelection } from '../../hooks/useIdeSelection.js';
|
import type { IDESelection } from '../../hooks/useIdeSelection.js';
|
||||||
@@ -55,7 +56,6 @@ import {
|
|||||||
} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
|
} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
|
||||||
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
||||||
import type { Message } from '../../types/message.js';
|
import type { Message } from '../../types/message.js';
|
||||||
import type { PermissionMode } from '../../types/permissions.js';
|
|
||||||
import type { BaseTextInputProps, PromptInputMode, VimMode } from '../../types/textInputTypes.js';
|
import type { BaseTextInputProps, PromptInputMode, VimMode } from '../../types/textInputTypes.js';
|
||||||
import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
|
import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
|
||||||
import { count } from '../../utils/array.js';
|
import { count } from '../../utils/array.js';
|
||||||
@@ -329,7 +329,7 @@ function PromptInput({
|
|||||||
const hasTungstenSession = useAppState(s => process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined);
|
const hasTungstenSession = useAppState(s => process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined);
|
||||||
const tmuxFooterVisible = process.env.USER_TYPE === 'ant' && hasTungstenSession;
|
const tmuxFooterVisible = process.env.USER_TYPE === 'ant' && hasTungstenSession;
|
||||||
// WebBrowser pill — visible when a browser is open
|
// WebBrowser pill — visible when a browser is open
|
||||||
const bagelFooterVisible = useAppState(s => false);
|
const bagelFooterVisible = useAppState(_s => false);
|
||||||
const teamContext = useAppState(s => s.teamContext);
|
const teamContext = useAppState(s => s.teamContext);
|
||||||
const queuedCommands = useCommandQueue();
|
const queuedCommands = useCommandQueue();
|
||||||
const promptSuggestionState = useAppState(s => s.promptSuggestion);
|
const promptSuggestionState = useAppState(s => s.promptSuggestion);
|
||||||
@@ -416,6 +416,16 @@ function PromptInput({
|
|||||||
// First ↓ selects the pill, second ↓ moves to row 0. Prevents double-select
|
// First ↓ selects the pill, second ↓ moves to row 0. Prevents double-select
|
||||||
// of pill + row when both bg tasks (pill) and forked agents (rows) are visible.
|
// of pill + row when both bg tasks (pill) and forked agents (rows) are visible.
|
||||||
const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex);
|
const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex);
|
||||||
|
const selectedBgAgentIndex = useAppState(s => s.selectedBgAgentIndex);
|
||||||
|
const setSelectedBgAgentIndex = useCallback(
|
||||||
|
(v: number | ((prev: number) => number)) =>
|
||||||
|
setAppState(prev => {
|
||||||
|
const next = typeof v === 'function' ? v(prev.selectedBgAgentIndex) : v;
|
||||||
|
if (next === prev.selectedBgAgentIndex) return prev;
|
||||||
|
return { ...prev, selectedBgAgentIndex: next };
|
||||||
|
}),
|
||||||
|
[setAppState],
|
||||||
|
);
|
||||||
const setCoordinatorTaskIndex = useCallback(
|
const setCoordinatorTaskIndex = useCallback(
|
||||||
(v: number | ((prev: number) => number)) =>
|
(v: number | ((prev: number) => number)) =>
|
||||||
setAppState(prev => {
|
setAppState(prev => {
|
||||||
@@ -502,10 +512,13 @@ function PromptInput({
|
|||||||
(runningTaskCount > 0 || (process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0)) &&
|
(runningTaskCount > 0 || (process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0)) &&
|
||||||
!shouldHideTasksFooter(tasks, showSpinnerTree);
|
!shouldHideTasksFooter(tasks, showSpinnerTree);
|
||||||
const teamsFooterVisible = cachedTeams.length > 0;
|
const teamsFooterVisible = cachedTeams.length > 0;
|
||||||
|
const bgAgentList = useBackgroundAgentTasks();
|
||||||
|
const bgAgentFooterVisible = bgAgentList.length > 0;
|
||||||
|
|
||||||
const footerItems = useMemo(
|
const footerItems = useMemo(
|
||||||
() =>
|
() =>
|
||||||
[
|
[
|
||||||
|
bgAgentFooterVisible && 'bg_agent',
|
||||||
tasksFooterVisible && 'tasks',
|
tasksFooterVisible && 'tasks',
|
||||||
tmuxFooterVisible && 'tmux',
|
tmuxFooterVisible && 'tmux',
|
||||||
bagelFooterVisible && 'bagel',
|
bagelFooterVisible && 'bagel',
|
||||||
@@ -514,6 +527,7 @@ function PromptInput({
|
|||||||
companionFooterVisible && 'companion',
|
companionFooterVisible && 'companion',
|
||||||
].filter(Boolean) as FooterItem[],
|
].filter(Boolean) as FooterItem[],
|
||||||
[
|
[
|
||||||
|
bgAgentFooterVisible,
|
||||||
tasksFooterVisible,
|
tasksFooterVisible,
|
||||||
tmuxFooterVisible,
|
tmuxFooterVisible,
|
||||||
bagelFooterVisible,
|
bagelFooterVisible,
|
||||||
@@ -538,9 +552,10 @@ function PromptInput({
|
|||||||
|
|
||||||
const tasksSelected = footerItemSelected === 'tasks';
|
const tasksSelected = footerItemSelected === 'tasks';
|
||||||
const tmuxSelected = footerItemSelected === 'tmux';
|
const tmuxSelected = footerItemSelected === 'tmux';
|
||||||
const bagelSelected = footerItemSelected === 'bagel';
|
const _bagelSelected = footerItemSelected === 'bagel';
|
||||||
const teamsSelected = footerItemSelected === 'teams';
|
const teamsSelected = footerItemSelected === 'teams';
|
||||||
const bridgeSelected = footerItemSelected === 'bridge';
|
const bridgeSelected = footerItemSelected === 'bridge';
|
||||||
|
const bgAgentSelected = footerItemSelected === 'bg_agent';
|
||||||
|
|
||||||
function selectFooterItem(item: FooterItem | null): void {
|
function selectFooterItem(item: FooterItem | null): void {
|
||||||
setAppState(prev => (prev.footerSelection === item ? prev : { ...prev, footerSelection: item }));
|
setAppState(prev => (prev.footerSelection === item ? prev : { ...prev, footerSelection: item }));
|
||||||
@@ -548,6 +563,9 @@ function PromptInput({
|
|||||||
setTeammateFooterIndex(0);
|
setTeammateFooterIndex(0);
|
||||||
setCoordinatorTaskIndex(minCoordinatorIndex);
|
setCoordinatorTaskIndex(minCoordinatorIndex);
|
||||||
}
|
}
|
||||||
|
if (item === 'bg_agent') {
|
||||||
|
setSelectedBgAgentIndex(-1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// delta: +1 = down/right, -1 = up/left. Returns true if nav happened
|
// delta: +1 = down/right, -1 = up/left. Returns true if nav happened
|
||||||
@@ -1809,6 +1827,15 @@ function PromptInput({
|
|||||||
useKeybindings(
|
useKeybindings(
|
||||||
{
|
{
|
||||||
'footer:up': () => {
|
'footer:up': () => {
|
||||||
|
// ↑ in bg_agent pill: move selection up (-1 = main). At -1, leave pill.
|
||||||
|
if (bgAgentSelected) {
|
||||||
|
if (selectedBgAgentIndex > -1) {
|
||||||
|
setSelectedBgAgentIndex(prev => prev - 1);
|
||||||
|
} else {
|
||||||
|
selectFooterItem(null);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
// ↑ scrolls within the coordinator task list before leaving the pill
|
// ↑ scrolls within the coordinator task list before leaving the pill
|
||||||
if (
|
if (
|
||||||
tasksSelected &&
|
tasksSelected &&
|
||||||
@@ -1822,6 +1849,13 @@ function PromptInput({
|
|||||||
navigateFooter(-1, true);
|
navigateFooter(-1, true);
|
||||||
},
|
},
|
||||||
'footer:down': () => {
|
'footer:down': () => {
|
||||||
|
// ↓ in bg_agent pill: move selection down through agents. Clamp at last.
|
||||||
|
if (bgAgentSelected) {
|
||||||
|
if (selectedBgAgentIndex < bgAgentList.length - 1) {
|
||||||
|
setSelectedBgAgentIndex(prev => prev + 1);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
// ↓ scrolls within the coordinator task list, never leaves the pill
|
// ↓ scrolls within the coordinator task list, never leaves the pill
|
||||||
if (tasksSelected && process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0) {
|
if (tasksSelected && process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0) {
|
||||||
if (coordinatorTaskIndex < coordinatorTaskCount - 1) {
|
if (coordinatorTaskIndex < coordinatorTaskCount - 1) {
|
||||||
@@ -1907,6 +1941,15 @@ function PromptInput({
|
|||||||
setShowBridgeDialog(true);
|
setShowBridgeDialog(true);
|
||||||
selectFooterItem(null);
|
selectFooterItem(null);
|
||||||
break;
|
break;
|
||||||
|
case 'bg_agent':
|
||||||
|
if (selectedBgAgentIndex === -1) {
|
||||||
|
exitTeammateView(setAppState);
|
||||||
|
} else {
|
||||||
|
const picked = bgAgentList[selectedBgAgentIndex];
|
||||||
|
if (picked) enterTeammateView(picked.agentId, setAppState);
|
||||||
|
}
|
||||||
|
// Keep the pill focused so ↑/↓ continue to work after Enter.
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'footer:clearSelection': () => {
|
'footer:clearSelection': () => {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { feature } from 'bun:bundle';
|
import { feature } from 'bun:bundle';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { memo, type ReactNode, useCallback, useMemo, useRef, useState } from 'react';
|
import { memo, type ReactNode, useMemo, useRef, useState } from 'react';
|
||||||
import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js';
|
import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js';
|
||||||
import { getBridgeStatus } from '../../bridge/bridgeStatusUtil.js';
|
import { getBridgeStatus } from '../../bridge/bridgeStatusUtil.js';
|
||||||
import { useSetPromptOverlay } from '../../context/promptOverlayContext.js';
|
import { useSetPromptOverlay } from '../../context/promptOverlayContext.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { memo, type ReactNode } from 'react';
|
import { memo, type ReactNode } from 'react';
|
||||||
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
import { useTerminalSize } from '../../hooks/useTerminalSize.js';
|
||||||
import { Box, Text, stringWidth } from '@anthropic/ink';
|
import { Box, Text, stringWidth } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { type ReactNode, useEffect, useRef, useState } from 'react';
|
import { type ReactNode, useEffect, useRef, useState } from 'react';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
|
import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { type ReactNode, useEffect, useState } from 'react';
|
import { type ReactNode, useEffect, useState } from 'react';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import type { SandboxViolationEvent } from '../utils/sandbox/sandbox-adapter.js';
|
import type { SandboxViolationEvent } from '../utils/sandbox/sandbox-adapter.js';
|
||||||
|
|||||||
@@ -15,14 +15,11 @@ import {
|
|||||||
} from '../../utils/config.js';
|
} from '../../utils/config.js';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import {
|
import {
|
||||||
permissionModeTitle,
|
|
||||||
permissionModeShortTitle,
|
permissionModeShortTitle,
|
||||||
permissionModeFromString,
|
permissionModeFromString,
|
||||||
toExternalPermissionMode,
|
toExternalPermissionMode,
|
||||||
isExternalPermissionMode,
|
isExternalPermissionMode,
|
||||||
EXTERNAL_PERMISSION_MODES,
|
|
||||||
PERMISSION_MODES,
|
PERMISSION_MODES,
|
||||||
type ExternalPermissionMode,
|
|
||||||
type PermissionMode,
|
type PermissionMode,
|
||||||
} from '../../utils/permissions/PermissionMode.js';
|
} from '../../utils/permissions/PermissionMode.js';
|
||||||
import {
|
import {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growt
|
|||||||
import { isEnvTruthy } from '../utils/envUtils.js';
|
import { isEnvTruthy } from '../utils/envUtils.js';
|
||||||
import { count } from '../utils/array.js';
|
import { count } from '../utils/array.js';
|
||||||
import sample from 'lodash-es/sample.js';
|
import sample from 'lodash-es/sample.js';
|
||||||
import { formatDuration, formatNumber, formatSecondsShort } from '../utils/format.js';
|
import { formatDuration, formatNumber } from '../utils/format.js';
|
||||||
import type { Theme } from 'src/utils/theme.js';
|
import type { Theme } from 'src/utils/theme.js';
|
||||||
import { activityManager } from '../utils/activityManager.js';
|
import { activityManager } from '../utils/activityManager.js';
|
||||||
import { getSpinnerVerbs } from '../constants/spinnerVerbs.js';
|
import { getSpinnerVerbs } from '../constants/spinnerVerbs.js';
|
||||||
@@ -244,7 +244,7 @@ function SpinnerWithVerbInner({
|
|||||||
|
|
||||||
// TTFT display is gated to internal builds — apiMetricsRef was removed from
|
// TTFT display is gated to internal builds — apiMetricsRef was removed from
|
||||||
// props during a refactor, so skip this until it's re-threaded.
|
// props during a refactor, so skip this until it's re-threaded.
|
||||||
let ttftText: string | null = null;
|
const _ttftText: string | null = null;
|
||||||
|
|
||||||
// When leader is idle but teammates are running (and we're viewing the leader),
|
// When leader is idle but teammates are running (and we're viewing the leader),
|
||||||
// show a static dim idle display instead of the animated spinner — otherwise
|
// show a static dim idle display instead of the animated spinner — otherwise
|
||||||
|
|||||||
@@ -288,6 +288,15 @@ function StatusLineInner({ messagesRef, lastAssistantMessageId, vimMode }: Props
|
|||||||
}
|
}
|
||||||
}, [lastAssistantMessageId, permissionMode, vimMode, mainLoopModel, scheduleUpdate]);
|
}, [lastAssistantMessageId, permissionMode, vimMode, mainLoopModel, scheduleUpdate]);
|
||||||
|
|
||||||
|
// Time-driven refresh: tick setInterval(refreshInterval seconds) through the
|
||||||
|
// existing debounced scheduleUpdate so interval + message-change don't double-fire.
|
||||||
|
const refreshIntervalMs = (settings?.statusLine?.refreshInterval ?? 0) * 1000;
|
||||||
|
useEffect(() => {
|
||||||
|
if (refreshIntervalMs <= 0) return;
|
||||||
|
const id = setInterval(() => scheduleUpdate(), refreshIntervalMs);
|
||||||
|
return () => clearInterval(id);
|
||||||
|
}, [refreshIntervalMs, scheduleUpdate]);
|
||||||
|
|
||||||
// When the statusLine command changes (hot reload), log the next result
|
// When the statusLine command changes (hot reload), log the next result
|
||||||
const statusLineCommand = settings?.statusLine?.command;
|
const statusLineCommand = settings?.statusLine?.command;
|
||||||
const isFirstSettingsRender = useRef(true);
|
const isFirstSettingsRender = useRef(true);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { isAutoMemoryEnabled } from '../../../memdir/paths.js';
|
import { isAutoMemoryEnabled } from '../../../memdir/paths.js';
|
||||||
import type { Tools } from '../../../Tool.js';
|
import type { Tools } from '../../../Tool.js';
|
||||||
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
|
import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
|
import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import React, { type ReactNode, useCallback, useState } from 'react';
|
import { type ReactNode, useCallback, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
|
type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
|
||||||
logEvent,
|
logEvent,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode, useCallback, useState } from 'react';
|
import { type ReactNode, useCallback, useState } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import { editPromptInEditor } from '../../../../utils/promptEditor.js';
|
import { editPromptInEditor } from '../../../../utils/promptEditor.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { APIUserAbortError } from '@anthropic-ai/sdk';
|
import { APIUserAbortError } from '@anthropic-ai/sdk';
|
||||||
import React, { type ReactNode, useCallback, useRef, useState } from 'react';
|
import { type ReactNode, useCallback, useRef, useState } from 'react';
|
||||||
import { useMainLoopModel } from '../../../../hooks/useMainLoopModel.js';
|
import { useMainLoopModel } from '../../../../hooks/useMainLoopModel.js';
|
||||||
import { Box, Byline, Text } from '@anthropic/ink';
|
import { Box, Byline, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import type { SettingSource } from '../../../../utils/settings/constants.js';
|
import type { SettingSource } from '../../../../utils/settings/constants.js';
|
||||||
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
|
import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
||||||
import { Select } from '../../../CustomSelect/select.js';
|
import { Select } from '../../../CustomSelect/select.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
||||||
import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import { useWizard } from '../../../wizard/index.js';
|
import { useWizard } from '../../../wizard/index.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode, useCallback, useState } from 'react';
|
import { type ReactNode, useCallback, useState } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import { editPromptInEditor } from '../../../../utils/promptEditor.js';
|
import { editPromptInEditor } from '../../../../utils/promptEditor.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import type { Tools } from '../../../../Tool.js';
|
import type { Tools } from '../../../../Tool.js';
|
||||||
import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
|
||||||
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode, useState } from 'react';
|
import { type ReactNode, useState } from 'react';
|
||||||
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
|
||||||
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
|
||||||
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ type Props = {
|
|||||||
inProgressToolCallCount?: number;
|
inProgressToolCallCount?: number;
|
||||||
lookups: ReturnType<typeof buildMessageLookups>;
|
lookups: ReturnType<typeof buildMessageLookups>;
|
||||||
isTranscriptMode?: boolean;
|
isTranscriptMode?: boolean;
|
||||||
|
defaultCollapsed?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function AssistantToolUseMessage({
|
export function AssistantToolUseMessage({
|
||||||
@@ -45,6 +46,7 @@ export function AssistantToolUseMessage({
|
|||||||
inProgressToolCallCount,
|
inProgressToolCallCount,
|
||||||
lookups,
|
lookups,
|
||||||
isTranscriptMode,
|
isTranscriptMode,
|
||||||
|
defaultCollapsed,
|
||||||
}: Props): React.ReactNode {
|
}: Props): React.ReactNode {
|
||||||
const terminalSize = useTerminalSize();
|
const terminalSize = useTerminalSize();
|
||||||
const [theme] = useTheme();
|
const [theme] = useTheme();
|
||||||
@@ -167,6 +169,7 @@ export function AssistantToolUseMessage({
|
|||||||
</Box>
|
</Box>
|
||||||
{!isResolved &&
|
{!isResolved &&
|
||||||
!isQueued &&
|
!isQueued &&
|
||||||
|
!defaultCollapsed &&
|
||||||
(isClassifierChecking ? (
|
(isClassifierChecking ? (
|
||||||
<MessageResponse height={1}>
|
<MessageResponse height={1}>
|
||||||
<Text dimColor>
|
<Text dimColor>
|
||||||
|
|||||||
@@ -1,4 +0,0 @@
|
|||||||
// Auto-generated stub — replace with real implementation
|
|
||||||
export {}
|
|
||||||
export const SnipBoundaryMessage: (props: Record<string, unknown>) => null =
|
|
||||||
() => null
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
// Auto-generated stub — replace with real implementation
|
|
||||||
export {}
|
|
||||||
export const UserCrossSessionMessage: (props: Record<string, unknown>) => null =
|
|
||||||
() => null
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
// Auto-generated stub — replace with real implementation
|
|
||||||
export {}
|
|
||||||
export const UserForkBoilerplateMessage: (
|
|
||||||
props: Record<string, unknown>,
|
|
||||||
) => null = () => null
|
|
||||||
@@ -3,28 +3,31 @@
|
|||||||
*/
|
*/
|
||||||
import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { FORK_BOILERPLATE_TAG, FORK_DIRECTIVE_PREFIX } from '../../constants/xml.js';
|
||||||
import { extractTag } from '../../utils/messages.js';
|
import { extractTag } from '../../utils/messages.js';
|
||||||
|
import { UserPromptMessage } from './UserPromptMessage.js';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
addMargin: boolean;
|
addMargin: boolean;
|
||||||
param: TextBlockParam;
|
param: TextBlockParam;
|
||||||
|
isTranscriptMode?: boolean;
|
||||||
|
timestamp?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function UserForkBoilerplateMessage({ param, addMargin }: Props): React.ReactNode {
|
export function UserForkBoilerplateMessage({ param, addMargin, isTranscriptMode, timestamp }: Props): React.ReactNode {
|
||||||
const text = param.text;
|
if (!extractTag(param.text, FORK_BOILERPLATE_TAG)) return null;
|
||||||
const extracted = extractTag(text, 'fork-boilerplate');
|
const closeTag = `</${FORK_BOILERPLATE_TAG}>`;
|
||||||
if (!extracted) {
|
const afterTag = param.text.slice(param.text.indexOf(closeTag) + closeTag.length).trimStart();
|
||||||
return null;
|
const userPrompt = afterTag.startsWith(FORK_DIRECTIVE_PREFIX)
|
||||||
}
|
? afterTag.slice(FORK_DIRECTIVE_PREFIX.length)
|
||||||
|
: afterTag;
|
||||||
const firstLine = extracted.trim().split('\n')[0] ?? '';
|
|
||||||
const preview = firstLine.length > 80 ? firstLine.slice(0, 77) + '...' : firstLine;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box flexDirection="row" marginTop={addMargin ? 1 : 0}>
|
<UserPromptMessage
|
||||||
<Text dimColor>[fork] </Text>
|
addMargin={addMargin}
|
||||||
<Text>{preview}</Text>
|
param={{ type: 'text', text: userPrompt }}
|
||||||
</Box>
|
isTranscriptMode={isTranscriptMode}
|
||||||
|
timestamp={timestamp}
|
||||||
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
// Auto-generated stub — replace with real implementation
|
|
||||||
export {}
|
|
||||||
export const UserGitHubWebhookMessage: (
|
|
||||||
props: Record<string, unknown>,
|
|
||||||
) => null = () => null
|
|
||||||
@@ -4,6 +4,7 @@ import * as React from 'react';
|
|||||||
import { NO_CONTENT_MESSAGE } from '../../constants/messages.js';
|
import { NO_CONTENT_MESSAGE } from '../../constants/messages.js';
|
||||||
import {
|
import {
|
||||||
COMMAND_MESSAGE_TAG,
|
COMMAND_MESSAGE_TAG,
|
||||||
|
FORK_BOILERPLATE_TAG,
|
||||||
LOCAL_COMMAND_CAVEAT_TAG,
|
LOCAL_COMMAND_CAVEAT_TAG,
|
||||||
TASK_NOTIFICATION_TAG,
|
TASK_NOTIFICATION_TAG,
|
||||||
TEAMMATE_MESSAGE_TAG,
|
TEAMMATE_MESSAGE_TAG,
|
||||||
@@ -124,16 +125,21 @@ export function UserTextMessage({
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fork child's first message: collapse the rules/format boilerplate, show
|
// Fork child's first message: collapse the rules/format boilerplate, show
|
||||||
// only the directive. FORK_BOILERPLATE_TAG is inlined so the import doesn't
|
// only the user prompt. Independent of FORK_SUBAGENT flag — the fork agent
|
||||||
// ship in external builds where feature('FORK_SUBAGENT') is false.
|
// transcript always needs to render the prompt as a normal user bubble.
|
||||||
if (feature('FORK_SUBAGENT')) {
|
if (param.text.includes(`<${FORK_BOILERPLATE_TAG}>`)) {
|
||||||
if (param.text.includes('<fork-boilerplate>')) {
|
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
const { UserForkBoilerplateMessage } =
|
||||||
const { UserForkBoilerplateMessage } =
|
require('./UserForkBoilerplateMessage.js') as typeof import('./UserForkBoilerplateMessage.js');
|
||||||
require('./UserForkBoilerplateMessage.js') as typeof import('./UserForkBoilerplateMessage.js');
|
/* eslint-enable @typescript-eslint/no-require-imports */
|
||||||
/* eslint-enable @typescript-eslint/no-require-imports */
|
return (
|
||||||
return <UserForkBoilerplateMessage addMargin={addMargin} param={param} />;
|
<UserForkBoilerplateMessage
|
||||||
}
|
addMargin={addMargin}
|
||||||
|
param={param}
|
||||||
|
isTranscriptMode={isTranscriptMode}
|
||||||
|
timestamp={timestamp}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cross-session UDS message (from another Claude session's SendMessage).
|
// Cross-session UDS message (from another Claude session's SendMessage).
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { homedir } from 'os';
|
import { homedir } from 'os';
|
||||||
import { basename, join, sep } from 'path';
|
import { basename, join, sep } from 'path';
|
||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { getOriginalCwd } from '../../../bootstrap/state.js';
|
import { getOriginalCwd } from '../../../bootstrap/state.js';
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
import { getShortcutDisplay } from '../../../keybindings/shortcutFormat.js';
|
import { getShortcutDisplay } from '../../../keybindings/shortcutFormat.js';
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { basename, sep } from 'path';
|
import { basename, sep } from 'path';
|
||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { getOriginalCwd } from '../../bootstrap/state.js';
|
import { getOriginalCwd } from '../../bootstrap/state.js';
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js';
|
import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js';
|
||||||
|
|||||||
63
src/components/tasks/BackgroundAgentSelector.tsx
Normal file
63
src/components/tasks/BackgroundAgentSelector.tsx
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
import { Box, Text } from '@anthropic/ink';
|
||||||
|
import { useBackgroundAgentTasks } from '../../hooks/useBackgroundAgentTasks.js';
|
||||||
|
import { useElapsedTime } from '../../hooks/useElapsedTime.js';
|
||||||
|
import { useAppState } from '../../state/AppState.js';
|
||||||
|
import type { LocalAgentTaskState } from '../../tasks/LocalAgentTask/LocalAgentTask.js';
|
||||||
|
import { formatTokens } from '../../utils/format.js';
|
||||||
|
|
||||||
|
function AgentRow({ task, selected }: { task: LocalAgentTaskState; selected: boolean }) {
|
||||||
|
const elapsed = useElapsedTime(task.startTime, task.status === 'running');
|
||||||
|
const tokens = task.progress?.tokenCount ?? 0;
|
||||||
|
const isRunning = task.status === 'running';
|
||||||
|
return (
|
||||||
|
<Box flexDirection="row" width="100%" justifyContent="space-between">
|
||||||
|
<Box flexDirection="row" flexShrink={1}>
|
||||||
|
<Text color={isRunning ? 'success' : undefined}>{selected ? '● ' : '○ '}</Text>
|
||||||
|
<Text bold={selected} wrap="truncate-end">
|
||||||
|
{task.agentType} <Text dimColor>{task.description}</Text>
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
<Box flexShrink={0}>
|
||||||
|
<Text dimColor>
|
||||||
|
{elapsed} · ↓ {formatTokens(tokens)} tokens
|
||||||
|
</Text>
|
||||||
|
</Box>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHint(pillFocused: boolean, viewedTask: LocalAgentTaskState | null): string {
|
||||||
|
if (pillFocused) return '↑/↓ to select · Enter to view';
|
||||||
|
if (!viewedTask) return 'shift+↓ to manage background agents';
|
||||||
|
return viewedTask.status === 'running' ? 'shift+↓ to manage · x to stop' : 'shift+↓ to manage · x to clear';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function BackgroundAgentSelector(): React.ReactNode {
|
||||||
|
const tasks = useBackgroundAgentTasks();
|
||||||
|
const viewingId = useAppState(s => s.viewingAgentTaskId);
|
||||||
|
const footerSelection = useAppState(s => s.footerSelection);
|
||||||
|
const selectedBgIndex = useAppState(s => s.selectedBgAgentIndex);
|
||||||
|
|
||||||
|
if (tasks.length === 0) return null;
|
||||||
|
|
||||||
|
const pillFocused = footerSelection === 'bg_agent';
|
||||||
|
const highlightedId = pillFocused
|
||||||
|
? selectedBgIndex === -1
|
||||||
|
? null
|
||||||
|
: (tasks[selectedBgIndex]?.agentId ?? null)
|
||||||
|
: (viewingId ?? null);
|
||||||
|
const mainHighlighted = pillFocused ? selectedBgIndex === -1 : viewingId === undefined;
|
||||||
|
const viewedTask = viewingId ? (tasks.find(t => t.agentId === viewingId) ?? null) : null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box flexDirection="column" width="100%">
|
||||||
|
<Box flexDirection="row" width="100%" justifyContent="space-between">
|
||||||
|
<Text bold={mainHighlighted}>{mainHighlighted ? '● ' : '○ '}main</Text>
|
||||||
|
<Text dimColor>{getHint(pillFocused, viewedTask)}</Text>
|
||||||
|
</Box>
|
||||||
|
{tasks.map(task => (
|
||||||
|
<AgentRow key={task.agentId} task={task} selected={task.agentId === highlightedId} />
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
import type { ReactNode } from 'react';
|
import type { ReactNode } from 'react';
|
||||||
import React from 'react';
|
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
import type { TaskStatus } from 'src/Task.js';
|
import type { TaskStatus } from 'src/Task.js';
|
||||||
import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js';
|
import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js';
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ type Props = {
|
|||||||
*/
|
*/
|
||||||
export function WorkflowDetailDialog({
|
export function WorkflowDetailDialog({
|
||||||
workflow,
|
workflow,
|
||||||
onDone,
|
onDone: _onDone,
|
||||||
onKill,
|
onKill,
|
||||||
onSkipAgent: _onSkipAgent,
|
onSkipAgent: _onSkipAgent,
|
||||||
onRetryAgent: _onRetryAgent,
|
onRetryAgent: _onRetryAgent,
|
||||||
|
|||||||
@@ -26,13 +26,7 @@ import { IT2_COMMAND, isInsideTmuxSync } from '../../utils/swarm/backends/detect
|
|||||||
import { ensureBackendsRegistered, getBackendByType, getCachedBackend } from '../../utils/swarm/backends/registry.js';
|
import { ensureBackendsRegistered, getBackendByType, getCachedBackend } from '../../utils/swarm/backends/registry.js';
|
||||||
import { isPaneBackend, type PaneBackendType } from '../../utils/swarm/backends/types.js';
|
import { isPaneBackend, type PaneBackendType } from '../../utils/swarm/backends/types.js';
|
||||||
import { getSwarmSocketName, TMUX_COMMAND } from '../../utils/swarm/constants.js';
|
import { getSwarmSocketName, TMUX_COMMAND } from '../../utils/swarm/constants.js';
|
||||||
import {
|
import { removeMemberFromTeam, setMemberMode, setMultipleMemberModes } from '../../utils/swarm/teamHelpers.js';
|
||||||
addHiddenPaneId,
|
|
||||||
removeHiddenPaneId,
|
|
||||||
removeMemberFromTeam,
|
|
||||||
setMemberMode,
|
|
||||||
setMultipleMemberModes,
|
|
||||||
} from '../../utils/swarm/teamHelpers.js';
|
|
||||||
import { listTasks, type Task, unassignTeammateTasks } from '../../utils/tasks.js';
|
import { listTasks, type Task, unassignTeammateTasks } from '../../utils/tasks.js';
|
||||||
import { getTeammateStatuses, type TeammateStatus, type TeamSummary } from '../../utils/teamDiscovery.js';
|
import { getTeammateStatuses, type TeammateStatus, type TeamSummary } from '../../utils/teamDiscovery.js';
|
||||||
import {
|
import {
|
||||||
@@ -560,13 +554,13 @@ async function toggleTeammateVisibility(teammate: TeammateStatus, teamName: stri
|
|||||||
* Hide a teammate pane using the backend abstraction.
|
* Hide a teammate pane using the backend abstraction.
|
||||||
* Only available for ant users (gated for dead code elimination in external builds)
|
* Only available for ant users (gated for dead code elimination in external builds)
|
||||||
*/
|
*/
|
||||||
async function hideTeammate(teammate: TeammateStatus, teamName: string): Promise<void> {}
|
async function hideTeammate(_teammate: TeammateStatus, _teamName: string): Promise<void> {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show a previously hidden teammate pane using the backend abstraction.
|
* Show a previously hidden teammate pane using the backend abstraction.
|
||||||
* Only available for ant users (gated for dead code elimination in external builds)
|
* Only available for ant users (gated for dead code elimination in external builds)
|
||||||
*/
|
*/
|
||||||
async function showTeammate(teammate: TeammateStatus, teamName: string): Promise<void> {}
|
async function showTeammate(_teammate: TeammateStatus, _teamName: string): Promise<void> {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a mode change message to a single teammate
|
* Send a mode change message to a single teammate
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import type { Theme } from '../../utils/theme.js';
|
import type { Theme } from '../../utils/theme.js';
|
||||||
import { Dialog } from '@anthropic/ink';
|
import { Dialog } from '@anthropic/ink';
|
||||||
import { useWizard } from './useWizard.js';
|
import { useWizard } from './useWizard.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
|
import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
|
||||||
import { Box, Text } from '@anthropic/ink';
|
import { Box, Text } from '@anthropic/ink';
|
||||||
import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { createContext, type ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
|
import { createContext, type ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
|
import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
|
||||||
import type { WizardContextValue, WizardProviderProps } from './types.js';
|
import type { WizardContextValue, WizardProviderProps } from './types.js';
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
* Split into data/setter context pairs so writers never re-render on
|
* Split into data/setter context pairs so writers never re-render on
|
||||||
* their own writes — the setter contexts are stable.
|
* their own writes — the setter contexts are stable.
|
||||||
*/
|
*/
|
||||||
import React, { createContext, type ReactNode, useContext, useEffect, useState } from 'react';
|
import { createContext, type ReactNode, useContext, useEffect, useState } from 'react';
|
||||||
import type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js';
|
import type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js';
|
||||||
|
|
||||||
export type PromptOverlayData = {
|
export type PromptOverlayData = {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { type ChildProcess } from 'child_process'
|
import { type ChildProcess } from 'child_process'
|
||||||
import { resolve } from 'path'
|
import { resolve } from 'path'
|
||||||
import { buildCliLaunch, spawnCli } from '../utils/cliLaunch.js'
|
import { buildCliLaunch, spawnCli } from '../utils/cliLaunch.js'
|
||||||
import { errorMessage } from '../utils/errors.js'
|
|
||||||
import {
|
import {
|
||||||
writeDaemonState,
|
writeDaemonState,
|
||||||
removeDaemonState,
|
removeDaemonState,
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
#!/usr/bin/env bun
|
#!/usr/bin/env bun
|
||||||
|
// Performance shim MUST be the first import — it replaces globalThis.performance
|
||||||
|
// with a JS-backed implementation before React/OTel capture the native reference.
|
||||||
|
// Without this, JSC's C++ Vector grows without bound in long-running sessions.
|
||||||
|
import '../utils/performanceShim.js';
|
||||||
import { feature } from 'bun:bundle';
|
import { feature } from 'bun:bundle';
|
||||||
import { isEnvTruthy } from '../utils/envUtils.js';
|
import { isEnvTruthy } from '../utils/envUtils.js';
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { getOauthProfileFromApiKey } from 'src/services/oauth/getOauthProfile.js';
|
import { getOauthProfileFromApiKey } from 'src/services/oauth/getOauthProfile.js';
|
||||||
import { isClaudeAISubscriber } from 'src/utils/auth.js';
|
import { isClaudeAISubscriber } from 'src/utils/auth.js';
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useEffect, useRef } from 'react';
|
import { useEffect, useRef } from 'react';
|
||||||
import { useNotifications } from 'src/context/notifications.js';
|
import { useNotifications } from 'src/context/notifications.js';
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
import type { MCPServerConnection } from 'src/services/mcp/types.js';
|
import type { MCPServerConnection } from 'src/services/mcp/types.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
import { useNotifications } from 'src/context/notifications.js';
|
import { useNotifications } from 'src/context/notifications.js';
|
||||||
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
||||||
import { useNotifications } from '../../context/notifications.js';
|
import { useNotifications } from '../../context/notifications.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { useEffect, useMemo } from 'react';
|
import { useEffect, useMemo } from 'react';
|
||||||
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
import { getIsRemoteMode } from '../../bootstrap/state.js';
|
||||||
import { useNotifications } from '../../context/notifications.js';
|
import { useNotifications } from '../../context/notifications.js';
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { useNotifications } from 'src/context/notifications.js';
|
import { useNotifications } from 'src/context/notifications.js';
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useRef, useState } from 'react';
|
import { useCallback, useRef, useState } from 'react';
|
||||||
import { getModeFromInput } from 'src/components/PromptInput/inputModes.js';
|
import { getModeFromInput } from 'src/components/PromptInput/inputModes.js';
|
||||||
import { useNotifications } from 'src/context/notifications.js';
|
import { useNotifications } from 'src/context/notifications.js';
|
||||||
import { ConfigurableShortcutHint } from '../components/ConfigurableShortcutHint.js';
|
import { ConfigurableShortcutHint } from '../components/ConfigurableShortcutHint.js';
|
||||||
|
|||||||
19
src/hooks/useBackgroundAgentTasks.ts
Normal file
19
src/hooks/useBackgroundAgentTasks.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { useMemo } from 'react'
|
||||||
|
import { useAppState } from '../state/AppState.js'
|
||||||
|
import {
|
||||||
|
isLocalAgentTask,
|
||||||
|
type LocalAgentTaskState,
|
||||||
|
} from '../tasks/LocalAgentTask/LocalAgentTask.js'
|
||||||
|
|
||||||
|
export function useBackgroundAgentTasks(): LocalAgentTaskState[] {
|
||||||
|
const tasks = useAppState(s => s.tasks)
|
||||||
|
return useMemo(() => {
|
||||||
|
const now = Date.now()
|
||||||
|
return Object.values(tasks)
|
||||||
|
.filter(isLocalAgentTask)
|
||||||
|
.filter(t => t.agentType !== 'main-session')
|
||||||
|
.filter(t => t.isBackgrounded !== false)
|
||||||
|
.filter(t => t.evictAfter === undefined || t.evictAfter > now)
|
||||||
|
.sort((a, b) => a.startTime - b.startTime)
|
||||||
|
}, [tasks])
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
import * as React from 'react';
|
|
||||||
import { Text } from '@anthropic/ink';
|
import { Text } from '@anthropic/ink';
|
||||||
import { isClaudeAISubscriber } from '../utils/auth.js';
|
import { isClaudeAISubscriber } from '../utils/auth.js';
|
||||||
import { isChromeExtensionInstalled, shouldEnableClaudeInChrome } from '../utils/claudeInChrome/setup.js';
|
import { isChromeExtensionInstalled, shouldEnableClaudeInChrome } from '../utils/claudeInChrome/setup.js';
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user