Compare commits
1 Commits
rcc/grok
...
rcc/parity
| Author | SHA1 | Date | |
|---|---|---|---|
|
0e722fa013 |
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"permissions": {
|
|
||||||
"defaultMode": "dontAsk"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -2,6 +2,3 @@ __pycache__/
|
|||||||
archive/
|
archive/
|
||||||
.omx/
|
.omx/
|
||||||
.clawd-agents/
|
.clawd-agents/
|
||||||
# Claude Code local artifacts
|
|
||||||
.claude/settings.local.json
|
|
||||||
.claude/sessions/
|
|
||||||
|
|||||||
21
CLAUDE.md
21
CLAUDE.md
@@ -1,21 +0,0 @@
|
|||||||
# CLAUDE.md
|
|
||||||
|
|
||||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
|
||||||
|
|
||||||
## Detected stack
|
|
||||||
- Languages: Rust.
|
|
||||||
- Frameworks: none detected from the supported starter markers.
|
|
||||||
|
|
||||||
## Verification
|
|
||||||
- Run Rust verification from `rust/`: `cargo fmt`, `cargo clippy --workspace --all-targets -- -D warnings`, `cargo test --workspace`
|
|
||||||
- `src/` and `tests/` are both present; update both surfaces together when behavior changes.
|
|
||||||
|
|
||||||
## Repository shape
|
|
||||||
- `rust/` contains the Rust workspace and active CLI/runtime implementation.
|
|
||||||
- `src/` contains source files that should stay consistent with generated guidance and tests.
|
|
||||||
- `tests/` contains validation surfaces that should be reviewed alongside code changes.
|
|
||||||
|
|
||||||
## Working agreement
|
|
||||||
- Prefer small, reviewable changes and keep generated bootstrap files aligned with actual repo workflows.
|
|
||||||
- Keep shared defaults in `.claude.json`; reserve `.claude/settings.local.json` for machine-local overrides.
|
|
||||||
- Do not overwrite existing `CLAUDE.md` content automatically; update it intentionally when repo workflows change.
|
|
||||||
343
PARITY.md
343
PARITY.md
@@ -1,214 +1,253 @@
|
|||||||
# PARITY GAP ANALYSIS
|
# PARITY Gap Analysis
|
||||||
|
|
||||||
Scope: read-only comparison between the original TypeScript source at `/home/bellman/Workspace/claude-code/src/` and the Rust port under `rust/crates/`.
|
Date: 2026-04-01
|
||||||
|
|
||||||
Method: compared feature surfaces, registries, entrypoints, and runtime plumbing only. No TypeScript source was copied.
|
Scope compared:
|
||||||
|
- Upstream TypeScript: `/home/bellman/Workspace/claude-code/src/`
|
||||||
|
- Rust port: `rust/crates/`
|
||||||
|
|
||||||
|
Method:
|
||||||
|
- Read-only comparison only.
|
||||||
|
- No upstream source was copied into this repo.
|
||||||
|
- This is a focused feature-gap report for `tools`, `hooks`, `plugins`, `skills`, `cli`, `assistant`, and `services`.
|
||||||
|
|
||||||
## Executive summary
|
## Executive summary
|
||||||
|
|
||||||
The Rust port has a good foundation for:
|
The Rust port has a solid core for:
|
||||||
- Anthropic API/OAuth basics
|
- basic prompt/REPL flow
|
||||||
- local conversation/session state
|
- session/runtime state
|
||||||
- a core tool loop
|
- Anthropic API/OAuth plumbing
|
||||||
- MCP stdio/bootstrap support
|
- a compact MVP tool registry
|
||||||
- CLAUDE.md discovery
|
- CLAUDE.md discovery
|
||||||
- a small but usable built-in tool set
|
- MCP config parsing/bootstrap primitives
|
||||||
|
|
||||||
It is **not feature-parity** with the TypeScript CLI.
|
But it is still materially behind the TypeScript implementation in six major areas:
|
||||||
|
1. **Tools surface area** is much smaller.
|
||||||
|
2. **Hook execution** is largely missing; Rust mostly loads hook config but does not run a TS-style PreToolUse/PostToolUse pipeline.
|
||||||
|
3. **Plugins** are effectively absent in Rust.
|
||||||
|
4. **Skills** are only partially implemented in Rust via direct `SKILL.md` loading; there is no comparable skills command/discovery/registration surface.
|
||||||
|
5. **CLI** breadth is much narrower in Rust.
|
||||||
|
6. **Assistant/tool orchestration** lacks the richer streaming concurrency, hook integration, and orchestration behavior present in TS.
|
||||||
|
7. **Services** in Rust cover API/auth/runtime basics, but many higher-level TS services are missing.
|
||||||
|
|
||||||
Largest gaps:
|
## Critical bug status on this branch
|
||||||
- **plugins** are effectively absent in Rust
|
|
||||||
- **hooks** are parsed but not executed in Rust
|
Targeted critical items requested by the user:
|
||||||
- **CLI breadth** is much narrower in Rust
|
- **Prompt mode tools enabled**: fixed in `rust/crates/rusty-claude-cli/src/main.rs:75-82`
|
||||||
- **skills** are local-file only in Rust, without the TS registry/bundled pipeline
|
- **Default permission mode = danger-full-access**: fixed in `rust/crates/rusty-claude-cli/src/args.rs:12-16`, `rust/crates/rusty-claude-cli/src/main.rs:348-353`, and starter config `rust/crates/rusty-claude-cli/src/init.rs:4-9`
|
||||||
- **assistant orchestration** lacks TS hook-aware orchestration and remote/structured transports
|
- **Tool input `{}` prefix bug**: fixed/guarded in streaming vs non-stream paths at `rust/crates/rusty-claude-cli/src/main.rs:2211-2256`
|
||||||
- **services** beyond core API/OAuth/MCP are mostly missing in Rust
|
- **Unlimited max_iterations**: already present at `rust/crates/runtime/src/conversation.rs:143-148` with `usize::MAX` initialization at `rust/crates/runtime/src/conversation.rs:119`
|
||||||
|
|
||||||
|
Build/test/manual verification is tracked separately below and must pass before the branch is considered done.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## tools/
|
## 1) tools/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Large per-tool module surface under `src/tools/`, including agent/task tools, AskUserQuestion, MCP tools, plan/worktree tools, REPL, schedule/task tools, synthetic output, brief/upload, and more.
|
||||||
- `src/tools/` contains broad tool families including `AgentTool`, `AskUserQuestionTool`, `BashTool`, `ConfigTool`, `FileReadTool`, `FileWriteTool`, `GlobTool`, `GrepTool`, `LSPTool`, `ListMcpResourcesTool`, `MCPTool`, `McpAuthTool`, `ReadMcpResourceTool`, `RemoteTriggerTool`, `ScheduleCronTool`, `SkillTool`, `Task*`, `Team*`, `TodoWriteTool`, `ToolSearchTool`, `WebFetchTool`, `WebSearchTool`.
|
- Evidence:
|
||||||
- Tool execution/orchestration is split across `src/services/tools/StreamingToolExecutor.ts`, `src/services/tools/toolExecution.ts`, `src/services/tools/toolHooks.ts`, and `src/services/tools/toolOrchestration.ts`.
|
- `src/tools/AgentTool/AgentTool.tsx`
|
||||||
|
- `src/tools/AskUserQuestionTool/AskUserQuestionTool.tsx`
|
||||||
|
- `src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts`
|
||||||
|
- `src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts`
|
||||||
|
- `src/tools/EnterPlanModeTool/EnterPlanModeTool.ts`
|
||||||
|
- `src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts`
|
||||||
|
- `src/tools/EnterWorktreeTool/EnterWorktreeTool.ts`
|
||||||
|
- `src/tools/ExitWorktreeTool/ExitWorktreeTool.ts`
|
||||||
|
- `src/tools/RemoteTriggerTool/RemoteTriggerTool.ts`
|
||||||
|
- `src/tools/ScheduleCronTool/*`
|
||||||
|
- `src/tools/TaskCreateTool/*`, `TaskGetTool/*`, `TaskListTool/*`, `TaskOutputTool/*`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- A single MVP registry in `rust/crates/tools/src/lib.rs:53-371`.
|
||||||
- Tool registry is centralized in `rust/crates/tools/src/lib.rs` via `mvp_tool_specs()`.
|
- Implemented tools include `bash`, `read_file`, `write_file`, `edit_file`, `glob_search`, `grep_search`, `WebFetch`, `WebSearch`, `TodoWrite`, `Skill`, `Agent`, `ToolSearch`, `NotebookEdit`, `Sleep`, `SendUserMessage`, `Config`, `StructuredOutput`, `REPL`, `PowerShell`.
|
||||||
- Current built-ins include shell/file/search/web/todo/skill/agent/config/notebook/repl/powershell primitives.
|
|
||||||
- Runtime execution is wired through `rust/crates/tools/src/lib.rs` and `rust/crates/runtime/src/conversation.rs`.
|
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- No Rust equivalents for major TS tools such as `AskUserQuestionTool`, `LSPTool`, `ListMcpResourcesTool`, `MCPTool`, `McpAuthTool`, `ReadMcpResourceTool`, `RemoteTriggerTool`, `ScheduleCronTool`, `Task*`, `Team*`, and several workflow/system tools.
|
- **Missing large chunks of the upstream tool catalog**: I did not find Rust equivalents for AskUserQuestion, MCP resource listing/reading tools, plan/worktree entry/exit tools, task management tools, remote trigger, synthetic output, or schedule/cron tools.
|
||||||
- Rust tool surface is still explicitly an MVP registry, not a parity registry.
|
- **Tool decomposition is much coarser**: TS isolates tool-specific validation/security/UI behavior per tool module; Rust centralizes almost everything in one file (`rust/crates/tools/src/lib.rs`).
|
||||||
- Rust lacks TS’s layered tool orchestration split.
|
- **Likely parity impact**: lower fidelity tool prompting, weaker per-tool behavior specialization, and fewer native tool choices exposed to the model.
|
||||||
|
|
||||||
**Status:** partial core only.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## hooks/
|
## 2) hooks/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- A full permission and tool-hook system with **PermissionRequest**, **PreToolUse**, **PostToolUse**, and failure/cancellation handling.
|
||||||
- Hook command surface under `src/commands/hooks/`.
|
- Evidence:
|
||||||
- Runtime hook machinery in `src/services/tools/toolHooks.ts` and `src/services/tools/toolExecution.ts`.
|
- `src/hooks/toolPermission/PermissionContext.ts:25,222`
|
||||||
- TS supports `PreToolUse`, `PostToolUse`, and broader hook-driven behaviors configured through settings and documented in `src/skills/bundled/updateConfig.ts`.
|
- `src/hooks/toolPermission/handlers/coordinatorHandler.ts:32-38`
|
||||||
|
- `src/hooks/toolPermission/handlers/interactiveHandler.ts:412-429`
|
||||||
|
- `src/services/tools/toolHooks.ts:39,435`
|
||||||
|
- `src/services/tools/toolExecution.ts:800,1074,1483`
|
||||||
|
- `src/commands/hooks/index.ts:5-8`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- Hook data is **loaded/merged from config** and visible in reports:
|
||||||
- Hook config is parsed and merged in `rust/crates/runtime/src/config.rs`.
|
- `rust/crates/runtime/src/config.rs:786-797,829-838`
|
||||||
- Hook config can be inspected via Rust config reporting in `rust/crates/commands/src/lib.rs` and `rust/crates/rusty-claude-cli/src/main.rs`.
|
- `rust/crates/rusty-claude-cli/src/main.rs:1665-1669`
|
||||||
- Prompt guidance mentions hooks in `rust/crates/runtime/src/prompt.rs`.
|
- The system prompt acknowledges user-configured hooks:
|
||||||
|
- `rust/crates/runtime/src/prompt.rs:452-459`
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- No actual hook execution pipeline in `rust/crates/runtime/src/conversation.rs`.
|
- **No comparable hook execution pipeline found** in the Rust runtime conversation/tool execution path.
|
||||||
- No PreToolUse/PostToolUse mutation/deny/rewrite/result-hook behavior.
|
- `rust/crates/runtime/src/conversation.rs:151-208` goes straight from assistant tool_use -> permission check -> tool execute -> tool_result, without TS-style PreToolUse/PostToolUse processing.
|
||||||
- No Rust `/hooks` parity command.
|
- I did **not** find Rust counterparts to TS files like `toolHooks.ts` or `PermissionContext.ts` that execute hook callbacks and alter/block tool behavior.
|
||||||
|
- Result: Rust appears to support **hook configuration visibility**, but not full **hook behavior parity**.
|
||||||
**Status:** config-only; runtime behavior missing.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## plugins/
|
## 3) plugins/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Built-in and bundled plugin registration plus CLI/service support for validate/list/install/uninstall/enable/disable/update flows.
|
||||||
- Built-in plugin scaffolding in `src/plugins/builtinPlugins.ts` and `src/plugins/bundled/index.ts`.
|
- Evidence:
|
||||||
- Plugin lifecycle/services in `src/services/plugins/PluginInstallationManager.ts` and `src/services/plugins/pluginOperations.ts`.
|
- `src/plugins/builtinPlugins.ts:7-17,149-150`
|
||||||
- CLI/plugin command surface under `src/commands/plugin/` and `src/commands/reload-plugins/`.
|
- `src/plugins/bundled/index.ts:7-22`
|
||||||
|
- `src/cli/handlers/plugins.ts:51,101,157,668`
|
||||||
|
- `src/services/plugins/pluginOperations.ts:16,54,306,435,713`
|
||||||
|
- `src/services/plugins/pluginCliCommands.ts:7,36`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- I did **not** find a dedicated plugin crate/module/handler under `rust/crates/`.
|
||||||
- No dedicated plugin subsystem appears under `rust/crates/`.
|
- The Rust crate layout is only `api`, `commands`, `compat-harness`, `runtime`, `rusty-claude-cli`, and `tools`.
|
||||||
- Repo-wide Rust references to plugins are effectively absent beyond text/help mentions.
|
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- No plugin loader.
|
- **Plugin loading/install/update/validation is missing.**
|
||||||
- No marketplace install/update/enable/disable flow.
|
- **No plugin CLI surface found** comparable to `claude plugin ...`.
|
||||||
- No `/plugin` or `/reload-plugins` parity.
|
- **No plugin runtime refresh/reconciliation layer found**.
|
||||||
- No plugin-provided hook/tool/command/MCP extension path.
|
- This is one of the largest parity gaps.
|
||||||
|
|
||||||
**Status:** missing.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## skills/ and CLAUDE.md discovery
|
## 4) skills/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Bundled skills registry and loader integration, plus a `skills` command.
|
||||||
- Skill loading/registry pipeline in `src/skills/loadSkillsDir.ts`, `src/skills/bundledSkills.ts`, and `src/skills/mcpSkillBuilders.ts`.
|
- Evidence:
|
||||||
- Bundled skills under `src/skills/bundled/`.
|
- `src/commands/skills/index.ts:6`
|
||||||
- Skills command surface under `src/commands/skills/`.
|
- `src/skills/bundledSkills.ts:44,99,107,114`
|
||||||
|
- `src/skills/loadSkillsDir.ts:65`
|
||||||
|
- `src/skills/mcpSkillBuilders.ts:4-21,40`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- A `Skill` tool that loads local `SKILL.md` files directly:
|
||||||
- `Skill` tool in `rust/crates/tools/src/lib.rs` resolves and reads local `SKILL.md` files.
|
- `rust/crates/tools/src/lib.rs:1244-1255`
|
||||||
- CLAUDE.md discovery is implemented in `rust/crates/runtime/src/prompt.rs`.
|
- `rust/crates/tools/src/lib.rs:1288-1323`
|
||||||
- Rust supports `/memory` and `/init` via `rust/crates/commands/src/lib.rs` and `rust/crates/rusty-claude-cli/src/main.rs`.
|
- CLAUDE.md / instruction discovery exists in runtime prompt loading:
|
||||||
|
- `rust/crates/runtime/src/prompt.rs:203-208`
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- No bundled skill registry equivalent.
|
- **No Rust `/skills` slash command** in `rust/crates/commands/src/lib.rs:41-166`.
|
||||||
- No `/skills` command.
|
- **No visible bundled-skill registry equivalent** to TS `bundledSkills.ts` / `loadSkillsDir.ts` / `mcpSkillBuilders.ts`.
|
||||||
- No MCP skill-builder pipeline.
|
- Current Rust skill support is closer to **direct file loading** than full upstream **skill discovery/registration/command integration**.
|
||||||
- No TS-style live skill discovery/reload/change handling.
|
|
||||||
- No comparable session-memory / team-memory integration around skills.
|
|
||||||
|
|
||||||
**Status:** basic local skill loading only.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## cli/
|
## 5) cli/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Broad CLI handler and transport surface.
|
||||||
- Large command surface under `src/commands/` including `agents`, `hooks`, `mcp`, `memory`, `model`, `permissions`, `plan`, `plugin`, `resume`, `review`, `skills`, `tasks`, and many more.
|
- Evidence:
|
||||||
- Structured/remote transport stack in `src/cli/structuredIO.ts`, `src/cli/remoteIO.ts`, and `src/cli/transports/*`.
|
- `src/cli/handlers/agents.ts:2-32`
|
||||||
- CLI handler split in `src/cli/handlers/*`.
|
- `src/cli/handlers/auth.ts`
|
||||||
|
- `src/cli/handlers/autoMode.ts:24,35,73`
|
||||||
|
- `src/cli/handlers/plugins.ts:2-3,101,157,668`
|
||||||
|
- `src/cli/remoteIO.ts:25-35,118-127`
|
||||||
|
- `src/cli/transports/SSETransport.ts`
|
||||||
|
- `src/cli/transports/WebSocketTransport.ts`
|
||||||
|
- `src/cli/transports/HybridTransport.ts`
|
||||||
|
- `src/cli/transports/SerialBatchEventUploader.ts`
|
||||||
|
- `src/cli/transports/WorkerStateUploader.ts`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- Minimal top-level subcommands in `rust/crates/rusty-claude-cli/src/args.rs:29-39` and `rust/crates/rusty-claude-cli/src/main.rs:67-90,242-261`.
|
||||||
- Shared slash command registry in `rust/crates/commands/src/lib.rs`.
|
- Slash command surface is 15 commands total in `rust/crates/commands/src/lib.rs:41-166,389`.
|
||||||
- Rust slash commands currently cover `help`, `status`, `compact`, `model`, `permissions`, `clear`, `cost`, `resume`, `config`, `memory`, `init`, `diff`, `version`, `export`, `session`.
|
|
||||||
- Main CLI/repl/prompt handling lives in `rust/crates/rusty-claude-cli/src/main.rs`.
|
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- Missing major TS command families: `/agents`, `/hooks`, `/mcp`, `/plugin`, `/skills`, `/plan`, `/review`, `/tasks`, and many others.
|
- **Missing major CLI subcommand families**: agents, plugins, mcp management, auto-mode tooling, and many other TS commands.
|
||||||
- No Rust equivalent to TS structured IO / remote transport layers.
|
- **Missing remote/transport stack parity**: I did not find Rust equivalents to TS remote structured IO / SSE / websocket / CCR transport layers.
|
||||||
- No TS-style handler decomposition for auth/plugins/MCP/agents.
|
- **Slash command breadth is much narrower** than TS command inventory under `src/commands/`.
|
||||||
- JSON prompt mode is improved on this branch, but still not clean transport parity: empirical verification shows tool-capable JSON output can emit human-readable tool-result lines before the final JSON object.
|
- **Prompt-mode parity bug** was present and is now fixed for this branch’s prompt path.
|
||||||
|
|
||||||
**Status:** functional local CLI core, much narrower than TS.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## assistant/ (agentic loop, streaming, tool calling)
|
## 6) assistant/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Rich tool orchestration and streaming execution behavior, including concurrency/cancellation/fallback logic.
|
||||||
- Assistant/session surface at `src/assistant/sessionHistory.ts`.
|
- Evidence:
|
||||||
- Tool orchestration in `src/services/tools/StreamingToolExecutor.ts`, `src/services/tools/toolExecution.ts`, `src/services/tools/toolOrchestration.ts`.
|
- `src/services/tools/StreamingToolExecutor.ts:35-214`
|
||||||
- Remote/structured streaming layers in `src/cli/structuredIO.ts` and `src/cli/remoteIO.ts`.
|
- `src/services/tools/toolExecution.ts:455-569,800-918,1483`
|
||||||
|
- `src/services/tools/toolOrchestration.ts:134-167`
|
||||||
|
- `src/assistant/sessionHistory.ts`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- A straightforward agentic loop in `rust/crates/runtime/src/conversation.rs:130-214`.
|
||||||
- Core loop in `rust/crates/runtime/src/conversation.rs`.
|
- Streaming API adaptation in `rust/crates/rusty-claude-cli/src/main.rs:1998-2058`.
|
||||||
- Stream/tool event translation in `rust/crates/rusty-claude-cli/src/main.rs`.
|
- Tool-use block assembly and non-stream fallback handling in `rust/crates/rusty-claude-cli/src/main.rs:2211-2256`.
|
||||||
- Session persistence in `rust/crates/runtime/src/session.rs`.
|
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- No TS-style hook-aware orchestration layer.
|
- **No TS-style streaming tool executor** with sibling cancellation / fallback discard semantics.
|
||||||
- No TS structured/remote assistant transport stack.
|
- **No integrated PreToolUse/PostToolUse hook participation** in assistant execution.
|
||||||
- No richer TS assistant/session-history/background-task integration.
|
- **No comparable orchestration layer for richer tool event semantics** found.
|
||||||
- JSON output path is no longer single-turn only on this branch, but output cleanliness still lags TS transport expectations.
|
- Historically broken parity items in prompt mode were:
|
||||||
|
- prompt tool enablement (`main.rs:75-82`) — now fixed on this branch
|
||||||
**Status:** strong core loop, missing orchestration layers.
|
- streamed `{}` tool-input prefix behavior (`main.rs:2211-2256`) — now fixed/guarded on this branch
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## services/ (API client, auth, models, MCP)
|
## 7) services/
|
||||||
|
|
||||||
### TS exists
|
### Upstream TS has
|
||||||
Evidence:
|
- Very broad service layer, including API, analytics, compact/session memory, prompt suggestions, plugin services, MCP service helpers, LSP management, policy limits, team memory sync, notifier/tips, etc.
|
||||||
- API services under `src/services/api/*`.
|
- Evidence:
|
||||||
- OAuth services under `src/services/oauth/*`.
|
- `src/services/api/client.ts`, `src/services/api/claude.ts`, `src/services/api/withRetry.ts`
|
||||||
- MCP services under `src/services/mcp/*`.
|
- `src/services/oauth/client.ts`, `src/services/oauth/index.ts`
|
||||||
- Additional service layers for analytics, prompt suggestion, session memory, plugin operations, settings sync, policy limits, team memory sync, notifier, voice, and more under `src/services/*`.
|
- `src/services/mcp/*`
|
||||||
|
- `src/services/plugins/*`
|
||||||
|
- `src/services/lsp/*`
|
||||||
|
- `src/services/compact/*`
|
||||||
|
- `src/services/SessionMemory/*`
|
||||||
|
- `src/services/PromptSuggestion/*`
|
||||||
|
- `src/services/analytics/*`
|
||||||
|
- `src/services/teamMemorySync/*`
|
||||||
|
|
||||||
### Rust exists
|
### Rust currently has
|
||||||
Evidence:
|
- Core service equivalents for:
|
||||||
- Core Anthropic API client in `rust/crates/api/src/{client,error,sse,types}.rs`.
|
- API client + SSE: `rust/crates/api/src/client.rs`, `rust/crates/api/src/sse.rs`, `rust/crates/api/src/types.rs`
|
||||||
- OAuth support in `rust/crates/runtime/src/oauth.rs`.
|
- OAuth: `rust/crates/runtime/src/oauth.rs`
|
||||||
- MCP config/bootstrap/client support in `rust/crates/runtime/src/{config,mcp,mcp_client,mcp_stdio}.rs`.
|
- MCP config/bootstrap primitives: `rust/crates/runtime/src/mcp.rs`, `rust/crates/runtime/src/mcp_client.rs`, `rust/crates/runtime/src/mcp_stdio.rs`, `rust/crates/runtime/src/config.rs`
|
||||||
- Usage accounting in `rust/crates/runtime/src/usage.rs`.
|
- prompt/context loading: `rust/crates/runtime/src/prompt.rs`
|
||||||
- Remote upstream-proxy support in `rust/crates/runtime/src/remote.rs`.
|
- session compaction/runtime usage: `rust/crates/runtime/src/compact.rs`, `rust/crates/runtime/src/usage.rs`
|
||||||
|
|
||||||
### Missing or broken in Rust
|
### Missing or broken in Rust
|
||||||
- Most TS service ecosystem beyond core messaging/auth/MCP is absent.
|
- **Missing many higher-level services**: analytics, plugin services, prompt suggestion, team memory sync, richer LSP service management, notifier/tips ecosystem, and much of the surrounding product/service scaffolding.
|
||||||
- No TS-equivalent plugin service layer.
|
- Rust is closer to a **runtime/API core** than a full parity implementation of the TS service layer.
|
||||||
- No TS-equivalent analytics/settings-sync/policy-limit/team-memory subsystems.
|
|
||||||
- No TS-style MCP connection-manager/UI layer.
|
|
||||||
- Model/provider ergonomics remain thinner than TS.
|
|
||||||
|
|
||||||
**Status:** core foundation exists; broader service ecosystem missing.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Critical bug status in this worktree
|
## Highest-priority parity gaps after the critical bug fixes
|
||||||
|
|
||||||
### Fixed
|
1. **Hook execution parity**
|
||||||
- **Prompt mode tools enabled**
|
- Config exists, execution does not appear to.
|
||||||
- `rust/crates/rusty-claude-cli/src/main.rs` now constructs prompt mode with `LiveCli::new(model, true, ...)`.
|
- This affects permissions, tool interception, and continuation behavior.
|
||||||
- **Default permission mode = DangerFullAccess**
|
|
||||||
- Runtime default now resolves to `DangerFullAccess` in `rust/crates/rusty-claude-cli/src/main.rs`.
|
|
||||||
- Clap default also uses `DangerFullAccess` in `rust/crates/rusty-claude-cli/src/args.rs`.
|
|
||||||
- Init template writes `dontAsk` in `rust/crates/rusty-claude-cli/src/init.rs`.
|
|
||||||
- **Streaming `{}` tool-input prefix bug**
|
|
||||||
- `rust/crates/rusty-claude-cli/src/main.rs` now strips the initial empty object only for streaming tool input, while preserving legitimate `{}` in non-stream responses.
|
|
||||||
- **Unlimited max_iterations**
|
|
||||||
- Verified at `rust/crates/runtime/src/conversation.rs` with `usize::MAX`.
|
|
||||||
|
|
||||||
### Remaining notable parity issue
|
2. **Plugin system parity**
|
||||||
- **JSON prompt output cleanliness**
|
- Entire install/load/manage surface appears missing.
|
||||||
- Tool-capable JSON mode now loops, but empirical verification still shows pre-JSON human-readable tool-result output when tools fire.
|
|
||||||
|
3. **CLI breadth parity**
|
||||||
|
- Missing many upstream command families and remote transports.
|
||||||
|
|
||||||
|
4. **Tool surface parity**
|
||||||
|
- MVP tool registry exists, but a large number of upstream tool types are absent.
|
||||||
|
|
||||||
|
5. **Assistant orchestration parity**
|
||||||
|
- Core loop exists, but advanced streaming/execution behaviors from TS are missing.
|
||||||
|
|
||||||
|
## Recommended next work after current critical fixes
|
||||||
|
|
||||||
|
1. Finish build/test/manual verification of the critical bug patch.
|
||||||
|
2. Implement **hook execution** before broadening the tool surface further.
|
||||||
|
3. Decide whether **plugins** are in-scope for parity; if yes, this likely needs dedicated design work, not a small patch.
|
||||||
|
4. Expand the CLI/tool matrix deliberately rather than adding one-off commands without shared orchestration support.
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[{"blocks":[{"text":"hello use bash tool for testing","type":"text"}],"role":"user"},{"blocks":[{"text":"\n\nHello! I'm ready to help. Let me run a quick bash command to confirm everything is working:","type":"text"},{"id":"toolu_01EuTzVfUK7iPRBvjZAovzfV","input":"{\"command\": \"echo \\\"Hello! Bash tool is working. 🎉\\\" && date && pwd\"}","name":"bash","type":"tool_use"}],"role":"assistant","usage":{"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":4277,"output_tokens":92}},{"blocks":[{"is_error":false,"output":"{\n \"stdout\": \"Hello! Bash tool is working. 🎉\\nWed Apr 1 02:25:46 AM UTC 2026\\n/home/bellman/Workspace/clawd-code/rust\\n\",\n \"stderr\": \"\",\n \"rawOutputPath\": null,\n \"interrupted\": false,\n \"isImage\": null,\n \"backgroundTaskId\": null,\n \"backgroundedByUser\": null,\n \"assistantAutoBackgrounded\": null,\n \"dangerouslyDisableSandbox\": null,\n \"returnCodeInterpretation\": null,\n \"noOutputExpected\": false,\n \"structuredContent\": null,\n \"persistedOutputPath\": null,\n \"persistedOutputSize\": null,\n \"sandboxStatus\": {\n \"enabled\": true,\n \"requested\": {\n \"enabled\": true,\n \"namespace_restrictions\": true,\n \"network_isolation\": false,\n \"filesystem_mode\": \"workspace-only\",\n \"allowed_mounts\": []\n },\n \"supported\": true,\n \"active\": true,\n \"namespace_supported\": true,\n \"namespace_active\": true,\n \"network_supported\": true,\n \"network_active\": false,\n \"filesystem_mode\": \"workspace-only\",\n \"filesystem_active\": true,\n \"allowed_mounts\": [],\n \"in_container\": false,\n \"container_markers\": [],\n \"fallback_reason\": null\n }\n}","tool_name":"bash","tool_use_id":"toolu_01EuTzVfUK7iPRBvjZAovzfV","type":"tool_result"}],"role":"tool"},{"blocks":[{"text":"Bash tool is working perfectly! ✅\n\nHere's a quick summary:\n- **Status**: Operational 🎉\n- **Date**: Wed Apr 1, 2026\n- **Working directory**: `/home/bellman/Workspace/clawd-code/rust`\n- **Sandbox**: Enabled and active\n\nHow can I help you today?","type":"text"}],"role":"assistant","usage":{"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":4746,"output_tokens":84}}],"version":1}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[{"blocks":[{"text":"who are you?","type":"text"}],"role":"user"},{"blocks":[{"text":"I'm **Claude**, an AI assistant built by Anthropic, currently running as a **Claude Code agent** (Claude Opus 4.6). I'm set up in your workspace at `/home/bellman/Workspace/clawd-code/rust` with the **oh-my-claudecode (OMC)** orchestration layer active.\n\nHere's what I can help you with:\n\n- **Software engineering tasks** — reading, writing, and refactoring code\n- **Debugging** — diagnosing issues, running tests, tracing errors\n- **Research & planning** — exploring codebases, understanding architecture, planning changes\n- **Shell commands** — building, testing, running tools in your environment\n- **Multi-agent workflows** — delegating specialized work (reviews, deep analysis, etc.) via OMC\n\nI have access to your local filesystem, can execute shell commands, search the web, and coordinate specialized sub-agents for complex tasks.\n\nWhat can I help you with today?","type":"text"}],"role":"assistant","usage":{"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":4292,"output_tokens":220}}],"version":1}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[],"version":1}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[],"version":1}
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
|
|||||||
{"messages":[{"blocks":[{"text":"clear","type":"text"}],"role":"user"},{"blocks":[{"text":"\n\nI've cleared the conversation. How can I help you today?","type":"text"}],"role":"assistant","usage":{"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":4272,"output_tokens":17}}],"version":1}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[{"blocks":[{"text":"exit","type":"text"}],"role":"user"},{"blocks":[{"text":"\n\nGoodbye! 👋","type":"text"}],"role":"assistant","usage":{"cache_creation_input_tokens":0,"cache_read_input_tokens":0,"input_tokens":4272,"output_tokens":10}}],"version":1}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
{"messages":[],"version":1}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"content": "Architecture & dependency analysis",
|
|
||||||
"activeForm": "Complete",
|
|
||||||
"status": "completed"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"content": "Runtime crate deep analysis",
|
|
||||||
"activeForm": "Complete",
|
|
||||||
"status": "completed"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"content": "CLI & Tools analysis",
|
|
||||||
"activeForm": "Complete",
|
|
||||||
"status": "completed"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"content": "Code quality verification",
|
|
||||||
"activeForm": "Complete",
|
|
||||||
"status": "completed"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"content": "Synthesize findings into unified report",
|
|
||||||
"activeForm": "Writing report",
|
|
||||||
"status": "in_progress"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@@ -1,221 +0,0 @@
|
|||||||
# TUI Enhancement Plan — Claw Code (`rusty-claude-cli`)
|
|
||||||
|
|
||||||
## Executive Summary
|
|
||||||
|
|
||||||
This plan covers a comprehensive analysis of the current terminal user interface and proposes phased enhancements that will transform the existing REPL/prompt CLI into a polished, modern TUI experience — while preserving the existing clean architecture and test coverage.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Current Architecture Analysis
|
|
||||||
|
|
||||||
### Crate Map
|
|
||||||
|
|
||||||
| Crate | Purpose | Lines | TUI Relevance |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `rusty-claude-cli` | Main binary: REPL loop, arg parsing, rendering, API bridge | ~3,600 | **Primary TUI surface** |
|
|
||||||
| `runtime` | Session, conversation loop, config, permissions, compaction | ~5,300 | Provides data/state |
|
|
||||||
| `api` | Anthropic HTTP client + SSE streaming | ~1,500 | Provides stream events |
|
|
||||||
| `commands` | Slash command metadata/parsing/help | ~470 | Drives command dispatch |
|
|
||||||
| `tools` | 18 built-in tool implementations | ~3,500 | Tool execution display |
|
|
||||||
|
|
||||||
### Current TUI Components
|
|
||||||
|
|
||||||
| Component | File | What It Does Today | Quality |
|
|
||||||
|---|---|---|---|
|
|
||||||
| **Input** | `input.rs` (269 lines) | `rustyline`-based line editor with slash-command tab completion, Shift+Enter newline, history | ✅ Solid |
|
|
||||||
| **Rendering** | `render.rs` (641 lines) | Markdown→terminal rendering (headings, lists, tables, code blocks with syntect highlighting, blockquotes), spinner widget | ✅ Good |
|
|
||||||
| **App/REPL loop** | `main.rs` (3,159 lines) | The monolithic `LiveCli` struct: REPL loop, all slash command handlers, streaming output, tool call display, permission prompting, session management | ⚠️ Monolithic |
|
|
||||||
| **Alt App** | `app.rs` (398 lines) | An earlier `CliApp` prototype with `ConversationClient`, stream event handling, `TerminalRenderer`, output format support | ⚠️ Appears unused/legacy |
|
|
||||||
|
|
||||||
### Key Dependencies
|
|
||||||
|
|
||||||
- **crossterm 0.28** — terminal control (cursor, colors, clear)
|
|
||||||
- **pulldown-cmark 0.13** — Markdown parsing
|
|
||||||
- **syntect 5** — syntax highlighting
|
|
||||||
- **rustyline 15** — line editing with completion
|
|
||||||
- **serde_json** — tool I/O formatting
|
|
||||||
|
|
||||||
### Strengths
|
|
||||||
|
|
||||||
1. **Clean rendering pipeline**: Markdown rendering is well-structured with state tracking, table rendering, code highlighting
|
|
||||||
2. **Rich tool display**: Tool calls get box-drawing borders (`╭─ name ─╮`), results show ✓/✗ icons
|
|
||||||
3. **Comprehensive slash commands**: 15 commands covering model switching, permissions, sessions, config, diff, export
|
|
||||||
4. **Session management**: Full persistence, resume, list, switch, compaction
|
|
||||||
5. **Permission prompting**: Interactive Y/N approval for restricted tool calls
|
|
||||||
6. **Thorough tests**: Every formatting function, every parse path has unit tests
|
|
||||||
|
|
||||||
### Weaknesses & Gaps
|
|
||||||
|
|
||||||
1. **`main.rs` is a 3,159-line monolith** — all REPL logic, formatting, API bridging, session management, and tests in one file
|
|
||||||
2. **No alternate-screen / full-screen layout** — everything is inline scrolling output
|
|
||||||
3. **No progress bars** — only a single braille spinner; no indication of streaming progress or token counts during generation
|
|
||||||
4. **No visual diff rendering** — `/diff` just dumps raw git diff text
|
|
||||||
5. **No syntax highlighting in streamed output** — markdown rendering only applies to tool results, not to the main assistant response stream
|
|
||||||
6. **No status bar / HUD** — model, tokens, session info not visible during interaction
|
|
||||||
7. **No image/attachment preview** — `SendUserMessage` resolves attachments but never displays them
|
|
||||||
8. **Streaming is char-by-char with artificial delay** — `stream_markdown` sleeps 8ms per whitespace-delimited chunk
|
|
||||||
9. **No color theme customization** — hardcoded `ColorTheme::default()`
|
|
||||||
10. **No resize handling** — no terminal size awareness for wrapping, truncation, or layout
|
|
||||||
11. **Dual app structs** — `app.rs` has a separate `CliApp` that duplicates `LiveCli` from `main.rs`
|
|
||||||
12. **No pager for long outputs** — `/status`, `/config`, `/memory` can overflow the viewport
|
|
||||||
13. **Tool results not collapsible** — large bash outputs flood the screen
|
|
||||||
14. **No thinking/reasoning indicator** — when the model is in "thinking" mode, no visual distinction
|
|
||||||
15. **No auto-complete for tool arguments** — only slash command names complete
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Enhancement Plan
|
|
||||||
|
|
||||||
### Phase 0: Structural Cleanup (Foundation)
|
|
||||||
|
|
||||||
**Goal**: Break the monolith, remove dead code, establish the module structure for TUI work.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 0.1 | **Extract `LiveCli` into `app.rs`** — Move the entire `LiveCli` struct, its impl, and helpers (`format_*`, `render_*`, session management) out of `main.rs` into focused modules: `app.rs` (core), `format.rs` (report formatting), `session_manager.rs` (session CRUD) | M |
|
|
||||||
| 0.2 | **Remove or merge the legacy `CliApp`** — The existing `app.rs` has an unused `CliApp` with its own `ConversationClient`-based rendering. Either delete it or merge its unique features (stream event handler pattern) into the active `LiveCli` | S |
|
|
||||||
| 0.3 | **Extract `main.rs` arg parsing** — The current `parse_args()` is a hand-rolled parser that duplicates the clap-based `args.rs`. Consolidate on the hand-rolled parser (it's more feature-complete) and move it to `args.rs`, or adopt clap fully | S |
|
|
||||||
| 0.4 | **Create a `tui/` module** — Introduce `crates/rusty-claude-cli/src/tui/mod.rs` as the namespace for all new TUI components: `status_bar.rs`, `layout.rs`, `tool_panel.rs`, etc. | S |
|
|
||||||
|
|
||||||
### Phase 1: Status Bar & Live HUD
|
|
||||||
|
|
||||||
**Goal**: Persistent information display during interaction.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 1.1 | **Terminal-size-aware status line** — Use `crossterm::terminal::size()` to render a bottom-pinned status bar showing: model name, permission mode, session ID, cumulative token count, estimated cost | M |
|
|
||||||
| 1.2 | **Live token counter** — Update the status bar in real-time as `AssistantEvent::Usage` and `AssistantEvent::TextDelta` events arrive during streaming | M |
|
|
||||||
| 1.3 | **Turn duration timer** — Show elapsed time for the current turn (the `showTurnDuration` config already exists in Config tool but isn't wired up) | S |
|
|
||||||
| 1.4 | **Git branch indicator** — Display the current git branch in the status bar (already parsed via `parse_git_status_metadata`) | S |
|
|
||||||
|
|
||||||
### Phase 2: Enhanced Streaming Output
|
|
||||||
|
|
||||||
**Goal**: Make the main response stream visually rich and responsive.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 2.1 | **Live markdown rendering** — Instead of raw text streaming, buffer text deltas and incrementally render Markdown as it arrives (heading detection, bold/italic, inline code). The existing `TerminalRenderer::render_markdown` can be adapted for incremental use | L |
|
|
||||||
| 2.2 | **Thinking indicator** — When extended thinking/reasoning is active, show a distinct animated indicator (e.g., `🧠 Reasoning...` with pulsing dots or a different spinner) instead of the generic `🦀 Thinking...` | S |
|
|
||||||
| 2.3 | **Streaming progress bar** — Add an optional horizontal progress indicator below the spinner showing approximate completion (based on max_tokens vs. output_tokens so far) | M |
|
|
||||||
| 2.4 | **Remove artificial stream delay** — The current `stream_markdown` sleeps 8ms per chunk. For tool results this is fine, but for the main response stream it should be immediate or configurable | S |
|
|
||||||
|
|
||||||
### Phase 3: Tool Call Visualization
|
|
||||||
|
|
||||||
**Goal**: Make tool execution legible and navigable.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 3.1 | **Collapsible tool output** — For tool results longer than N lines (configurable, default 15), show a summary with `[+] Expand` hint; pressing a key reveals the full output. Initially implement as truncation with a "full output saved to file" fallback | M |
|
|
||||||
| 3.2 | **Syntax-highlighted tool results** — When tool results contain code (detected by tool name — `bash` stdout, `read_file` content, `REPL` output), apply syntect highlighting rather than rendering as plain text | M |
|
|
||||||
| 3.3 | **Tool call timeline** — For multi-tool turns, show a compact summary: `🔧 bash → ✓ | read_file → ✓ | edit_file → ✓ (3 tools, 1.2s)` after all tool calls complete | S |
|
|
||||||
| 3.4 | **Diff-aware edit_file display** — When `edit_file` succeeds, show a colored unified diff of the change instead of just `✓ edit_file: path` | M |
|
|
||||||
| 3.5 | **Permission prompt enhancement** — Style the approval prompt with box drawing, color the tool name, show a one-line summary of what the tool will do | S |
|
|
||||||
|
|
||||||
### Phase 4: Enhanced Slash Commands & Navigation
|
|
||||||
|
|
||||||
**Goal**: Improve information display and add missing features.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 4.1 | **Colored `/diff` output** — Parse the git diff and render it with red/green coloring for removals/additions, similar to `delta` or `diff-so-fancy` | M |
|
|
||||||
| 4.2 | **Pager for long outputs** — When `/status`, `/config`, `/memory`, or `/diff` produce output longer than the terminal height, pipe through an internal pager (scroll with j/k/q) or external `$PAGER` | M |
|
|
||||||
| 4.3 | **`/search` command** — Add a new command to search conversation history by keyword | M |
|
|
||||||
| 4.4 | **`/undo` command** — Undo the last file edit by restoring from the `originalFile` data in `write_file`/`edit_file` tool results | M |
|
|
||||||
| 4.5 | **Interactive session picker** — Replace the text-based `/session list` with an interactive fuzzy-filterable list (up/down arrows to select, enter to switch) | L |
|
|
||||||
| 4.6 | **Tab completion for tool arguments** — Extend `SlashCommandHelper` to complete file paths after `/export`, model names after `/model`, session IDs after `/session switch` | M |
|
|
||||||
|
|
||||||
### Phase 5: Color Themes & Configuration
|
|
||||||
|
|
||||||
**Goal**: User-customizable visual appearance.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 5.1 | **Named color themes** — Add `dark` (current default), `light`, `solarized`, `catppuccin` themes. Wire to the existing `Config` tool's `theme` setting | M |
|
|
||||||
| 5.2 | **ANSI-256 / truecolor detection** — Detect terminal capabilities and fall back gracefully (no colors → 16 colors → 256 → truecolor) | M |
|
|
||||||
| 5.3 | **Configurable spinner style** — Allow choosing between braille dots, bar, moon phases, etc. | S |
|
|
||||||
| 5.4 | **Banner customization** — Make the ASCII art banner optional or configurable via settings | S |
|
|
||||||
|
|
||||||
### Phase 6: Full-Screen TUI Mode (Stretch)
|
|
||||||
|
|
||||||
**Goal**: Optional alternate-screen layout for power users.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 6.1 | **Add `ratatui` dependency** — Introduce `ratatui` (terminal UI framework) as an optional dependency for the full-screen mode | S |
|
|
||||||
| 6.2 | **Split-pane layout** — Top pane: conversation with scrollback; Bottom pane: input area; Right sidebar (optional): tool status/todo list | XL |
|
|
||||||
| 6.3 | **Scrollable conversation view** — Navigate past messages with PgUp/PgDn, search within conversation | L |
|
|
||||||
| 6.4 | **Keyboard shortcuts panel** — Show `?` help overlay with all keybindings | M |
|
|
||||||
| 6.5 | **Mouse support** — Click to expand tool results, scroll conversation, select text for copy | L |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. Priority Recommendation
|
|
||||||
|
|
||||||
### Immediate (High Impact, Moderate Effort)
|
|
||||||
|
|
||||||
1. **Phase 0** — Essential cleanup. The 3,159-line `main.rs` is the #1 maintenance risk and blocks clean TUI additions.
|
|
||||||
2. **Phase 1.1–1.2** — Status bar with live tokens. Highest-impact UX win: users constantly want to know token usage.
|
|
||||||
3. **Phase 2.4** — Remove artificial delay. Low effort, immediately noticeable improvement.
|
|
||||||
4. **Phase 3.1** — Collapsible tool output. Large bash outputs currently wreck readability.
|
|
||||||
|
|
||||||
### Near-Term (Next Sprint)
|
|
||||||
|
|
||||||
5. **Phase 2.1** — Live markdown rendering. Makes the core interaction feel polished.
|
|
||||||
6. **Phase 3.2** — Syntax-highlighted tool results.
|
|
||||||
7. **Phase 3.4** — Diff-aware edit display.
|
|
||||||
8. **Phase 4.1** — Colored diff for `/diff`.
|
|
||||||
|
|
||||||
### Longer-Term
|
|
||||||
|
|
||||||
9. **Phase 5** — Color themes (user demand-driven).
|
|
||||||
10. **Phase 4.2–4.6** — Enhanced navigation and commands.
|
|
||||||
11. **Phase 6** — Full-screen mode (major undertaking, evaluate after earlier phases ship).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Architecture Recommendations
|
|
||||||
|
|
||||||
### Module Structure After Phase 0
|
|
||||||
|
|
||||||
```
|
|
||||||
crates/rusty-claude-cli/src/
|
|
||||||
├── main.rs # Entrypoint, arg dispatch only (~100 lines)
|
|
||||||
├── args.rs # CLI argument parsing (consolidate existing two parsers)
|
|
||||||
├── app.rs # LiveCli struct, REPL loop, turn execution
|
|
||||||
├── format.rs # All report formatting (status, cost, model, permissions, etc.)
|
|
||||||
├── session_mgr.rs # Session CRUD: create, resume, list, switch, persist
|
|
||||||
├── init.rs # Repo initialization (unchanged)
|
|
||||||
├── input.rs # Line editor (unchanged, minor extensions)
|
|
||||||
├── render.rs # TerminalRenderer, Spinner (extended)
|
|
||||||
└── tui/
|
|
||||||
├── mod.rs # TUI module root
|
|
||||||
├── status_bar.rs # Persistent bottom status line
|
|
||||||
├── tool_panel.rs # Tool call visualization (boxes, timelines, collapsible)
|
|
||||||
├── diff_view.rs # Colored diff rendering
|
|
||||||
├── pager.rs # Internal pager for long outputs
|
|
||||||
└── theme.rs # Color theme definitions and selection
|
|
||||||
```
|
|
||||||
|
|
||||||
### Key Design Principles
|
|
||||||
|
|
||||||
1. **Keep the inline REPL as the default** — Full-screen TUI should be opt-in (`--tui` flag)
|
|
||||||
2. **Everything testable without a terminal** — All formatting functions take `&mut impl Write`, never assume stdout directly
|
|
||||||
3. **Streaming-first** — Rendering should work incrementally, not buffering the entire response
|
|
||||||
4. **Respect `crossterm` for all terminal control** — Don't mix raw ANSI escape codes with crossterm (the current codebase does this in the startup banner)
|
|
||||||
5. **Feature-gate heavy dependencies** — `ratatui` should be behind a `full-tui` feature flag
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Risk Assessment
|
|
||||||
|
|
||||||
| Risk | Mitigation |
|
|
||||||
|---|---|
|
|
||||||
| Breaking the working REPL during refactor | Phase 0 is pure restructuring with existing test coverage as safety net |
|
|
||||||
| Terminal compatibility issues (tmux, SSH, Windows) | Rely on crossterm's abstraction; test in degraded environments |
|
|
||||||
| Performance regression with rich rendering | Profile before/after; keep the fast path (raw streaming) always available |
|
|
||||||
| Scope creep into Phase 6 | Ship Phases 0–3 as a coherent release before starting Phase 6 |
|
|
||||||
| `app.rs` vs `main.rs` confusion | Phase 0.2 explicitly resolves this by removing the legacy `CliApp` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
*Generated: 2026-03-31 | Workspace: `rust/` | Branch: `dev/rust`*
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
version = "12"
|
|
||||||
|
|
||||||
[overrides]
|
|
||||||
2
rust/Cargo.lock
generated
2
rust/Cargo.lock
generated
@@ -1545,12 +1545,10 @@ dependencies = [
|
|||||||
name = "tools"
|
name = "tools"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"api",
|
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"runtime",
|
"runtime",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tokio",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
353
rust/README.md
353
rust/README.md
@@ -1,149 +1,230 @@
|
|||||||
# 🦞 Claw Code — Rust Implementation
|
# Rusty Claude CLI
|
||||||
|
|
||||||
A high-performance Rust rewrite of the Claude Code CLI agent harness. Built for speed, safety, and native tool execution.
|
`rust/` contains the Rust workspace for the integrated `rusty-claude-cli` deliverable.
|
||||||
|
It is intended to be something you can clone, build, and run directly.
|
||||||
|
|
||||||
## Quick Start
|
## Workspace layout
|
||||||
|
|
||||||
```bash
|
```text
|
||||||
# Build
|
|
||||||
cd rust/
|
|
||||||
cargo build --release
|
|
||||||
|
|
||||||
# Run interactive REPL
|
|
||||||
./target/release/claw
|
|
||||||
|
|
||||||
# One-shot prompt
|
|
||||||
./target/release/claw prompt "explain this codebase"
|
|
||||||
|
|
||||||
# With specific model
|
|
||||||
./target/release/claw --model sonnet prompt "fix the bug in main.rs"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
Set your API credentials:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
export ANTHROPIC_API_KEY="sk-ant-..."
|
|
||||||
# Or use a proxy
|
|
||||||
export ANTHROPIC_BASE_URL="https://your-proxy.com"
|
|
||||||
```
|
|
||||||
|
|
||||||
Or authenticate via OAuth:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
claw login
|
|
||||||
```
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
| Feature | Status |
|
|
||||||
|---------|--------|
|
|
||||||
| Anthropic API + streaming | ✅ |
|
|
||||||
| OAuth login/logout | ✅ |
|
|
||||||
| Interactive REPL (rustyline) | ✅ |
|
|
||||||
| Tool system (bash, read, write, edit, grep, glob) | ✅ |
|
|
||||||
| Web tools (search, fetch) | ✅ |
|
|
||||||
| Sub-agent orchestration | ✅ |
|
|
||||||
| Todo tracking | ✅ |
|
|
||||||
| Notebook editing | ✅ |
|
|
||||||
| CLAUDE.md / project memory | ✅ |
|
|
||||||
| Config file hierarchy (.claude.json) | ✅ |
|
|
||||||
| Permission system | ✅ |
|
|
||||||
| MCP server lifecycle | ✅ |
|
|
||||||
| Session persistence + resume | ✅ |
|
|
||||||
| Extended thinking (thinking blocks) | ✅ |
|
|
||||||
| Cost tracking + usage display | ✅ |
|
|
||||||
| Git integration | ✅ |
|
|
||||||
| Markdown terminal rendering (ANSI) | ✅ |
|
|
||||||
| Model aliases (opus/sonnet/haiku) | ✅ |
|
|
||||||
| Slash commands (/status, /compact, /clear, etc.) | ✅ |
|
|
||||||
| Hooks (PreToolUse/PostToolUse) | 🔧 Config only |
|
|
||||||
| Plugin system | 📋 Planned |
|
|
||||||
| Skills registry | 📋 Planned |
|
|
||||||
|
|
||||||
## Model Aliases
|
|
||||||
|
|
||||||
Short names resolve to the latest model versions:
|
|
||||||
|
|
||||||
| Alias | Resolves To |
|
|
||||||
|-------|------------|
|
|
||||||
| `opus` | `claude-opus-4-6` |
|
|
||||||
| `sonnet` | `claude-sonnet-4-6` |
|
|
||||||
| `haiku` | `claude-haiku-4-5-20251213` |
|
|
||||||
|
|
||||||
## CLI Flags
|
|
||||||
|
|
||||||
```
|
|
||||||
claw [OPTIONS] [COMMAND]
|
|
||||||
|
|
||||||
Options:
|
|
||||||
--model MODEL Set the model (alias or full name)
|
|
||||||
--dangerously-skip-permissions Skip all permission checks
|
|
||||||
--permission-mode MODE Set read-only, workspace-write, or danger-full-access
|
|
||||||
--allowedTools TOOLS Restrict enabled tools
|
|
||||||
--output-format FORMAT Output format (text or json)
|
|
||||||
--version, -V Print version info
|
|
||||||
|
|
||||||
Commands:
|
|
||||||
prompt <text> One-shot prompt (non-interactive)
|
|
||||||
login Authenticate via OAuth
|
|
||||||
logout Clear stored credentials
|
|
||||||
init Initialize project config
|
|
||||||
doctor Check environment health
|
|
||||||
self-update Update to latest version
|
|
||||||
```
|
|
||||||
|
|
||||||
## Slash Commands (REPL)
|
|
||||||
|
|
||||||
| Command | Description |
|
|
||||||
|---------|-------------|
|
|
||||||
| `/help` | Show help |
|
|
||||||
| `/status` | Show session status (model, tokens, cost) |
|
|
||||||
| `/cost` | Show cost breakdown |
|
|
||||||
| `/compact` | Compact conversation history |
|
|
||||||
| `/clear` | Clear conversation |
|
|
||||||
| `/model [name]` | Show or switch model |
|
|
||||||
| `/permissions` | Show or switch permission mode |
|
|
||||||
| `/config [section]` | Show config (env, hooks, model) |
|
|
||||||
| `/memory` | Show CLAUDE.md contents |
|
|
||||||
| `/diff` | Show git diff |
|
|
||||||
| `/export [path]` | Export conversation |
|
|
||||||
| `/session [id]` | Resume a previous session |
|
|
||||||
| `/version` | Show version |
|
|
||||||
|
|
||||||
## Workspace Layout
|
|
||||||
|
|
||||||
```
|
|
||||||
rust/
|
rust/
|
||||||
├── Cargo.toml # Workspace root
|
├── Cargo.toml
|
||||||
├── Cargo.lock
|
├── Cargo.lock
|
||||||
|
├── README.md
|
||||||
└── crates/
|
└── crates/
|
||||||
├── api/ # Anthropic API client + SSE streaming
|
├── api/ # Anthropic API client + SSE streaming support
|
||||||
├── commands/ # Shared slash-command registry
|
├── commands/ # Shared slash-command metadata/help surfaces
|
||||||
├── compat-harness/ # TS manifest extraction harness
|
├── compat-harness/ # Upstream TS manifest extraction harness
|
||||||
├── runtime/ # Session, config, permissions, MCP, prompts
|
├── runtime/ # Session/runtime/config/prompt orchestration
|
||||||
├── rusty-claude-cli/ # Main CLI binary (`claw`)
|
├── rusty-claude-cli/ # Main CLI binary
|
||||||
└── tools/ # Built-in tool implementations
|
└── tools/ # Built-in tool implementations
|
||||||
```
|
```
|
||||||
|
|
||||||
### Crate Responsibilities
|
## Prerequisites
|
||||||
|
|
||||||
- **api** — HTTP client, SSE stream parser, request/response types, auth (API key + OAuth bearer)
|
- Rust toolchain installed (`rustup`, stable toolchain)
|
||||||
- **commands** — Slash command definitions and help text generation
|
- Network access and Anthropic credentials for live prompt/REPL usage
|
||||||
- **compat-harness** — Extracts tool/prompt manifests from upstream TS source
|
|
||||||
- **runtime** — `ConversationRuntime` agentic loop, `ConfigLoader` hierarchy, `Session` persistence, permission policy, MCP client, system prompt assembly, usage tracking
|
|
||||||
- **rusty-claude-cli** — REPL, one-shot prompt, streaming display, tool call rendering, CLI argument parsing
|
|
||||||
- **tools** — Tool specs + execution: Bash, ReadFile, WriteFile, EditFile, GlobSearch, GrepSearch, WebSearch, WebFetch, Agent, TodoWrite, NotebookEdit, Skill, ToolSearch, REPL runtimes
|
|
||||||
|
|
||||||
## Stats
|
## Build
|
||||||
|
|
||||||
- **~20K lines** of Rust
|
From the repository root:
|
||||||
- **6 crates** in workspace
|
|
||||||
- **Binary name:** `claw`
|
|
||||||
- **Default model:** `claude-opus-4-6`
|
|
||||||
- **Default permissions:** `danger-full-access`
|
|
||||||
|
|
||||||
## License
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo build --release -p rusty-claude-cli
|
||||||
|
```
|
||||||
|
|
||||||
See repository root.
|
The optimized binary will be written to:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./target/release/rusty-claude-cli
|
||||||
|
```
|
||||||
|
|
||||||
|
## Test
|
||||||
|
|
||||||
|
Run the verified workspace test suite used for release-readiness:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo test --workspace --exclude compat-harness
|
||||||
|
```
|
||||||
|
|
||||||
|
## Quick start
|
||||||
|
|
||||||
|
### Show help
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --help
|
||||||
|
```
|
||||||
|
|
||||||
|
### Print version
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --version
|
||||||
|
```
|
||||||
|
|
||||||
|
### Login with OAuth
|
||||||
|
|
||||||
|
Configure `settings.json` with an `oauth` block containing `clientId`, `authorizeUrl`, `tokenUrl`, optional `callbackPort`, and optional `scopes`, then run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- login
|
||||||
|
```
|
||||||
|
|
||||||
|
This opens the browser, listens on the configured localhost callback, exchanges the auth code for tokens, and stores OAuth credentials in `~/.claude/credentials.json` (or `$CLAUDE_CONFIG_HOME/credentials.json`).
|
||||||
|
|
||||||
|
### Logout
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- logout
|
||||||
|
```
|
||||||
|
|
||||||
|
This removes only the stored OAuth credentials and preserves unrelated JSON fields in `credentials.json`.
|
||||||
|
|
||||||
|
### Self-update
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- self-update
|
||||||
|
```
|
||||||
|
|
||||||
|
The command checks the latest GitHub release for `instructkr/clawd-code`, compares it to the current binary version, downloads the matching binary asset plus checksum manifest, verifies SHA-256, replaces the current executable, and prints the release changelog. If no published release or matching asset exists, it exits safely with an explanatory message.
|
||||||
|
|
||||||
|
## Usage examples
|
||||||
|
|
||||||
|
### 1) Prompt mode
|
||||||
|
|
||||||
|
Send one prompt, stream the answer, then exit:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- prompt "Summarize the architecture of this repository"
|
||||||
|
```
|
||||||
|
|
||||||
|
Use a specific model:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --model claude-sonnet-4-20250514 prompt "List the key crates in this workspace"
|
||||||
|
```
|
||||||
|
|
||||||
|
Restrict enabled tools in an interactive session:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --allowedTools read,glob
|
||||||
|
```
|
||||||
|
|
||||||
|
Bootstrap Claude project files for the current repo:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- init
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2) REPL mode
|
||||||
|
|
||||||
|
Start the interactive shell:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli --
|
||||||
|
```
|
||||||
|
|
||||||
|
Inside the REPL, useful commands include:
|
||||||
|
|
||||||
|
```text
|
||||||
|
/help
|
||||||
|
/status
|
||||||
|
/model claude-sonnet-4-20250514
|
||||||
|
/permissions workspace-write
|
||||||
|
/cost
|
||||||
|
/compact
|
||||||
|
/memory
|
||||||
|
/config
|
||||||
|
/init
|
||||||
|
/diff
|
||||||
|
/version
|
||||||
|
/export notes.txt
|
||||||
|
/sessions
|
||||||
|
/session list
|
||||||
|
/exit
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3) Resume an existing session
|
||||||
|
|
||||||
|
Inspect or maintain a saved session file without entering the REPL:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --resume session-123456 /status /compact /cost
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also inspect memory/config state for a restored session:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd rust
|
||||||
|
cargo run -p rusty-claude-cli -- --resume ~/.claude/sessions/session-123456.json /memory /config
|
||||||
|
```
|
||||||
|
|
||||||
|
## Available commands
|
||||||
|
|
||||||
|
### Top-level CLI commands
|
||||||
|
|
||||||
|
- `prompt <text...>` — run one prompt non-interactively
|
||||||
|
- `--resume <session-id-or-path> [/commands...]` — inspect or maintain a saved session stored under `~/.claude/sessions/`
|
||||||
|
- `dump-manifests` — print extracted upstream manifest counts
|
||||||
|
- `bootstrap-plan` — print the current bootstrap skeleton
|
||||||
|
- `system-prompt [--cwd PATH] [--date YYYY-MM-DD]` — render the synthesized system prompt
|
||||||
|
- `self-update` — update the installed binary from the latest GitHub release when a matching asset is available
|
||||||
|
- `--help` / `-h` — show CLI help
|
||||||
|
- `--version` / `-V` — print the CLI version and build info locally (no API call)
|
||||||
|
- `--output-format text|json` — choose non-interactive prompt output rendering
|
||||||
|
- `--allowedTools <tool[,tool...]>` — restrict enabled tools for interactive sessions and prompt-mode tool use
|
||||||
|
|
||||||
|
### Interactive slash commands
|
||||||
|
|
||||||
|
- `/help` — show command help
|
||||||
|
- `/status` — show current session status
|
||||||
|
- `/compact` — compact local session history
|
||||||
|
- `/model [model]` — inspect or switch the active model
|
||||||
|
- `/permissions [read-only|workspace-write|danger-full-access]` — inspect or switch permissions
|
||||||
|
- `/clear [--confirm]` — clear the current local session
|
||||||
|
- `/cost` — show token usage totals
|
||||||
|
- `/resume <session-id-or-path>` — load a saved session into the REPL
|
||||||
|
- `/config [env|hooks|model]` — inspect discovered Claude config
|
||||||
|
- `/memory` — inspect loaded instruction memory files
|
||||||
|
- `/init` — bootstrap `.claude.json`, `.claude/`, `CLAUDE.md`, and local ignore rules
|
||||||
|
- `/diff` — show the current git diff for the workspace
|
||||||
|
- `/version` — print version and build metadata locally
|
||||||
|
- `/export [file]` — export the current conversation transcript
|
||||||
|
- `/sessions` — list recent managed local sessions from `~/.claude/sessions/`
|
||||||
|
- `/session [list|switch <session-id>]` — inspect or switch managed local sessions
|
||||||
|
- `/exit` — leave the REPL
|
||||||
|
|
||||||
|
## Environment variables
|
||||||
|
|
||||||
|
### Anthropic/API
|
||||||
|
|
||||||
|
- `ANTHROPIC_API_KEY` — highest-precedence API credential
|
||||||
|
- `ANTHROPIC_AUTH_TOKEN` — bearer-token override used when no API key is set
|
||||||
|
- Persisted OAuth credentials in `~/.claude/credentials.json` — used when neither env var is set
|
||||||
|
- `ANTHROPIC_BASE_URL` — override the Anthropic API base URL
|
||||||
|
- `ANTHROPIC_MODEL` — default model used by selected live integration tests
|
||||||
|
|
||||||
|
### CLI/runtime
|
||||||
|
|
||||||
|
- `RUSTY_CLAUDE_PERMISSION_MODE` — default REPL permission mode (`read-only`, `workspace-write`, or `danger-full-access`)
|
||||||
|
- `CLAUDE_CONFIG_HOME` — override Claude config discovery root
|
||||||
|
- `CLAUDE_CODE_REMOTE` — enable remote-session bootstrap handling when supported
|
||||||
|
- `CLAUDE_CODE_REMOTE_SESSION_ID` — remote session identifier when using remote mode
|
||||||
|
- `CLAUDE_CODE_UPSTREAM` — override the upstream TS source path for compat-harness extraction
|
||||||
|
- `CLAWD_WEB_SEARCH_BASE_URL` — override the built-in web search service endpoint used by tooling
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- `compat-harness` exists to compare the Rust port against the upstream TypeScript codebase and is intentionally excluded from the requested release test run.
|
||||||
|
- The CLI currently focuses on a practical integrated workflow: prompt execution, REPL operation, session inspection/resume, config discovery, and tool/runtime plumbing.
|
||||||
|
|||||||
@@ -1,221 +0,0 @@
|
|||||||
# TUI Enhancement Plan — Claw Code (`rusty-claude-cli`)
|
|
||||||
|
|
||||||
## Executive Summary
|
|
||||||
|
|
||||||
This plan covers a comprehensive analysis of the current terminal user interface and proposes phased enhancements that will transform the existing REPL/prompt CLI into a polished, modern TUI experience — while preserving the existing clean architecture and test coverage.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Current Architecture Analysis
|
|
||||||
|
|
||||||
### Crate Map
|
|
||||||
|
|
||||||
| Crate | Purpose | Lines | TUI Relevance |
|
|
||||||
|---|---|---|---|
|
|
||||||
| `rusty-claude-cli` | Main binary: REPL loop, arg parsing, rendering, API bridge | ~3,600 | **Primary TUI surface** |
|
|
||||||
| `runtime` | Session, conversation loop, config, permissions, compaction | ~5,300 | Provides data/state |
|
|
||||||
| `api` | Anthropic HTTP client + SSE streaming | ~1,500 | Provides stream events |
|
|
||||||
| `commands` | Slash command metadata/parsing/help | ~470 | Drives command dispatch |
|
|
||||||
| `tools` | 18 built-in tool implementations | ~3,500 | Tool execution display |
|
|
||||||
|
|
||||||
### Current TUI Components
|
|
||||||
|
|
||||||
| Component | File | What It Does Today | Quality |
|
|
||||||
|---|---|---|---|
|
|
||||||
| **Input** | `input.rs` (269 lines) | `rustyline`-based line editor with slash-command tab completion, Shift+Enter newline, history | ✅ Solid |
|
|
||||||
| **Rendering** | `render.rs` (641 lines) | Markdown→terminal rendering (headings, lists, tables, code blocks with syntect highlighting, blockquotes), spinner widget | ✅ Good |
|
|
||||||
| **App/REPL loop** | `main.rs` (3,159 lines) | The monolithic `LiveCli` struct: REPL loop, all slash command handlers, streaming output, tool call display, permission prompting, session management | ⚠️ Monolithic |
|
|
||||||
| **Alt App** | `app.rs` (398 lines) | An earlier `CliApp` prototype with `ConversationClient`, stream event handling, `TerminalRenderer`, output format support | ⚠️ Appears unused/legacy |
|
|
||||||
|
|
||||||
### Key Dependencies
|
|
||||||
|
|
||||||
- **crossterm 0.28** — terminal control (cursor, colors, clear)
|
|
||||||
- **pulldown-cmark 0.13** — Markdown parsing
|
|
||||||
- **syntect 5** — syntax highlighting
|
|
||||||
- **rustyline 15** — line editing with completion
|
|
||||||
- **serde_json** — tool I/O formatting
|
|
||||||
|
|
||||||
### Strengths
|
|
||||||
|
|
||||||
1. **Clean rendering pipeline**: Markdown rendering is well-structured with state tracking, table rendering, code highlighting
|
|
||||||
2. **Rich tool display**: Tool calls get box-drawing borders (`╭─ name ─╮`), results show ✓/✗ icons
|
|
||||||
3. **Comprehensive slash commands**: 15 commands covering model switching, permissions, sessions, config, diff, export
|
|
||||||
4. **Session management**: Full persistence, resume, list, switch, compaction
|
|
||||||
5. **Permission prompting**: Interactive Y/N approval for restricted tool calls
|
|
||||||
6. **Thorough tests**: Every formatting function, every parse path has unit tests
|
|
||||||
|
|
||||||
### Weaknesses & Gaps
|
|
||||||
|
|
||||||
1. **`main.rs` is a 3,159-line monolith** — all REPL logic, formatting, API bridging, session management, and tests in one file
|
|
||||||
2. **No alternate-screen / full-screen layout** — everything is inline scrolling output
|
|
||||||
3. **No progress bars** — only a single braille spinner; no indication of streaming progress or token counts during generation
|
|
||||||
4. **No visual diff rendering** — `/diff` just dumps raw git diff text
|
|
||||||
5. **No syntax highlighting in streamed output** — markdown rendering only applies to tool results, not to the main assistant response stream
|
|
||||||
6. **No status bar / HUD** — model, tokens, session info not visible during interaction
|
|
||||||
7. **No image/attachment preview** — `SendUserMessage` resolves attachments but never displays them
|
|
||||||
8. **Streaming is char-by-char with artificial delay** — `stream_markdown` sleeps 8ms per whitespace-delimited chunk
|
|
||||||
9. **No color theme customization** — hardcoded `ColorTheme::default()`
|
|
||||||
10. **No resize handling** — no terminal size awareness for wrapping, truncation, or layout
|
|
||||||
11. **Dual app structs** — `app.rs` has a separate `CliApp` that duplicates `LiveCli` from `main.rs`
|
|
||||||
12. **No pager for long outputs** — `/status`, `/config`, `/memory` can overflow the viewport
|
|
||||||
13. **Tool results not collapsible** — large bash outputs flood the screen
|
|
||||||
14. **No thinking/reasoning indicator** — when the model is in "thinking" mode, no visual distinction
|
|
||||||
15. **No auto-complete for tool arguments** — only slash command names complete
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Enhancement Plan
|
|
||||||
|
|
||||||
### Phase 0: Structural Cleanup (Foundation)
|
|
||||||
|
|
||||||
**Goal**: Break the monolith, remove dead code, establish the module structure for TUI work.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 0.1 | **Extract `LiveCli` into `app.rs`** — Move the entire `LiveCli` struct, its impl, and helpers (`format_*`, `render_*`, session management) out of `main.rs` into focused modules: `app.rs` (core), `format.rs` (report formatting), `session_manager.rs` (session CRUD) | M |
|
|
||||||
| 0.2 | **Remove or merge the legacy `CliApp`** — The existing `app.rs` has an unused `CliApp` with its own `ConversationClient`-based rendering. Either delete it or merge its unique features (stream event handler pattern) into the active `LiveCli` | S |
|
|
||||||
| 0.3 | **Extract `main.rs` arg parsing** — The current `parse_args()` is a hand-rolled parser that duplicates the clap-based `args.rs`. Consolidate on the hand-rolled parser (it's more feature-complete) and move it to `args.rs`, or adopt clap fully | S |
|
|
||||||
| 0.4 | **Create a `tui/` module** — Introduce `crates/rusty-claude-cli/src/tui/mod.rs` as the namespace for all new TUI components: `status_bar.rs`, `layout.rs`, `tool_panel.rs`, etc. | S |
|
|
||||||
|
|
||||||
### Phase 1: Status Bar & Live HUD
|
|
||||||
|
|
||||||
**Goal**: Persistent information display during interaction.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 1.1 | **Terminal-size-aware status line** — Use `crossterm::terminal::size()` to render a bottom-pinned status bar showing: model name, permission mode, session ID, cumulative token count, estimated cost | M |
|
|
||||||
| 1.2 | **Live token counter** — Update the status bar in real-time as `AssistantEvent::Usage` and `AssistantEvent::TextDelta` events arrive during streaming | M |
|
|
||||||
| 1.3 | **Turn duration timer** — Show elapsed time for the current turn (the `showTurnDuration` config already exists in Config tool but isn't wired up) | S |
|
|
||||||
| 1.4 | **Git branch indicator** — Display the current git branch in the status bar (already parsed via `parse_git_status_metadata`) | S |
|
|
||||||
|
|
||||||
### Phase 2: Enhanced Streaming Output
|
|
||||||
|
|
||||||
**Goal**: Make the main response stream visually rich and responsive.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 2.1 | **Live markdown rendering** — Instead of raw text streaming, buffer text deltas and incrementally render Markdown as it arrives (heading detection, bold/italic, inline code). The existing `TerminalRenderer::render_markdown` can be adapted for incremental use | L |
|
|
||||||
| 2.2 | **Thinking indicator** — When extended thinking/reasoning is active, show a distinct animated indicator (e.g., `🧠 Reasoning...` with pulsing dots or a different spinner) instead of the generic `🦀 Thinking...` | S |
|
|
||||||
| 2.3 | **Streaming progress bar** — Add an optional horizontal progress indicator below the spinner showing approximate completion (based on max_tokens vs. output_tokens so far) | M |
|
|
||||||
| 2.4 | **Remove artificial stream delay** — The current `stream_markdown` sleeps 8ms per chunk. For tool results this is fine, but for the main response stream it should be immediate or configurable | S |
|
|
||||||
|
|
||||||
### Phase 3: Tool Call Visualization
|
|
||||||
|
|
||||||
**Goal**: Make tool execution legible and navigable.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 3.1 | **Collapsible tool output** — For tool results longer than N lines (configurable, default 15), show a summary with `[+] Expand` hint; pressing a key reveals the full output. Initially implement as truncation with a "full output saved to file" fallback | M |
|
|
||||||
| 3.2 | **Syntax-highlighted tool results** — When tool results contain code (detected by tool name — `bash` stdout, `read_file` content, `REPL` output), apply syntect highlighting rather than rendering as plain text | M |
|
|
||||||
| 3.3 | **Tool call timeline** — For multi-tool turns, show a compact summary: `🔧 bash → ✓ | read_file → ✓ | edit_file → ✓ (3 tools, 1.2s)` after all tool calls complete | S |
|
|
||||||
| 3.4 | **Diff-aware edit_file display** — When `edit_file` succeeds, show a colored unified diff of the change instead of just `✓ edit_file: path` | M |
|
|
||||||
| 3.5 | **Permission prompt enhancement** — Style the approval prompt with box drawing, color the tool name, show a one-line summary of what the tool will do | S |
|
|
||||||
|
|
||||||
### Phase 4: Enhanced Slash Commands & Navigation
|
|
||||||
|
|
||||||
**Goal**: Improve information display and add missing features.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 4.1 | **Colored `/diff` output** — Parse the git diff and render it with red/green coloring for removals/additions, similar to `delta` or `diff-so-fancy` | M |
|
|
||||||
| 4.2 | **Pager for long outputs** — When `/status`, `/config`, `/memory`, or `/diff` produce output longer than the terminal height, pipe through an internal pager (scroll with j/k/q) or external `$PAGER` | M |
|
|
||||||
| 4.3 | **`/search` command** — Add a new command to search conversation history by keyword | M |
|
|
||||||
| 4.4 | **`/undo` command** — Undo the last file edit by restoring from the `originalFile` data in `write_file`/`edit_file` tool results | M |
|
|
||||||
| 4.5 | **Interactive session picker** — Replace the text-based `/session list` with an interactive fuzzy-filterable list (up/down arrows to select, enter to switch) | L |
|
|
||||||
| 4.6 | **Tab completion for tool arguments** — Extend `SlashCommandHelper` to complete file paths after `/export`, model names after `/model`, session IDs after `/session switch` | M |
|
|
||||||
|
|
||||||
### Phase 5: Color Themes & Configuration
|
|
||||||
|
|
||||||
**Goal**: User-customizable visual appearance.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 5.1 | **Named color themes** — Add `dark` (current default), `light`, `solarized`, `catppuccin` themes. Wire to the existing `Config` tool's `theme` setting | M |
|
|
||||||
| 5.2 | **ANSI-256 / truecolor detection** — Detect terminal capabilities and fall back gracefully (no colors → 16 colors → 256 → truecolor) | M |
|
|
||||||
| 5.3 | **Configurable spinner style** — Allow choosing between braille dots, bar, moon phases, etc. | S |
|
|
||||||
| 5.4 | **Banner customization** — Make the ASCII art banner optional or configurable via settings | S |
|
|
||||||
|
|
||||||
### Phase 6: Full-Screen TUI Mode (Stretch)
|
|
||||||
|
|
||||||
**Goal**: Optional alternate-screen layout for power users.
|
|
||||||
|
|
||||||
| Task | Description | Effort |
|
|
||||||
|---|---|---|
|
|
||||||
| 6.1 | **Add `ratatui` dependency** — Introduce `ratatui` (terminal UI framework) as an optional dependency for the full-screen mode | S |
|
|
||||||
| 6.2 | **Split-pane layout** — Top pane: conversation with scrollback; Bottom pane: input area; Right sidebar (optional): tool status/todo list | XL |
|
|
||||||
| 6.3 | **Scrollable conversation view** — Navigate past messages with PgUp/PgDn, search within conversation | L |
|
|
||||||
| 6.4 | **Keyboard shortcuts panel** — Show `?` help overlay with all keybindings | M |
|
|
||||||
| 6.5 | **Mouse support** — Click to expand tool results, scroll conversation, select text for copy | L |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. Priority Recommendation
|
|
||||||
|
|
||||||
### Immediate (High Impact, Moderate Effort)
|
|
||||||
|
|
||||||
1. **Phase 0** — Essential cleanup. The 3,159-line `main.rs` is the #1 maintenance risk and blocks clean TUI additions.
|
|
||||||
2. **Phase 1.1–1.2** — Status bar with live tokens. Highest-impact UX win: users constantly want to know token usage.
|
|
||||||
3. **Phase 2.4** — Remove artificial delay. Low effort, immediately noticeable improvement.
|
|
||||||
4. **Phase 3.1** — Collapsible tool output. Large bash outputs currently wreck readability.
|
|
||||||
|
|
||||||
### Near-Term (Next Sprint)
|
|
||||||
|
|
||||||
5. **Phase 2.1** — Live markdown rendering. Makes the core interaction feel polished.
|
|
||||||
6. **Phase 3.2** — Syntax-highlighted tool results.
|
|
||||||
7. **Phase 3.4** — Diff-aware edit display.
|
|
||||||
8. **Phase 4.1** — Colored diff for `/diff`.
|
|
||||||
|
|
||||||
### Longer-Term
|
|
||||||
|
|
||||||
9. **Phase 5** — Color themes (user demand-driven).
|
|
||||||
10. **Phase 4.2–4.6** — Enhanced navigation and commands.
|
|
||||||
11. **Phase 6** — Full-screen mode (major undertaking, evaluate after earlier phases ship).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Architecture Recommendations
|
|
||||||
|
|
||||||
### Module Structure After Phase 0
|
|
||||||
|
|
||||||
```
|
|
||||||
crates/rusty-claude-cli/src/
|
|
||||||
├── main.rs # Entrypoint, arg dispatch only (~100 lines)
|
|
||||||
├── args.rs # CLI argument parsing (consolidate existing two parsers)
|
|
||||||
├── app.rs # LiveCli struct, REPL loop, turn execution
|
|
||||||
├── format.rs # All report formatting (status, cost, model, permissions, etc.)
|
|
||||||
├── session_mgr.rs # Session CRUD: create, resume, list, switch, persist
|
|
||||||
├── init.rs # Repo initialization (unchanged)
|
|
||||||
├── input.rs # Line editor (unchanged, minor extensions)
|
|
||||||
├── render.rs # TerminalRenderer, Spinner (extended)
|
|
||||||
└── tui/
|
|
||||||
├── mod.rs # TUI module root
|
|
||||||
├── status_bar.rs # Persistent bottom status line
|
|
||||||
├── tool_panel.rs # Tool call visualization (boxes, timelines, collapsible)
|
|
||||||
├── diff_view.rs # Colored diff rendering
|
|
||||||
├── pager.rs # Internal pager for long outputs
|
|
||||||
└── theme.rs # Color theme definitions and selection
|
|
||||||
```
|
|
||||||
|
|
||||||
### Key Design Principles
|
|
||||||
|
|
||||||
1. **Keep the inline REPL as the default** — Full-screen TUI should be opt-in (`--tui` flag)
|
|
||||||
2. **Everything testable without a terminal** — All formatting functions take `&mut impl Write`, never assume stdout directly
|
|
||||||
3. **Streaming-first** — Rendering should work incrementally, not buffering the entire response
|
|
||||||
4. **Respect `crossterm` for all terminal control** — Don't mix raw ANSI escape codes with crossterm (the current codebase does this in the startup banner)
|
|
||||||
5. **Feature-gate heavy dependencies** — `ratatui` should be behind a `full-tui` feature flag
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Risk Assessment
|
|
||||||
|
|
||||||
| Risk | Mitigation |
|
|
||||||
|---|---|
|
|
||||||
| Breaking the working REPL during refactor | Phase 0 is pure restructuring with existing test coverage as safety net |
|
|
||||||
| Terminal compatibility issues (tmux, SSH, Windows) | Rely on crossterm's abstraction; test in degraded environments |
|
|
||||||
| Performance regression with rich rendering | Profile before/after; keep the fast path (raw streaming) always available |
|
|
||||||
| Scope creep into Phase 6 | Ship Phases 0–3 as a coherent release before starting Phase 6 |
|
|
||||||
| `app.rs` vs `main.rs` confusion | Phase 0.2 explicitly resolves this by removing the legacy `CliApp` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
*Generated: 2026-03-31 | Workspace: `rust/` | Branch: `dev/rust`*
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -4,10 +4,7 @@ use std::time::Duration;
|
|||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub enum ApiError {
|
pub enum ApiError {
|
||||||
MissingCredentials {
|
MissingApiKey,
|
||||||
provider: &'static str,
|
|
||||||
env_vars: &'static [&'static str],
|
|
||||||
},
|
|
||||||
ExpiredOAuthToken,
|
ExpiredOAuthToken,
|
||||||
Auth(String),
|
Auth(String),
|
||||||
InvalidApiKeyEnv(VarError),
|
InvalidApiKeyEnv(VarError),
|
||||||
@@ -33,21 +30,13 @@ pub enum ApiError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl ApiError {
|
impl ApiError {
|
||||||
#[must_use]
|
|
||||||
pub const fn missing_credentials(
|
|
||||||
provider: &'static str,
|
|
||||||
env_vars: &'static [&'static str],
|
|
||||||
) -> Self {
|
|
||||||
Self::MissingCredentials { provider, env_vars }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn is_retryable(&self) -> bool {
|
pub fn is_retryable(&self) -> bool {
|
||||||
match self {
|
match self {
|
||||||
Self::Http(error) => error.is_connect() || error.is_timeout() || error.is_request(),
|
Self::Http(error) => error.is_connect() || error.is_timeout() || error.is_request(),
|
||||||
Self::Api { retryable, .. } => *retryable,
|
Self::Api { retryable, .. } => *retryable,
|
||||||
Self::RetriesExhausted { last_error, .. } => last_error.is_retryable(),
|
Self::RetriesExhausted { last_error, .. } => last_error.is_retryable(),
|
||||||
Self::MissingCredentials { .. }
|
Self::MissingApiKey
|
||||||
| Self::ExpiredOAuthToken
|
| Self::ExpiredOAuthToken
|
||||||
| Self::Auth(_)
|
| Self::Auth(_)
|
||||||
| Self::InvalidApiKeyEnv(_)
|
| Self::InvalidApiKeyEnv(_)
|
||||||
@@ -62,11 +51,12 @@ impl ApiError {
|
|||||||
impl Display for ApiError {
|
impl Display for ApiError {
|
||||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||||
match self {
|
match self {
|
||||||
Self::MissingCredentials { provider, env_vars } => write!(
|
Self::MissingApiKey => {
|
||||||
f,
|
write!(
|
||||||
"missing {provider} credentials; export {} before calling the {provider} API",
|
f,
|
||||||
env_vars.join(" or ")
|
"ANTHROPIC_AUTH_TOKEN or ANTHROPIC_API_KEY is not set; export one before calling the Anthropic API"
|
||||||
),
|
)
|
||||||
|
}
|
||||||
Self::ExpiredOAuthToken => {
|
Self::ExpiredOAuthToken => {
|
||||||
write!(
|
write!(
|
||||||
f,
|
f,
|
||||||
@@ -75,7 +65,10 @@ impl Display for ApiError {
|
|||||||
}
|
}
|
||||||
Self::Auth(message) => write!(f, "auth error: {message}"),
|
Self::Auth(message) => write!(f, "auth error: {message}"),
|
||||||
Self::InvalidApiKeyEnv(error) => {
|
Self::InvalidApiKeyEnv(error) => {
|
||||||
write!(f, "failed to read credential environment variable: {error}")
|
write!(
|
||||||
|
f,
|
||||||
|
"failed to read ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY: {error}"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
Self::Http(error) => write!(f, "http error: {error}"),
|
Self::Http(error) => write!(f, "http error: {error}"),
|
||||||
Self::Io(error) => write!(f, "io error: {error}"),
|
Self::Io(error) => write!(f, "io error: {error}"),
|
||||||
@@ -88,14 +81,20 @@ impl Display for ApiError {
|
|||||||
..
|
..
|
||||||
} => match (error_type, message) {
|
} => match (error_type, message) {
|
||||||
(Some(error_type), Some(message)) => {
|
(Some(error_type), Some(message)) => {
|
||||||
write!(f, "api returned {status} ({error_type}): {message}")
|
write!(
|
||||||
|
f,
|
||||||
|
"anthropic api returned {status} ({error_type}): {message}"
|
||||||
|
)
|
||||||
}
|
}
|
||||||
_ => write!(f, "api returned {status}: {body}"),
|
_ => write!(f, "anthropic api returned {status}: {body}"),
|
||||||
},
|
},
|
||||||
Self::RetriesExhausted {
|
Self::RetriesExhausted {
|
||||||
attempts,
|
attempts,
|
||||||
last_error,
|
last_error,
|
||||||
} => write!(f, "api failed after {attempts} attempts: {last_error}"),
|
} => write!(
|
||||||
|
f,
|
||||||
|
"anthropic api failed after {attempts} attempts: {last_error}"
|
||||||
|
),
|
||||||
Self::InvalidSseFrame(message) => write!(f, "invalid sse frame: {message}"),
|
Self::InvalidSseFrame(message) => write!(f, "invalid sse frame: {message}"),
|
||||||
Self::BackoffOverflow {
|
Self::BackoffOverflow {
|
||||||
attempt,
|
attempt,
|
||||||
|
|||||||
@@ -1,19 +1,13 @@
|
|||||||
mod client;
|
mod client;
|
||||||
mod error;
|
mod error;
|
||||||
mod providers;
|
|
||||||
mod sse;
|
mod sse;
|
||||||
mod types;
|
mod types;
|
||||||
|
|
||||||
pub use client::{
|
pub use client::{
|
||||||
oauth_token_is_expired, read_base_url, read_xai_base_url, resolve_saved_oauth_token,
|
oauth_token_is_expired, read_base_url, resolve_saved_oauth_token, resolve_startup_auth_source,
|
||||||
resolve_startup_auth_source, MessageStream, OAuthTokenSet, ProviderClient,
|
AnthropicClient, AuthSource, MessageStream, OAuthTokenSet,
|
||||||
};
|
};
|
||||||
pub use error::ApiError;
|
pub use error::ApiError;
|
||||||
pub use providers::anthropic::{AnthropicClient, AuthSource};
|
|
||||||
pub use providers::openai_compat::{OpenAiCompatClient, OpenAiCompatConfig};
|
|
||||||
pub use providers::{
|
|
||||||
detect_provider_kind, max_tokens_for_model, resolve_model_alias, ProviderKind,
|
|
||||||
};
|
|
||||||
pub use sse::{parse_frame, SseParser};
|
pub use sse::{parse_frame, SseParser};
|
||||||
pub use types::{
|
pub use types::{
|
||||||
ContentBlockDelta, ContentBlockDeltaEvent, ContentBlockStartEvent, ContentBlockStopEvent,
|
ContentBlockDelta, ContentBlockDeltaEvent, ContentBlockStartEvent, ContentBlockStopEvent,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,216 +0,0 @@
|
|||||||
use std::future::Future;
|
|
||||||
use std::pin::Pin;
|
|
||||||
|
|
||||||
use crate::error::ApiError;
|
|
||||||
use crate::types::{MessageRequest, MessageResponse};
|
|
||||||
|
|
||||||
pub mod anthropic;
|
|
||||||
pub mod openai_compat;
|
|
||||||
|
|
||||||
pub type ProviderFuture<'a, T> = Pin<Box<dyn Future<Output = Result<T, ApiError>> + Send + 'a>>;
|
|
||||||
|
|
||||||
pub trait Provider {
|
|
||||||
type Stream;
|
|
||||||
|
|
||||||
fn send_message<'a>(
|
|
||||||
&'a self,
|
|
||||||
request: &'a MessageRequest,
|
|
||||||
) -> ProviderFuture<'a, MessageResponse>;
|
|
||||||
|
|
||||||
fn stream_message<'a>(
|
|
||||||
&'a self,
|
|
||||||
request: &'a MessageRequest,
|
|
||||||
) -> ProviderFuture<'a, Self::Stream>;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub enum ProviderKind {
|
|
||||||
Anthropic,
|
|
||||||
Xai,
|
|
||||||
OpenAi,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub struct ProviderMetadata {
|
|
||||||
pub provider: ProviderKind,
|
|
||||||
pub auth_env: &'static str,
|
|
||||||
pub base_url_env: &'static str,
|
|
||||||
pub default_base_url: &'static str,
|
|
||||||
}
|
|
||||||
|
|
||||||
const MODEL_REGISTRY: &[(&str, ProviderMetadata)] = &[
|
|
||||||
(
|
|
||||||
"opus",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Anthropic,
|
|
||||||
auth_env: "ANTHROPIC_API_KEY",
|
|
||||||
base_url_env: "ANTHROPIC_BASE_URL",
|
|
||||||
default_base_url: anthropic::DEFAULT_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"sonnet",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Anthropic,
|
|
||||||
auth_env: "ANTHROPIC_API_KEY",
|
|
||||||
base_url_env: "ANTHROPIC_BASE_URL",
|
|
||||||
default_base_url: anthropic::DEFAULT_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"haiku",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Anthropic,
|
|
||||||
auth_env: "ANTHROPIC_API_KEY",
|
|
||||||
base_url_env: "ANTHROPIC_BASE_URL",
|
|
||||||
default_base_url: anthropic::DEFAULT_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"grok",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"grok-3",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"grok-mini",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"grok-3-mini",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"grok-2",
|
|
||||||
ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
];
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn resolve_model_alias(model: &str) -> String {
|
|
||||||
let trimmed = model.trim();
|
|
||||||
let lower = trimmed.to_ascii_lowercase();
|
|
||||||
MODEL_REGISTRY
|
|
||||||
.iter()
|
|
||||||
.find_map(|(alias, metadata)| {
|
|
||||||
(*alias == lower).then_some(match metadata.provider {
|
|
||||||
ProviderKind::Anthropic => match *alias {
|
|
||||||
"opus" => "claude-opus-4-6",
|
|
||||||
"sonnet" => "claude-sonnet-4-6",
|
|
||||||
"haiku" => "claude-haiku-4-5-20251213",
|
|
||||||
_ => trimmed,
|
|
||||||
},
|
|
||||||
ProviderKind::Xai => match *alias {
|
|
||||||
"grok" | "grok-3" => "grok-3",
|
|
||||||
"grok-mini" | "grok-3-mini" => "grok-3-mini",
|
|
||||||
"grok-2" => "grok-2",
|
|
||||||
_ => trimmed,
|
|
||||||
},
|
|
||||||
ProviderKind::OpenAi => trimmed,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.map_or_else(|| trimmed.to_string(), ToOwned::to_owned)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn metadata_for_model(model: &str) -> Option<ProviderMetadata> {
|
|
||||||
let canonical = resolve_model_alias(model);
|
|
||||||
if canonical.starts_with("claude") {
|
|
||||||
return Some(ProviderMetadata {
|
|
||||||
provider: ProviderKind::Anthropic,
|
|
||||||
auth_env: "ANTHROPIC_API_KEY",
|
|
||||||
base_url_env: "ANTHROPIC_BASE_URL",
|
|
||||||
default_base_url: anthropic::DEFAULT_BASE_URL,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if canonical.starts_with("grok") {
|
|
||||||
return Some(ProviderMetadata {
|
|
||||||
provider: ProviderKind::Xai,
|
|
||||||
auth_env: "XAI_API_KEY",
|
|
||||||
base_url_env: "XAI_BASE_URL",
|
|
||||||
default_base_url: openai_compat::DEFAULT_XAI_BASE_URL,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
None
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn detect_provider_kind(model: &str) -> ProviderKind {
|
|
||||||
if let Some(metadata) = metadata_for_model(model) {
|
|
||||||
return metadata.provider;
|
|
||||||
}
|
|
||||||
if anthropic::has_auth_from_env_or_saved().unwrap_or(false) {
|
|
||||||
return ProviderKind::Anthropic;
|
|
||||||
}
|
|
||||||
if openai_compat::has_api_key("OPENAI_API_KEY") {
|
|
||||||
return ProviderKind::OpenAi;
|
|
||||||
}
|
|
||||||
if openai_compat::has_api_key("XAI_API_KEY") {
|
|
||||||
return ProviderKind::Xai;
|
|
||||||
}
|
|
||||||
ProviderKind::Anthropic
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn max_tokens_for_model(model: &str) -> u32 {
|
|
||||||
let canonical = resolve_model_alias(model);
|
|
||||||
if canonical.contains("opus") {
|
|
||||||
32_000
|
|
||||||
} else {
|
|
||||||
64_000
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::{detect_provider_kind, max_tokens_for_model, resolve_model_alias, ProviderKind};
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn resolves_grok_aliases() {
|
|
||||||
assert_eq!(resolve_model_alias("grok"), "grok-3");
|
|
||||||
assert_eq!(resolve_model_alias("grok-mini"), "grok-3-mini");
|
|
||||||
assert_eq!(resolve_model_alias("grok-2"), "grok-2");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn detects_provider_from_model_name_first() {
|
|
||||||
assert_eq!(detect_provider_kind("grok"), ProviderKind::Xai);
|
|
||||||
assert_eq!(
|
|
||||||
detect_provider_kind("claude-sonnet-4-6"),
|
|
||||||
ProviderKind::Anthropic
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn keeps_existing_max_token_heuristic() {
|
|
||||||
assert_eq!(max_tokens_for_model("opus"), 32_000);
|
|
||||||
assert_eq!(max_tokens_for_model("grok-3"), 64_000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -3,9 +3,9 @@ use std::sync::Arc;
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use api::{
|
use api::{
|
||||||
AnthropicClient, ApiError, AuthSource, ContentBlockDelta, ContentBlockDeltaEvent,
|
AnthropicClient, ApiError, ContentBlockDelta, ContentBlockDeltaEvent, ContentBlockStartEvent,
|
||||||
ContentBlockStartEvent, InputContentBlock, InputMessage, MessageDeltaEvent, MessageRequest,
|
InputContentBlock, InputMessage, MessageDeltaEvent, MessageRequest, OutputContentBlock,
|
||||||
OutputContentBlock, ProviderClient, StreamEvent, ToolChoice, ToolDefinition,
|
StreamEvent, ToolChoice, ToolDefinition,
|
||||||
};
|
};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
@@ -195,47 +195,6 @@ async fn retries_retryable_failures_before_succeeding() {
|
|||||||
assert_eq!(state.lock().await.len(), 2);
|
assert_eq!(state.lock().await.len(), 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn provider_client_dispatches_anthropic_requests() {
|
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
|
||||||
let server = spawn_server(
|
|
||||||
state.clone(),
|
|
||||||
vec![http_response(
|
|
||||||
"200 OK",
|
|
||||||
"application/json",
|
|
||||||
"{\"id\":\"msg_provider\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[{\"type\":\"text\",\"text\":\"Dispatched\"}],\"model\":\"claude-3-7-sonnet-latest\",\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"usage\":{\"input_tokens\":3,\"output_tokens\":2}}",
|
|
||||||
)],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let client = ProviderClient::from_model_with_anthropic_auth(
|
|
||||||
"claude-sonnet-4-6",
|
|
||||||
Some(AuthSource::ApiKey("test-key".to_string())),
|
|
||||||
)
|
|
||||||
.expect("anthropic provider client should be constructed");
|
|
||||||
let client = match client {
|
|
||||||
ProviderClient::Anthropic(client) => {
|
|
||||||
ProviderClient::Anthropic(client.with_base_url(server.base_url()))
|
|
||||||
}
|
|
||||||
other => panic!("expected anthropic provider, got {other:?}"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let response = client
|
|
||||||
.send_message(&sample_request(false))
|
|
||||||
.await
|
|
||||||
.expect("provider-dispatched request should succeed");
|
|
||||||
|
|
||||||
assert_eq!(response.total_tokens(), 5);
|
|
||||||
|
|
||||||
let captured = state.lock().await;
|
|
||||||
let request = captured.first().expect("server should capture request");
|
|
||||||
assert_eq!(request.path, "/v1/messages");
|
|
||||||
assert_eq!(
|
|
||||||
request.headers.get("x-api-key").map(String::as_str),
|
|
||||||
Some("test-key")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn surfaces_retry_exhaustion_for_persistent_retryable_errors() {
|
async fn surfaces_retry_exhaustion_for_persistent_retryable_errors() {
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
||||||
|
|||||||
@@ -1,415 +0,0 @@
|
|||||||
use std::collections::HashMap;
|
|
||||||
use std::ffi::OsString;
|
|
||||||
use std::sync::Arc;
|
|
||||||
use std::sync::{Mutex as StdMutex, OnceLock};
|
|
||||||
|
|
||||||
use api::{
|
|
||||||
ContentBlockDelta, ContentBlockDeltaEvent, ContentBlockStartEvent, ContentBlockStopEvent,
|
|
||||||
InputContentBlock, InputMessage, MessageRequest, OpenAiCompatClient, OpenAiCompatConfig,
|
|
||||||
OutputContentBlock, ProviderClient, StreamEvent, ToolChoice, ToolDefinition,
|
|
||||||
};
|
|
||||||
use serde_json::json;
|
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
|
||||||
use tokio::net::TcpListener;
|
|
||||||
use tokio::sync::Mutex;
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn send_message_uses_openai_compatible_endpoint_and_auth() {
|
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
|
||||||
let body = concat!(
|
|
||||||
"{",
|
|
||||||
"\"id\":\"chatcmpl_test\",",
|
|
||||||
"\"model\":\"grok-3\",",
|
|
||||||
"\"choices\":[{",
|
|
||||||
"\"message\":{\"role\":\"assistant\",\"content\":\"Hello from Grok\",\"tool_calls\":[]},",
|
|
||||||
"\"finish_reason\":\"stop\"",
|
|
||||||
"}],",
|
|
||||||
"\"usage\":{\"prompt_tokens\":11,\"completion_tokens\":5}",
|
|
||||||
"}"
|
|
||||||
);
|
|
||||||
let server = spawn_server(
|
|
||||||
state.clone(),
|
|
||||||
vec![http_response("200 OK", "application/json", body)],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let client = OpenAiCompatClient::new("xai-test-key", OpenAiCompatConfig::xai())
|
|
||||||
.with_base_url(server.base_url());
|
|
||||||
let response = client
|
|
||||||
.send_message(&sample_request(false))
|
|
||||||
.await
|
|
||||||
.expect("request should succeed");
|
|
||||||
|
|
||||||
assert_eq!(response.model, "grok-3");
|
|
||||||
assert_eq!(response.total_tokens(), 16);
|
|
||||||
assert_eq!(
|
|
||||||
response.content,
|
|
||||||
vec![OutputContentBlock::Text {
|
|
||||||
text: "Hello from Grok".to_string(),
|
|
||||||
}]
|
|
||||||
);
|
|
||||||
|
|
||||||
let captured = state.lock().await;
|
|
||||||
let request = captured.first().expect("server should capture request");
|
|
||||||
assert_eq!(request.path, "/chat/completions");
|
|
||||||
assert_eq!(
|
|
||||||
request.headers.get("authorization").map(String::as_str),
|
|
||||||
Some("Bearer xai-test-key")
|
|
||||||
);
|
|
||||||
let body: serde_json::Value = serde_json::from_str(&request.body).expect("json body");
|
|
||||||
assert_eq!(body["model"], json!("grok-3"));
|
|
||||||
assert_eq!(body["messages"][0]["role"], json!("system"));
|
|
||||||
assert_eq!(body["tools"][0]["type"], json!("function"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn send_message_accepts_full_chat_completions_endpoint_override() {
|
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
|
||||||
let body = concat!(
|
|
||||||
"{",
|
|
||||||
"\"id\":\"chatcmpl_full_endpoint\",",
|
|
||||||
"\"model\":\"grok-3\",",
|
|
||||||
"\"choices\":[{",
|
|
||||||
"\"message\":{\"role\":\"assistant\",\"content\":\"Endpoint override works\",\"tool_calls\":[]},",
|
|
||||||
"\"finish_reason\":\"stop\"",
|
|
||||||
"}],",
|
|
||||||
"\"usage\":{\"prompt_tokens\":7,\"completion_tokens\":3}",
|
|
||||||
"}"
|
|
||||||
);
|
|
||||||
let server = spawn_server(
|
|
||||||
state.clone(),
|
|
||||||
vec![http_response("200 OK", "application/json", body)],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let endpoint_url = format!("{}/chat/completions", server.base_url());
|
|
||||||
let client = OpenAiCompatClient::new("xai-test-key", OpenAiCompatConfig::xai())
|
|
||||||
.with_base_url(endpoint_url);
|
|
||||||
let response = client
|
|
||||||
.send_message(&sample_request(false))
|
|
||||||
.await
|
|
||||||
.expect("request should succeed");
|
|
||||||
|
|
||||||
assert_eq!(response.total_tokens(), 10);
|
|
||||||
|
|
||||||
let captured = state.lock().await;
|
|
||||||
let request = captured.first().expect("server should capture request");
|
|
||||||
assert_eq!(request.path, "/chat/completions");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn stream_message_normalizes_text_and_multiple_tool_calls() {
|
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
|
||||||
let sse = concat!(
|
|
||||||
"data: {\"id\":\"chatcmpl_stream\",\"model\":\"grok-3\",\"choices\":[{\"delta\":{\"content\":\"Hello\"}}]}\n\n",
|
|
||||||
"data: {\"id\":\"chatcmpl_stream\",\"choices\":[{\"delta\":{\"tool_calls\":[{\"index\":0,\"id\":\"call_1\",\"function\":{\"name\":\"weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}},{\"index\":1,\"id\":\"call_2\",\"function\":{\"name\":\"clock\",\"arguments\":\"{\\\"zone\\\":\\\"UTC\\\"}\"}}]}}]}\n\n",
|
|
||||||
"data: {\"id\":\"chatcmpl_stream\",\"choices\":[{\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\n",
|
|
||||||
"data: [DONE]\n\n"
|
|
||||||
);
|
|
||||||
let server = spawn_server(
|
|
||||||
state.clone(),
|
|
||||||
vec![http_response_with_headers(
|
|
||||||
"200 OK",
|
|
||||||
"text/event-stream",
|
|
||||||
sse,
|
|
||||||
&[("x-request-id", "req_grok_stream")],
|
|
||||||
)],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
|
|
||||||
let client = OpenAiCompatClient::new("xai-test-key", OpenAiCompatConfig::xai())
|
|
||||||
.with_base_url(server.base_url());
|
|
||||||
let mut stream = client
|
|
||||||
.stream_message(&sample_request(false))
|
|
||||||
.await
|
|
||||||
.expect("stream should start");
|
|
||||||
|
|
||||||
assert_eq!(stream.request_id(), Some("req_grok_stream"));
|
|
||||||
|
|
||||||
let mut events = Vec::new();
|
|
||||||
while let Some(event) = stream.next_event().await.expect("event should parse") {
|
|
||||||
events.push(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
assert!(matches!(events[0], StreamEvent::MessageStart(_)));
|
|
||||||
assert!(matches!(
|
|
||||||
events[1],
|
|
||||||
StreamEvent::ContentBlockStart(ContentBlockStartEvent {
|
|
||||||
content_block: OutputContentBlock::Text { .. },
|
|
||||||
..
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[2],
|
|
||||||
StreamEvent::ContentBlockDelta(ContentBlockDeltaEvent {
|
|
||||||
delta: ContentBlockDelta::TextDelta { .. },
|
|
||||||
..
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[3],
|
|
||||||
StreamEvent::ContentBlockStart(ContentBlockStartEvent {
|
|
||||||
index: 1,
|
|
||||||
content_block: OutputContentBlock::ToolUse { .. },
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[4],
|
|
||||||
StreamEvent::ContentBlockDelta(ContentBlockDeltaEvent {
|
|
||||||
index: 1,
|
|
||||||
delta: ContentBlockDelta::InputJsonDelta { .. },
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[5],
|
|
||||||
StreamEvent::ContentBlockStart(ContentBlockStartEvent {
|
|
||||||
index: 2,
|
|
||||||
content_block: OutputContentBlock::ToolUse { .. },
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[6],
|
|
||||||
StreamEvent::ContentBlockDelta(ContentBlockDeltaEvent {
|
|
||||||
index: 2,
|
|
||||||
delta: ContentBlockDelta::InputJsonDelta { .. },
|
|
||||||
})
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[7],
|
|
||||||
StreamEvent::ContentBlockStop(ContentBlockStopEvent { index: 1 })
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[8],
|
|
||||||
StreamEvent::ContentBlockStop(ContentBlockStopEvent { index: 2 })
|
|
||||||
));
|
|
||||||
assert!(matches!(
|
|
||||||
events[9],
|
|
||||||
StreamEvent::ContentBlockStop(ContentBlockStopEvent { index: 0 })
|
|
||||||
));
|
|
||||||
assert!(matches!(events[10], StreamEvent::MessageDelta(_)));
|
|
||||||
assert!(matches!(events[11], StreamEvent::MessageStop(_)));
|
|
||||||
|
|
||||||
let captured = state.lock().await;
|
|
||||||
let request = captured.first().expect("captured request");
|
|
||||||
assert_eq!(request.path, "/chat/completions");
|
|
||||||
assert!(request.body.contains("\"stream\":true"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn provider_client_dispatches_xai_requests_from_env() {
|
|
||||||
let _lock = env_lock();
|
|
||||||
let _api_key = ScopedEnvVar::set("XAI_API_KEY", "xai-test-key");
|
|
||||||
|
|
||||||
let state = Arc::new(Mutex::new(Vec::<CapturedRequest>::new()));
|
|
||||||
let server = spawn_server(
|
|
||||||
state.clone(),
|
|
||||||
vec![http_response(
|
|
||||||
"200 OK",
|
|
||||||
"application/json",
|
|
||||||
"{\"id\":\"chatcmpl_provider\",\"model\":\"grok-3\",\"choices\":[{\"message\":{\"role\":\"assistant\",\"content\":\"Through provider client\",\"tool_calls\":[]},\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":9,\"completion_tokens\":4}}",
|
|
||||||
)],
|
|
||||||
)
|
|
||||||
.await;
|
|
||||||
let _base_url = ScopedEnvVar::set("XAI_BASE_URL", server.base_url());
|
|
||||||
|
|
||||||
let client =
|
|
||||||
ProviderClient::from_model("grok").expect("xAI provider client should be constructed");
|
|
||||||
assert!(matches!(client, ProviderClient::Xai(_)));
|
|
||||||
|
|
||||||
let response = client
|
|
||||||
.send_message(&sample_request(false))
|
|
||||||
.await
|
|
||||||
.expect("provider-dispatched request should succeed");
|
|
||||||
|
|
||||||
assert_eq!(response.total_tokens(), 13);
|
|
||||||
|
|
||||||
let captured = state.lock().await;
|
|
||||||
let request = captured.first().expect("captured request");
|
|
||||||
assert_eq!(request.path, "/chat/completions");
|
|
||||||
assert_eq!(
|
|
||||||
request.headers.get("authorization").map(String::as_str),
|
|
||||||
Some("Bearer xai-test-key")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
struct CapturedRequest {
|
|
||||||
path: String,
|
|
||||||
headers: HashMap<String, String>,
|
|
||||||
body: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct TestServer {
|
|
||||||
base_url: String,
|
|
||||||
join_handle: tokio::task::JoinHandle<()>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TestServer {
|
|
||||||
fn base_url(&self) -> String {
|
|
||||||
self.base_url.clone()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for TestServer {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
self.join_handle.abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn spawn_server(
|
|
||||||
state: Arc<Mutex<Vec<CapturedRequest>>>,
|
|
||||||
responses: Vec<String>,
|
|
||||||
) -> TestServer {
|
|
||||||
let listener = TcpListener::bind("127.0.0.1:0")
|
|
||||||
.await
|
|
||||||
.expect("listener should bind");
|
|
||||||
let address = listener.local_addr().expect("listener addr");
|
|
||||||
let join_handle = tokio::spawn(async move {
|
|
||||||
for response in responses {
|
|
||||||
let (mut socket, _) = listener.accept().await.expect("accept");
|
|
||||||
let mut buffer = Vec::new();
|
|
||||||
let mut header_end = None;
|
|
||||||
loop {
|
|
||||||
let mut chunk = [0_u8; 1024];
|
|
||||||
let read = socket.read(&mut chunk).await.expect("read request");
|
|
||||||
if read == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
buffer.extend_from_slice(&chunk[..read]);
|
|
||||||
if let Some(position) = find_header_end(&buffer) {
|
|
||||||
header_end = Some(position);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let header_end = header_end.expect("headers should exist");
|
|
||||||
let (header_bytes, remaining) = buffer.split_at(header_end);
|
|
||||||
let header_text = String::from_utf8(header_bytes.to_vec()).expect("utf8 headers");
|
|
||||||
let mut lines = header_text.split("\r\n");
|
|
||||||
let request_line = lines.next().expect("request line");
|
|
||||||
let path = request_line
|
|
||||||
.split_whitespace()
|
|
||||||
.nth(1)
|
|
||||||
.expect("path")
|
|
||||||
.to_string();
|
|
||||||
let mut headers = HashMap::new();
|
|
||||||
let mut content_length = 0_usize;
|
|
||||||
for line in lines {
|
|
||||||
if line.is_empty() {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
let (name, value) = line.split_once(':').expect("header");
|
|
||||||
let value = value.trim().to_string();
|
|
||||||
if name.eq_ignore_ascii_case("content-length") {
|
|
||||||
content_length = value.parse().expect("content length");
|
|
||||||
}
|
|
||||||
headers.insert(name.to_ascii_lowercase(), value);
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut body = remaining[4..].to_vec();
|
|
||||||
while body.len() < content_length {
|
|
||||||
let mut chunk = vec![0_u8; content_length - body.len()];
|
|
||||||
let read = socket.read(&mut chunk).await.expect("read body");
|
|
||||||
if read == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
body.extend_from_slice(&chunk[..read]);
|
|
||||||
}
|
|
||||||
|
|
||||||
state.lock().await.push(CapturedRequest {
|
|
||||||
path,
|
|
||||||
headers,
|
|
||||||
body: String::from_utf8(body).expect("utf8 body"),
|
|
||||||
});
|
|
||||||
|
|
||||||
socket
|
|
||||||
.write_all(response.as_bytes())
|
|
||||||
.await
|
|
||||||
.expect("write response");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
TestServer {
|
|
||||||
base_url: format!("http://{address}"),
|
|
||||||
join_handle,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn find_header_end(bytes: &[u8]) -> Option<usize> {
|
|
||||||
bytes.windows(4).position(|window| window == b"\r\n\r\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn http_response(status: &str, content_type: &str, body: &str) -> String {
|
|
||||||
http_response_with_headers(status, content_type, body, &[])
|
|
||||||
}
|
|
||||||
|
|
||||||
fn http_response_with_headers(
|
|
||||||
status: &str,
|
|
||||||
content_type: &str,
|
|
||||||
body: &str,
|
|
||||||
headers: &[(&str, &str)],
|
|
||||||
) -> String {
|
|
||||||
let mut extra_headers = String::new();
|
|
||||||
for (name, value) in headers {
|
|
||||||
use std::fmt::Write as _;
|
|
||||||
write!(&mut extra_headers, "{name}: {value}\r\n").expect("header write");
|
|
||||||
}
|
|
||||||
format!(
|
|
||||||
"HTTP/1.1 {status}\r\ncontent-type: {content_type}\r\n{extra_headers}content-length: {}\r\nconnection: close\r\n\r\n{body}",
|
|
||||||
body.len()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn sample_request(stream: bool) -> MessageRequest {
|
|
||||||
MessageRequest {
|
|
||||||
model: "grok-3".to_string(),
|
|
||||||
max_tokens: 64,
|
|
||||||
messages: vec![InputMessage {
|
|
||||||
role: "user".to_string(),
|
|
||||||
content: vec![InputContentBlock::Text {
|
|
||||||
text: "Say hello".to_string(),
|
|
||||||
}],
|
|
||||||
}],
|
|
||||||
system: Some("Use tools when needed".to_string()),
|
|
||||||
tools: Some(vec![ToolDefinition {
|
|
||||||
name: "weather".to_string(),
|
|
||||||
description: Some("Fetches weather".to_string()),
|
|
||||||
input_schema: json!({
|
|
||||||
"type": "object",
|
|
||||||
"properties": {"city": {"type": "string"}},
|
|
||||||
"required": ["city"]
|
|
||||||
}),
|
|
||||||
}]),
|
|
||||||
tool_choice: Some(ToolChoice::Auto),
|
|
||||||
stream,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn env_lock() -> std::sync::MutexGuard<'static, ()> {
|
|
||||||
static LOCK: OnceLock<StdMutex<()>> = OnceLock::new();
|
|
||||||
LOCK.get_or_init(|| StdMutex::new(()))
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(|poisoned| poisoned.into_inner())
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ScopedEnvVar {
|
|
||||||
key: &'static str,
|
|
||||||
previous: Option<OsString>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ScopedEnvVar {
|
|
||||||
fn set(key: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
|
|
||||||
let previous = std::env::var_os(key);
|
|
||||||
std::env::set_var(key, value);
|
|
||||||
Self { key, previous }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for ScopedEnvVar {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
match &self.previous {
|
|
||||||
Some(value) => std::env::set_var(self.key, value),
|
|
||||||
None => std::env::remove_var(self.key),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
use std::ffi::OsString;
|
|
||||||
use std::sync::{Mutex, OnceLock};
|
|
||||||
|
|
||||||
use api::{read_xai_base_url, ApiError, AuthSource, ProviderClient, ProviderKind};
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn provider_client_routes_grok_aliases_through_xai() {
|
|
||||||
let _lock = env_lock();
|
|
||||||
let _xai_api_key = EnvVarGuard::set("XAI_API_KEY", Some("xai-test-key"));
|
|
||||||
|
|
||||||
let client = ProviderClient::from_model("grok-mini").expect("grok alias should resolve");
|
|
||||||
|
|
||||||
assert_eq!(client.provider_kind(), ProviderKind::Xai);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn provider_client_reports_missing_xai_credentials_for_grok_models() {
|
|
||||||
let _lock = env_lock();
|
|
||||||
let _xai_api_key = EnvVarGuard::set("XAI_API_KEY", None);
|
|
||||||
|
|
||||||
let error = ProviderClient::from_model("grok-3")
|
|
||||||
.expect_err("grok requests without XAI_API_KEY should fail fast");
|
|
||||||
|
|
||||||
match error {
|
|
||||||
ApiError::MissingCredentials { provider, env_vars } => {
|
|
||||||
assert_eq!(provider, "xAI");
|
|
||||||
assert_eq!(env_vars, &["XAI_API_KEY"]);
|
|
||||||
}
|
|
||||||
other => panic!("expected missing xAI credentials, got {other:?}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn provider_client_uses_explicit_anthropic_auth_without_env_lookup() {
|
|
||||||
let _lock = env_lock();
|
|
||||||
let _anthropic_api_key = EnvVarGuard::set("ANTHROPIC_API_KEY", None);
|
|
||||||
let _anthropic_auth_token = EnvVarGuard::set("ANTHROPIC_AUTH_TOKEN", None);
|
|
||||||
|
|
||||||
let client = ProviderClient::from_model_with_anthropic_auth(
|
|
||||||
"claude-sonnet-4-6",
|
|
||||||
Some(AuthSource::ApiKey("anthropic-test-key".to_string())),
|
|
||||||
)
|
|
||||||
.expect("explicit anthropic auth should avoid env lookup");
|
|
||||||
|
|
||||||
assert_eq!(client.provider_kind(), ProviderKind::Anthropic);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn read_xai_base_url_prefers_env_override() {
|
|
||||||
let _lock = env_lock();
|
|
||||||
let _xai_base_url = EnvVarGuard::set("XAI_BASE_URL", Some("https://example.xai.test/v1"));
|
|
||||||
|
|
||||||
assert_eq!(read_xai_base_url(), "https://example.xai.test/v1");
|
|
||||||
}
|
|
||||||
|
|
||||||
fn env_lock() -> std::sync::MutexGuard<'static, ()> {
|
|
||||||
static LOCK: OnceLock<Mutex<()>> = OnceLock::new();
|
|
||||||
LOCK.get_or_init(|| Mutex::new(()))
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(|poisoned| poisoned.into_inner())
|
|
||||||
}
|
|
||||||
|
|
||||||
struct EnvVarGuard {
|
|
||||||
key: &'static str,
|
|
||||||
original: Option<OsString>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl EnvVarGuard {
|
|
||||||
fn set(key: &'static str, value: Option<&str>) -> Self {
|
|
||||||
let original = std::env::var_os(key);
|
|
||||||
match value {
|
|
||||||
Some(value) => std::env::set_var(key, value),
|
|
||||||
None => std::env::remove_var(key),
|
|
||||||
}
|
|
||||||
Self { key, original }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for EnvVarGuard {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
match &self.original {
|
|
||||||
Some(value) => std::env::set_var(self.key, value),
|
|
||||||
None => std::env::remove_var(self.key),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -37,7 +37,6 @@ pub struct RuntimeConfig {
|
|||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
pub struct RuntimeFeatureConfig {
|
pub struct RuntimeFeatureConfig {
|
||||||
hooks: RuntimeHookConfig,
|
|
||||||
mcp: McpConfigCollection,
|
mcp: McpConfigCollection,
|
||||||
oauth: Option<OAuthConfig>,
|
oauth: Option<OAuthConfig>,
|
||||||
model: Option<String>,
|
model: Option<String>,
|
||||||
@@ -45,12 +44,6 @@ pub struct RuntimeFeatureConfig {
|
|||||||
sandbox: SandboxConfig,
|
sandbox: SandboxConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
|
||||||
pub struct RuntimeHookConfig {
|
|
||||||
pre_tool_use: Vec<String>,
|
|
||||||
post_tool_use: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
pub struct McpConfigCollection {
|
pub struct McpConfigCollection {
|
||||||
servers: BTreeMap<String, ScopedMcpServerConfig>,
|
servers: BTreeMap<String, ScopedMcpServerConfig>,
|
||||||
@@ -228,7 +221,6 @@ impl ConfigLoader {
|
|||||||
let merged_value = JsonValue::Object(merged.clone());
|
let merged_value = JsonValue::Object(merged.clone());
|
||||||
|
|
||||||
let feature_config = RuntimeFeatureConfig {
|
let feature_config = RuntimeFeatureConfig {
|
||||||
hooks: parse_optional_hooks_config(&merged_value)?,
|
|
||||||
mcp: McpConfigCollection {
|
mcp: McpConfigCollection {
|
||||||
servers: mcp_servers,
|
servers: mcp_servers,
|
||||||
},
|
},
|
||||||
@@ -286,11 +278,6 @@ impl RuntimeConfig {
|
|||||||
&self.feature_config.mcp
|
&self.feature_config.mcp
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn hooks(&self) -> &RuntimeHookConfig {
|
|
||||||
&self.feature_config.hooks
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn oauth(&self) -> Option<&OAuthConfig> {
|
pub fn oauth(&self) -> Option<&OAuthConfig> {
|
||||||
self.feature_config.oauth.as_ref()
|
self.feature_config.oauth.as_ref()
|
||||||
@@ -313,17 +300,6 @@ impl RuntimeConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl RuntimeFeatureConfig {
|
impl RuntimeFeatureConfig {
|
||||||
#[must_use]
|
|
||||||
pub fn with_hooks(mut self, hooks: RuntimeHookConfig) -> Self {
|
|
||||||
self.hooks = hooks;
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn hooks(&self) -> &RuntimeHookConfig {
|
|
||||||
&self.hooks
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn mcp(&self) -> &McpConfigCollection {
|
pub fn mcp(&self) -> &McpConfigCollection {
|
||||||
&self.mcp
|
&self.mcp
|
||||||
@@ -350,26 +326,6 @@ impl RuntimeFeatureConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RuntimeHookConfig {
|
|
||||||
#[must_use]
|
|
||||||
pub fn new(pre_tool_use: Vec<String>, post_tool_use: Vec<String>) -> Self {
|
|
||||||
Self {
|
|
||||||
pre_tool_use,
|
|
||||||
post_tool_use,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn pre_tool_use(&self) -> &[String] {
|
|
||||||
&self.pre_tool_use
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn post_tool_use(&self) -> &[String] {
|
|
||||||
&self.post_tool_use
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl McpConfigCollection {
|
impl McpConfigCollection {
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn servers(&self) -> &BTreeMap<String, ScopedMcpServerConfig> {
|
pub fn servers(&self) -> &BTreeMap<String, ScopedMcpServerConfig> {
|
||||||
@@ -468,22 +424,6 @@ fn parse_optional_model(root: &JsonValue) -> Option<String> {
|
|||||||
.map(ToOwned::to_owned)
|
.map(ToOwned::to_owned)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_optional_hooks_config(root: &JsonValue) -> Result<RuntimeHookConfig, ConfigError> {
|
|
||||||
let Some(object) = root.as_object() else {
|
|
||||||
return Ok(RuntimeHookConfig::default());
|
|
||||||
};
|
|
||||||
let Some(hooks_value) = object.get("hooks") else {
|
|
||||||
return Ok(RuntimeHookConfig::default());
|
|
||||||
};
|
|
||||||
let hooks = expect_object(hooks_value, "merged settings.hooks")?;
|
|
||||||
Ok(RuntimeHookConfig {
|
|
||||||
pre_tool_use: optional_string_array(hooks, "PreToolUse", "merged settings.hooks")?
|
|
||||||
.unwrap_or_default(),
|
|
||||||
post_tool_use: optional_string_array(hooks, "PostToolUse", "merged settings.hooks")?
|
|
||||||
.unwrap_or_default(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_optional_permission_mode(
|
fn parse_optional_permission_mode(
|
||||||
root: &JsonValue,
|
root: &JsonValue,
|
||||||
) -> Result<Option<ResolvedPermissionMode>, ConfigError> {
|
) -> Result<Option<ResolvedPermissionMode>, ConfigError> {
|
||||||
@@ -896,8 +836,6 @@ mod tests {
|
|||||||
.and_then(JsonValue::as_object)
|
.and_then(JsonValue::as_object)
|
||||||
.expect("hooks object")
|
.expect("hooks object")
|
||||||
.contains_key("PostToolUse"));
|
.contains_key("PostToolUse"));
|
||||||
assert_eq!(loaded.hooks().pre_tool_use(), &["base".to_string()]);
|
|
||||||
assert_eq!(loaded.hooks().post_tool_use(), &["project".to_string()]);
|
|
||||||
assert!(loaded.mcp().get("home").is_some());
|
assert!(loaded.mcp().get("home").is_some());
|
||||||
assert!(loaded.mcp().get("project").is_some());
|
assert!(loaded.mcp().get("project").is_some());
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ use std::fmt::{Display, Formatter};
|
|||||||
use crate::compact::{
|
use crate::compact::{
|
||||||
compact_session, estimate_session_tokens, CompactionConfig, CompactionResult,
|
compact_session, estimate_session_tokens, CompactionConfig, CompactionResult,
|
||||||
};
|
};
|
||||||
use crate::config::RuntimeFeatureConfig;
|
|
||||||
use crate::hooks::{HookRunResult, HookRunner};
|
|
||||||
use crate::permissions::{PermissionOutcome, PermissionPolicy, PermissionPrompter};
|
use crate::permissions::{PermissionOutcome, PermissionPolicy, PermissionPrompter};
|
||||||
use crate::session::{ContentBlock, ConversationMessage, Session};
|
use crate::session::{ContentBlock, ConversationMessage, Session};
|
||||||
use crate::usage::{TokenUsage, UsageTracker};
|
use crate::usage::{TokenUsage, UsageTracker};
|
||||||
@@ -96,7 +94,6 @@ pub struct ConversationRuntime<C, T> {
|
|||||||
system_prompt: Vec<String>,
|
system_prompt: Vec<String>,
|
||||||
max_iterations: usize,
|
max_iterations: usize,
|
||||||
usage_tracker: UsageTracker,
|
usage_tracker: UsageTracker,
|
||||||
hook_runner: HookRunner,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<C, T> ConversationRuntime<C, T>
|
impl<C, T> ConversationRuntime<C, T>
|
||||||
@@ -111,25 +108,6 @@ where
|
|||||||
tool_executor: T,
|
tool_executor: T,
|
||||||
permission_policy: PermissionPolicy,
|
permission_policy: PermissionPolicy,
|
||||||
system_prompt: Vec<String>,
|
system_prompt: Vec<String>,
|
||||||
) -> Self {
|
|
||||||
Self::new_with_features(
|
|
||||||
session,
|
|
||||||
api_client,
|
|
||||||
tool_executor,
|
|
||||||
permission_policy,
|
|
||||||
system_prompt,
|
|
||||||
&RuntimeFeatureConfig::default(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn new_with_features(
|
|
||||||
session: Session,
|
|
||||||
api_client: C,
|
|
||||||
tool_executor: T,
|
|
||||||
permission_policy: PermissionPolicy,
|
|
||||||
system_prompt: Vec<String>,
|
|
||||||
feature_config: &RuntimeFeatureConfig,
|
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let usage_tracker = UsageTracker::from_session(&session);
|
let usage_tracker = UsageTracker::from_session(&session);
|
||||||
Self {
|
Self {
|
||||||
@@ -140,7 +118,6 @@ where
|
|||||||
system_prompt,
|
system_prompt,
|
||||||
max_iterations: usize::MAX,
|
max_iterations: usize::MAX,
|
||||||
usage_tracker,
|
usage_tracker,
|
||||||
hook_runner: HookRunner::from_feature_config(feature_config),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,41 +185,19 @@ where
|
|||||||
|
|
||||||
let result_message = match permission_outcome {
|
let result_message = match permission_outcome {
|
||||||
PermissionOutcome::Allow => {
|
PermissionOutcome::Allow => {
|
||||||
let pre_hook_result = self.hook_runner.run_pre_tool_use(&tool_name, &input);
|
match self.tool_executor.execute(&tool_name, &input) {
|
||||||
if pre_hook_result.is_denied() {
|
Ok(output) => ConversationMessage::tool_result(
|
||||||
let deny_message = format!("PreToolUse hook denied tool `{tool_name}`");
|
|
||||||
ConversationMessage::tool_result(
|
|
||||||
tool_use_id,
|
tool_use_id,
|
||||||
tool_name,
|
tool_name,
|
||||||
format_hook_message(&pre_hook_result, &deny_message),
|
output,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
Err(error) => ConversationMessage::tool_result(
|
||||||
|
tool_use_id,
|
||||||
|
tool_name,
|
||||||
|
error.to_string(),
|
||||||
true,
|
true,
|
||||||
)
|
),
|
||||||
} else {
|
|
||||||
let (mut output, mut is_error) =
|
|
||||||
match self.tool_executor.execute(&tool_name, &input) {
|
|
||||||
Ok(output) => (output, false),
|
|
||||||
Err(error) => (error.to_string(), true),
|
|
||||||
};
|
|
||||||
output = merge_hook_feedback(pre_hook_result.messages(), output, false);
|
|
||||||
|
|
||||||
let post_hook_result = self
|
|
||||||
.hook_runner
|
|
||||||
.run_post_tool_use(&tool_name, &input, &output, is_error);
|
|
||||||
if post_hook_result.is_denied() {
|
|
||||||
is_error = true;
|
|
||||||
}
|
|
||||||
output = merge_hook_feedback(
|
|
||||||
post_hook_result.messages(),
|
|
||||||
output,
|
|
||||||
post_hook_result.is_denied(),
|
|
||||||
);
|
|
||||||
|
|
||||||
ConversationMessage::tool_result(
|
|
||||||
tool_use_id,
|
|
||||||
tool_name,
|
|
||||||
output,
|
|
||||||
is_error,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PermissionOutcome::Deny { reason } => {
|
PermissionOutcome::Deny { reason } => {
|
||||||
@@ -335,32 +290,6 @@ fn flush_text_block(text: &mut String, blocks: &mut Vec<ContentBlock>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn format_hook_message(result: &HookRunResult, fallback: &str) -> String {
|
|
||||||
if result.messages().is_empty() {
|
|
||||||
fallback.to_string()
|
|
||||||
} else {
|
|
||||||
result.messages().join("\n")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn merge_hook_feedback(messages: &[String], output: String, denied: bool) -> String {
|
|
||||||
if messages.is_empty() {
|
|
||||||
return output;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut sections = Vec::new();
|
|
||||||
if !output.trim().is_empty() {
|
|
||||||
sections.push(output);
|
|
||||||
}
|
|
||||||
let label = if denied {
|
|
||||||
"Hook feedback (denied)"
|
|
||||||
} else {
|
|
||||||
"Hook feedback"
|
|
||||||
};
|
|
||||||
sections.push(format!("{label}:\n{}", messages.join("\n")));
|
|
||||||
sections.join("\n\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
type ToolHandler = Box<dyn FnMut(&str) -> Result<String, ToolError>>;
|
type ToolHandler = Box<dyn FnMut(&str) -> Result<String, ToolError>>;
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
@@ -400,7 +329,6 @@ mod tests {
|
|||||||
StaticToolExecutor,
|
StaticToolExecutor,
|
||||||
};
|
};
|
||||||
use crate::compact::CompactionConfig;
|
use crate::compact::CompactionConfig;
|
||||||
use crate::config::{RuntimeFeatureConfig, RuntimeHookConfig};
|
|
||||||
use crate::permissions::{
|
use crate::permissions::{
|
||||||
PermissionMode, PermissionPolicy, PermissionPromptDecision, PermissionPrompter,
|
PermissionMode, PermissionPolicy, PermissionPromptDecision, PermissionPrompter,
|
||||||
PermissionRequest,
|
PermissionRequest,
|
||||||
@@ -575,141 +503,6 @@ mod tests {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn denies_tool_use_when_pre_tool_hook_blocks() {
|
|
||||||
struct SingleCallApiClient;
|
|
||||||
impl ApiClient for SingleCallApiClient {
|
|
||||||
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
|
||||||
if request
|
|
||||||
.messages
|
|
||||||
.iter()
|
|
||||||
.any(|message| message.role == MessageRole::Tool)
|
|
||||||
{
|
|
||||||
return Ok(vec![
|
|
||||||
AssistantEvent::TextDelta("blocked".to_string()),
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
Ok(vec![
|
|
||||||
AssistantEvent::ToolUse {
|
|
||||||
id: "tool-1".to_string(),
|
|
||||||
name: "blocked".to_string(),
|
|
||||||
input: r#"{"path":"secret.txt"}"#.to_string(),
|
|
||||||
},
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut runtime = ConversationRuntime::new_with_features(
|
|
||||||
Session::new(),
|
|
||||||
SingleCallApiClient,
|
|
||||||
StaticToolExecutor::new().register("blocked", |_input| {
|
|
||||||
panic!("tool should not execute when hook denies")
|
|
||||||
}),
|
|
||||||
PermissionPolicy::new(PermissionMode::DangerFullAccess),
|
|
||||||
vec!["system".to_string()],
|
|
||||||
&RuntimeFeatureConfig::default().with_hooks(RuntimeHookConfig::new(
|
|
||||||
vec![shell_snippet("printf 'blocked by hook'; exit 2")],
|
|
||||||
Vec::new(),
|
|
||||||
)),
|
|
||||||
);
|
|
||||||
|
|
||||||
let summary = runtime
|
|
||||||
.run_turn("use the tool", None)
|
|
||||||
.expect("conversation should continue after hook denial");
|
|
||||||
|
|
||||||
assert_eq!(summary.tool_results.len(), 1);
|
|
||||||
let ContentBlock::ToolResult {
|
|
||||||
is_error, output, ..
|
|
||||||
} = &summary.tool_results[0].blocks[0]
|
|
||||||
else {
|
|
||||||
panic!("expected tool result block");
|
|
||||||
};
|
|
||||||
assert!(
|
|
||||||
*is_error,
|
|
||||||
"hook denial should produce an error result: {output}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
output.contains("denied tool") || output.contains("blocked by hook"),
|
|
||||||
"unexpected hook denial output: {output:?}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn appends_post_tool_hook_feedback_to_tool_result() {
|
|
||||||
struct TwoCallApiClient {
|
|
||||||
calls: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ApiClient for TwoCallApiClient {
|
|
||||||
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
|
||||||
self.calls += 1;
|
|
||||||
match self.calls {
|
|
||||||
1 => Ok(vec![
|
|
||||||
AssistantEvent::ToolUse {
|
|
||||||
id: "tool-1".to_string(),
|
|
||||||
name: "add".to_string(),
|
|
||||||
input: r#"{"lhs":2,"rhs":2}"#.to_string(),
|
|
||||||
},
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
]),
|
|
||||||
2 => {
|
|
||||||
assert!(request
|
|
||||||
.messages
|
|
||||||
.iter()
|
|
||||||
.any(|message| message.role == MessageRole::Tool));
|
|
||||||
Ok(vec![
|
|
||||||
AssistantEvent::TextDelta("done".to_string()),
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
])
|
|
||||||
}
|
|
||||||
_ => Err(RuntimeError::new("unexpected extra API call")),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut runtime = ConversationRuntime::new_with_features(
|
|
||||||
Session::new(),
|
|
||||||
TwoCallApiClient { calls: 0 },
|
|
||||||
StaticToolExecutor::new().register("add", |_input| Ok("4".to_string())),
|
|
||||||
PermissionPolicy::new(PermissionMode::DangerFullAccess),
|
|
||||||
vec!["system".to_string()],
|
|
||||||
&RuntimeFeatureConfig::default().with_hooks(RuntimeHookConfig::new(
|
|
||||||
vec![shell_snippet("printf 'pre hook ran'")],
|
|
||||||
vec![shell_snippet("printf 'post hook ran'")],
|
|
||||||
)),
|
|
||||||
);
|
|
||||||
|
|
||||||
let summary = runtime
|
|
||||||
.run_turn("use add", None)
|
|
||||||
.expect("tool loop succeeds");
|
|
||||||
|
|
||||||
assert_eq!(summary.tool_results.len(), 1);
|
|
||||||
let ContentBlock::ToolResult {
|
|
||||||
is_error, output, ..
|
|
||||||
} = &summary.tool_results[0].blocks[0]
|
|
||||||
else {
|
|
||||||
panic!("expected tool result block");
|
|
||||||
};
|
|
||||||
assert!(
|
|
||||||
!*is_error,
|
|
||||||
"post hook should preserve non-error result: {output:?}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
output.contains('4'),
|
|
||||||
"tool output missing value: {output:?}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
output.contains("pre hook ran"),
|
|
||||||
"tool output missing pre hook feedback: {output:?}"
|
|
||||||
);
|
|
||||||
assert!(
|
|
||||||
output.contains("post hook ran"),
|
|
||||||
"tool output missing post hook feedback: {output:?}"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn reconstructs_usage_tracker_from_restored_session() {
|
fn reconstructs_usage_tracker_from_restored_session() {
|
||||||
struct SimpleApi;
|
struct SimpleApi;
|
||||||
@@ -788,14 +581,4 @@ mod tests {
|
|||||||
MessageRole::System
|
MessageRole::System
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
fn shell_snippet(script: &str) -> String {
|
|
||||||
script.replace('\'', "\"")
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
fn shell_snippet(script: &str) -> String {
|
|
||||||
script.to_string()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,357 +0,0 @@
|
|||||||
use std::ffi::OsStr;
|
|
||||||
use std::process::Command;
|
|
||||||
|
|
||||||
use serde_json::json;
|
|
||||||
|
|
||||||
use crate::config::{RuntimeFeatureConfig, RuntimeHookConfig};
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
||||||
pub enum HookEvent {
|
|
||||||
PreToolUse,
|
|
||||||
PostToolUse,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl HookEvent {
|
|
||||||
fn as_str(self) -> &'static str {
|
|
||||||
match self {
|
|
||||||
Self::PreToolUse => "PreToolUse",
|
|
||||||
Self::PostToolUse => "PostToolUse",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
pub struct HookRunResult {
|
|
||||||
denied: bool,
|
|
||||||
messages: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl HookRunResult {
|
|
||||||
#[must_use]
|
|
||||||
pub fn allow(messages: Vec<String>) -> Self {
|
|
||||||
Self {
|
|
||||||
denied: false,
|
|
||||||
messages,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn is_denied(&self) -> bool {
|
|
||||||
self.denied
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn messages(&self) -> &[String] {
|
|
||||||
&self.messages
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
|
||||||
pub struct HookRunner {
|
|
||||||
config: RuntimeHookConfig,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
|
||||||
struct HookCommandRequest<'a> {
|
|
||||||
event: HookEvent,
|
|
||||||
tool_name: &'a str,
|
|
||||||
tool_input: &'a str,
|
|
||||||
tool_output: Option<&'a str>,
|
|
||||||
is_error: bool,
|
|
||||||
payload: &'a str,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl HookRunner {
|
|
||||||
#[must_use]
|
|
||||||
pub fn new(config: RuntimeHookConfig) -> Self {
|
|
||||||
Self { config }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn from_feature_config(feature_config: &RuntimeFeatureConfig) -> Self {
|
|
||||||
Self::new(feature_config.hooks().clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn run_pre_tool_use(&self, tool_name: &str, tool_input: &str) -> HookRunResult {
|
|
||||||
self.run_commands(
|
|
||||||
HookEvent::PreToolUse,
|
|
||||||
self.config.pre_tool_use(),
|
|
||||||
tool_name,
|
|
||||||
tool_input,
|
|
||||||
None,
|
|
||||||
false,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn run_post_tool_use(
|
|
||||||
&self,
|
|
||||||
tool_name: &str,
|
|
||||||
tool_input: &str,
|
|
||||||
tool_output: &str,
|
|
||||||
is_error: bool,
|
|
||||||
) -> HookRunResult {
|
|
||||||
self.run_commands(
|
|
||||||
HookEvent::PostToolUse,
|
|
||||||
self.config.post_tool_use(),
|
|
||||||
tool_name,
|
|
||||||
tool_input,
|
|
||||||
Some(tool_output),
|
|
||||||
is_error,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_commands(
|
|
||||||
&self,
|
|
||||||
event: HookEvent,
|
|
||||||
commands: &[String],
|
|
||||||
tool_name: &str,
|
|
||||||
tool_input: &str,
|
|
||||||
tool_output: Option<&str>,
|
|
||||||
is_error: bool,
|
|
||||||
) -> HookRunResult {
|
|
||||||
if commands.is_empty() {
|
|
||||||
return HookRunResult::allow(Vec::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let payload = json!({
|
|
||||||
"hook_event_name": event.as_str(),
|
|
||||||
"tool_name": tool_name,
|
|
||||||
"tool_input": parse_tool_input(tool_input),
|
|
||||||
"tool_input_json": tool_input,
|
|
||||||
"tool_output": tool_output,
|
|
||||||
"tool_result_is_error": is_error,
|
|
||||||
})
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
let mut messages = Vec::new();
|
|
||||||
|
|
||||||
for command in commands {
|
|
||||||
match Self::run_command(
|
|
||||||
command,
|
|
||||||
HookCommandRequest {
|
|
||||||
event,
|
|
||||||
tool_name,
|
|
||||||
tool_input,
|
|
||||||
tool_output,
|
|
||||||
is_error,
|
|
||||||
payload: &payload,
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
HookCommandOutcome::Allow { message } => {
|
|
||||||
if let Some(message) = message {
|
|
||||||
messages.push(message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
HookCommandOutcome::Deny { message } => {
|
|
||||||
let message = message.unwrap_or_else(|| {
|
|
||||||
format!("{} hook denied tool `{tool_name}`", event.as_str())
|
|
||||||
});
|
|
||||||
messages.push(message);
|
|
||||||
return HookRunResult {
|
|
||||||
denied: true,
|
|
||||||
messages,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
HookCommandOutcome::Warn { message } => messages.push(message),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
HookRunResult::allow(messages)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_command(command: &str, request: HookCommandRequest<'_>) -> HookCommandOutcome {
|
|
||||||
let mut child = shell_command(command);
|
|
||||||
child.stdin(std::process::Stdio::piped());
|
|
||||||
child.stdout(std::process::Stdio::piped());
|
|
||||||
child.stderr(std::process::Stdio::piped());
|
|
||||||
child.env("HOOK_EVENT", request.event.as_str());
|
|
||||||
child.env("HOOK_TOOL_NAME", request.tool_name);
|
|
||||||
child.env("HOOK_TOOL_INPUT", request.tool_input);
|
|
||||||
child.env(
|
|
||||||
"HOOK_TOOL_IS_ERROR",
|
|
||||||
if request.is_error { "1" } else { "0" },
|
|
||||||
);
|
|
||||||
if let Some(tool_output) = request.tool_output {
|
|
||||||
child.env("HOOK_TOOL_OUTPUT", tool_output);
|
|
||||||
}
|
|
||||||
|
|
||||||
match child.output_with_stdin(request.payload.as_bytes()) {
|
|
||||||
Ok(output) => {
|
|
||||||
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
|
||||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
|
||||||
let message = (!stdout.is_empty()).then_some(stdout);
|
|
||||||
match output.status.code() {
|
|
||||||
Some(0) => HookCommandOutcome::Allow { message },
|
|
||||||
Some(2) => HookCommandOutcome::Deny { message },
|
|
||||||
Some(code) => HookCommandOutcome::Warn {
|
|
||||||
message: format_hook_warning(
|
|
||||||
command,
|
|
||||||
code,
|
|
||||||
message.as_deref(),
|
|
||||||
stderr.as_str(),
|
|
||||||
),
|
|
||||||
},
|
|
||||||
None => HookCommandOutcome::Warn {
|
|
||||||
message: format!(
|
|
||||||
"{} hook `{command}` terminated by signal while handling `{}`",
|
|
||||||
request.event.as_str(),
|
|
||||||
request.tool_name
|
|
||||||
),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(error) => HookCommandOutcome::Warn {
|
|
||||||
message: format!(
|
|
||||||
"{} hook `{command}` failed to start for `{}`: {error}",
|
|
||||||
request.event.as_str(),
|
|
||||||
request.tool_name
|
|
||||||
),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
enum HookCommandOutcome {
|
|
||||||
Allow { message: Option<String> },
|
|
||||||
Deny { message: Option<String> },
|
|
||||||
Warn { message: String },
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_tool_input(tool_input: &str) -> serde_json::Value {
|
|
||||||
serde_json::from_str(tool_input).unwrap_or_else(|_| json!({ "raw": tool_input }))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_hook_warning(command: &str, code: i32, stdout: Option<&str>, stderr: &str) -> String {
|
|
||||||
let mut message =
|
|
||||||
format!("Hook `{command}` exited with status {code}; allowing tool execution to continue");
|
|
||||||
if let Some(stdout) = stdout.filter(|stdout| !stdout.is_empty()) {
|
|
||||||
message.push_str(": ");
|
|
||||||
message.push_str(stdout);
|
|
||||||
} else if !stderr.is_empty() {
|
|
||||||
message.push_str(": ");
|
|
||||||
message.push_str(stderr);
|
|
||||||
}
|
|
||||||
message
|
|
||||||
}
|
|
||||||
|
|
||||||
fn shell_command(command: &str) -> CommandWithStdin {
|
|
||||||
#[cfg(windows)]
|
|
||||||
let mut command_builder = {
|
|
||||||
let mut command_builder = Command::new("cmd");
|
|
||||||
command_builder.arg("/C").arg(command);
|
|
||||||
CommandWithStdin::new(command_builder)
|
|
||||||
};
|
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
let command_builder = {
|
|
||||||
let mut command_builder = Command::new("sh");
|
|
||||||
command_builder.arg("-lc").arg(command);
|
|
||||||
CommandWithStdin::new(command_builder)
|
|
||||||
};
|
|
||||||
|
|
||||||
command_builder
|
|
||||||
}
|
|
||||||
|
|
||||||
struct CommandWithStdin {
|
|
||||||
command: Command,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl CommandWithStdin {
|
|
||||||
fn new(command: Command) -> Self {
|
|
||||||
Self { command }
|
|
||||||
}
|
|
||||||
|
|
||||||
fn stdin(&mut self, cfg: std::process::Stdio) -> &mut Self {
|
|
||||||
self.command.stdin(cfg);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn stdout(&mut self, cfg: std::process::Stdio) -> &mut Self {
|
|
||||||
self.command.stdout(cfg);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn stderr(&mut self, cfg: std::process::Stdio) -> &mut Self {
|
|
||||||
self.command.stderr(cfg);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn env<K, V>(&mut self, key: K, value: V) -> &mut Self
|
|
||||||
where
|
|
||||||
K: AsRef<OsStr>,
|
|
||||||
V: AsRef<OsStr>,
|
|
||||||
{
|
|
||||||
self.command.env(key, value);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
fn output_with_stdin(&mut self, stdin: &[u8]) -> std::io::Result<std::process::Output> {
|
|
||||||
let mut child = self.command.spawn()?;
|
|
||||||
if let Some(mut child_stdin) = child.stdin.take() {
|
|
||||||
use std::io::Write;
|
|
||||||
child_stdin.write_all(stdin)?;
|
|
||||||
}
|
|
||||||
child.wait_with_output()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::{HookRunResult, HookRunner};
|
|
||||||
use crate::config::{RuntimeFeatureConfig, RuntimeHookConfig};
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn allows_exit_code_zero_and_captures_stdout() {
|
|
||||||
let runner = HookRunner::new(RuntimeHookConfig::new(
|
|
||||||
vec![shell_snippet("printf 'pre ok'")],
|
|
||||||
Vec::new(),
|
|
||||||
));
|
|
||||||
|
|
||||||
let result = runner.run_pre_tool_use("Read", r#"{"path":"README.md"}"#);
|
|
||||||
|
|
||||||
assert_eq!(result, HookRunResult::allow(vec!["pre ok".to_string()]));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn denies_exit_code_two() {
|
|
||||||
let runner = HookRunner::new(RuntimeHookConfig::new(
|
|
||||||
vec![shell_snippet("printf 'blocked by hook'; exit 2")],
|
|
||||||
Vec::new(),
|
|
||||||
));
|
|
||||||
|
|
||||||
let result = runner.run_pre_tool_use("Bash", r#"{"command":"pwd"}"#);
|
|
||||||
|
|
||||||
assert!(result.is_denied());
|
|
||||||
assert_eq!(result.messages(), &["blocked by hook".to_string()]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn warns_for_other_non_zero_statuses() {
|
|
||||||
let runner = HookRunner::from_feature_config(&RuntimeFeatureConfig::default().with_hooks(
|
|
||||||
RuntimeHookConfig::new(
|
|
||||||
vec![shell_snippet("printf 'warning hook'; exit 1")],
|
|
||||||
Vec::new(),
|
|
||||||
),
|
|
||||||
));
|
|
||||||
|
|
||||||
let result = runner.run_pre_tool_use("Edit", r#"{"file":"src/lib.rs"}"#);
|
|
||||||
|
|
||||||
assert!(!result.is_denied());
|
|
||||||
assert!(result
|
|
||||||
.messages()
|
|
||||||
.iter()
|
|
||||||
.any(|message| message.contains("allowing tool execution to continue")));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
fn shell_snippet(script: &str) -> String {
|
|
||||||
script.replace('\'', "\"")
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(not(windows))]
|
|
||||||
fn shell_snippet(script: &str) -> String {
|
|
||||||
script.to_string()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ mod compact;
|
|||||||
mod config;
|
mod config;
|
||||||
mod conversation;
|
mod conversation;
|
||||||
mod file_ops;
|
mod file_ops;
|
||||||
mod hooks;
|
|
||||||
mod json;
|
mod json;
|
||||||
mod mcp;
|
mod mcp;
|
||||||
mod mcp_client;
|
mod mcp_client;
|
||||||
@@ -27,8 +26,8 @@ pub use config::{
|
|||||||
ConfigEntry, ConfigError, ConfigLoader, ConfigSource, McpClaudeAiProxyServerConfig,
|
ConfigEntry, ConfigError, ConfigLoader, ConfigSource, McpClaudeAiProxyServerConfig,
|
||||||
McpConfigCollection, McpOAuthConfig, McpRemoteServerConfig, McpSdkServerConfig,
|
McpConfigCollection, McpOAuthConfig, McpRemoteServerConfig, McpSdkServerConfig,
|
||||||
McpServerConfig, McpStdioServerConfig, McpTransport, McpWebSocketServerConfig, OAuthConfig,
|
McpServerConfig, McpStdioServerConfig, McpTransport, McpWebSocketServerConfig, OAuthConfig,
|
||||||
ResolvedPermissionMode, RuntimeConfig, RuntimeFeatureConfig, RuntimeHookConfig,
|
ResolvedPermissionMode, RuntimeConfig, RuntimeFeatureConfig, ScopedMcpServerConfig,
|
||||||
ScopedMcpServerConfig, CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
||||||
};
|
};
|
||||||
pub use conversation::{
|
pub use conversation::{
|
||||||
ApiClient, ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, StaticToolExecutor,
|
ApiClient, ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, StaticToolExecutor,
|
||||||
@@ -39,7 +38,6 @@ pub use file_ops::{
|
|||||||
GrepSearchInput, GrepSearchOutput, ReadFileOutput, StructuredPatchHunk, TextFilePayload,
|
GrepSearchInput, GrepSearchOutput, ReadFileOutput, StructuredPatchHunk, TextFilePayload,
|
||||||
WriteFileOutput,
|
WriteFileOutput,
|
||||||
};
|
};
|
||||||
pub use hooks::{HookEvent, HookRunResult, HookRunner};
|
|
||||||
pub use mcp::{
|
pub use mcp::{
|
||||||
mcp_server_signature, mcp_tool_name, mcp_tool_prefix, normalize_name_for_mcp,
|
mcp_server_signature, mcp_tool_name, mcp_tool_prefix, normalize_name_for_mcp,
|
||||||
scoped_mcp_config_hash, unwrap_ccr_proxy_url,
|
scoped_mcp_config_hash, unwrap_ccr_proxy_url,
|
||||||
|
|||||||
@@ -12,9 +12,8 @@ use std::process::Command;
|
|||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
use api::{
|
use api::{
|
||||||
detect_provider_kind, max_tokens_for_model, resolve_model_alias, resolve_startup_auth_source,
|
resolve_startup_auth_source, AnthropicClient, AuthSource, ContentBlockDelta, InputContentBlock,
|
||||||
AnthropicClient, AuthSource, ContentBlockDelta, InputContentBlock, InputMessage,
|
InputMessage, MessageRequest, MessageResponse, OutputContentBlock,
|
||||||
MessageRequest, MessageResponse, OutputContentBlock, ProviderClient, ProviderKind,
|
|
||||||
StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition, ToolResultContentBlock,
|
StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition, ToolResultContentBlock,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -23,12 +22,12 @@ use commands::{
|
|||||||
};
|
};
|
||||||
use compat_harness::{extract_manifest, UpstreamPaths};
|
use compat_harness::{extract_manifest, UpstreamPaths};
|
||||||
use init::initialize_repo;
|
use init::initialize_repo;
|
||||||
use render::{MarkdownStreamState, Spinner, TerminalRenderer};
|
use render::{Spinner, TerminalRenderer};
|
||||||
use runtime::{
|
use runtime::{
|
||||||
clear_oauth_credentials, generate_pkce_pair, generate_state, load_system_prompt,
|
clear_oauth_credentials, generate_pkce_pair, generate_state, load_system_prompt,
|
||||||
parse_oauth_callback_request_target, save_oauth_credentials, ApiClient, ApiRequest,
|
parse_oauth_callback_request_target, save_oauth_credentials, ApiClient, ApiRequest,
|
||||||
AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
|
AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
|
||||||
ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest, OAuthConfig,
|
ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest,
|
||||||
OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
||||||
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
||||||
};
|
};
|
||||||
@@ -36,6 +35,13 @@ use serde_json::json;
|
|||||||
use tools::{execute_tool, mvp_tool_specs, ToolSpec};
|
use tools::{execute_tool, mvp_tool_specs, ToolSpec};
|
||||||
|
|
||||||
const DEFAULT_MODEL: &str = "claude-opus-4-6";
|
const DEFAULT_MODEL: &str = "claude-opus-4-6";
|
||||||
|
fn max_tokens_for_model(model: &str) -> u32 {
|
||||||
|
if model.contains("opus") {
|
||||||
|
32_000
|
||||||
|
} else {
|
||||||
|
64_000
|
||||||
|
}
|
||||||
|
}
|
||||||
const DEFAULT_DATE: &str = "2026-03-31";
|
const DEFAULT_DATE: &str = "2026-03-31";
|
||||||
const DEFAULT_OAUTH_CALLBACK_PORT: u16 = 4545;
|
const DEFAULT_OAUTH_CALLBACK_PORT: u16 = 4545;
|
||||||
const VERSION: &str = env!("CARGO_PKG_VERSION");
|
const VERSION: &str = env!("CARGO_PKG_VERSION");
|
||||||
@@ -190,25 +196,6 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
|
|||||||
permission_mode = PermissionMode::DangerFullAccess;
|
permission_mode = PermissionMode::DangerFullAccess;
|
||||||
index += 1;
|
index += 1;
|
||||||
}
|
}
|
||||||
"-p" => {
|
|
||||||
// Claude Code compat: -p "prompt" = one-shot prompt
|
|
||||||
let prompt = args[index + 1..].join(" ");
|
|
||||||
if prompt.trim().is_empty() {
|
|
||||||
return Err("-p requires a prompt string".to_string());
|
|
||||||
}
|
|
||||||
return Ok(CliAction::Prompt {
|
|
||||||
prompt,
|
|
||||||
model: resolve_model_alias(&model).to_string(),
|
|
||||||
output_format,
|
|
||||||
allowed_tools: normalize_allowed_tools(&allowed_tool_values)?,
|
|
||||||
permission_mode,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
"--print" => {
|
|
||||||
// Claude Code compat: --print makes output non-interactive
|
|
||||||
output_format = CliOutputFormat::Text;
|
|
||||||
index += 1;
|
|
||||||
}
|
|
||||||
"--allowedTools" | "--allowed-tools" => {
|
"--allowedTools" | "--allowed-tools" => {
|
||||||
let value = args
|
let value = args
|
||||||
.get(index + 1)
|
.get(index + 1)
|
||||||
@@ -282,6 +269,15 @@ fn parse_args(args: &[String]) -> Result<CliAction, String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn resolve_model_alias(model: &str) -> &str {
|
||||||
|
match model {
|
||||||
|
"opus" => "claude-opus-4-6",
|
||||||
|
"sonnet" => "claude-sonnet-4-6",
|
||||||
|
"haiku" => "claude-haiku-4-5-20251213",
|
||||||
|
_ => model,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn normalize_allowed_tools(values: &[String]) -> Result<Option<AllowedToolSet>, String> {
|
fn normalize_allowed_tools(values: &[String]) -> Result<Option<AllowedToolSet>, String> {
|
||||||
if values.is_empty() {
|
if values.is_empty() {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
@@ -432,26 +428,15 @@ fn print_bootstrap_plan() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn default_oauth_config() -> OAuthConfig {
|
|
||||||
OAuthConfig {
|
|
||||||
client_id: String::from("9d1c250a-e61b-44d9-88ed-5944d1962f5e"),
|
|
||||||
authorize_url: String::from("https://platform.claude.com/oauth/authorize"),
|
|
||||||
token_url: String::from("https://platform.claude.com/v1/oauth/token"),
|
|
||||||
callback_port: None,
|
|
||||||
manual_redirect_url: None,
|
|
||||||
scopes: vec![
|
|
||||||
String::from("user:profile"),
|
|
||||||
String::from("user:inference"),
|
|
||||||
String::from("user:sessions:claude_code"),
|
|
||||||
],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_login() -> Result<(), Box<dyn std::error::Error>> {
|
fn run_login() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let cwd = env::current_dir()?;
|
let cwd = env::current_dir()?;
|
||||||
let config = ConfigLoader::default_for(&cwd).load()?;
|
let config = ConfigLoader::default_for(&cwd).load()?;
|
||||||
let default_oauth = default_oauth_config();
|
let oauth = config.oauth().ok_or_else(|| {
|
||||||
let oauth = config.oauth().unwrap_or(&default_oauth);
|
io::Error::new(
|
||||||
|
io::ErrorKind::NotFound,
|
||||||
|
"OAuth config is missing. Add settings.oauth.clientId/authorizeUrl/tokenUrl first.",
|
||||||
|
)
|
||||||
|
})?;
|
||||||
let callback_port = oauth.callback_port.unwrap_or(DEFAULT_OAUTH_CALLBACK_PORT);
|
let callback_port = oauth.callback_port.unwrap_or(DEFAULT_OAUTH_CALLBACK_PORT);
|
||||||
let redirect_uri = runtime::loopback_redirect_uri(callback_port);
|
let redirect_uri = runtime::loopback_redirect_uri(callback_port);
|
||||||
let pkce = generate_pkce_pair()?;
|
let pkce = generate_pkce_pair()?;
|
||||||
@@ -965,7 +950,7 @@ struct LiveCli {
|
|||||||
allowed_tools: Option<AllowedToolSet>,
|
allowed_tools: Option<AllowedToolSet>,
|
||||||
permission_mode: PermissionMode,
|
permission_mode: PermissionMode,
|
||||||
system_prompt: Vec<String>,
|
system_prompt: Vec<String>,
|
||||||
runtime: ConversationRuntime<ProviderRuntimeClient, CliToolExecutor>,
|
runtime: ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>,
|
||||||
session: SessionHandle,
|
session: SessionHandle,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1888,15 +1873,6 @@ fn build_system_prompt() -> Result<Vec<String>, Box<dyn std::error::Error>> {
|
|||||||
)?)
|
)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_runtime_feature_config(
|
|
||||||
) -> Result<runtime::RuntimeFeatureConfig, Box<dyn std::error::Error>> {
|
|
||||||
let cwd = env::current_dir()?;
|
|
||||||
Ok(ConfigLoader::default_for(cwd)
|
|
||||||
.load()?
|
|
||||||
.feature_config()
|
|
||||||
.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_runtime(
|
fn build_runtime(
|
||||||
session: Session,
|
session: Session,
|
||||||
model: String,
|
model: String,
|
||||||
@@ -1905,16 +1881,14 @@ fn build_runtime(
|
|||||||
emit_output: bool,
|
emit_output: bool,
|
||||||
allowed_tools: Option<AllowedToolSet>,
|
allowed_tools: Option<AllowedToolSet>,
|
||||||
permission_mode: PermissionMode,
|
permission_mode: PermissionMode,
|
||||||
) -> Result<ConversationRuntime<ProviderRuntimeClient, CliToolExecutor>, Box<dyn std::error::Error>>
|
) -> Result<ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>, Box<dyn std::error::Error>>
|
||||||
{
|
{
|
||||||
let feature_config = build_runtime_feature_config()?;
|
Ok(ConversationRuntime::new(
|
||||||
Ok(ConversationRuntime::new_with_features(
|
|
||||||
session,
|
session,
|
||||||
ProviderRuntimeClient::new(model, enable_tools, emit_output, allowed_tools.clone())?,
|
AnthropicRuntimeClient::new(model, enable_tools, emit_output, allowed_tools.clone())?,
|
||||||
CliToolExecutor::new(allowed_tools, emit_output),
|
CliToolExecutor::new(allowed_tools, emit_output),
|
||||||
permission_policy(permission_mode),
|
permission_policy(permission_mode),
|
||||||
system_prompt,
|
system_prompt,
|
||||||
&feature_config,
|
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1964,33 +1938,26 @@ impl runtime::PermissionPrompter for CliPermissionPrompter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ProviderRuntimeClient {
|
struct AnthropicRuntimeClient {
|
||||||
runtime: tokio::runtime::Runtime,
|
runtime: tokio::runtime::Runtime,
|
||||||
client: ProviderClient,
|
client: AnthropicClient,
|
||||||
model: String,
|
model: String,
|
||||||
enable_tools: bool,
|
enable_tools: bool,
|
||||||
emit_output: bool,
|
emit_output: bool,
|
||||||
allowed_tools: Option<AllowedToolSet>,
|
allowed_tools: Option<AllowedToolSet>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ProviderRuntimeClient {
|
impl AnthropicRuntimeClient {
|
||||||
fn new(
|
fn new(
|
||||||
model: String,
|
model: String,
|
||||||
enable_tools: bool,
|
enable_tools: bool,
|
||||||
emit_output: bool,
|
emit_output: bool,
|
||||||
allowed_tools: Option<AllowedToolSet>,
|
allowed_tools: Option<AllowedToolSet>,
|
||||||
) -> Result<Self, Box<dyn std::error::Error>> {
|
) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
let model = resolve_model_alias(&model).to_string();
|
|
||||||
let client = match detect_provider_kind(&model) {
|
|
||||||
ProviderKind::Anthropic => ProviderClient::from_model_with_anthropic_auth(
|
|
||||||
&model,
|
|
||||||
Some(resolve_cli_auth_source()?),
|
|
||||||
)?,
|
|
||||||
ProviderKind::Xai | ProviderKind::OpenAi => ProviderClient::from_model(&model)?,
|
|
||||||
};
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
runtime: tokio::runtime::Runtime::new()?,
|
runtime: tokio::runtime::Runtime::new()?,
|
||||||
client,
|
client: AnthropicClient::from_auth(resolve_cli_auth_source()?)
|
||||||
|
.with_base_url(api::read_base_url()),
|
||||||
model,
|
model,
|
||||||
enable_tools,
|
enable_tools,
|
||||||
emit_output,
|
emit_output,
|
||||||
@@ -2009,7 +1976,7 @@ fn resolve_cli_auth_source() -> Result<AuthSource, Box<dyn std::error::Error>> {
|
|||||||
})?)
|
})?)
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ApiClient for ProviderRuntimeClient {
|
impl ApiClient for AnthropicRuntimeClient {
|
||||||
#[allow(clippy::too_many_lines)]
|
#[allow(clippy::too_many_lines)]
|
||||||
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
||||||
let message_request = MessageRequest {
|
let message_request = MessageRequest {
|
||||||
@@ -2044,10 +2011,8 @@ impl ApiClient for ProviderRuntimeClient {
|
|||||||
} else {
|
} else {
|
||||||
&mut sink
|
&mut sink
|
||||||
};
|
};
|
||||||
let renderer = TerminalRenderer::new();
|
|
||||||
let mut markdown_stream = MarkdownStreamState::default();
|
|
||||||
let mut events = Vec::new();
|
let mut events = Vec::new();
|
||||||
let mut pending_tools: BTreeMap<u32, (String, String, String)> = BTreeMap::new();
|
let mut pending_tool: Option<(String, String, String)> = None;
|
||||||
let mut saw_stop = false;
|
let mut saw_stop = false;
|
||||||
|
|
||||||
while let Some(event) = stream
|
while let Some(event) = stream
|
||||||
@@ -2058,50 +2023,35 @@ impl ApiClient for ProviderRuntimeClient {
|
|||||||
match event {
|
match event {
|
||||||
ApiStreamEvent::MessageStart(start) => {
|
ApiStreamEvent::MessageStart(start) => {
|
||||||
for block in start.message.content {
|
for block in start.message.content {
|
||||||
push_output_block(
|
push_output_block(block, out, &mut events, &mut pending_tool, true)?;
|
||||||
block,
|
|
||||||
0,
|
|
||||||
out,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
)?;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ApiStreamEvent::ContentBlockStart(start) => {
|
ApiStreamEvent::ContentBlockStart(start) => {
|
||||||
push_output_block(
|
push_output_block(
|
||||||
start.content_block,
|
start.content_block,
|
||||||
start.index,
|
|
||||||
out,
|
out,
|
||||||
&mut events,
|
&mut events,
|
||||||
&mut pending_tools,
|
&mut pending_tool,
|
||||||
true,
|
true,
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
ApiStreamEvent::ContentBlockDelta(delta) => match delta.delta {
|
ApiStreamEvent::ContentBlockDelta(delta) => match delta.delta {
|
||||||
ContentBlockDelta::TextDelta { text } => {
|
ContentBlockDelta::TextDelta { text } => {
|
||||||
if !text.is_empty() {
|
if !text.is_empty() {
|
||||||
if let Some(rendered) = markdown_stream.push(&renderer, &text) {
|
write!(out, "{text}")
|
||||||
write!(out, "{rendered}")
|
.and_then(|()| out.flush())
|
||||||
.and_then(|()| out.flush())
|
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
|
||||||
}
|
|
||||||
events.push(AssistantEvent::TextDelta(text));
|
events.push(AssistantEvent::TextDelta(text));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ContentBlockDelta::InputJsonDelta { partial_json } => {
|
ContentBlockDelta::InputJsonDelta { partial_json } => {
|
||||||
if let Some((_, _, input)) = pending_tools.get_mut(&delta.index) {
|
if let Some((_, _, input)) = &mut pending_tool {
|
||||||
input.push_str(&partial_json);
|
input.push_str(&partial_json);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ApiStreamEvent::ContentBlockStop(stop) => {
|
ApiStreamEvent::ContentBlockStop(_) => {
|
||||||
if let Some(rendered) = markdown_stream.flush(&renderer) {
|
if let Some((id, name, input)) = pending_tool.take() {
|
||||||
write!(out, "{rendered}")
|
|
||||||
.and_then(|()| out.flush())
|
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
|
||||||
}
|
|
||||||
if let Some((id, name, input)) = pending_tools.remove(&stop.index) {
|
|
||||||
// Display tool call now that input is fully accumulated
|
// Display tool call now that input is fully accumulated
|
||||||
writeln!(out, "\n{}", format_tool_call_start(&name, &input))
|
writeln!(out, "\n{}", format_tool_call_start(&name, &input))
|
||||||
.and_then(|()| out.flush())
|
.and_then(|()| out.flush())
|
||||||
@@ -2119,11 +2069,6 @@ impl ApiClient for ProviderRuntimeClient {
|
|||||||
}
|
}
|
||||||
ApiStreamEvent::MessageStop(_) => {
|
ApiStreamEvent::MessageStop(_) => {
|
||||||
saw_stop = true;
|
saw_stop = true;
|
||||||
if let Some(rendered) = markdown_stream.flush(&renderer) {
|
|
||||||
write!(out, "{rendered}")
|
|
||||||
.and_then(|()| out.flush())
|
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
|
||||||
}
|
|
||||||
events.push(AssistantEvent::MessageStop);
|
events.push(AssistantEvent::MessageStop);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2226,49 +2171,56 @@ fn format_tool_call_start(name: &str, input: &str) -> String {
|
|||||||
serde_json::from_str(input).unwrap_or(serde_json::Value::String(input.to_string()));
|
serde_json::from_str(input).unwrap_or(serde_json::Value::String(input.to_string()));
|
||||||
|
|
||||||
let detail = match name {
|
let detail = match name {
|
||||||
"bash" | "Bash" => format_bash_call(&parsed),
|
"bash" | "Bash" => parsed
|
||||||
"read_file" | "Read" => {
|
.get("command")
|
||||||
let path = extract_tool_path(&parsed);
|
.and_then(|v| v.as_str())
|
||||||
format!("\x1b[2m📄 Reading {path}…\x1b[0m")
|
.map(|cmd| truncate_for_summary(cmd, 120))
|
||||||
}
|
.unwrap_or_default(),
|
||||||
|
"read_file" | "Read" => parsed
|
||||||
|
.get("file_path")
|
||||||
|
.or_else(|| parsed.get("path"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("?")
|
||||||
|
.to_string(),
|
||||||
"write_file" | "Write" => {
|
"write_file" | "Write" => {
|
||||||
let path = extract_tool_path(&parsed);
|
let path = parsed
|
||||||
|
.get("file_path")
|
||||||
|
.or_else(|| parsed.get("path"))
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("?");
|
||||||
let lines = parsed
|
let lines = parsed
|
||||||
.get("content")
|
.get("content")
|
||||||
.and_then(|value| value.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.map_or(0, |content| content.lines().count());
|
.map_or(0, |c| c.lines().count());
|
||||||
format!("\x1b[1;32m✏️ Writing {path}\x1b[0m \x1b[2m({lines} lines)\x1b[0m")
|
format!("{path} ({lines} lines)")
|
||||||
}
|
}
|
||||||
"edit_file" | "Edit" => {
|
"edit_file" | "Edit" => {
|
||||||
let path = extract_tool_path(&parsed);
|
let path = parsed
|
||||||
let old_value = parsed
|
.get("file_path")
|
||||||
.get("old_string")
|
.or_else(|| parsed.get("path"))
|
||||||
.or_else(|| parsed.get("oldString"))
|
.and_then(|v| v.as_str())
|
||||||
.and_then(|value| value.as_str())
|
.unwrap_or("?");
|
||||||
.unwrap_or_default();
|
path.to_string()
|
||||||
let new_value = parsed
|
|
||||||
.get("new_string")
|
|
||||||
.or_else(|| parsed.get("newString"))
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
format!(
|
|
||||||
"\x1b[1;33m📝 Editing {path}\x1b[0m{}",
|
|
||||||
format_patch_preview(old_value, new_value)
|
|
||||||
.map(|preview| format!("\n{preview}"))
|
|
||||||
.unwrap_or_default()
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
"glob_search" | "Glob" => format_search_start("🔎 Glob", &parsed),
|
"glob_search" | "Glob" => parsed
|
||||||
"grep_search" | "Grep" => format_search_start("🔎 Grep", &parsed),
|
.get("pattern")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("?")
|
||||||
|
.to_string(),
|
||||||
|
"grep_search" | "Grep" => parsed
|
||||||
|
.get("pattern")
|
||||||
|
.and_then(|v| v.as_str())
|
||||||
|
.unwrap_or("?")
|
||||||
|
.to_string(),
|
||||||
"web_search" | "WebSearch" => parsed
|
"web_search" | "WebSearch" => parsed
|
||||||
.get("query")
|
.get("query")
|
||||||
.and_then(|value| value.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.unwrap_or("?")
|
.unwrap_or("?")
|
||||||
.to_string(),
|
.to_string(),
|
||||||
_ => summarize_tool_payload(input),
|
_ => summarize_tool_payload(input),
|
||||||
};
|
};
|
||||||
|
|
||||||
let border = "─".repeat(name.len() + 8);
|
let border = "─".repeat(name.len() + 6);
|
||||||
format!(
|
format!(
|
||||||
"\x1b[38;5;245m╭─ \x1b[1;36m{name}\x1b[0;38;5;245m ─╮\x1b[0m\n\x1b[38;5;245m│\x1b[0m {detail}\n\x1b[38;5;245m╰{border}╯\x1b[0m"
|
"\x1b[38;5;245m╭─ \x1b[1;36m{name}\x1b[0;38;5;245m ─╮\x1b[0m\n\x1b[38;5;245m│\x1b[0m {detail}\n\x1b[38;5;245m╰{border}╯\x1b[0m"
|
||||||
)
|
)
|
||||||
@@ -2280,269 +2232,8 @@ fn format_tool_result(name: &str, output: &str, is_error: bool) -> String {
|
|||||||
} else {
|
} else {
|
||||||
"\x1b[1;32m✓\x1b[0m"
|
"\x1b[1;32m✓\x1b[0m"
|
||||||
};
|
};
|
||||||
if is_error {
|
let summary = truncate_for_summary(output.trim(), 200);
|
||||||
let summary = truncate_for_summary(output.trim(), 160);
|
format!("{icon} \x1b[38;5;245m{name}:\x1b[0m {summary}")
|
||||||
return if summary.is_empty() {
|
|
||||||
format!("{icon} \x1b[38;5;245m{name}\x1b[0m")
|
|
||||||
} else {
|
|
||||||
format!("{icon} \x1b[38;5;245m{name}\x1b[0m\n\x1b[38;5;203m{summary}\x1b[0m")
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
let parsed: serde_json::Value =
|
|
||||||
serde_json::from_str(output).unwrap_or(serde_json::Value::String(output.to_string()));
|
|
||||||
match name {
|
|
||||||
"bash" | "Bash" => format_bash_result(icon, &parsed),
|
|
||||||
"read_file" | "Read" => format_read_result(icon, &parsed),
|
|
||||||
"write_file" | "Write" => format_write_result(icon, &parsed),
|
|
||||||
"edit_file" | "Edit" => format_edit_result(icon, &parsed),
|
|
||||||
"glob_search" | "Glob" => format_glob_result(icon, &parsed),
|
|
||||||
"grep_search" | "Grep" => format_grep_result(icon, &parsed),
|
|
||||||
_ => {
|
|
||||||
let summary = truncate_for_summary(output.trim(), 200);
|
|
||||||
format!("{icon} \x1b[38;5;245m{name}:\x1b[0m {summary}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_tool_path(parsed: &serde_json::Value) -> String {
|
|
||||||
parsed
|
|
||||||
.get("file_path")
|
|
||||||
.or_else(|| parsed.get("filePath"))
|
|
||||||
.or_else(|| parsed.get("path"))
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or("?")
|
|
||||||
.to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_search_start(label: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let pattern = parsed
|
|
||||||
.get("pattern")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or("?");
|
|
||||||
let scope = parsed
|
|
||||||
.get("path")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or(".");
|
|
||||||
format!("{label} {pattern}\n\x1b[2min {scope}\x1b[0m")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_patch_preview(old_value: &str, new_value: &str) -> Option<String> {
|
|
||||||
if old_value.is_empty() && new_value.is_empty() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Some(format!(
|
|
||||||
"\x1b[38;5;203m- {}\x1b[0m\n\x1b[38;5;70m+ {}\x1b[0m",
|
|
||||||
truncate_for_summary(first_visible_line(old_value), 72),
|
|
||||||
truncate_for_summary(first_visible_line(new_value), 72)
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_bash_call(parsed: &serde_json::Value) -> String {
|
|
||||||
let command = parsed
|
|
||||||
.get("command")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
if command.is_empty() {
|
|
||||||
String::new()
|
|
||||||
} else {
|
|
||||||
format!(
|
|
||||||
"\x1b[48;5;236;38;5;255m $ {} \x1b[0m",
|
|
||||||
truncate_for_summary(command, 160)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn first_visible_line(text: &str) -> &str {
|
|
||||||
text.lines()
|
|
||||||
.find(|line| !line.trim().is_empty())
|
|
||||||
.unwrap_or(text)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_bash_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let mut lines = vec![format!("{icon} \x1b[38;5;245mbash\x1b[0m")];
|
|
||||||
if let Some(task_id) = parsed
|
|
||||||
.get("backgroundTaskId")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
{
|
|
||||||
lines[0].push_str(&format!(" backgrounded ({task_id})"));
|
|
||||||
} else if let Some(status) = parsed
|
|
||||||
.get("returnCodeInterpretation")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.filter(|status| !status.is_empty())
|
|
||||||
{
|
|
||||||
lines[0].push_str(&format!(" {status}"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(stdout) = parsed.get("stdout").and_then(|value| value.as_str()) {
|
|
||||||
if !stdout.trim().is_empty() {
|
|
||||||
lines.push(stdout.trim_end().to_string());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(stderr) = parsed.get("stderr").and_then(|value| value.as_str()) {
|
|
||||||
if !stderr.trim().is_empty() {
|
|
||||||
lines.push(format!("\x1b[38;5;203m{}\x1b[0m", stderr.trim_end()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lines.join("\n\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_read_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let file = parsed.get("file").unwrap_or(parsed);
|
|
||||||
let path = extract_tool_path(file);
|
|
||||||
let start_line = file
|
|
||||||
.get("startLine")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(1);
|
|
||||||
let num_lines = file
|
|
||||||
.get("numLines")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let total_lines = file
|
|
||||||
.get("totalLines")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(num_lines);
|
|
||||||
let content = file
|
|
||||||
.get("content")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
let end_line = start_line.saturating_add(num_lines.saturating_sub(1));
|
|
||||||
|
|
||||||
format!(
|
|
||||||
"{icon} \x1b[2m📄 Read {path} (lines {}-{} of {})\x1b[0m\n{}",
|
|
||||||
start_line,
|
|
||||||
end_line.max(start_line),
|
|
||||||
total_lines,
|
|
||||||
content
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_write_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let path = extract_tool_path(parsed);
|
|
||||||
let kind = parsed
|
|
||||||
.get("type")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or("write");
|
|
||||||
let line_count = parsed
|
|
||||||
.get("content")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.map(|content| content.lines().count())
|
|
||||||
.unwrap_or(0);
|
|
||||||
format!(
|
|
||||||
"{icon} \x1b[1;32m✏️ {} {path}\x1b[0m \x1b[2m({line_count} lines)\x1b[0m",
|
|
||||||
if kind == "create" { "Wrote" } else { "Updated" },
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_structured_patch_preview(parsed: &serde_json::Value) -> Option<String> {
|
|
||||||
let hunks = parsed.get("structuredPatch")?.as_array()?;
|
|
||||||
let mut preview = Vec::new();
|
|
||||||
for hunk in hunks.iter().take(2) {
|
|
||||||
let lines = hunk.get("lines")?.as_array()?;
|
|
||||||
for line in lines.iter().filter_map(|value| value.as_str()).take(6) {
|
|
||||||
match line.chars().next() {
|
|
||||||
Some('+') => preview.push(format!("\x1b[38;5;70m{line}\x1b[0m")),
|
|
||||||
Some('-') => preview.push(format!("\x1b[38;5;203m{line}\x1b[0m")),
|
|
||||||
_ => preview.push(line.to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if preview.is_empty() {
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
Some(preview.join("\n"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_edit_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let path = extract_tool_path(parsed);
|
|
||||||
let suffix = if parsed
|
|
||||||
.get("replaceAll")
|
|
||||||
.and_then(|value| value.as_bool())
|
|
||||||
.unwrap_or(false)
|
|
||||||
{
|
|
||||||
" (replace all)"
|
|
||||||
} else {
|
|
||||||
""
|
|
||||||
};
|
|
||||||
let preview = format_structured_patch_preview(parsed).or_else(|| {
|
|
||||||
let old_value = parsed
|
|
||||||
.get("oldString")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
let new_value = parsed
|
|
||||||
.get("newString")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
format_patch_preview(old_value, new_value)
|
|
||||||
});
|
|
||||||
|
|
||||||
match preview {
|
|
||||||
Some(preview) => format!("{icon} \x1b[1;33m📝 Edited {path}{suffix}\x1b[0m\n{preview}"),
|
|
||||||
None => format!("{icon} \x1b[1;33m📝 Edited {path}{suffix}\x1b[0m"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_glob_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let num_files = parsed
|
|
||||||
.get("numFiles")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let filenames = parsed
|
|
||||||
.get("filenames")
|
|
||||||
.and_then(|value| value.as_array())
|
|
||||||
.map(|files| {
|
|
||||||
files
|
|
||||||
.iter()
|
|
||||||
.filter_map(|value| value.as_str())
|
|
||||||
.take(8)
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join("\n")
|
|
||||||
})
|
|
||||||
.unwrap_or_default();
|
|
||||||
if filenames.is_empty() {
|
|
||||||
format!("{icon} \x1b[38;5;245mglob_search\x1b[0m matched {num_files} files")
|
|
||||||
} else {
|
|
||||||
format!("{icon} \x1b[38;5;245mglob_search\x1b[0m matched {num_files} files\n{filenames}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_grep_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|
||||||
let num_matches = parsed
|
|
||||||
.get("numMatches")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let num_files = parsed
|
|
||||||
.get("numFiles")
|
|
||||||
.and_then(|value| value.as_u64())
|
|
||||||
.unwrap_or(0);
|
|
||||||
let content = parsed
|
|
||||||
.get("content")
|
|
||||||
.and_then(|value| value.as_str())
|
|
||||||
.unwrap_or_default();
|
|
||||||
let filenames = parsed
|
|
||||||
.get("filenames")
|
|
||||||
.and_then(|value| value.as_array())
|
|
||||||
.map(|files| {
|
|
||||||
files
|
|
||||||
.iter()
|
|
||||||
.filter_map(|value| value.as_str())
|
|
||||||
.take(8)
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join("\n")
|
|
||||||
})
|
|
||||||
.unwrap_or_default();
|
|
||||||
let summary = format!(
|
|
||||||
"{icon} \x1b[38;5;245mgrep_search\x1b[0m {num_matches} matches across {num_files} files"
|
|
||||||
);
|
|
||||||
if !content.trim().is_empty() {
|
|
||||||
format!("{summary}\n{}", content.trim_end())
|
|
||||||
} else if !filenames.is_empty() {
|
|
||||||
format!("{summary}\n{filenames}")
|
|
||||||
} else {
|
|
||||||
summary
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn summarize_tool_payload(payload: &str) -> String {
|
fn summarize_tool_payload(payload: &str) -> String {
|
||||||
@@ -2565,17 +2256,15 @@ fn truncate_for_summary(value: &str, limit: usize) -> String {
|
|||||||
|
|
||||||
fn push_output_block(
|
fn push_output_block(
|
||||||
block: OutputContentBlock,
|
block: OutputContentBlock,
|
||||||
block_index: u32,
|
|
||||||
out: &mut (impl Write + ?Sized),
|
out: &mut (impl Write + ?Sized),
|
||||||
events: &mut Vec<AssistantEvent>,
|
events: &mut Vec<AssistantEvent>,
|
||||||
pending_tools: &mut BTreeMap<u32, (String, String, String)>,
|
pending_tool: &mut Option<(String, String, String)>,
|
||||||
streaming_tool_input: bool,
|
streaming_tool_input: bool,
|
||||||
) -> Result<(), RuntimeError> {
|
) -> Result<(), RuntimeError> {
|
||||||
match block {
|
match block {
|
||||||
OutputContentBlock::Text { text } => {
|
OutputContentBlock::Text { text } => {
|
||||||
if !text.is_empty() {
|
if !text.is_empty() {
|
||||||
let rendered = TerminalRenderer::new().markdown_to_ansi(&text);
|
write!(out, "{text}")
|
||||||
write!(out, "{rendered}")
|
|
||||||
.and_then(|()| out.flush())
|
.and_then(|()| out.flush())
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
||||||
events.push(AssistantEvent::TextDelta(text));
|
events.push(AssistantEvent::TextDelta(text));
|
||||||
@@ -2593,7 +2282,7 @@ fn push_output_block(
|
|||||||
} else {
|
} else {
|
||||||
input.to_string()
|
input.to_string()
|
||||||
};
|
};
|
||||||
pending_tools.insert(block_index, (id, name, initial_input));
|
*pending_tool = Some((id, name, initial_input));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -2604,13 +2293,11 @@ fn response_to_events(
|
|||||||
out: &mut (impl Write + ?Sized),
|
out: &mut (impl Write + ?Sized),
|
||||||
) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
||||||
let mut events = Vec::new();
|
let mut events = Vec::new();
|
||||||
let mut pending_tools = BTreeMap::new();
|
let mut pending_tool = None;
|
||||||
|
|
||||||
for (index, block) in response.content.into_iter().enumerate() {
|
for block in response.content {
|
||||||
let index =
|
push_output_block(block, out, &mut events, &mut pending_tool, false)?;
|
||||||
u32::try_from(index).map_err(|_| RuntimeError::new("response block index overflow"))?;
|
if let Some((id, name, input)) = pending_tool.take() {
|
||||||
push_output_block(block, index, out, &mut events, &mut pending_tools, false)?;
|
|
||||||
if let Some((id, name, input)) = pending_tools.remove(&index) {
|
|
||||||
events.push(AssistantEvent::ToolUse { id, name, input });
|
events.push(AssistantEvent::ToolUse { id, name, input });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2836,7 +2523,6 @@ mod tests {
|
|||||||
use api::{MessageResponse, OutputContentBlock, Usage};
|
use api::{MessageResponse, OutputContentBlock, Usage};
|
||||||
use runtime::{AssistantEvent, ContentBlock, ConversationMessage, MessageRole, PermissionMode};
|
use runtime::{AssistantEvent, ContentBlock, ConversationMessage, MessageRole, PermissionMode};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -2916,9 +2602,6 @@ mod tests {
|
|||||||
assert_eq!(resolve_model_alias("opus"), "claude-opus-4-6");
|
assert_eq!(resolve_model_alias("opus"), "claude-opus-4-6");
|
||||||
assert_eq!(resolve_model_alias("sonnet"), "claude-sonnet-4-6");
|
assert_eq!(resolve_model_alias("sonnet"), "claude-sonnet-4-6");
|
||||||
assert_eq!(resolve_model_alias("haiku"), "claude-haiku-4-5-20251213");
|
assert_eq!(resolve_model_alias("haiku"), "claude-haiku-4-5-20251213");
|
||||||
assert_eq!(resolve_model_alias("grok"), "grok-3");
|
|
||||||
assert_eq!(resolve_model_alias("grok-mini"), "grok-3-mini");
|
|
||||||
assert_eq!(resolve_model_alias("grok-2"), "grok-2");
|
|
||||||
assert_eq!(resolve_model_alias("claude-opus"), "claude-opus");
|
assert_eq!(resolve_model_alias("claude-opus"), "claude-opus");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3373,43 +3056,16 @@ mod tests {
|
|||||||
assert!(start.contains("read_file"));
|
assert!(start.contains("read_file"));
|
||||||
assert!(start.contains("src/main.rs"));
|
assert!(start.contains("src/main.rs"));
|
||||||
|
|
||||||
let done = format_tool_result(
|
let done = format_tool_result("read_file", r#"{"contents":"hello"}"#, false);
|
||||||
"read_file",
|
assert!(done.contains("read_file:"));
|
||||||
r#"{"file":{"filePath":"src/main.rs","content":"hello","numLines":1,"startLine":1,"totalLines":1}}"#,
|
assert!(done.contains("contents"));
|
||||||
false,
|
|
||||||
);
|
|
||||||
assert!(done.contains("📄 Read src/main.rs"));
|
|
||||||
assert!(done.contains("hello"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn push_output_block_renders_markdown_text() {
|
|
||||||
let mut out = Vec::new();
|
|
||||||
let mut events = Vec::new();
|
|
||||||
let mut pending_tools = BTreeMap::new();
|
|
||||||
|
|
||||||
push_output_block(
|
|
||||||
OutputContentBlock::Text {
|
|
||||||
text: "# Heading".to_string(),
|
|
||||||
},
|
|
||||||
0,
|
|
||||||
&mut out,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
false,
|
|
||||||
)
|
|
||||||
.expect("text block should render");
|
|
||||||
|
|
||||||
let rendered = String::from_utf8(out).expect("utf8");
|
|
||||||
assert!(rendered.contains("Heading"));
|
|
||||||
assert!(rendered.contains('\u{1b}'));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn push_output_block_skips_empty_object_prefix_for_tool_streams() {
|
fn push_output_block_skips_empty_object_prefix_for_tool_streams() {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
let mut events = Vec::new();
|
let mut events = Vec::new();
|
||||||
let mut pending_tools = BTreeMap::new();
|
let mut pending_tool = None;
|
||||||
|
|
||||||
push_output_block(
|
push_output_block(
|
||||||
OutputContentBlock::ToolUse {
|
OutputContentBlock::ToolUse {
|
||||||
@@ -3417,83 +3073,20 @@ mod tests {
|
|||||||
name: "read_file".to_string(),
|
name: "read_file".to_string(),
|
||||||
input: json!({}),
|
input: json!({}),
|
||||||
},
|
},
|
||||||
1,
|
|
||||||
&mut out,
|
&mut out,
|
||||||
&mut events,
|
&mut events,
|
||||||
&mut pending_tools,
|
&mut pending_tool,
|
||||||
true,
|
true,
|
||||||
)
|
)
|
||||||
.expect("tool block should accumulate");
|
.expect("tool block should accumulate");
|
||||||
|
|
||||||
assert!(events.is_empty());
|
assert!(events.is_empty());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
pending_tools.remove(&1),
|
pending_tool,
|
||||||
Some(("tool-1".to_string(), "read_file".to_string(), String::new(),))
|
Some(("tool-1".to_string(), "read_file".to_string(), String::new(),))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn pending_tools_preserve_multiple_streaming_tool_calls_by_index() {
|
|
||||||
let mut out = Vec::new();
|
|
||||||
let mut events = Vec::new();
|
|
||||||
let mut pending_tools = BTreeMap::new();
|
|
||||||
|
|
||||||
push_output_block(
|
|
||||||
OutputContentBlock::ToolUse {
|
|
||||||
id: "tool-1".to_string(),
|
|
||||||
name: "read_file".to_string(),
|
|
||||||
input: json!({}),
|
|
||||||
},
|
|
||||||
1,
|
|
||||||
&mut out,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
)
|
|
||||||
.expect("first tool should accumulate");
|
|
||||||
push_output_block(
|
|
||||||
OutputContentBlock::ToolUse {
|
|
||||||
id: "tool-2".to_string(),
|
|
||||||
name: "grep_search".to_string(),
|
|
||||||
input: json!({}),
|
|
||||||
},
|
|
||||||
2,
|
|
||||||
&mut out,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
)
|
|
||||||
.expect("second tool should accumulate");
|
|
||||||
|
|
||||||
pending_tools
|
|
||||||
.get_mut(&1)
|
|
||||||
.expect("first tool pending")
|
|
||||||
.2
|
|
||||||
.push_str("{\"path\":\"src/main.rs\"}");
|
|
||||||
pending_tools
|
|
||||||
.get_mut(&2)
|
|
||||||
.expect("second tool pending")
|
|
||||||
.2
|
|
||||||
.push_str("{\"pattern\":\"TODO\"}");
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
pending_tools.remove(&1),
|
|
||||||
Some((
|
|
||||||
"tool-1".to_string(),
|
|
||||||
"read_file".to_string(),
|
|
||||||
"{\"path\":\"src/main.rs\"}".to_string(),
|
|
||||||
))
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
pending_tools.remove(&2),
|
|
||||||
Some((
|
|
||||||
"tool-2".to_string(),
|
|
||||||
"grep_search".to_string(),
|
|
||||||
"{\"pattern\":\"TODO\"}".to_string(),
|
|
||||||
))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn response_to_events_preserves_empty_object_json_input_outside_streaming() {
|
fn response_to_events_preserves_empty_object_json_input_outside_streaming() {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
use std::fmt::Write as FmtWrite;
|
use std::fmt::Write as FmtWrite;
|
||||||
use std::io::{self, Write};
|
use std::io::{self, Write};
|
||||||
|
use std::thread;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
use crossterm::cursor::{MoveToColumn, RestorePosition, SavePosition};
|
use crossterm::cursor::{MoveToColumn, RestorePosition, SavePosition};
|
||||||
use crossterm::style::{Color, Print, ResetColor, SetForegroundColor, Stylize};
|
use crossterm::style::{Color, Print, ResetColor, SetForegroundColor, Stylize};
|
||||||
@@ -20,7 +22,6 @@ pub struct ColorTheme {
|
|||||||
link: Color,
|
link: Color,
|
||||||
quote: Color,
|
quote: Color,
|
||||||
table_border: Color,
|
table_border: Color,
|
||||||
code_block_border: Color,
|
|
||||||
spinner_active: Color,
|
spinner_active: Color,
|
||||||
spinner_done: Color,
|
spinner_done: Color,
|
||||||
spinner_failed: Color,
|
spinner_failed: Color,
|
||||||
@@ -36,7 +37,6 @@ impl Default for ColorTheme {
|
|||||||
link: Color::Blue,
|
link: Color::Blue,
|
||||||
quote: Color::DarkGrey,
|
quote: Color::DarkGrey,
|
||||||
table_border: Color::DarkCyan,
|
table_border: Color::DarkCyan,
|
||||||
code_block_border: Color::DarkGrey,
|
|
||||||
spinner_active: Color::Blue,
|
spinner_active: Color::Blue,
|
||||||
spinner_done: Color::Green,
|
spinner_done: Color::Green,
|
||||||
spinner_failed: Color::Red,
|
spinner_failed: Color::Red,
|
||||||
@@ -154,64 +154,33 @@ impl TableState {
|
|||||||
struct RenderState {
|
struct RenderState {
|
||||||
emphasis: usize,
|
emphasis: usize,
|
||||||
strong: usize,
|
strong: usize,
|
||||||
heading_level: Option<u8>,
|
|
||||||
quote: usize,
|
quote: usize,
|
||||||
list_stack: Vec<ListKind>,
|
list_stack: Vec<ListKind>,
|
||||||
link_stack: Vec<LinkState>,
|
|
||||||
table: Option<TableState>,
|
table: Option<TableState>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
struct LinkState {
|
|
||||||
destination: String,
|
|
||||||
text: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RenderState {
|
impl RenderState {
|
||||||
fn style_text(&self, text: &str, theme: &ColorTheme) -> String {
|
fn style_text(&self, text: &str, theme: &ColorTheme) -> String {
|
||||||
let mut style = text.stylize();
|
let mut styled = text.to_string();
|
||||||
|
if self.strong > 0 {
|
||||||
if matches!(self.heading_level, Some(1 | 2)) || self.strong > 0 {
|
styled = format!("{}", styled.bold().with(theme.strong));
|
||||||
style = style.bold();
|
|
||||||
}
|
}
|
||||||
if self.emphasis > 0 {
|
if self.emphasis > 0 {
|
||||||
style = style.italic();
|
styled = format!("{}", styled.italic().with(theme.emphasis));
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(level) = self.heading_level {
|
|
||||||
style = match level {
|
|
||||||
1 => style.with(theme.heading),
|
|
||||||
2 => style.white(),
|
|
||||||
3 => style.with(Color::Blue),
|
|
||||||
_ => style.with(Color::Grey),
|
|
||||||
};
|
|
||||||
} else if self.strong > 0 {
|
|
||||||
style = style.with(theme.strong);
|
|
||||||
} else if self.emphasis > 0 {
|
|
||||||
style = style.with(theme.emphasis);
|
|
||||||
}
|
|
||||||
|
|
||||||
if self.quote > 0 {
|
if self.quote > 0 {
|
||||||
style = style.with(theme.quote);
|
styled = format!("{}", styled.with(theme.quote));
|
||||||
}
|
}
|
||||||
|
styled
|
||||||
format!("{style}")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn append_raw(&mut self, output: &mut String, text: &str) {
|
fn capture_target_mut<'a>(&'a mut self, output: &'a mut String) -> &'a mut String {
|
||||||
if let Some(link) = self.link_stack.last_mut() {
|
if let Some(table) = self.table.as_mut() {
|
||||||
link.text.push_str(text);
|
&mut table.current_cell
|
||||||
} else if let Some(table) = self.table.as_mut() {
|
|
||||||
table.current_cell.push_str(text);
|
|
||||||
} else {
|
} else {
|
||||||
output.push_str(text);
|
output
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn append_styled(&mut self, output: &mut String, text: &str, theme: &ColorTheme) {
|
|
||||||
let styled = self.style_text(text, theme);
|
|
||||||
self.append_raw(output, &styled);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -269,11 +238,6 @@ impl TerminalRenderer {
|
|||||||
output.trim_end().to_string()
|
output.trim_end().to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn markdown_to_ansi(&self, markdown: &str) -> String {
|
|
||||||
self.render_markdown(markdown)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(clippy::too_many_lines)]
|
#[allow(clippy::too_many_lines)]
|
||||||
fn render_event(
|
fn render_event(
|
||||||
&self,
|
&self,
|
||||||
@@ -285,21 +249,15 @@ impl TerminalRenderer {
|
|||||||
in_code_block: &mut bool,
|
in_code_block: &mut bool,
|
||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
Event::Start(Tag::Heading { level, .. }) => {
|
Event::Start(Tag::Heading { level, .. }) => self.start_heading(level as u8, output),
|
||||||
self.start_heading(state, level as u8, output)
|
Event::End(TagEnd::Heading(..) | TagEnd::Paragraph) => output.push_str("\n\n"),
|
||||||
}
|
|
||||||
Event::End(TagEnd::Paragraph) => output.push_str("\n\n"),
|
|
||||||
Event::Start(Tag::BlockQuote(..)) => self.start_quote(state, output),
|
Event::Start(Tag::BlockQuote(..)) => self.start_quote(state, output),
|
||||||
Event::End(TagEnd::BlockQuote(..)) => {
|
Event::End(TagEnd::BlockQuote(..)) => {
|
||||||
state.quote = state.quote.saturating_sub(1);
|
state.quote = state.quote.saturating_sub(1);
|
||||||
output.push('\n');
|
output.push('\n');
|
||||||
}
|
}
|
||||||
Event::End(TagEnd::Heading(..)) => {
|
|
||||||
state.heading_level = None;
|
|
||||||
output.push_str("\n\n");
|
|
||||||
}
|
|
||||||
Event::End(TagEnd::Item) | Event::SoftBreak | Event::HardBreak => {
|
Event::End(TagEnd::Item) | Event::SoftBreak | Event::HardBreak => {
|
||||||
state.append_raw(output, "\n");
|
state.capture_target_mut(output).push('\n');
|
||||||
}
|
}
|
||||||
Event::Start(Tag::List(first_item)) => {
|
Event::Start(Tag::List(first_item)) => {
|
||||||
let kind = match first_item {
|
let kind = match first_item {
|
||||||
@@ -335,52 +293,41 @@ impl TerminalRenderer {
|
|||||||
Event::Code(code) => {
|
Event::Code(code) => {
|
||||||
let rendered =
|
let rendered =
|
||||||
format!("{}", format!("`{code}`").with(self.color_theme.inline_code));
|
format!("{}", format!("`{code}`").with(self.color_theme.inline_code));
|
||||||
state.append_raw(output, &rendered);
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
Event::Rule => output.push_str("---\n"),
|
Event::Rule => output.push_str("---\n"),
|
||||||
Event::Text(text) => {
|
Event::Text(text) => {
|
||||||
self.push_text(text.as_ref(), state, output, code_buffer, *in_code_block);
|
self.push_text(text.as_ref(), state, output, code_buffer, *in_code_block);
|
||||||
}
|
}
|
||||||
Event::Html(html) | Event::InlineHtml(html) => {
|
Event::Html(html) | Event::InlineHtml(html) => {
|
||||||
state.append_raw(output, &html);
|
state.capture_target_mut(output).push_str(&html);
|
||||||
}
|
}
|
||||||
Event::FootnoteReference(reference) => {
|
Event::FootnoteReference(reference) => {
|
||||||
state.append_raw(output, &format!("[{reference}]"));
|
let _ = write!(state.capture_target_mut(output), "[{reference}]");
|
||||||
}
|
}
|
||||||
Event::TaskListMarker(done) => {
|
Event::TaskListMarker(done) => {
|
||||||
state.append_raw(output, if done { "[x] " } else { "[ ] " });
|
state
|
||||||
|
.capture_target_mut(output)
|
||||||
|
.push_str(if done { "[x] " } else { "[ ] " });
|
||||||
}
|
}
|
||||||
Event::InlineMath(math) | Event::DisplayMath(math) => {
|
Event::InlineMath(math) | Event::DisplayMath(math) => {
|
||||||
state.append_raw(output, &math);
|
state.capture_target_mut(output).push_str(&math);
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Link { dest_url, .. }) => {
|
Event::Start(Tag::Link { dest_url, .. }) => {
|
||||||
state.link_stack.push(LinkState {
|
let rendered = format!(
|
||||||
destination: dest_url.to_string(),
|
"{}",
|
||||||
text: String::new(),
|
format!("[{dest_url}]")
|
||||||
});
|
.underlined()
|
||||||
}
|
.with(self.color_theme.link)
|
||||||
Event::End(TagEnd::Link) => {
|
);
|
||||||
if let Some(link) = state.link_stack.pop() {
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
let label = if link.text.is_empty() {
|
|
||||||
link.destination.clone()
|
|
||||||
} else {
|
|
||||||
link.text
|
|
||||||
};
|
|
||||||
let rendered = format!(
|
|
||||||
"{}",
|
|
||||||
format!("[{label}]({})", link.destination)
|
|
||||||
.underlined()
|
|
||||||
.with(self.color_theme.link)
|
|
||||||
);
|
|
||||||
state.append_raw(output, &rendered);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Image { dest_url, .. }) => {
|
Event::Start(Tag::Image { dest_url, .. }) => {
|
||||||
let rendered = format!(
|
let rendered = format!(
|
||||||
"{}",
|
"{}",
|
||||||
format!("[image:{dest_url}]").with(self.color_theme.link)
|
format!("[image:{dest_url}]").with(self.color_theme.link)
|
||||||
);
|
);
|
||||||
state.append_raw(output, &rendered);
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Table(..)) => state.table = Some(TableState::default()),
|
Event::Start(Tag::Table(..)) => state.table = Some(TableState::default()),
|
||||||
Event::End(TagEnd::Table) => {
|
Event::End(TagEnd::Table) => {
|
||||||
@@ -422,15 +369,19 @@ impl TerminalRenderer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Paragraph | Tag::MetadataBlock(..) | _)
|
Event::Start(Tag::Paragraph | Tag::MetadataBlock(..) | _)
|
||||||
| Event::End(TagEnd::Image | TagEnd::MetadataBlock(..) | _) => {}
|
| Event::End(TagEnd::Link | TagEnd::Image | TagEnd::MetadataBlock(..) | _) => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_heading(&self, state: &mut RenderState, level: u8, output: &mut String) {
|
fn start_heading(&self, level: u8, output: &mut String) {
|
||||||
state.heading_level = Some(level);
|
output.push('\n');
|
||||||
if !output.is_empty() {
|
let prefix = match level {
|
||||||
output.push('\n');
|
1 => "# ",
|
||||||
}
|
2 => "## ",
|
||||||
|
3 => "### ",
|
||||||
|
_ => "#### ",
|
||||||
|
};
|
||||||
|
let _ = write!(output, "{}", prefix.bold().with(self.color_theme.heading));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_quote(&self, state: &mut RenderState, output: &mut String) {
|
fn start_quote(&self, state: &mut RenderState, output: &mut String) {
|
||||||
@@ -454,27 +405,20 @@ impl TerminalRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn start_code_block(&self, code_language: &str, output: &mut String) {
|
fn start_code_block(&self, code_language: &str, output: &mut String) {
|
||||||
let label = if code_language.is_empty() {
|
if !code_language.is_empty() {
|
||||||
"code".to_string()
|
let _ = writeln!(
|
||||||
} else {
|
output,
|
||||||
code_language.to_string()
|
"{}",
|
||||||
};
|
format!("╭─ {code_language}").with(self.color_theme.heading)
|
||||||
let _ = writeln!(
|
);
|
||||||
output,
|
}
|
||||||
"{}",
|
|
||||||
format!("╭─ {label}")
|
|
||||||
.bold()
|
|
||||||
.with(self.color_theme.code_block_border)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn finish_code_block(&self, code_buffer: &str, code_language: &str, output: &mut String) {
|
fn finish_code_block(&self, code_buffer: &str, code_language: &str, output: &mut String) {
|
||||||
output.push_str(&self.highlight_code(code_buffer, code_language));
|
output.push_str(&self.highlight_code(code_buffer, code_language));
|
||||||
let _ = write!(
|
if !code_language.is_empty() {
|
||||||
output,
|
let _ = write!(output, "{}", "╰─".with(self.color_theme.heading));
|
||||||
"{}",
|
}
|
||||||
"╰─".bold().with(self.color_theme.code_block_border)
|
|
||||||
);
|
|
||||||
output.push_str("\n\n");
|
output.push_str("\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -489,7 +433,8 @@ impl TerminalRenderer {
|
|||||||
if in_code_block {
|
if in_code_block {
|
||||||
code_buffer.push_str(text);
|
code_buffer.push_str(text);
|
||||||
} else {
|
} else {
|
||||||
state.append_styled(output, text, &self.color_theme);
|
let rendered = state.style_text(text, &self.color_theme);
|
||||||
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -576,10 +521,9 @@ impl TerminalRenderer {
|
|||||||
for line in LinesWithEndings::from(code) {
|
for line in LinesWithEndings::from(code) {
|
||||||
match syntax_highlighter.highlight_line(line, &self.syntax_set) {
|
match syntax_highlighter.highlight_line(line, &self.syntax_set) {
|
||||||
Ok(ranges) => {
|
Ok(ranges) => {
|
||||||
let escaped = as_24_bit_terminal_escaped(&ranges[..], false);
|
colored_output.push_str(&as_24_bit_terminal_escaped(&ranges[..], false));
|
||||||
colored_output.push_str(&apply_code_block_background(&escaped));
|
|
||||||
}
|
}
|
||||||
Err(_) => colored_output.push_str(&apply_code_block_background(line)),
|
Err(_) => colored_output.push_str(line),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,83 +531,16 @@ impl TerminalRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn stream_markdown(&self, markdown: &str, out: &mut impl Write) -> io::Result<()> {
|
pub fn stream_markdown(&self, markdown: &str, out: &mut impl Write) -> io::Result<()> {
|
||||||
let rendered_markdown = self.markdown_to_ansi(markdown);
|
let rendered_markdown = self.render_markdown(markdown);
|
||||||
write!(out, "{rendered_markdown}")?;
|
for chunk in rendered_markdown.split_inclusive(char::is_whitespace) {
|
||||||
if !rendered_markdown.ends_with('\n') {
|
write!(out, "{chunk}")?;
|
||||||
writeln!(out)?;
|
out.flush()?;
|
||||||
|
thread::sleep(Duration::from_millis(8));
|
||||||
}
|
}
|
||||||
out.flush()
|
writeln!(out)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
|
||||||
pub struct MarkdownStreamState {
|
|
||||||
pending: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl MarkdownStreamState {
|
|
||||||
#[must_use]
|
|
||||||
pub fn push(&mut self, renderer: &TerminalRenderer, delta: &str) -> Option<String> {
|
|
||||||
self.pending.push_str(delta);
|
|
||||||
let split = find_stream_safe_boundary(&self.pending)?;
|
|
||||||
let ready = self.pending[..split].to_string();
|
|
||||||
self.pending.drain(..split);
|
|
||||||
Some(renderer.markdown_to_ansi(&ready))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn flush(&mut self, renderer: &TerminalRenderer) -> Option<String> {
|
|
||||||
if self.pending.trim().is_empty() {
|
|
||||||
self.pending.clear();
|
|
||||||
None
|
|
||||||
} else {
|
|
||||||
let pending = std::mem::take(&mut self.pending);
|
|
||||||
Some(renderer.markdown_to_ansi(&pending))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn apply_code_block_background(line: &str) -> String {
|
|
||||||
let trimmed = line.trim_end_matches('\n');
|
|
||||||
let trailing_newline = if trimmed.len() == line.len() {
|
|
||||||
""
|
|
||||||
} else {
|
|
||||||
"\n"
|
|
||||||
};
|
|
||||||
let with_background = trimmed.replace("\u{1b}[0m", "\u{1b}[0;48;5;236m");
|
|
||||||
format!("\u{1b}[48;5;236m{with_background}\u{1b}[0m{trailing_newline}")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn find_stream_safe_boundary(markdown: &str) -> Option<usize> {
|
|
||||||
let mut in_fence = false;
|
|
||||||
let mut last_boundary = None;
|
|
||||||
|
|
||||||
for (offset, line) in markdown.split_inclusive('\n').scan(0usize, |cursor, line| {
|
|
||||||
let start = *cursor;
|
|
||||||
*cursor += line.len();
|
|
||||||
Some((start, line))
|
|
||||||
}) {
|
|
||||||
let trimmed = line.trim_start();
|
|
||||||
if trimmed.starts_with("```") || trimmed.starts_with("~~~") {
|
|
||||||
in_fence = !in_fence;
|
|
||||||
if !in_fence {
|
|
||||||
last_boundary = Some(offset + line.len());
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if in_fence {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if trimmed.is_empty() {
|
|
||||||
last_boundary = Some(offset + line.len());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
last_boundary
|
|
||||||
}
|
|
||||||
|
|
||||||
fn visible_width(input: &str) -> usize {
|
fn visible_width(input: &str) -> usize {
|
||||||
strip_ansi(input).chars().count()
|
strip_ansi(input).chars().count()
|
||||||
}
|
}
|
||||||
@@ -692,7 +569,7 @@ fn strip_ansi(input: &str) -> String {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{strip_ansi, MarkdownStreamState, Spinner, TerminalRenderer};
|
use super::{strip_ansi, Spinner, TerminalRenderer};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn renders_markdown_with_styling_and_lists() {
|
fn renders_markdown_with_styling_and_lists() {
|
||||||
@@ -706,28 +583,16 @@ mod tests {
|
|||||||
assert!(markdown_output.contains('\u{1b}'));
|
assert!(markdown_output.contains('\u{1b}'));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn renders_links_as_colored_markdown_labels() {
|
|
||||||
let terminal_renderer = TerminalRenderer::new();
|
|
||||||
let markdown_output =
|
|
||||||
terminal_renderer.render_markdown("See [Claw](https://example.com/docs) now.");
|
|
||||||
let plain_text = strip_ansi(&markdown_output);
|
|
||||||
|
|
||||||
assert!(plain_text.contains("[Claw](https://example.com/docs)"));
|
|
||||||
assert!(markdown_output.contains('\u{1b}'));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn highlights_fenced_code_blocks() {
|
fn highlights_fenced_code_blocks() {
|
||||||
let terminal_renderer = TerminalRenderer::new();
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
let markdown_output =
|
let markdown_output =
|
||||||
terminal_renderer.markdown_to_ansi("```rust\nfn hi() { println!(\"hi\"); }\n```");
|
terminal_renderer.render_markdown("```rust\nfn hi() { println!(\"hi\"); }\n```");
|
||||||
let plain_text = strip_ansi(&markdown_output);
|
let plain_text = strip_ansi(&markdown_output);
|
||||||
|
|
||||||
assert!(plain_text.contains("╭─ rust"));
|
assert!(plain_text.contains("╭─ rust"));
|
||||||
assert!(plain_text.contains("fn hi"));
|
assert!(plain_text.contains("fn hi"));
|
||||||
assert!(markdown_output.contains('\u{1b}'));
|
assert!(markdown_output.contains('\u{1b}'));
|
||||||
assert!(markdown_output.contains("[48;5;236m"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -758,26 +623,6 @@ mod tests {
|
|||||||
assert!(markdown_output.contains('\u{1b}'));
|
assert!(markdown_output.contains('\u{1b}'));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn streaming_state_waits_for_complete_blocks() {
|
|
||||||
let renderer = TerminalRenderer::new();
|
|
||||||
let mut state = MarkdownStreamState::default();
|
|
||||||
|
|
||||||
assert_eq!(state.push(&renderer, "# Heading"), None);
|
|
||||||
let flushed = state
|
|
||||||
.push(&renderer, "\n\nParagraph\n\n")
|
|
||||||
.expect("completed block");
|
|
||||||
let plain_text = strip_ansi(&flushed);
|
|
||||||
assert!(plain_text.contains("Heading"));
|
|
||||||
assert!(plain_text.contains("Paragraph"));
|
|
||||||
|
|
||||||
assert_eq!(state.push(&renderer, "```rust\nfn main() {}\n"), None);
|
|
||||||
let code = state
|
|
||||||
.push(&renderer, "```\n")
|
|
||||||
.expect("closed code fence flushes");
|
|
||||||
assert!(strip_ansi(&code).contains("fn main()"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn spinner_advances_frames() {
|
fn spinner_advances_frames() {
|
||||||
let terminal_renderer = TerminalRenderer::new();
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
|
|||||||
@@ -6,12 +6,10 @@ license.workspace = true
|
|||||||
publish.workspace = true
|
publish.workspace = true
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
api = { path = "../api" }
|
|
||||||
runtime = { path = "../runtime" }
|
runtime = { path = "../runtime" }
|
||||||
reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls"] }
|
reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls"] }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
tokio = { version = "1", features = ["rt-multi-thread"] }
|
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|||||||
@@ -3,17 +3,10 @@ use std::path::{Path, PathBuf};
|
|||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
use api::{
|
|
||||||
max_tokens_for_model, resolve_model_alias, ContentBlockDelta, InputContentBlock, InputMessage,
|
|
||||||
MessageRequest, MessageResponse, OutputContentBlock, ProviderClient,
|
|
||||||
StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition, ToolResultContentBlock,
|
|
||||||
};
|
|
||||||
use reqwest::blocking::Client;
|
use reqwest::blocking::Client;
|
||||||
use runtime::{
|
use runtime::{
|
||||||
edit_file, execute_bash, glob_search, grep_search, load_system_prompt, read_file, write_file,
|
edit_file, execute_bash, glob_search, grep_search, read_file, write_file, BashCommandInput,
|
||||||
ApiClient, ApiRequest, AssistantEvent, BashCommandInput, ContentBlock, ConversationMessage,
|
GrepSearchInput, PermissionMode,
|
||||||
ConversationRuntime, GrepSearchInput, MessageRole, PermissionMode, PermissionPolicy,
|
|
||||||
RuntimeError, Session, TokenUsage, ToolError, ToolExecutor,
|
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::{json, Value};
|
use serde_json::{json, Value};
|
||||||
@@ -709,7 +702,7 @@ struct SkillOutput {
|
|||||||
prompt: String,
|
prompt: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
struct AgentOutput {
|
struct AgentOutput {
|
||||||
#[serde(rename = "agentId")]
|
#[serde(rename = "agentId")]
|
||||||
agent_id: String,
|
agent_id: String,
|
||||||
@@ -725,20 +718,6 @@ struct AgentOutput {
|
|||||||
manifest_file: String,
|
manifest_file: String,
|
||||||
#[serde(rename = "createdAt")]
|
#[serde(rename = "createdAt")]
|
||||||
created_at: String,
|
created_at: String,
|
||||||
#[serde(rename = "startedAt", skip_serializing_if = "Option::is_none")]
|
|
||||||
started_at: Option<String>,
|
|
||||||
#[serde(rename = "completedAt", skip_serializing_if = "Option::is_none")]
|
|
||||||
completed_at: Option<String>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
error: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
struct AgentJob {
|
|
||||||
manifest: AgentOutput,
|
|
||||||
prompt: String,
|
|
||||||
system_prompt: Vec<String>,
|
|
||||||
allowed_tools: BTreeSet<String>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
@@ -1280,7 +1259,15 @@ fn validate_todos(todos: &[TodoItem]) -> Result<(), String> {
|
|||||||
if todos.is_empty() {
|
if todos.is_empty() {
|
||||||
return Err(String::from("todos must not be empty"));
|
return Err(String::from("todos must not be empty"));
|
||||||
}
|
}
|
||||||
// Allow multiple in_progress items for parallel workflows
|
let in_progress = todos
|
||||||
|
.iter()
|
||||||
|
.filter(|todo| matches!(todo.status, TodoStatus::InProgress))
|
||||||
|
.count();
|
||||||
|
if in_progress > 1 {
|
||||||
|
return Err(String::from(
|
||||||
|
"exactly zero or one todo items may be in_progress",
|
||||||
|
));
|
||||||
|
}
|
||||||
if todos.iter().any(|todo| todo.content.trim().is_empty()) {
|
if todos.iter().any(|todo| todo.content.trim().is_empty()) {
|
||||||
return Err(String::from("todo content must not be empty"));
|
return Err(String::from("todo content must not be empty"));
|
||||||
}
|
}
|
||||||
@@ -1336,18 +1323,7 @@ fn resolve_skill_path(skill: &str) -> Result<std::path::PathBuf, String> {
|
|||||||
Err(format!("unknown skill: {requested}"))
|
Err(format!("unknown skill: {requested}"))
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_AGENT_MODEL: &str = "claude-opus-4-6";
|
|
||||||
const DEFAULT_AGENT_SYSTEM_DATE: &str = "2026-03-31";
|
|
||||||
const DEFAULT_AGENT_MAX_ITERATIONS: usize = 32;
|
|
||||||
|
|
||||||
fn execute_agent(input: AgentInput) -> Result<AgentOutput, String> {
|
fn execute_agent(input: AgentInput) -> Result<AgentOutput, String> {
|
||||||
execute_agent_with_spawn(input, spawn_agent_job)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn execute_agent_with_spawn<F>(input: AgentInput, spawn_fn: F) -> Result<AgentOutput, String>
|
|
||||||
where
|
|
||||||
F: FnOnce(AgentJob) -> Result<(), String>,
|
|
||||||
{
|
|
||||||
if input.description.trim().is_empty() {
|
if input.description.trim().is_empty() {
|
||||||
return Err(String::from("description must not be empty"));
|
return Err(String::from("description must not be empty"));
|
||||||
}
|
}
|
||||||
@@ -1361,7 +1337,6 @@ where
|
|||||||
let output_file = output_dir.join(format!("{agent_id}.md"));
|
let output_file = output_dir.join(format!("{agent_id}.md"));
|
||||||
let manifest_file = output_dir.join(format!("{agent_id}.json"));
|
let manifest_file = output_dir.join(format!("{agent_id}.json"));
|
||||||
let normalized_subagent_type = normalize_subagent_type(input.subagent_type.as_deref());
|
let normalized_subagent_type = normalize_subagent_type(input.subagent_type.as_deref());
|
||||||
let model = resolve_agent_model(input.model.as_deref());
|
|
||||||
let agent_name = input
|
let agent_name = input
|
||||||
.name
|
.name
|
||||||
.as_deref()
|
.as_deref()
|
||||||
@@ -1369,8 +1344,6 @@ where
|
|||||||
.filter(|name| !name.is_empty())
|
.filter(|name| !name.is_empty())
|
||||||
.unwrap_or_else(|| slugify_agent_name(&input.description));
|
.unwrap_or_else(|| slugify_agent_name(&input.description));
|
||||||
let created_at = iso8601_now();
|
let created_at = iso8601_now();
|
||||||
let system_prompt = build_agent_system_prompt(&normalized_subagent_type)?;
|
|
||||||
let allowed_tools = allowed_tools_for_subagent(&normalized_subagent_type);
|
|
||||||
|
|
||||||
let output_contents = format!(
|
let output_contents = format!(
|
||||||
"# Agent Task
|
"# Agent Task
|
||||||
@@ -1394,514 +1367,19 @@ where
|
|||||||
name: agent_name,
|
name: agent_name,
|
||||||
description: input.description,
|
description: input.description,
|
||||||
subagent_type: Some(normalized_subagent_type),
|
subagent_type: Some(normalized_subagent_type),
|
||||||
model: Some(model),
|
model: input.model,
|
||||||
status: String::from("running"),
|
status: String::from("queued"),
|
||||||
output_file: output_file.display().to_string(),
|
output_file: output_file.display().to_string(),
|
||||||
manifest_file: manifest_file.display().to_string(),
|
manifest_file: manifest_file.display().to_string(),
|
||||||
created_at: created_at.clone(),
|
created_at,
|
||||||
started_at: Some(created_at),
|
|
||||||
completed_at: None,
|
|
||||||
error: None,
|
|
||||||
};
|
};
|
||||||
write_agent_manifest(&manifest)?;
|
std::fs::write(
|
||||||
|
&manifest_file,
|
||||||
let manifest_for_spawn = manifest.clone();
|
serde_json::to_string_pretty(&manifest).map_err(|error| error.to_string())?,
|
||||||
let job = AgentJob {
|
|
||||||
manifest: manifest_for_spawn,
|
|
||||||
prompt: input.prompt,
|
|
||||||
system_prompt,
|
|
||||||
allowed_tools,
|
|
||||||
};
|
|
||||||
if let Err(error) = spawn_fn(job) {
|
|
||||||
let error = format!("failed to spawn sub-agent: {error}");
|
|
||||||
persist_agent_terminal_state(&manifest, "failed", None, Some(error.clone()))?;
|
|
||||||
return Err(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(manifest)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn spawn_agent_job(job: AgentJob) -> Result<(), String> {
|
|
||||||
let thread_name = format!("clawd-agent-{}", job.manifest.agent_id);
|
|
||||||
std::thread::Builder::new()
|
|
||||||
.name(thread_name)
|
|
||||||
.spawn(move || {
|
|
||||||
let result =
|
|
||||||
std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| run_agent_job(&job)));
|
|
||||||
match result {
|
|
||||||
Ok(Ok(())) => {}
|
|
||||||
Ok(Err(error)) => {
|
|
||||||
let _ =
|
|
||||||
persist_agent_terminal_state(&job.manifest, "failed", None, Some(error));
|
|
||||||
}
|
|
||||||
Err(_) => {
|
|
||||||
let _ = persist_agent_terminal_state(
|
|
||||||
&job.manifest,
|
|
||||||
"failed",
|
|
||||||
None,
|
|
||||||
Some(String::from("sub-agent thread panicked")),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.map(|_| ())
|
|
||||||
.map_err(|error| error.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_agent_job(job: &AgentJob) -> Result<(), String> {
|
|
||||||
let mut runtime = build_agent_runtime(job)?.with_max_iterations(DEFAULT_AGENT_MAX_ITERATIONS);
|
|
||||||
let summary = runtime
|
|
||||||
.run_turn(job.prompt.clone(), None)
|
|
||||||
.map_err(|error| error.to_string())?;
|
|
||||||
let final_text = final_assistant_text(&summary);
|
|
||||||
persist_agent_terminal_state(&job.manifest, "completed", Some(final_text.as_str()), None)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_agent_runtime(
|
|
||||||
job: &AgentJob,
|
|
||||||
) -> Result<ConversationRuntime<ProviderRuntimeClient, SubagentToolExecutor>, String> {
|
|
||||||
let model = job
|
|
||||||
.manifest
|
|
||||||
.model
|
|
||||||
.clone()
|
|
||||||
.unwrap_or_else(|| DEFAULT_AGENT_MODEL.to_string());
|
|
||||||
let allowed_tools = job.allowed_tools.clone();
|
|
||||||
let api_client = ProviderRuntimeClient::new(model, allowed_tools.clone())?;
|
|
||||||
let tool_executor = SubagentToolExecutor::new(allowed_tools);
|
|
||||||
Ok(ConversationRuntime::new(
|
|
||||||
Session::new(),
|
|
||||||
api_client,
|
|
||||||
tool_executor,
|
|
||||||
agent_permission_policy(),
|
|
||||||
job.system_prompt.clone(),
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_agent_system_prompt(subagent_type: &str) -> Result<Vec<String>, String> {
|
|
||||||
let cwd = std::env::current_dir().map_err(|error| error.to_string())?;
|
|
||||||
let mut prompt = load_system_prompt(
|
|
||||||
cwd,
|
|
||||||
DEFAULT_AGENT_SYSTEM_DATE.to_string(),
|
|
||||||
std::env::consts::OS,
|
|
||||||
"unknown",
|
|
||||||
)
|
)
|
||||||
.map_err(|error| error.to_string())?;
|
.map_err(|error| error.to_string())?;
|
||||||
prompt.push(format!(
|
|
||||||
"You are a background sub-agent of type `{subagent_type}`. Work only on the delegated task, use only the tools available to you, do not ask the user questions, and finish with a concise result."
|
|
||||||
));
|
|
||||||
Ok(prompt)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn resolve_agent_model(model: Option<&str>) -> String {
|
Ok(manifest)
|
||||||
model
|
|
||||||
.map(str::trim)
|
|
||||||
.filter(|model| !model.is_empty())
|
|
||||||
.unwrap_or(DEFAULT_AGENT_MODEL)
|
|
||||||
.to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn allowed_tools_for_subagent(subagent_type: &str) -> BTreeSet<String> {
|
|
||||||
let tools = match subagent_type {
|
|
||||||
"Explore" => vec![
|
|
||||||
"read_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"WebFetch",
|
|
||||||
"WebSearch",
|
|
||||||
"ToolSearch",
|
|
||||||
"Skill",
|
|
||||||
"StructuredOutput",
|
|
||||||
],
|
|
||||||
"Plan" => vec![
|
|
||||||
"read_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"WebFetch",
|
|
||||||
"WebSearch",
|
|
||||||
"ToolSearch",
|
|
||||||
"Skill",
|
|
||||||
"TodoWrite",
|
|
||||||
"StructuredOutput",
|
|
||||||
"SendUserMessage",
|
|
||||||
],
|
|
||||||
"Verification" => vec![
|
|
||||||
"bash",
|
|
||||||
"read_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"WebFetch",
|
|
||||||
"WebSearch",
|
|
||||||
"ToolSearch",
|
|
||||||
"TodoWrite",
|
|
||||||
"StructuredOutput",
|
|
||||||
"SendUserMessage",
|
|
||||||
"PowerShell",
|
|
||||||
],
|
|
||||||
"claude-code-guide" => vec![
|
|
||||||
"read_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"WebFetch",
|
|
||||||
"WebSearch",
|
|
||||||
"ToolSearch",
|
|
||||||
"Skill",
|
|
||||||
"StructuredOutput",
|
|
||||||
"SendUserMessage",
|
|
||||||
],
|
|
||||||
"statusline-setup" => vec![
|
|
||||||
"bash",
|
|
||||||
"read_file",
|
|
||||||
"write_file",
|
|
||||||
"edit_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"ToolSearch",
|
|
||||||
],
|
|
||||||
_ => vec![
|
|
||||||
"bash",
|
|
||||||
"read_file",
|
|
||||||
"write_file",
|
|
||||||
"edit_file",
|
|
||||||
"glob_search",
|
|
||||||
"grep_search",
|
|
||||||
"WebFetch",
|
|
||||||
"WebSearch",
|
|
||||||
"TodoWrite",
|
|
||||||
"Skill",
|
|
||||||
"ToolSearch",
|
|
||||||
"NotebookEdit",
|
|
||||||
"Sleep",
|
|
||||||
"SendUserMessage",
|
|
||||||
"Config",
|
|
||||||
"StructuredOutput",
|
|
||||||
"REPL",
|
|
||||||
"PowerShell",
|
|
||||||
],
|
|
||||||
};
|
|
||||||
tools.into_iter().map(str::to_string).collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn agent_permission_policy() -> PermissionPolicy {
|
|
||||||
mvp_tool_specs().into_iter().fold(
|
|
||||||
PermissionPolicy::new(PermissionMode::DangerFullAccess),
|
|
||||||
|policy, spec| policy.with_tool_requirement(spec.name, spec.required_permission),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn write_agent_manifest(manifest: &AgentOutput) -> Result<(), String> {
|
|
||||||
std::fs::write(
|
|
||||||
&manifest.manifest_file,
|
|
||||||
serde_json::to_string_pretty(manifest).map_err(|error| error.to_string())?,
|
|
||||||
)
|
|
||||||
.map_err(|error| error.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn persist_agent_terminal_state(
|
|
||||||
manifest: &AgentOutput,
|
|
||||||
status: &str,
|
|
||||||
result: Option<&str>,
|
|
||||||
error: Option<String>,
|
|
||||||
) -> Result<(), String> {
|
|
||||||
append_agent_output(
|
|
||||||
&manifest.output_file,
|
|
||||||
&format_agent_terminal_output(status, result, error.as_deref()),
|
|
||||||
)?;
|
|
||||||
let mut next_manifest = manifest.clone();
|
|
||||||
next_manifest.status = status.to_string();
|
|
||||||
next_manifest.completed_at = Some(iso8601_now());
|
|
||||||
next_manifest.error = error;
|
|
||||||
write_agent_manifest(&next_manifest)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn append_agent_output(path: &str, suffix: &str) -> Result<(), String> {
|
|
||||||
use std::io::Write as _;
|
|
||||||
|
|
||||||
let mut file = std::fs::OpenOptions::new()
|
|
||||||
.append(true)
|
|
||||||
.open(path)
|
|
||||||
.map_err(|error| error.to_string())?;
|
|
||||||
file.write_all(suffix.as_bytes())
|
|
||||||
.map_err(|error| error.to_string())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn format_agent_terminal_output(status: &str, result: Option<&str>, error: Option<&str>) -> String {
|
|
||||||
let mut sections = vec![format!("\n## Result\n\n- status: {status}\n")];
|
|
||||||
if let Some(result) = result.filter(|value| !value.trim().is_empty()) {
|
|
||||||
sections.push(format!("\n### Final response\n\n{}\n", result.trim()));
|
|
||||||
}
|
|
||||||
if let Some(error) = error.filter(|value| !value.trim().is_empty()) {
|
|
||||||
sections.push(format!("\n### Error\n\n{}\n", error.trim()));
|
|
||||||
}
|
|
||||||
sections.join("")
|
|
||||||
}
|
|
||||||
|
|
||||||
struct ProviderRuntimeClient {
|
|
||||||
runtime: tokio::runtime::Runtime,
|
|
||||||
client: ProviderClient,
|
|
||||||
model: String,
|
|
||||||
allowed_tools: BTreeSet<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ProviderRuntimeClient {
|
|
||||||
fn new(model: String, allowed_tools: BTreeSet<String>) -> Result<Self, String> {
|
|
||||||
let model = resolve_model_alias(&model).to_string();
|
|
||||||
let client = ProviderClient::from_model(&model).map_err(|error| error.to_string())?;
|
|
||||||
Ok(Self {
|
|
||||||
runtime: tokio::runtime::Runtime::new().map_err(|error| error.to_string())?,
|
|
||||||
client,
|
|
||||||
model,
|
|
||||||
allowed_tools,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ApiClient for ProviderRuntimeClient {
|
|
||||||
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
|
||||||
let tools = tool_specs_for_allowed_tools(Some(&self.allowed_tools))
|
|
||||||
.into_iter()
|
|
||||||
.map(|spec| ToolDefinition {
|
|
||||||
name: spec.name.to_string(),
|
|
||||||
description: Some(spec.description.to_string()),
|
|
||||||
input_schema: spec.input_schema,
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
let message_request = MessageRequest {
|
|
||||||
model: self.model.clone(),
|
|
||||||
max_tokens: max_tokens_for_model(&self.model),
|
|
||||||
messages: convert_messages(&request.messages),
|
|
||||||
system: (!request.system_prompt.is_empty()).then(|| request.system_prompt.join("\n\n")),
|
|
||||||
tools: (!tools.is_empty()).then_some(tools),
|
|
||||||
tool_choice: (!self.allowed_tools.is_empty()).then_some(ToolChoice::Auto),
|
|
||||||
stream: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
self.runtime.block_on(async {
|
|
||||||
let mut stream = self
|
|
||||||
.client
|
|
||||||
.stream_message(&message_request)
|
|
||||||
.await
|
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
|
||||||
let mut events = Vec::new();
|
|
||||||
let mut pending_tools: BTreeMap<u32, (String, String, String)> = BTreeMap::new();
|
|
||||||
let mut saw_stop = false;
|
|
||||||
|
|
||||||
while let Some(event) = stream
|
|
||||||
.next_event()
|
|
||||||
.await
|
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?
|
|
||||||
{
|
|
||||||
match event {
|
|
||||||
ApiStreamEvent::MessageStart(start) => {
|
|
||||||
for block in start.message.content {
|
|
||||||
push_output_block(block, 0, &mut events, &mut pending_tools, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ApiStreamEvent::ContentBlockStart(start) => {
|
|
||||||
push_output_block(
|
|
||||||
start.content_block,
|
|
||||||
start.index,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
ApiStreamEvent::ContentBlockDelta(delta) => match delta.delta {
|
|
||||||
ContentBlockDelta::TextDelta { text } => {
|
|
||||||
if !text.is_empty() {
|
|
||||||
events.push(AssistantEvent::TextDelta(text));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ContentBlockDelta::InputJsonDelta { partial_json } => {
|
|
||||||
if let Some((_, _, input)) = pending_tools.get_mut(&delta.index) {
|
|
||||||
input.push_str(&partial_json);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
ApiStreamEvent::ContentBlockStop(stop) => {
|
|
||||||
if let Some((id, name, input)) = pending_tools.remove(&stop.index) {
|
|
||||||
events.push(AssistantEvent::ToolUse { id, name, input });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ApiStreamEvent::MessageDelta(delta) => {
|
|
||||||
events.push(AssistantEvent::Usage(TokenUsage {
|
|
||||||
input_tokens: delta.usage.input_tokens,
|
|
||||||
output_tokens: delta.usage.output_tokens,
|
|
||||||
cache_creation_input_tokens: 0,
|
|
||||||
cache_read_input_tokens: 0,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
ApiStreamEvent::MessageStop(_) => {
|
|
||||||
saw_stop = true;
|
|
||||||
events.push(AssistantEvent::MessageStop);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !saw_stop
|
|
||||||
&& events.iter().any(|event| {
|
|
||||||
matches!(event, AssistantEvent::TextDelta(text) if !text.is_empty())
|
|
||||||
|| matches!(event, AssistantEvent::ToolUse { .. })
|
|
||||||
})
|
|
||||||
{
|
|
||||||
events.push(AssistantEvent::MessageStop);
|
|
||||||
}
|
|
||||||
|
|
||||||
if events
|
|
||||||
.iter()
|
|
||||||
.any(|event| matches!(event, AssistantEvent::MessageStop))
|
|
||||||
{
|
|
||||||
return Ok(events);
|
|
||||||
}
|
|
||||||
|
|
||||||
let response = self
|
|
||||||
.client
|
|
||||||
.send_message(&MessageRequest {
|
|
||||||
stream: false,
|
|
||||||
..message_request.clone()
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
.map_err(|error| RuntimeError::new(error.to_string()))?;
|
|
||||||
Ok(response_to_events(response))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct SubagentToolExecutor {
|
|
||||||
allowed_tools: BTreeSet<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SubagentToolExecutor {
|
|
||||||
fn new(allowed_tools: BTreeSet<String>) -> Self {
|
|
||||||
Self { allowed_tools }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ToolExecutor for SubagentToolExecutor {
|
|
||||||
fn execute(&mut self, tool_name: &str, input: &str) -> Result<String, ToolError> {
|
|
||||||
if !self.allowed_tools.contains(tool_name) {
|
|
||||||
return Err(ToolError::new(format!(
|
|
||||||
"tool `{tool_name}` is not enabled for this sub-agent"
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
let value = serde_json::from_str(input)
|
|
||||||
.map_err(|error| ToolError::new(format!("invalid tool input JSON: {error}")))?;
|
|
||||||
execute_tool(tool_name, &value).map_err(ToolError::new)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn tool_specs_for_allowed_tools(allowed_tools: Option<&BTreeSet<String>>) -> Vec<ToolSpec> {
|
|
||||||
mvp_tool_specs()
|
|
||||||
.into_iter()
|
|
||||||
.filter(|spec| allowed_tools.is_none_or(|allowed| allowed.contains(spec.name)))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn convert_messages(messages: &[ConversationMessage]) -> Vec<InputMessage> {
|
|
||||||
messages
|
|
||||||
.iter()
|
|
||||||
.filter_map(|message| {
|
|
||||||
let role = match message.role {
|
|
||||||
MessageRole::System | MessageRole::User | MessageRole::Tool => "user",
|
|
||||||
MessageRole::Assistant => "assistant",
|
|
||||||
};
|
|
||||||
let content = message
|
|
||||||
.blocks
|
|
||||||
.iter()
|
|
||||||
.map(|block| match block {
|
|
||||||
ContentBlock::Text { text } => InputContentBlock::Text { text: text.clone() },
|
|
||||||
ContentBlock::ToolUse { id, name, input } => InputContentBlock::ToolUse {
|
|
||||||
id: id.clone(),
|
|
||||||
name: name.clone(),
|
|
||||||
input: serde_json::from_str(input)
|
|
||||||
.unwrap_or_else(|_| serde_json::json!({ "raw": input })),
|
|
||||||
},
|
|
||||||
ContentBlock::ToolResult {
|
|
||||||
tool_use_id,
|
|
||||||
output,
|
|
||||||
is_error,
|
|
||||||
..
|
|
||||||
} => InputContentBlock::ToolResult {
|
|
||||||
tool_use_id: tool_use_id.clone(),
|
|
||||||
content: vec![ToolResultContentBlock::Text {
|
|
||||||
text: output.clone(),
|
|
||||||
}],
|
|
||||||
is_error: *is_error,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
(!content.is_empty()).then(|| InputMessage {
|
|
||||||
role: role.to_string(),
|
|
||||||
content,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn push_output_block(
|
|
||||||
block: OutputContentBlock,
|
|
||||||
block_index: u32,
|
|
||||||
events: &mut Vec<AssistantEvent>,
|
|
||||||
pending_tools: &mut BTreeMap<u32, (String, String, String)>,
|
|
||||||
streaming_tool_input: bool,
|
|
||||||
) {
|
|
||||||
match block {
|
|
||||||
OutputContentBlock::Text { text } => {
|
|
||||||
if !text.is_empty() {
|
|
||||||
events.push(AssistantEvent::TextDelta(text));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutputContentBlock::ToolUse { id, name, input } => {
|
|
||||||
let initial_input = if streaming_tool_input
|
|
||||||
&& input.is_object()
|
|
||||||
&& input.as_object().is_some_and(serde_json::Map::is_empty)
|
|
||||||
{
|
|
||||||
String::new()
|
|
||||||
} else {
|
|
||||||
input.to_string()
|
|
||||||
};
|
|
||||||
pending_tools.insert(block_index, (id, name, initial_input));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn response_to_events(response: MessageResponse) -> Vec<AssistantEvent> {
|
|
||||||
let mut events = Vec::new();
|
|
||||||
let mut pending_tools = BTreeMap::new();
|
|
||||||
|
|
||||||
for (index, block) in response.content.into_iter().enumerate() {
|
|
||||||
let index = u32::try_from(index).expect("response block index overflow");
|
|
||||||
push_output_block(block, index, &mut events, &mut pending_tools, false);
|
|
||||||
if let Some((id, name, input)) = pending_tools.remove(&index) {
|
|
||||||
events.push(AssistantEvent::ToolUse { id, name, input });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
events.push(AssistantEvent::Usage(TokenUsage {
|
|
||||||
input_tokens: response.usage.input_tokens,
|
|
||||||
output_tokens: response.usage.output_tokens,
|
|
||||||
cache_creation_input_tokens: response.usage.cache_creation_input_tokens,
|
|
||||||
cache_read_input_tokens: response.usage.cache_read_input_tokens,
|
|
||||||
}));
|
|
||||||
events.push(AssistantEvent::MessageStop);
|
|
||||||
events
|
|
||||||
}
|
|
||||||
|
|
||||||
fn final_assistant_text(summary: &runtime::TurnSummary) -> String {
|
|
||||||
summary
|
|
||||||
.assistant_messages
|
|
||||||
.last()
|
|
||||||
.map(|message| {
|
|
||||||
message
|
|
||||||
.blocks
|
|
||||||
.iter()
|
|
||||||
.filter_map(|block| match block {
|
|
||||||
ContentBlock::Text { text } => Some(text.as_str()),
|
|
||||||
_ => None,
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join("")
|
|
||||||
})
|
|
||||||
.unwrap_or_default()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(clippy::needless_pass_by_value)]
|
#[allow(clippy::needless_pass_by_value)]
|
||||||
@@ -2895,8 +2373,6 @@ fn parse_skill_description(contents: &str) -> Option<String> {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::collections::BTreeMap;
|
|
||||||
use std::collections::BTreeSet;
|
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::io::{Read, Write};
|
use std::io::{Read, Write};
|
||||||
use std::net::{SocketAddr, TcpListener};
|
use std::net::{SocketAddr, TcpListener};
|
||||||
@@ -2905,13 +2381,7 @@ mod tests {
|
|||||||
use std::thread;
|
use std::thread;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use super::{
|
use super::{execute_tool, mvp_tool_specs};
|
||||||
agent_permission_policy, allowed_tools_for_subagent, execute_agent_with_spawn,
|
|
||||||
execute_tool, final_assistant_text, mvp_tool_specs, persist_agent_terminal_state,
|
|
||||||
push_output_block, AgentInput, AgentJob, SubagentToolExecutor,
|
|
||||||
};
|
|
||||||
use api::OutputContentBlock;
|
|
||||||
use runtime::{ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, Session};
|
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
|
|
||||||
fn env_lock() -> &'static Mutex<()> {
|
fn env_lock() -> &'static Mutex<()> {
|
||||||
@@ -3125,63 +2595,6 @@ mod tests {
|
|||||||
assert!(error.contains("relative URL without a base") || error.contains("empty host"));
|
assert!(error.contains("relative URL without a base") || error.contains("empty host"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn pending_tools_preserve_multiple_streaming_tool_calls_by_index() {
|
|
||||||
let mut events = Vec::new();
|
|
||||||
let mut pending_tools = BTreeMap::new();
|
|
||||||
|
|
||||||
push_output_block(
|
|
||||||
OutputContentBlock::ToolUse {
|
|
||||||
id: "tool-1".to_string(),
|
|
||||||
name: "read_file".to_string(),
|
|
||||||
input: json!({}),
|
|
||||||
},
|
|
||||||
1,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
push_output_block(
|
|
||||||
OutputContentBlock::ToolUse {
|
|
||||||
id: "tool-2".to_string(),
|
|
||||||
name: "grep_search".to_string(),
|
|
||||||
input: json!({}),
|
|
||||||
},
|
|
||||||
2,
|
|
||||||
&mut events,
|
|
||||||
&mut pending_tools,
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
|
|
||||||
pending_tools
|
|
||||||
.get_mut(&1)
|
|
||||||
.expect("first tool pending")
|
|
||||||
.2
|
|
||||||
.push_str("{\"path\":\"src/main.rs\"}");
|
|
||||||
pending_tools
|
|
||||||
.get_mut(&2)
|
|
||||||
.expect("second tool pending")
|
|
||||||
.2
|
|
||||||
.push_str("{\"pattern\":\"TODO\"}");
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
pending_tools.remove(&1),
|
|
||||||
Some((
|
|
||||||
"tool-1".to_string(),
|
|
||||||
"read_file".to_string(),
|
|
||||||
"{\"path\":\"src/main.rs\"}".to_string(),
|
|
||||||
))
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
pending_tools.remove(&2),
|
|
||||||
Some((
|
|
||||||
"tool-2".to_string(),
|
|
||||||
"grep_search".to_string(),
|
|
||||||
"{\"pattern\":\"TODO\"}".to_string(),
|
|
||||||
))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn todo_write_persists_and_returns_previous_state() {
|
fn todo_write_persists_and_returns_previous_state() {
|
||||||
let _guard = env_lock()
|
let _guard = env_lock()
|
||||||
@@ -3241,8 +2654,7 @@ mod tests {
|
|||||||
.expect_err("empty todos should fail");
|
.expect_err("empty todos should fail");
|
||||||
assert!(empty.contains("todos must not be empty"));
|
assert!(empty.contains("todos must not be empty"));
|
||||||
|
|
||||||
// Multiple in_progress items are now allowed for parallel workflows
|
let too_many_active = execute_tool(
|
||||||
let _multi_active = execute_tool(
|
|
||||||
"TodoWrite",
|
"TodoWrite",
|
||||||
&json!({
|
&json!({
|
||||||
"todos": [
|
"todos": [
|
||||||
@@ -3251,7 +2663,8 @@ mod tests {
|
|||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.expect("multiple in-progress todos should succeed");
|
.expect_err("multiple in-progress todos should fail");
|
||||||
|
assert!(too_many_active.contains("zero or one todo items may be in_progress"));
|
||||||
|
|
||||||
let blank_content = execute_tool(
|
let blank_content = execute_tool(
|
||||||
"TodoWrite",
|
"TodoWrite",
|
||||||
@@ -3360,48 +2773,32 @@ mod tests {
|
|||||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||||
let dir = temp_path("agent-store");
|
let dir = temp_path("agent-store");
|
||||||
std::env::set_var("CLAWD_AGENT_STORE", &dir);
|
std::env::set_var("CLAWD_AGENT_STORE", &dir);
|
||||||
let captured = Arc::new(Mutex::new(None::<AgentJob>));
|
|
||||||
let captured_for_spawn = Arc::clone(&captured);
|
|
||||||
|
|
||||||
let manifest = execute_agent_with_spawn(
|
let result = execute_tool(
|
||||||
AgentInput {
|
"Agent",
|
||||||
description: "Audit the branch".to_string(),
|
&json!({
|
||||||
prompt: "Check tests and outstanding work.".to_string(),
|
"description": "Audit the branch",
|
||||||
subagent_type: Some("Explore".to_string()),
|
"prompt": "Check tests and outstanding work.",
|
||||||
name: Some("ship-audit".to_string()),
|
"subagent_type": "Explore",
|
||||||
model: None,
|
"name": "ship-audit"
|
||||||
},
|
}),
|
||||||
move |job| {
|
|
||||||
*captured_for_spawn
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(std::sync::PoisonError::into_inner) = Some(job);
|
|
||||||
Ok(())
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
.expect("Agent should succeed");
|
.expect("Agent should succeed");
|
||||||
std::env::remove_var("CLAWD_AGENT_STORE");
|
std::env::remove_var("CLAWD_AGENT_STORE");
|
||||||
|
|
||||||
assert_eq!(manifest.name, "ship-audit");
|
let output: serde_json::Value = serde_json::from_str(&result).expect("valid json");
|
||||||
assert_eq!(manifest.subagent_type.as_deref(), Some("Explore"));
|
assert_eq!(output["name"], "ship-audit");
|
||||||
assert_eq!(manifest.status, "running");
|
assert_eq!(output["subagentType"], "Explore");
|
||||||
assert!(!manifest.created_at.is_empty());
|
assert_eq!(output["status"], "queued");
|
||||||
assert!(manifest.started_at.is_some());
|
assert!(output["createdAt"].as_str().is_some());
|
||||||
assert!(manifest.completed_at.is_none());
|
let manifest_file = output["manifestFile"].as_str().expect("manifest file");
|
||||||
let contents = std::fs::read_to_string(&manifest.output_file).expect("agent file exists");
|
let output_file = output["outputFile"].as_str().expect("output file");
|
||||||
|
let contents = std::fs::read_to_string(output_file).expect("agent file exists");
|
||||||
let manifest_contents =
|
let manifest_contents =
|
||||||
std::fs::read_to_string(&manifest.manifest_file).expect("manifest file exists");
|
std::fs::read_to_string(manifest_file).expect("manifest file exists");
|
||||||
assert!(contents.contains("Audit the branch"));
|
assert!(contents.contains("Audit the branch"));
|
||||||
assert!(contents.contains("Check tests and outstanding work."));
|
assert!(contents.contains("Check tests and outstanding work."));
|
||||||
assert!(manifest_contents.contains("\"subagentType\": \"Explore\""));
|
assert!(manifest_contents.contains("\"subagentType\": \"Explore\""));
|
||||||
assert!(manifest_contents.contains("\"status\": \"running\""));
|
|
||||||
let captured_job = captured
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
|
||||||
.clone()
|
|
||||||
.expect("spawn job should be captured");
|
|
||||||
assert_eq!(captured_job.prompt, "Check tests and outstanding work.");
|
|
||||||
assert!(captured_job.allowed_tools.contains("read_file"));
|
|
||||||
assert!(!captured_job.allowed_tools.contains("Agent"));
|
|
||||||
|
|
||||||
let normalized = execute_tool(
|
let normalized = execute_tool(
|
||||||
"Agent",
|
"Agent",
|
||||||
@@ -3430,195 +2827,6 @@ mod tests {
|
|||||||
let _ = std::fs::remove_dir_all(dir);
|
let _ = std::fs::remove_dir_all(dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn agent_fake_runner_can_persist_completion_and_failure() {
|
|
||||||
let _guard = env_lock()
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
||||||
let dir = temp_path("agent-runner");
|
|
||||||
std::env::set_var("CLAWD_AGENT_STORE", &dir);
|
|
||||||
|
|
||||||
let completed = execute_agent_with_spawn(
|
|
||||||
AgentInput {
|
|
||||||
description: "Complete the task".to_string(),
|
|
||||||
prompt: "Do the work".to_string(),
|
|
||||||
subagent_type: Some("Explore".to_string()),
|
|
||||||
name: Some("complete-task".to_string()),
|
|
||||||
model: Some("claude-sonnet-4-6".to_string()),
|
|
||||||
},
|
|
||||||
|job| {
|
|
||||||
persist_agent_terminal_state(
|
|
||||||
&job.manifest,
|
|
||||||
"completed",
|
|
||||||
Some("Finished successfully"),
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("completed agent should succeed");
|
|
||||||
|
|
||||||
let completed_manifest = std::fs::read_to_string(&completed.manifest_file)
|
|
||||||
.expect("completed manifest should exist");
|
|
||||||
let completed_output =
|
|
||||||
std::fs::read_to_string(&completed.output_file).expect("completed output should exist");
|
|
||||||
assert!(completed_manifest.contains("\"status\": \"completed\""));
|
|
||||||
assert!(completed_output.contains("Finished successfully"));
|
|
||||||
|
|
||||||
let failed = execute_agent_with_spawn(
|
|
||||||
AgentInput {
|
|
||||||
description: "Fail the task".to_string(),
|
|
||||||
prompt: "Do the failing work".to_string(),
|
|
||||||
subagent_type: Some("Verification".to_string()),
|
|
||||||
name: Some("fail-task".to_string()),
|
|
||||||
model: None,
|
|
||||||
},
|
|
||||||
|job| {
|
|
||||||
persist_agent_terminal_state(
|
|
||||||
&job.manifest,
|
|
||||||
"failed",
|
|
||||||
None,
|
|
||||||
Some(String::from("simulated failure")),
|
|
||||||
)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("failed agent should still spawn");
|
|
||||||
|
|
||||||
let failed_manifest =
|
|
||||||
std::fs::read_to_string(&failed.manifest_file).expect("failed manifest should exist");
|
|
||||||
let failed_output =
|
|
||||||
std::fs::read_to_string(&failed.output_file).expect("failed output should exist");
|
|
||||||
assert!(failed_manifest.contains("\"status\": \"failed\""));
|
|
||||||
assert!(failed_manifest.contains("simulated failure"));
|
|
||||||
assert!(failed_output.contains("simulated failure"));
|
|
||||||
|
|
||||||
let spawn_error = execute_agent_with_spawn(
|
|
||||||
AgentInput {
|
|
||||||
description: "Spawn error task".to_string(),
|
|
||||||
prompt: "Never starts".to_string(),
|
|
||||||
subagent_type: None,
|
|
||||||
name: Some("spawn-error".to_string()),
|
|
||||||
model: None,
|
|
||||||
},
|
|
||||||
|_| Err(String::from("thread creation failed")),
|
|
||||||
)
|
|
||||||
.expect_err("spawn errors should surface");
|
|
||||||
assert!(spawn_error.contains("failed to spawn sub-agent"));
|
|
||||||
let spawn_error_manifest = std::fs::read_dir(&dir)
|
|
||||||
.expect("agent dir should exist")
|
|
||||||
.filter_map(Result::ok)
|
|
||||||
.map(|entry| entry.path())
|
|
||||||
.filter(|path| path.extension().and_then(|ext| ext.to_str()) == Some("json"))
|
|
||||||
.find_map(|path| {
|
|
||||||
let contents = std::fs::read_to_string(&path).ok()?;
|
|
||||||
contents
|
|
||||||
.contains("\"name\": \"spawn-error\"")
|
|
||||||
.then_some(contents)
|
|
||||||
})
|
|
||||||
.expect("failed manifest should still be written");
|
|
||||||
assert!(spawn_error_manifest.contains("\"status\": \"failed\""));
|
|
||||||
assert!(spawn_error_manifest.contains("thread creation failed"));
|
|
||||||
|
|
||||||
std::env::remove_var("CLAWD_AGENT_STORE");
|
|
||||||
let _ = std::fs::remove_dir_all(dir);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn agent_tool_subset_mapping_is_expected() {
|
|
||||||
let general = allowed_tools_for_subagent("general-purpose");
|
|
||||||
assert!(general.contains("bash"));
|
|
||||||
assert!(general.contains("write_file"));
|
|
||||||
assert!(!general.contains("Agent"));
|
|
||||||
|
|
||||||
let explore = allowed_tools_for_subagent("Explore");
|
|
||||||
assert!(explore.contains("read_file"));
|
|
||||||
assert!(explore.contains("grep_search"));
|
|
||||||
assert!(!explore.contains("bash"));
|
|
||||||
|
|
||||||
let plan = allowed_tools_for_subagent("Plan");
|
|
||||||
assert!(plan.contains("TodoWrite"));
|
|
||||||
assert!(plan.contains("StructuredOutput"));
|
|
||||||
assert!(!plan.contains("Agent"));
|
|
||||||
|
|
||||||
let verification = allowed_tools_for_subagent("Verification");
|
|
||||||
assert!(verification.contains("bash"));
|
|
||||||
assert!(verification.contains("PowerShell"));
|
|
||||||
assert!(!verification.contains("write_file"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct MockSubagentApiClient {
|
|
||||||
calls: usize,
|
|
||||||
input_path: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl runtime::ApiClient for MockSubagentApiClient {
|
|
||||||
fn stream(&mut self, request: ApiRequest) -> Result<Vec<AssistantEvent>, RuntimeError> {
|
|
||||||
self.calls += 1;
|
|
||||||
match self.calls {
|
|
||||||
1 => {
|
|
||||||
assert_eq!(request.messages.len(), 1);
|
|
||||||
Ok(vec![
|
|
||||||
AssistantEvent::ToolUse {
|
|
||||||
id: "tool-1".to_string(),
|
|
||||||
name: "read_file".to_string(),
|
|
||||||
input: json!({ "path": self.input_path }).to_string(),
|
|
||||||
},
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
])
|
|
||||||
}
|
|
||||||
2 => {
|
|
||||||
assert!(request.messages.len() >= 3);
|
|
||||||
Ok(vec![
|
|
||||||
AssistantEvent::TextDelta("Scope: completed mock review".to_string()),
|
|
||||||
AssistantEvent::MessageStop,
|
|
||||||
])
|
|
||||||
}
|
|
||||||
_ => panic!("unexpected mock stream call"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn subagent_runtime_executes_tool_loop_with_isolated_session() {
|
|
||||||
let _guard = env_lock()
|
|
||||||
.lock()
|
|
||||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
||||||
let path = temp_path("subagent-input.txt");
|
|
||||||
std::fs::write(&path, "hello from child").expect("write input file");
|
|
||||||
|
|
||||||
let mut runtime = ConversationRuntime::new(
|
|
||||||
Session::new(),
|
|
||||||
MockSubagentApiClient {
|
|
||||||
calls: 0,
|
|
||||||
input_path: path.display().to_string(),
|
|
||||||
},
|
|
||||||
SubagentToolExecutor::new(BTreeSet::from([String::from("read_file")])),
|
|
||||||
agent_permission_policy(),
|
|
||||||
vec![String::from("system prompt")],
|
|
||||||
);
|
|
||||||
|
|
||||||
let summary = runtime
|
|
||||||
.run_turn("Inspect the delegated file", None)
|
|
||||||
.expect("subagent loop should succeed");
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
final_assistant_text(&summary),
|
|
||||||
"Scope: completed mock review"
|
|
||||||
);
|
|
||||||
assert!(runtime
|
|
||||||
.session()
|
|
||||||
.messages
|
|
||||||
.iter()
|
|
||||||
.flat_map(|message| message.blocks.iter())
|
|
||||||
.any(|block| matches!(
|
|
||||||
block,
|
|
||||||
runtime::ContentBlock::ToolResult { output, .. }
|
|
||||||
if output.contains("hello from child")
|
|
||||||
)));
|
|
||||||
|
|
||||||
let _ = std::fs::remove_file(path);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn agent_rejects_blank_required_fields() {
|
fn agent_rejects_blank_required_fields() {
|
||||||
let missing_description = execute_tool(
|
let missing_description = execute_tool(
|
||||||
|
|||||||
Reference in New Issue
Block a user