Skip to content

An agent-managed museum exhibit, built in Rust with Gajae-Code / LazyCodex — developed and maintained with no human intervention.

Rust

Merge remote-tracking branch 'origin/rcc/cli' into dev/rust

Yeachan-Heoc92403994d4b
diff --cc rust/crates/rusty-claude-cli/src/main.rs
index 1293d985,3002bf9e..df355435
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@@ -11,12 -9,14 +11,14 @@@ use std::process::Command
use std::time::{SystemTime, UNIX_EPOCH};
use api::{
- AnthropicClient, ContentBlockDelta, InputContentBlock, InputMessage, MessageRequest,
- MessageResponse, OutputContentBlock, StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition,
- ToolResultContentBlock,
+ resolve_saved_oauth_token, AnthropicClient, AuthSource, ContentBlockDelta, InputContentBlock,
+ InputMessage, MessageRequest, MessageResponse, OutputContentBlock,
+ StreamEvent as ApiStreamEvent, ToolChoice, ToolDefinition, ToolResultContentBlock,
};
- use commands::{render_slash_command_help, resume_supported_slash_commands, SlashCommand};
+ use commands::{
+ render_slash_command_help, resume_supported_slash_commands, slash_command_specs, SlashCommand,
+ };
use compat_harness::{extract_manifest, UpstreamPaths};
use render::{Spinner, TerminalRenderer};
use runtime::{
@@@ -888,25 -716,37 +890,38 @@@ fn run_resume_command
fn run_repl(
model: String,
allowed_tools: Option<AllowedToolSet>,
+ permission_mode: PermissionMode,
) -> Result<(), Box<dyn std::error::Error>> {
- let mut cli = LiveCli::new(model, true, allowed_tools)?;
+ let mut cli = LiveCli::new(model, true, allowed_tools, permission_mode)?;
- let editor = input::LineEditor::new("› ");
+ let mut editor = input::LineEditor::new("› ", slash_command_completion_candidates());
println!("{}", cli.startup_banner());
- while let Some(input) = editor.read_line()? {
- let trimmed = input.trim();
- if trimmed.is_empty() {
- continue;
- }
- if matches!(trimmed, "/exit" | "/quit") {
- break;
- }
- if let Some(command) = SlashCommand::parse(trimmed) {
- cli.handle_repl_command(command)?;
- continue;
+ loop {
+ match editor.read_line()? {
+ input::ReadOutcome::Submit(input) => {
+ let trimmed = input.trim().to_string();
+ if trimmed.is_empty() {
+ continue;
+ }
+ if matches!(trimmed.as_str(), "/exit" | "/quit") {
+ cli.persist_session()?;
+ break;
+ }
+ if let Some(command) = SlashCommand::parse(&trimmed) {
+ if cli.handle_repl_command(command)? {
+ cli.persist_session()?;
+ }
+ continue;
+ }
+ editor.push_history(input);
+ cli.run_turn(&trimmed)?;
+ }
+ input::ReadOutcome::Cancel => {}
+ input::ReadOutcome::Exit => {
+ cli.persist_session()?;
+ break;
+ }
}
- cli.run_turn(trimmed)?;
}
Ok(())
@@@ -1149,24 -1015,22 +1196,26 @@@ impl LiveCli
self.system_prompt.clone(),
true,
self.allowed_tools.clone(),
+ self.permission_mode,
)?;
self.model.clone_from(&model);
- self.persist_session()?;
println!(
"{}",
format_model_switch_report(&previous, &model, message_count)
);
- Ok(())
+ Ok(true)
}
- fn set_permissions(&mut self, mode: Option<String>) -> Result<(), Box<dyn std::error::Error>> {
+ fn set_permissions(
+ &mut self,
+ mode: Option<String>,
+ ) -> Result<bool, Box<dyn std::error::Error>> {
let Some(mode) = mode else {
- println!("{}", format_permissions_report(permission_mode_label()));
+ println!(
+ "{}",
+ format_permissions_report(self.permission_mode.as_str())
+ );
- return Ok(());
+ return Ok(false);
};
let normalized = normalize_permission_mode(&mode).ok_or_else(|| {
@@@ -1175,23 -1039,21 +1224,22 @@@
)
})?;
- if normalized == permission_mode_label() {
+ if normalized == self.permission_mode.as_str() {
println!("{}", format_permissions_report(normalized));
- return Ok(());
+ return Ok(false);
}
- let previous = permission_mode_label().to_string();
+ let previous = self.permission_mode.as_str().to_string();
let session = self.runtime.session().clone();
- self.runtime = build_runtime_with_permission_mode(
+ self.permission_mode = permission_mode_from_label(normalized);
+ self.runtime = build_runtime(
session,
self.model.clone(),
self.system_prompt.clone(),
true,
self.allowed_tools.clone(),
- normalized,
+ self.permission_mode,
)?;
- self.persist_session()?;
println!(
"{}",
format_permissions_switch_report(&previous, normalized)
@@@ -1214,16 -1076,15 +1262,15 @@@
self.system_prompt.clone(),
true,
self.allowed_tools.clone(),
- permission_mode_label(),
+ self.permission_mode,
)?;
- self.persist_session()?;
println!(
"Session cleared\n Mode fresh session\n Preserved model {}\n Permission mode {}\n Session {}",
self.model,
- permission_mode_label(),
+ self.permission_mode.as_str(),
self.session.id,
);
- Ok(())
+ Ok(true)
}
fn print_cost(&self) {
@@@ -1249,10 -1110,9 +1296,9 @@@
self.system_prompt.clone(),
true,
self.allowed_tools.clone(),
- permission_mode_label(),
+ self.permission_mode,
)?;
self.session = handle;
- self.persist_session()?;
println!(
"{}",
format_resume_report(
@@@ -1326,10 -1186,9 +1372,9 @@@
self.system_prompt.clone(),
true,
self.allowed_tools.clone(),
- permission_mode_label(),
+ self.permission_mode,
)?;
self.session = handle;
- self.persist_session()?;
println!(
"Session switched\n Active session {}\n File {}\n Messages {}",
self.session.id,
@@@ -2279,12 -2171,12 +2399,12 @@@ mod tests
filter_tool_specs, format_compact_report, format_cost_report, format_init_report,
format_model_report, format_model_switch_report, format_permissions_report,
format_permissions_switch_report, format_resume_report, format_status_report,
- normalize_permission_mode, parse_args, parse_git_status_metadata, render_config_report,
- render_init_claude_md, render_memory_report, render_repl_help,
- resume_supported_slash_commands, status_context, CliAction, CliOutputFormat, SlashCommand,
- StatusUsage, DEFAULT_MODEL,
+ format_tool_call_start, format_tool_result, normalize_permission_mode, parse_args,
+ parse_git_status_metadata, render_config_report, render_init_claude_md,
+ render_memory_report, render_repl_help, resume_supported_slash_commands, status_context,
+ CliAction, CliOutputFormat, SlashCommand, StatusUsage, DEFAULT_MODEL,
};
- use runtime::{ContentBlock, ConversationMessage, MessageRole};
+ use runtime::{ContentBlock, ConversationMessage, MessageRole, PermissionMode};
use std::path::{Path, PathBuf};
#[test]