mirror of
https://github.com/instructkr/claw-code.git
synced 2026-04-06 08:04:50 +08:00
Reduce REPL overhead for orchestration-heavy workflows
Claw already exposes useful orchestration primitives such as session forking, resume, ultraplan, agents, and skills, but compared with OmO/OMX they were still high-friction to discover and re-type during live operator loops. This change makes the REPL act more like an orchestration console by refreshing context-aware tab completions before each prompt, allowing completion after slash-command arguments, and surfacing common workflow paths such as model aliases, permission modes, and recent session IDs. The startup banner and REPL help now advertise that guidance so the capability is visible instead of hidden. Constraint: Keep the improvement low-risk and REPL-local without adding dependencies or new command semantics Rejected: Add a brand new orchestration slash command | higher UX surface area and more docs burden than a discoverability fix Rejected: Implement a persistent HUD/status bar first | higher implementation risk than improving existing command ergonomics Confidence: high Scope-risk: narrow Reversibility: clean Directive: Keep dynamic completion candidates aligned with slash-command behavior and session management semantics Tested: cargo test -p rusty-claude-cli Not-tested: Interactive TTY tab-completion behavior in a live terminal session; full clippy remains blocked by pre-existing runtime crate lints
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
use std::borrow::Cow;
|
||||
use std::cell::RefCell;
|
||||
use std::collections::BTreeSet;
|
||||
use std::io::{self, IsTerminal, Write};
|
||||
|
||||
use rustyline::completion::{Completer, Pair};
|
||||
@@ -27,7 +28,7 @@ struct SlashCommandHelper {
|
||||
impl SlashCommandHelper {
|
||||
fn new(completions: Vec<String>) -> Self {
|
||||
Self {
|
||||
completions,
|
||||
completions: normalize_completions(completions),
|
||||
current_line: RefCell::new(String::new()),
|
||||
}
|
||||
}
|
||||
@@ -45,6 +46,10 @@ impl SlashCommandHelper {
|
||||
current.clear();
|
||||
current.push_str(line);
|
||||
}
|
||||
|
||||
fn set_completions(&mut self, completions: Vec<String>) {
|
||||
self.completions = normalize_completions(completions);
|
||||
}
|
||||
}
|
||||
|
||||
impl Completer for SlashCommandHelper {
|
||||
@@ -126,6 +131,12 @@ impl LineEditor {
|
||||
let _ = self.editor.add_history_entry(entry);
|
||||
}
|
||||
|
||||
pub fn set_completions(&mut self, completions: Vec<String>) {
|
||||
if let Some(helper) = self.editor.helper_mut() {
|
||||
helper.set_completions(completions);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn read_line(&mut self) -> io::Result<ReadOutcome> {
|
||||
if !io::stdin().is_terminal() || !io::stdout().is_terminal() {
|
||||
return self.read_line_fallback();
|
||||
@@ -192,13 +203,22 @@ fn slash_command_prefix(line: &str, pos: usize) -> Option<&str> {
|
||||
}
|
||||
|
||||
let prefix = &line[..pos];
|
||||
if prefix.contains(char::is_whitespace) || !prefix.starts_with('/') {
|
||||
if !prefix.starts_with('/') {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(prefix)
|
||||
}
|
||||
|
||||
fn normalize_completions(completions: Vec<String>) -> Vec<String> {
|
||||
let mut seen = BTreeSet::new();
|
||||
completions
|
||||
.into_iter()
|
||||
.filter(|candidate| candidate.starts_with('/'))
|
||||
.filter(|candidate| seen.insert(candidate.clone()))
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::{slash_command_prefix, LineEditor, SlashCommandHelper};
|
||||
@@ -208,9 +228,13 @@ mod tests {
|
||||
use rustyline::Context;
|
||||
|
||||
#[test]
|
||||
fn extracts_only_terminal_slash_command_prefixes() {
|
||||
fn extracts_terminal_slash_command_prefixes_with_arguments() {
|
||||
assert_eq!(slash_command_prefix("/he", 3), Some("/he"));
|
||||
assert_eq!(slash_command_prefix("/help me", 5), None);
|
||||
assert_eq!(slash_command_prefix("/help me", 8), Some("/help me"));
|
||||
assert_eq!(
|
||||
slash_command_prefix("/session switch ses", 19),
|
||||
Some("/session switch ses")
|
||||
);
|
||||
assert_eq!(slash_command_prefix("hello", 5), None);
|
||||
assert_eq!(slash_command_prefix("/help", 2), None);
|
||||
}
|
||||
@@ -238,6 +262,30 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn completes_matching_slash_command_arguments() {
|
||||
let helper = SlashCommandHelper::new(vec![
|
||||
"/model".to_string(),
|
||||
"/model opus".to_string(),
|
||||
"/model sonnet".to_string(),
|
||||
"/session switch alpha".to_string(),
|
||||
]);
|
||||
let history = DefaultHistory::new();
|
||||
let ctx = Context::new(&history);
|
||||
let (start, matches) = helper
|
||||
.complete("/model o", 8, &ctx)
|
||||
.expect("completion should work");
|
||||
|
||||
assert_eq!(start, 0);
|
||||
assert_eq!(
|
||||
matches
|
||||
.into_iter()
|
||||
.map(|candidate| candidate.replacement)
|
||||
.collect::<Vec<_>>(),
|
||||
vec!["/model opus".to_string()]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ignores_non_slash_command_completion_requests() {
|
||||
let helper = SlashCommandHelper::new(vec!["/help".to_string()]);
|
||||
@@ -266,4 +314,17 @@ mod tests {
|
||||
|
||||
assert_eq!(editor.editor.history().len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn set_completions_replaces_and_normalizes_candidates() {
|
||||
let mut editor = LineEditor::new("> ", vec!["/help".to_string()]);
|
||||
editor.set_completions(vec![
|
||||
"/model opus".to_string(),
|
||||
"/model opus".to_string(),
|
||||
"status".to_string(),
|
||||
]);
|
||||
|
||||
let helper = editor.editor.helper().expect("helper should exist");
|
||||
assert_eq!(helper.completions, vec!["/model opus".to_string()]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user