Compare commits
1 Commits
rcc/sandbo
...
rcc/render
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
650a24b6e2 |
@@ -51,12 +51,6 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
|
|||||||
argument_hint: None,
|
argument_hint: None,
|
||||||
resume_supported: true,
|
resume_supported: true,
|
||||||
},
|
},
|
||||||
SlashCommandSpec {
|
|
||||||
name: "sandbox",
|
|
||||||
summary: "Show sandbox isolation status",
|
|
||||||
argument_hint: None,
|
|
||||||
resume_supported: true,
|
|
||||||
},
|
|
||||||
SlashCommandSpec {
|
SlashCommandSpec {
|
||||||
name: "compact",
|
name: "compact",
|
||||||
summary: "Compact local session history",
|
summary: "Compact local session history",
|
||||||
@@ -141,7 +135,6 @@ const SLASH_COMMAND_SPECS: &[SlashCommandSpec] = &[
|
|||||||
pub enum SlashCommand {
|
pub enum SlashCommand {
|
||||||
Help,
|
Help,
|
||||||
Status,
|
Status,
|
||||||
Sandbox,
|
|
||||||
Compact,
|
Compact,
|
||||||
Model {
|
Model {
|
||||||
model: Option<String>,
|
model: Option<String>,
|
||||||
@@ -186,7 +179,6 @@ impl SlashCommand {
|
|||||||
Some(match command {
|
Some(match command {
|
||||||
"help" => Self::Help,
|
"help" => Self::Help,
|
||||||
"status" => Self::Status,
|
"status" => Self::Status,
|
||||||
"sandbox" => Self::Sandbox,
|
|
||||||
"compact" => Self::Compact,
|
"compact" => Self::Compact,
|
||||||
"model" => Self::Model {
|
"model" => Self::Model {
|
||||||
model: parts.next().map(ToOwned::to_owned),
|
model: parts.next().map(ToOwned::to_owned),
|
||||||
@@ -287,7 +279,6 @@ pub fn handle_slash_command(
|
|||||||
session: session.clone(),
|
session: session.clone(),
|
||||||
}),
|
}),
|
||||||
SlashCommand::Status
|
SlashCommand::Status
|
||||||
| SlashCommand::Sandbox
|
|
||||||
| SlashCommand::Model { .. }
|
| SlashCommand::Model { .. }
|
||||||
| SlashCommand::Permissions { .. }
|
| SlashCommand::Permissions { .. }
|
||||||
| SlashCommand::Clear { .. }
|
| SlashCommand::Clear { .. }
|
||||||
@@ -316,7 +307,6 @@ mod tests {
|
|||||||
fn parses_supported_slash_commands() {
|
fn parses_supported_slash_commands() {
|
||||||
assert_eq!(SlashCommand::parse("/help"), Some(SlashCommand::Help));
|
assert_eq!(SlashCommand::parse("/help"), Some(SlashCommand::Help));
|
||||||
assert_eq!(SlashCommand::parse(" /status "), Some(SlashCommand::Status));
|
assert_eq!(SlashCommand::parse(" /status "), Some(SlashCommand::Status));
|
||||||
assert_eq!(SlashCommand::parse("/sandbox"), Some(SlashCommand::Sandbox));
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
SlashCommand::parse("/model claude-opus"),
|
SlashCommand::parse("/model claude-opus"),
|
||||||
Some(SlashCommand::Model {
|
Some(SlashCommand::Model {
|
||||||
@@ -383,7 +373,6 @@ mod tests {
|
|||||||
assert!(help.contains("works with --resume SESSION.json"));
|
assert!(help.contains("works with --resume SESSION.json"));
|
||||||
assert!(help.contains("/help"));
|
assert!(help.contains("/help"));
|
||||||
assert!(help.contains("/status"));
|
assert!(help.contains("/status"));
|
||||||
assert!(help.contains("/sandbox"));
|
|
||||||
assert!(help.contains("/compact"));
|
assert!(help.contains("/compact"));
|
||||||
assert!(help.contains("/model [model]"));
|
assert!(help.contains("/model [model]"));
|
||||||
assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
|
assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
|
||||||
@@ -397,8 +386,8 @@ mod tests {
|
|||||||
assert!(help.contains("/version"));
|
assert!(help.contains("/version"));
|
||||||
assert!(help.contains("/export [file]"));
|
assert!(help.contains("/export [file]"));
|
||||||
assert!(help.contains("/session [list|switch <session-id>]"));
|
assert!(help.contains("/session [list|switch <session-id>]"));
|
||||||
assert_eq!(slash_command_specs().len(), 16);
|
assert_eq!(slash_command_specs().len(), 15);
|
||||||
assert_eq!(resume_supported_slash_commands().len(), 12);
|
assert_eq!(resume_supported_slash_commands().len(), 11);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -445,7 +434,6 @@ mod tests {
|
|||||||
let session = Session::new();
|
let session = Session::new();
|
||||||
assert!(handle_slash_command("/unknown", &session, CompactionConfig::default()).is_none());
|
assert!(handle_slash_command("/unknown", &session, CompactionConfig::default()).is_none());
|
||||||
assert!(handle_slash_command("/status", &session, CompactionConfig::default()).is_none());
|
assert!(handle_slash_command("/status", &session, CompactionConfig::default()).is_none());
|
||||||
assert!(handle_slash_command("/sandbox", &session, CompactionConfig::default()).is_none());
|
|
||||||
assert!(
|
assert!(
|
||||||
handle_slash_command("/model claude", &session, CompactionConfig::default()).is_none()
|
handle_slash_command("/model claude", &session, CompactionConfig::default()).is_none()
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
use std::env;
|
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::process::{Command, Stdio};
|
use std::process::{Command, Stdio};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
@@ -8,12 +7,6 @@ use tokio::process::Command as TokioCommand;
|
|||||||
use tokio::runtime::Builder;
|
use tokio::runtime::Builder;
|
||||||
use tokio::time::timeout;
|
use tokio::time::timeout;
|
||||||
|
|
||||||
use crate::sandbox::{
|
|
||||||
build_linux_sandbox_command, resolve_sandbox_status_for_request, FilesystemIsolationMode,
|
|
||||||
SandboxConfig, SandboxStatus,
|
|
||||||
};
|
|
||||||
use crate::ConfigLoader;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
|
||||||
pub struct BashCommandInput {
|
pub struct BashCommandInput {
|
||||||
pub command: String,
|
pub command: String,
|
||||||
@@ -23,14 +16,6 @@ pub struct BashCommandInput {
|
|||||||
pub run_in_background: Option<bool>,
|
pub run_in_background: Option<bool>,
|
||||||
#[serde(rename = "dangerouslyDisableSandbox")]
|
#[serde(rename = "dangerouslyDisableSandbox")]
|
||||||
pub dangerously_disable_sandbox: Option<bool>,
|
pub dangerously_disable_sandbox: Option<bool>,
|
||||||
#[serde(rename = "namespaceRestrictions")]
|
|
||||||
pub namespace_restrictions: Option<bool>,
|
|
||||||
#[serde(rename = "isolateNetwork")]
|
|
||||||
pub isolate_network: Option<bool>,
|
|
||||||
#[serde(rename = "filesystemMode")]
|
|
||||||
pub filesystem_mode: Option<FilesystemIsolationMode>,
|
|
||||||
#[serde(rename = "allowedMounts")]
|
|
||||||
pub allowed_mounts: Option<Vec<String>>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||||
@@ -60,17 +45,13 @@ pub struct BashCommandOutput {
|
|||||||
pub persisted_output_path: Option<String>,
|
pub persisted_output_path: Option<String>,
|
||||||
#[serde(rename = "persistedOutputSize")]
|
#[serde(rename = "persistedOutputSize")]
|
||||||
pub persisted_output_size: Option<u64>,
|
pub persisted_output_size: Option<u64>,
|
||||||
#[serde(rename = "sandboxStatus")]
|
|
||||||
pub sandbox_status: Option<SandboxStatus>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn execute_bash(input: BashCommandInput) -> io::Result<BashCommandOutput> {
|
pub fn execute_bash(input: BashCommandInput) -> io::Result<BashCommandOutput> {
|
||||||
let cwd = env::current_dir()?;
|
|
||||||
let sandbox_status = sandbox_status_for_input(&input, &cwd);
|
|
||||||
|
|
||||||
if input.run_in_background.unwrap_or(false) {
|
if input.run_in_background.unwrap_or(false) {
|
||||||
let mut child = prepare_command(&input.command, &cwd, &sandbox_status, false);
|
let child = Command::new("sh")
|
||||||
let child = child
|
.arg("-lc")
|
||||||
|
.arg(&input.command)
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
.stdout(Stdio::null())
|
.stdout(Stdio::null())
|
||||||
.stderr(Stdio::null())
|
.stderr(Stdio::null())
|
||||||
@@ -91,20 +72,16 @@ pub fn execute_bash(input: BashCommandInput) -> io::Result<BashCommandOutput> {
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: Some(sandbox_status),
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let runtime = Builder::new_current_thread().enable_all().build()?;
|
let runtime = Builder::new_current_thread().enable_all().build()?;
|
||||||
runtime.block_on(execute_bash_async(input, sandbox_status, cwd))
|
runtime.block_on(execute_bash_async(input))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn execute_bash_async(
|
async fn execute_bash_async(input: BashCommandInput) -> io::Result<BashCommandOutput> {
|
||||||
input: BashCommandInput,
|
let mut command = TokioCommand::new("sh");
|
||||||
sandbox_status: SandboxStatus,
|
command.arg("-lc").arg(&input.command);
|
||||||
cwd: std::path::PathBuf,
|
|
||||||
) -> io::Result<BashCommandOutput> {
|
|
||||||
let mut command = prepare_tokio_command(&input.command, &cwd, &sandbox_status, true);
|
|
||||||
|
|
||||||
let output_result = if let Some(timeout_ms) = input.timeout {
|
let output_result = if let Some(timeout_ms) = input.timeout {
|
||||||
match timeout(Duration::from_millis(timeout_ms), command.output()).await {
|
match timeout(Duration::from_millis(timeout_ms), command.output()).await {
|
||||||
@@ -125,7 +102,6 @@ async fn execute_bash_async(
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: Some(sandbox_status),
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -160,88 +136,12 @@ async fn execute_bash_async(
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: Some(sandbox_status),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sandbox_status_for_input(input: &BashCommandInput, cwd: &std::path::Path) -> SandboxStatus {
|
|
||||||
let config = ConfigLoader::default_for(cwd).load().map_or_else(
|
|
||||||
|_| SandboxConfig::default(),
|
|
||||||
|runtime_config| runtime_config.sandbox().clone(),
|
|
||||||
);
|
|
||||||
let request = config.resolve_request(
|
|
||||||
input.dangerously_disable_sandbox.map(|disabled| !disabled),
|
|
||||||
input.namespace_restrictions,
|
|
||||||
input.isolate_network,
|
|
||||||
input.filesystem_mode,
|
|
||||||
input.allowed_mounts.clone(),
|
|
||||||
);
|
|
||||||
resolve_sandbox_status_for_request(&request, cwd)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn prepare_command(
|
|
||||||
command: &str,
|
|
||||||
cwd: &std::path::Path,
|
|
||||||
sandbox_status: &SandboxStatus,
|
|
||||||
create_dirs: bool,
|
|
||||||
) -> Command {
|
|
||||||
if create_dirs {
|
|
||||||
prepare_sandbox_dirs(cwd);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(launcher) = build_linux_sandbox_command(command, cwd, sandbox_status) {
|
|
||||||
let mut prepared = Command::new(launcher.program);
|
|
||||||
prepared.args(launcher.args);
|
|
||||||
prepared.current_dir(cwd);
|
|
||||||
prepared.envs(launcher.env);
|
|
||||||
return prepared;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut prepared = Command::new("sh");
|
|
||||||
prepared.arg("-lc").arg(command).current_dir(cwd);
|
|
||||||
if sandbox_status.filesystem_active {
|
|
||||||
prepared.env("HOME", cwd.join(".sandbox-home"));
|
|
||||||
prepared.env("TMPDIR", cwd.join(".sandbox-tmp"));
|
|
||||||
}
|
|
||||||
prepared
|
|
||||||
}
|
|
||||||
|
|
||||||
fn prepare_tokio_command(
|
|
||||||
command: &str,
|
|
||||||
cwd: &std::path::Path,
|
|
||||||
sandbox_status: &SandboxStatus,
|
|
||||||
create_dirs: bool,
|
|
||||||
) -> TokioCommand {
|
|
||||||
if create_dirs {
|
|
||||||
prepare_sandbox_dirs(cwd);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(launcher) = build_linux_sandbox_command(command, cwd, sandbox_status) {
|
|
||||||
let mut prepared = TokioCommand::new(launcher.program);
|
|
||||||
prepared.args(launcher.args);
|
|
||||||
prepared.current_dir(cwd);
|
|
||||||
prepared.envs(launcher.env);
|
|
||||||
return prepared;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut prepared = TokioCommand::new("sh");
|
|
||||||
prepared.arg("-lc").arg(command).current_dir(cwd);
|
|
||||||
if sandbox_status.filesystem_active {
|
|
||||||
prepared.env("HOME", cwd.join(".sandbox-home"));
|
|
||||||
prepared.env("TMPDIR", cwd.join(".sandbox-tmp"));
|
|
||||||
}
|
|
||||||
prepared
|
|
||||||
}
|
|
||||||
|
|
||||||
fn prepare_sandbox_dirs(cwd: &std::path::Path) {
|
|
||||||
let _ = std::fs::create_dir_all(cwd.join(".sandbox-home"));
|
|
||||||
let _ = std::fs::create_dir_all(cwd.join(".sandbox-tmp"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{execute_bash, BashCommandInput};
|
use super::{execute_bash, BashCommandInput};
|
||||||
use crate::sandbox::FilesystemIsolationMode;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn executes_simple_command() {
|
fn executes_simple_command() {
|
||||||
@@ -251,33 +151,10 @@ mod tests {
|
|||||||
description: None,
|
description: None,
|
||||||
run_in_background: Some(false),
|
run_in_background: Some(false),
|
||||||
dangerously_disable_sandbox: Some(false),
|
dangerously_disable_sandbox: Some(false),
|
||||||
namespace_restrictions: Some(false),
|
|
||||||
isolate_network: Some(false),
|
|
||||||
filesystem_mode: Some(FilesystemIsolationMode::WorkspaceOnly),
|
|
||||||
allowed_mounts: None,
|
|
||||||
})
|
})
|
||||||
.expect("bash command should execute");
|
.expect("bash command should execute");
|
||||||
|
|
||||||
assert_eq!(output.stdout, "hello");
|
assert_eq!(output.stdout, "hello");
|
||||||
assert!(!output.interrupted);
|
assert!(!output.interrupted);
|
||||||
assert!(output.sandbox_status.is_some());
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn disables_sandbox_when_requested() {
|
|
||||||
let output = execute_bash(BashCommandInput {
|
|
||||||
command: String::from("printf 'hello'"),
|
|
||||||
timeout: Some(1_000),
|
|
||||||
description: None,
|
|
||||||
run_in_background: Some(false),
|
|
||||||
dangerously_disable_sandbox: Some(true),
|
|
||||||
namespace_restrictions: None,
|
|
||||||
isolate_network: None,
|
|
||||||
filesystem_mode: None,
|
|
||||||
allowed_mounts: None,
|
|
||||||
})
|
|
||||||
.expect("bash command should execute");
|
|
||||||
|
|
||||||
assert!(!output.sandbox_status.expect("sandbox status").enabled);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ use std::fs;
|
|||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
use crate::json::JsonValue;
|
use crate::json::JsonValue;
|
||||||
use crate::sandbox::{FilesystemIsolationMode, SandboxConfig};
|
|
||||||
|
|
||||||
pub const CLAUDE_CODE_SETTINGS_SCHEMA_NAME: &str = "SettingsSchema";
|
pub const CLAUDE_CODE_SETTINGS_SCHEMA_NAME: &str = "SettingsSchema";
|
||||||
|
|
||||||
@@ -41,7 +40,6 @@ pub struct RuntimeFeatureConfig {
|
|||||||
oauth: Option<OAuthConfig>,
|
oauth: Option<OAuthConfig>,
|
||||||
model: Option<String>,
|
model: Option<String>,
|
||||||
permission_mode: Option<ResolvedPermissionMode>,
|
permission_mode: Option<ResolvedPermissionMode>,
|
||||||
sandbox: SandboxConfig,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
@@ -227,7 +225,6 @@ impl ConfigLoader {
|
|||||||
oauth: parse_optional_oauth_config(&merged_value, "merged settings.oauth")?,
|
oauth: parse_optional_oauth_config(&merged_value, "merged settings.oauth")?,
|
||||||
model: parse_optional_model(&merged_value),
|
model: parse_optional_model(&merged_value),
|
||||||
permission_mode: parse_optional_permission_mode(&merged_value)?,
|
permission_mode: parse_optional_permission_mode(&merged_value)?,
|
||||||
sandbox: parse_optional_sandbox_config(&merged_value)?,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(RuntimeConfig {
|
Ok(RuntimeConfig {
|
||||||
@@ -292,11 +289,6 @@ impl RuntimeConfig {
|
|||||||
pub fn permission_mode(&self) -> Option<ResolvedPermissionMode> {
|
pub fn permission_mode(&self) -> Option<ResolvedPermissionMode> {
|
||||||
self.feature_config.permission_mode
|
self.feature_config.permission_mode
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn sandbox(&self) -> &SandboxConfig {
|
|
||||||
&self.feature_config.sandbox
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RuntimeFeatureConfig {
|
impl RuntimeFeatureConfig {
|
||||||
@@ -319,11 +311,6 @@ impl RuntimeFeatureConfig {
|
|||||||
pub fn permission_mode(&self) -> Option<ResolvedPermissionMode> {
|
pub fn permission_mode(&self) -> Option<ResolvedPermissionMode> {
|
||||||
self.permission_mode
|
self.permission_mode
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn sandbox(&self) -> &SandboxConfig {
|
|
||||||
&self.sandbox
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl McpConfigCollection {
|
impl McpConfigCollection {
|
||||||
@@ -458,42 +445,6 @@ fn parse_permission_mode_label(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parse_optional_sandbox_config(root: &JsonValue) -> Result<SandboxConfig, ConfigError> {
|
|
||||||
let Some(object) = root.as_object() else {
|
|
||||||
return Ok(SandboxConfig::default());
|
|
||||||
};
|
|
||||||
let Some(sandbox_value) = object.get("sandbox") else {
|
|
||||||
return Ok(SandboxConfig::default());
|
|
||||||
};
|
|
||||||
let sandbox = expect_object(sandbox_value, "merged settings.sandbox")?;
|
|
||||||
let filesystem_mode = optional_string(sandbox, "filesystemMode", "merged settings.sandbox")?
|
|
||||||
.map(parse_filesystem_mode_label)
|
|
||||||
.transpose()?;
|
|
||||||
Ok(SandboxConfig {
|
|
||||||
enabled: optional_bool(sandbox, "enabled", "merged settings.sandbox")?,
|
|
||||||
namespace_restrictions: optional_bool(
|
|
||||||
sandbox,
|
|
||||||
"namespaceRestrictions",
|
|
||||||
"merged settings.sandbox",
|
|
||||||
)?,
|
|
||||||
network_isolation: optional_bool(sandbox, "networkIsolation", "merged settings.sandbox")?,
|
|
||||||
filesystem_mode,
|
|
||||||
allowed_mounts: optional_string_array(sandbox, "allowedMounts", "merged settings.sandbox")?
|
|
||||||
.unwrap_or_default(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_filesystem_mode_label(value: &str) -> Result<FilesystemIsolationMode, ConfigError> {
|
|
||||||
match value {
|
|
||||||
"off" => Ok(FilesystemIsolationMode::Off),
|
|
||||||
"workspace-only" => Ok(FilesystemIsolationMode::WorkspaceOnly),
|
|
||||||
"allow-list" => Ok(FilesystemIsolationMode::AllowList),
|
|
||||||
other => Err(ConfigError::Parse(format!(
|
|
||||||
"merged settings.sandbox.filesystemMode: unsupported filesystem mode {other}"
|
|
||||||
))),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_optional_oauth_config(
|
fn parse_optional_oauth_config(
|
||||||
root: &JsonValue,
|
root: &JsonValue,
|
||||||
context: &str,
|
context: &str,
|
||||||
@@ -737,7 +688,6 @@ mod tests {
|
|||||||
CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
||||||
};
|
};
|
||||||
use crate::json::JsonValue;
|
use crate::json::JsonValue;
|
||||||
use crate::sandbox::FilesystemIsolationMode;
|
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
@@ -842,44 +792,6 @@ mod tests {
|
|||||||
fs::remove_dir_all(root).expect("cleanup temp dir");
|
fs::remove_dir_all(root).expect("cleanup temp dir");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn parses_sandbox_config() {
|
|
||||||
let root = temp_dir();
|
|
||||||
let cwd = root.join("project");
|
|
||||||
let home = root.join("home").join(".claude");
|
|
||||||
fs::create_dir_all(cwd.join(".claude")).expect("project config dir");
|
|
||||||
fs::create_dir_all(&home).expect("home config dir");
|
|
||||||
|
|
||||||
fs::write(
|
|
||||||
cwd.join(".claude").join("settings.local.json"),
|
|
||||||
r#"{
|
|
||||||
"sandbox": {
|
|
||||||
"enabled": true,
|
|
||||||
"namespaceRestrictions": false,
|
|
||||||
"networkIsolation": true,
|
|
||||||
"filesystemMode": "allow-list",
|
|
||||||
"allowedMounts": ["logs", "tmp/cache"]
|
|
||||||
}
|
|
||||||
}"#,
|
|
||||||
)
|
|
||||||
.expect("write local settings");
|
|
||||||
|
|
||||||
let loaded = ConfigLoader::new(&cwd, &home)
|
|
||||||
.load()
|
|
||||||
.expect("config should load");
|
|
||||||
|
|
||||||
assert_eq!(loaded.sandbox().enabled, Some(true));
|
|
||||||
assert_eq!(loaded.sandbox().namespace_restrictions, Some(false));
|
|
||||||
assert_eq!(loaded.sandbox().network_isolation, Some(true));
|
|
||||||
assert_eq!(
|
|
||||||
loaded.sandbox().filesystem_mode,
|
|
||||||
Some(FilesystemIsolationMode::AllowList)
|
|
||||||
);
|
|
||||||
assert_eq!(loaded.sandbox().allowed_mounts, vec!["logs", "tmp/cache"]);
|
|
||||||
|
|
||||||
fs::remove_dir_all(root).expect("cleanup temp dir");
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parses_typed_mcp_and_oauth_config() {
|
fn parses_typed_mcp_and_oauth_config() {
|
||||||
let root = temp_dir();
|
let root = temp_dir();
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ mod oauth;
|
|||||||
mod permissions;
|
mod permissions;
|
||||||
mod prompt;
|
mod prompt;
|
||||||
mod remote;
|
mod remote;
|
||||||
mod sandbox;
|
|
||||||
mod session;
|
mod session;
|
||||||
mod usage;
|
mod usage;
|
||||||
|
|
||||||
@@ -74,12 +73,6 @@ pub use remote::{
|
|||||||
RemoteSessionContext, UpstreamProxyBootstrap, UpstreamProxyState, DEFAULT_REMOTE_BASE_URL,
|
RemoteSessionContext, UpstreamProxyBootstrap, UpstreamProxyState, DEFAULT_REMOTE_BASE_URL,
|
||||||
DEFAULT_SESSION_TOKEN_PATH, DEFAULT_SYSTEM_CA_BUNDLE, NO_PROXY_HOSTS, UPSTREAM_PROXY_ENV_KEYS,
|
DEFAULT_SESSION_TOKEN_PATH, DEFAULT_SYSTEM_CA_BUNDLE, NO_PROXY_HOSTS, UPSTREAM_PROXY_ENV_KEYS,
|
||||||
};
|
};
|
||||||
pub use sandbox::{
|
|
||||||
build_linux_sandbox_command, detect_container_environment, detect_container_environment_from,
|
|
||||||
resolve_sandbox_status, resolve_sandbox_status_for_request, ContainerEnvironment,
|
|
||||||
FilesystemIsolationMode, LinuxSandboxCommand, SandboxConfig, SandboxDetectionInputs,
|
|
||||||
SandboxRequest, SandboxStatus,
|
|
||||||
};
|
|
||||||
pub use session::{ContentBlock, ConversationMessage, MessageRole, Session, SessionError};
|
pub use session::{ContentBlock, ConversationMessage, MessageRole, Session, SessionError};
|
||||||
pub use usage::{
|
pub use usage::{
|
||||||
format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
|
format_usd, pricing_for_model, ModelPricing, TokenUsage, UsageCostEstimate, UsageTracker,
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ pub enum PermissionMode {
|
|||||||
ReadOnly,
|
ReadOnly,
|
||||||
WorkspaceWrite,
|
WorkspaceWrite,
|
||||||
DangerFullAccess,
|
DangerFullAccess,
|
||||||
Prompt,
|
|
||||||
Allow,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PermissionMode {
|
impl PermissionMode {
|
||||||
@@ -16,8 +14,6 @@ impl PermissionMode {
|
|||||||
Self::ReadOnly => "read-only",
|
Self::ReadOnly => "read-only",
|
||||||
Self::WorkspaceWrite => "workspace-write",
|
Self::WorkspaceWrite => "workspace-write",
|
||||||
Self::DangerFullAccess => "danger-full-access",
|
Self::DangerFullAccess => "danger-full-access",
|
||||||
Self::Prompt => "prompt",
|
|
||||||
Self::Allow => "allow",
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -94,7 +90,7 @@ impl PermissionPolicy {
|
|||||||
) -> PermissionOutcome {
|
) -> PermissionOutcome {
|
||||||
let current_mode = self.active_mode();
|
let current_mode = self.active_mode();
|
||||||
let required_mode = self.required_mode_for(tool_name);
|
let required_mode = self.required_mode_for(tool_name);
|
||||||
if current_mode == PermissionMode::Allow || current_mode >= required_mode {
|
if current_mode >= required_mode {
|
||||||
return PermissionOutcome::Allow;
|
return PermissionOutcome::Allow;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,9 +101,8 @@ impl PermissionPolicy {
|
|||||||
required_mode,
|
required_mode,
|
||||||
};
|
};
|
||||||
|
|
||||||
if current_mode == PermissionMode::Prompt
|
if current_mode == PermissionMode::WorkspaceWrite
|
||||||
|| (current_mode == PermissionMode::WorkspaceWrite
|
&& required_mode == PermissionMode::DangerFullAccess
|
||||||
&& required_mode == PermissionMode::DangerFullAccess)
|
|
||||||
{
|
{
|
||||||
return match prompter.as_mut() {
|
return match prompter.as_mut() {
|
||||||
Some(prompter) => match prompter.decide(&request) {
|
Some(prompter) => match prompter.decide(&request) {
|
||||||
|
|||||||
@@ -1,364 +0,0 @@
|
|||||||
use std::env;
|
|
||||||
use std::fs;
|
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
|
|
||||||
#[serde(rename_all = "kebab-case")]
|
|
||||||
pub enum FilesystemIsolationMode {
|
|
||||||
Off,
|
|
||||||
#[default]
|
|
||||||
WorkspaceOnly,
|
|
||||||
AllowList,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FilesystemIsolationMode {
|
|
||||||
#[must_use]
|
|
||||||
pub fn as_str(self) -> &'static str {
|
|
||||||
match self {
|
|
||||||
Self::Off => "off",
|
|
||||||
Self::WorkspaceOnly => "workspace-only",
|
|
||||||
Self::AllowList => "allow-list",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
|
|
||||||
pub struct SandboxConfig {
|
|
||||||
pub enabled: Option<bool>,
|
|
||||||
pub namespace_restrictions: Option<bool>,
|
|
||||||
pub network_isolation: Option<bool>,
|
|
||||||
pub filesystem_mode: Option<FilesystemIsolationMode>,
|
|
||||||
pub allowed_mounts: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
|
|
||||||
pub struct SandboxRequest {
|
|
||||||
pub enabled: bool,
|
|
||||||
pub namespace_restrictions: bool,
|
|
||||||
pub network_isolation: bool,
|
|
||||||
pub filesystem_mode: FilesystemIsolationMode,
|
|
||||||
pub allowed_mounts: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
|
|
||||||
pub struct ContainerEnvironment {
|
|
||||||
pub in_container: bool,
|
|
||||||
pub markers: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[allow(clippy::struct_excessive_bools)]
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Default)]
|
|
||||||
pub struct SandboxStatus {
|
|
||||||
pub enabled: bool,
|
|
||||||
pub requested: SandboxRequest,
|
|
||||||
pub supported: bool,
|
|
||||||
pub active: bool,
|
|
||||||
pub namespace_supported: bool,
|
|
||||||
pub namespace_active: bool,
|
|
||||||
pub network_supported: bool,
|
|
||||||
pub network_active: bool,
|
|
||||||
pub filesystem_mode: FilesystemIsolationMode,
|
|
||||||
pub filesystem_active: bool,
|
|
||||||
pub allowed_mounts: Vec<String>,
|
|
||||||
pub in_container: bool,
|
|
||||||
pub container_markers: Vec<String>,
|
|
||||||
pub fallback_reason: Option<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
pub struct SandboxDetectionInputs<'a> {
|
|
||||||
pub env_pairs: Vec<(String, String)>,
|
|
||||||
pub dockerenv_exists: bool,
|
|
||||||
pub containerenv_exists: bool,
|
|
||||||
pub proc_1_cgroup: Option<&'a str>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
pub struct LinuxSandboxCommand {
|
|
||||||
pub program: String,
|
|
||||||
pub args: Vec<String>,
|
|
||||||
pub env: Vec<(String, String)>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SandboxConfig {
|
|
||||||
#[must_use]
|
|
||||||
pub fn resolve_request(
|
|
||||||
&self,
|
|
||||||
enabled_override: Option<bool>,
|
|
||||||
namespace_override: Option<bool>,
|
|
||||||
network_override: Option<bool>,
|
|
||||||
filesystem_mode_override: Option<FilesystemIsolationMode>,
|
|
||||||
allowed_mounts_override: Option<Vec<String>>,
|
|
||||||
) -> SandboxRequest {
|
|
||||||
SandboxRequest {
|
|
||||||
enabled: enabled_override.unwrap_or(self.enabled.unwrap_or(true)),
|
|
||||||
namespace_restrictions: namespace_override
|
|
||||||
.unwrap_or(self.namespace_restrictions.unwrap_or(true)),
|
|
||||||
network_isolation: network_override.unwrap_or(self.network_isolation.unwrap_or(false)),
|
|
||||||
filesystem_mode: filesystem_mode_override
|
|
||||||
.or(self.filesystem_mode)
|
|
||||||
.unwrap_or_default(),
|
|
||||||
allowed_mounts: allowed_mounts_override.unwrap_or_else(|| self.allowed_mounts.clone()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn detect_container_environment() -> ContainerEnvironment {
|
|
||||||
let proc_1_cgroup = fs::read_to_string("/proc/1/cgroup").ok();
|
|
||||||
detect_container_environment_from(SandboxDetectionInputs {
|
|
||||||
env_pairs: env::vars().collect(),
|
|
||||||
dockerenv_exists: Path::new("/.dockerenv").exists(),
|
|
||||||
containerenv_exists: Path::new("/run/.containerenv").exists(),
|
|
||||||
proc_1_cgroup: proc_1_cgroup.as_deref(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn detect_container_environment_from(
|
|
||||||
inputs: SandboxDetectionInputs<'_>,
|
|
||||||
) -> ContainerEnvironment {
|
|
||||||
let mut markers = Vec::new();
|
|
||||||
if inputs.dockerenv_exists {
|
|
||||||
markers.push("/.dockerenv".to_string());
|
|
||||||
}
|
|
||||||
if inputs.containerenv_exists {
|
|
||||||
markers.push("/run/.containerenv".to_string());
|
|
||||||
}
|
|
||||||
for (key, value) in inputs.env_pairs {
|
|
||||||
let normalized = key.to_ascii_lowercase();
|
|
||||||
if matches!(
|
|
||||||
normalized.as_str(),
|
|
||||||
"container" | "docker" | "podman" | "kubernetes_service_host"
|
|
||||||
) && !value.is_empty()
|
|
||||||
{
|
|
||||||
markers.push(format!("env:{key}={value}"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(cgroup) = inputs.proc_1_cgroup {
|
|
||||||
for needle in ["docker", "containerd", "kubepods", "podman", "libpod"] {
|
|
||||||
if cgroup.contains(needle) {
|
|
||||||
markers.push(format!("/proc/1/cgroup:{needle}"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
markers.sort();
|
|
||||||
markers.dedup();
|
|
||||||
ContainerEnvironment {
|
|
||||||
in_container: !markers.is_empty(),
|
|
||||||
markers,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn resolve_sandbox_status(config: &SandboxConfig, cwd: &Path) -> SandboxStatus {
|
|
||||||
let request = config.resolve_request(None, None, None, None, None);
|
|
||||||
resolve_sandbox_status_for_request(&request, cwd)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn resolve_sandbox_status_for_request(request: &SandboxRequest, cwd: &Path) -> SandboxStatus {
|
|
||||||
let container = detect_container_environment();
|
|
||||||
let namespace_supported = cfg!(target_os = "linux") && command_exists("unshare");
|
|
||||||
let network_supported = namespace_supported;
|
|
||||||
let filesystem_active =
|
|
||||||
request.enabled && request.filesystem_mode != FilesystemIsolationMode::Off;
|
|
||||||
let mut fallback_reasons = Vec::new();
|
|
||||||
|
|
||||||
if request.enabled && request.namespace_restrictions && !namespace_supported {
|
|
||||||
fallback_reasons
|
|
||||||
.push("namespace isolation unavailable (requires Linux with `unshare`)".to_string());
|
|
||||||
}
|
|
||||||
if request.enabled && request.network_isolation && !network_supported {
|
|
||||||
fallback_reasons
|
|
||||||
.push("network isolation unavailable (requires Linux with `unshare`)".to_string());
|
|
||||||
}
|
|
||||||
if request.enabled
|
|
||||||
&& request.filesystem_mode == FilesystemIsolationMode::AllowList
|
|
||||||
&& request.allowed_mounts.is_empty()
|
|
||||||
{
|
|
||||||
fallback_reasons
|
|
||||||
.push("filesystem allow-list requested without configured mounts".to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
let active = request.enabled
|
|
||||||
&& (!request.namespace_restrictions || namespace_supported)
|
|
||||||
&& (!request.network_isolation || network_supported);
|
|
||||||
|
|
||||||
let allowed_mounts = normalize_mounts(&request.allowed_mounts, cwd);
|
|
||||||
|
|
||||||
SandboxStatus {
|
|
||||||
enabled: request.enabled,
|
|
||||||
requested: request.clone(),
|
|
||||||
supported: namespace_supported,
|
|
||||||
active,
|
|
||||||
namespace_supported,
|
|
||||||
namespace_active: request.enabled && request.namespace_restrictions && namespace_supported,
|
|
||||||
network_supported,
|
|
||||||
network_active: request.enabled && request.network_isolation && network_supported,
|
|
||||||
filesystem_mode: request.filesystem_mode,
|
|
||||||
filesystem_active,
|
|
||||||
allowed_mounts,
|
|
||||||
in_container: container.in_container,
|
|
||||||
container_markers: container.markers,
|
|
||||||
fallback_reason: (!fallback_reasons.is_empty()).then(|| fallback_reasons.join("; ")),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn build_linux_sandbox_command(
|
|
||||||
command: &str,
|
|
||||||
cwd: &Path,
|
|
||||||
status: &SandboxStatus,
|
|
||||||
) -> Option<LinuxSandboxCommand> {
|
|
||||||
if !cfg!(target_os = "linux")
|
|
||||||
|| !status.enabled
|
|
||||||
|| (!status.namespace_active && !status.network_active)
|
|
||||||
{
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut args = vec![
|
|
||||||
"--user".to_string(),
|
|
||||||
"--map-root-user".to_string(),
|
|
||||||
"--mount".to_string(),
|
|
||||||
"--ipc".to_string(),
|
|
||||||
"--pid".to_string(),
|
|
||||||
"--uts".to_string(),
|
|
||||||
"--fork".to_string(),
|
|
||||||
];
|
|
||||||
if status.network_active {
|
|
||||||
args.push("--net".to_string());
|
|
||||||
}
|
|
||||||
args.push("sh".to_string());
|
|
||||||
args.push("-lc".to_string());
|
|
||||||
args.push(command.to_string());
|
|
||||||
|
|
||||||
let sandbox_home = cwd.join(".sandbox-home");
|
|
||||||
let sandbox_tmp = cwd.join(".sandbox-tmp");
|
|
||||||
let mut env = vec![
|
|
||||||
("HOME".to_string(), sandbox_home.display().to_string()),
|
|
||||||
("TMPDIR".to_string(), sandbox_tmp.display().to_string()),
|
|
||||||
(
|
|
||||||
"CLAWD_SANDBOX_FILESYSTEM_MODE".to_string(),
|
|
||||||
status.filesystem_mode.as_str().to_string(),
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"CLAWD_SANDBOX_ALLOWED_MOUNTS".to_string(),
|
|
||||||
status.allowed_mounts.join(":"),
|
|
||||||
),
|
|
||||||
];
|
|
||||||
if let Ok(path) = env::var("PATH") {
|
|
||||||
env.push(("PATH".to_string(), path));
|
|
||||||
}
|
|
||||||
|
|
||||||
Some(LinuxSandboxCommand {
|
|
||||||
program: "unshare".to_string(),
|
|
||||||
args,
|
|
||||||
env,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn normalize_mounts(mounts: &[String], cwd: &Path) -> Vec<String> {
|
|
||||||
let cwd = cwd.to_path_buf();
|
|
||||||
mounts
|
|
||||||
.iter()
|
|
||||||
.map(|mount| {
|
|
||||||
let path = PathBuf::from(mount);
|
|
||||||
if path.is_absolute() {
|
|
||||||
path
|
|
||||||
} else {
|
|
||||||
cwd.join(path)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.map(|path| path.display().to_string())
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn command_exists(command: &str) -> bool {
|
|
||||||
env::var_os("PATH")
|
|
||||||
.is_some_and(|paths| env::split_paths(&paths).any(|path| path.join(command).exists()))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::{
|
|
||||||
build_linux_sandbox_command, detect_container_environment_from, FilesystemIsolationMode,
|
|
||||||
SandboxConfig, SandboxDetectionInputs,
|
|
||||||
};
|
|
||||||
use std::path::Path;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn detects_container_markers_from_multiple_sources() {
|
|
||||||
let detected = detect_container_environment_from(SandboxDetectionInputs {
|
|
||||||
env_pairs: vec![("container".to_string(), "docker".to_string())],
|
|
||||||
dockerenv_exists: true,
|
|
||||||
containerenv_exists: false,
|
|
||||||
proc_1_cgroup: Some("12:memory:/docker/abc"),
|
|
||||||
});
|
|
||||||
|
|
||||||
assert!(detected.in_container);
|
|
||||||
assert!(detected
|
|
||||||
.markers
|
|
||||||
.iter()
|
|
||||||
.any(|marker| marker == "/.dockerenv"));
|
|
||||||
assert!(detected
|
|
||||||
.markers
|
|
||||||
.iter()
|
|
||||||
.any(|marker| marker == "env:container=docker"));
|
|
||||||
assert!(detected
|
|
||||||
.markers
|
|
||||||
.iter()
|
|
||||||
.any(|marker| marker == "/proc/1/cgroup:docker"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn resolves_request_with_overrides() {
|
|
||||||
let config = SandboxConfig {
|
|
||||||
enabled: Some(true),
|
|
||||||
namespace_restrictions: Some(true),
|
|
||||||
network_isolation: Some(false),
|
|
||||||
filesystem_mode: Some(FilesystemIsolationMode::WorkspaceOnly),
|
|
||||||
allowed_mounts: vec!["logs".to_string()],
|
|
||||||
};
|
|
||||||
|
|
||||||
let request = config.resolve_request(
|
|
||||||
Some(true),
|
|
||||||
Some(false),
|
|
||||||
Some(true),
|
|
||||||
Some(FilesystemIsolationMode::AllowList),
|
|
||||||
Some(vec!["tmp".to_string()]),
|
|
||||||
);
|
|
||||||
|
|
||||||
assert!(request.enabled);
|
|
||||||
assert!(!request.namespace_restrictions);
|
|
||||||
assert!(request.network_isolation);
|
|
||||||
assert_eq!(request.filesystem_mode, FilesystemIsolationMode::AllowList);
|
|
||||||
assert_eq!(request.allowed_mounts, vec!["tmp"]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn builds_linux_launcher_with_network_flag_when_requested() {
|
|
||||||
let config = SandboxConfig::default();
|
|
||||||
let status = super::resolve_sandbox_status_for_request(
|
|
||||||
&config.resolve_request(
|
|
||||||
Some(true),
|
|
||||||
Some(true),
|
|
||||||
Some(true),
|
|
||||||
Some(FilesystemIsolationMode::WorkspaceOnly),
|
|
||||||
None,
|
|
||||||
),
|
|
||||||
Path::new("/workspace"),
|
|
||||||
);
|
|
||||||
|
|
||||||
if let Some(launcher) =
|
|
||||||
build_linux_sandbox_command("printf hi", Path::new("/workspace"), &status)
|
|
||||||
{
|
|
||||||
assert_eq!(launcher.program, "unshare");
|
|
||||||
assert!(launcher.args.iter().any(|arg| arg == "--mount"));
|
|
||||||
assert!(launcher.args.iter().any(|arg| arg == "--net") == status.network_active);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -23,8 +23,8 @@ use compat_harness::{extract_manifest, UpstreamPaths};
|
|||||||
use render::{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, resolve_sandbox_status, save_oauth_credentials, ApiClient,
|
parse_oauth_callback_request_target, save_oauth_credentials, ApiClient, ApiRequest,
|
||||||
ApiRequest, AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
|
AssistantEvent, CompactionConfig, ConfigLoader, ConfigSource, ContentBlock,
|
||||||
ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest,
|
ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest,
|
||||||
OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
||||||
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
||||||
@@ -591,7 +591,6 @@ struct StatusContext {
|
|||||||
memory_file_count: usize,
|
memory_file_count: usize,
|
||||||
project_root: Option<PathBuf>,
|
project_root: Option<PathBuf>,
|
||||||
git_branch: Option<String>,
|
git_branch: Option<String>,
|
||||||
sandbox_status: runtime::SandboxStatus,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
@@ -841,18 +840,6 @@ fn run_resume_command(
|
|||||||
)),
|
)),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
SlashCommand::Sandbox => {
|
|
||||||
let cwd = env::current_dir()?;
|
|
||||||
let loader = ConfigLoader::default_for(&cwd);
|
|
||||||
let runtime_config = loader.load()?;
|
|
||||||
Ok(ResumeCommandOutcome {
|
|
||||||
session: session.clone(),
|
|
||||||
message: Some(format_sandbox_report(&resolve_sandbox_status(
|
|
||||||
runtime_config.sandbox(),
|
|
||||||
&cwd,
|
|
||||||
))),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
SlashCommand::Cost => {
|
SlashCommand::Cost => {
|
||||||
let usage = UsageTracker::from_session(session).cumulative_usage();
|
let usage = UsageTracker::from_session(session).cumulative_usage();
|
||||||
Ok(ResumeCommandOutcome {
|
Ok(ResumeCommandOutcome {
|
||||||
@@ -1104,10 +1091,6 @@ impl LiveCli {
|
|||||||
self.print_status();
|
self.print_status();
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
SlashCommand::Sandbox => {
|
|
||||||
Self::print_sandbox_status();
|
|
||||||
false
|
|
||||||
}
|
|
||||||
SlashCommand::Compact => {
|
SlashCommand::Compact => {
|
||||||
self.compact()?;
|
self.compact()?;
|
||||||
false
|
false
|
||||||
@@ -1179,18 +1162,6 @@ impl LiveCli {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn print_sandbox_status() {
|
|
||||||
let cwd = env::current_dir().expect("current dir");
|
|
||||||
let loader = ConfigLoader::default_for(&cwd);
|
|
||||||
let runtime_config = loader
|
|
||||||
.load()
|
|
||||||
.unwrap_or_else(|_| runtime::RuntimeConfig::empty());
|
|
||||||
println!(
|
|
||||||
"{}",
|
|
||||||
format_sandbox_report(&resolve_sandbox_status(runtime_config.sandbox(), &cwd))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn set_model(&mut self, model: Option<String>) -> Result<bool, Box<dyn std::error::Error>> {
|
fn set_model(&mut self, model: Option<String>) -> Result<bool, Box<dyn std::error::Error>> {
|
||||||
let Some(model) = model else {
|
let Some(model) = model else {
|
||||||
println!(
|
println!(
|
||||||
@@ -1566,7 +1537,6 @@ fn status_context(
|
|||||||
let project_context = ProjectContext::discover_with_git(&cwd, DEFAULT_DATE)?;
|
let project_context = ProjectContext::discover_with_git(&cwd, DEFAULT_DATE)?;
|
||||||
let (project_root, git_branch) =
|
let (project_root, git_branch) =
|
||||||
parse_git_status_metadata(project_context.git_status.as_deref());
|
parse_git_status_metadata(project_context.git_status.as_deref());
|
||||||
let sandbox_status = resolve_sandbox_status(runtime_config.sandbox(), &cwd);
|
|
||||||
Ok(StatusContext {
|
Ok(StatusContext {
|
||||||
cwd,
|
cwd,
|
||||||
session_path: session_path.map(Path::to_path_buf),
|
session_path: session_path.map(Path::to_path_buf),
|
||||||
@@ -1575,7 +1545,6 @@ fn status_context(
|
|||||||
memory_file_count: project_context.instruction_files.len(),
|
memory_file_count: project_context.instruction_files.len(),
|
||||||
project_root,
|
project_root,
|
||||||
git_branch,
|
git_branch,
|
||||||
sandbox_status,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1628,7 +1597,6 @@ fn format_status_report(
|
|||||||
context.discovered_config_files,
|
context.discovered_config_files,
|
||||||
context.memory_file_count,
|
context.memory_file_count,
|
||||||
),
|
),
|
||||||
format_sandbox_report(&context.sandbox_status),
|
|
||||||
]
|
]
|
||||||
.join(
|
.join(
|
||||||
"
|
"
|
||||||
@@ -1637,49 +1605,6 @@ fn format_status_report(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn format_sandbox_report(status: &runtime::SandboxStatus) -> String {
|
|
||||||
format!(
|
|
||||||
"Sandbox
|
|
||||||
Enabled {}
|
|
||||||
Active {}
|
|
||||||
Supported {}
|
|
||||||
In container {}
|
|
||||||
Requested ns {}
|
|
||||||
Active ns {}
|
|
||||||
Requested net {}
|
|
||||||
Active net {}
|
|
||||||
Filesystem mode {}
|
|
||||||
Filesystem active {}
|
|
||||||
Allowed mounts {}
|
|
||||||
Markers {}
|
|
||||||
Fallback reason {}",
|
|
||||||
status.enabled,
|
|
||||||
status.active,
|
|
||||||
status.supported,
|
|
||||||
status.in_container,
|
|
||||||
status.requested.namespace_restrictions,
|
|
||||||
status.namespace_active,
|
|
||||||
status.requested.network_isolation,
|
|
||||||
status.network_active,
|
|
||||||
status.filesystem_mode.as_str(),
|
|
||||||
status.filesystem_active,
|
|
||||||
if status.allowed_mounts.is_empty() {
|
|
||||||
"<none>".to_string()
|
|
||||||
} else {
|
|
||||||
status.allowed_mounts.join(", ")
|
|
||||||
},
|
|
||||||
if status.container_markers.is_empty() {
|
|
||||||
"<none>".to_string()
|
|
||||||
} else {
|
|
||||||
status.container_markers.join(", ")
|
|
||||||
},
|
|
||||||
status
|
|
||||||
.fallback_reason
|
|
||||||
.clone()
|
|
||||||
.unwrap_or_else(|| "<none>".to_string()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn render_config_report(section: Option<&str>) -> Result<String, Box<dyn std::error::Error>> {
|
fn render_config_report(section: Option<&str>) -> Result<String, Box<dyn std::error::Error>> {
|
||||||
let cwd = env::current_dir()?;
|
let cwd = env::current_dir()?;
|
||||||
let loader = ConfigLoader::default_for(&cwd);
|
let loader = ConfigLoader::default_for(&cwd);
|
||||||
@@ -2676,7 +2601,6 @@ mod tests {
|
|||||||
assert!(help.contains("REPL"));
|
assert!(help.contains("REPL"));
|
||||||
assert!(help.contains("/help"));
|
assert!(help.contains("/help"));
|
||||||
assert!(help.contains("/status"));
|
assert!(help.contains("/status"));
|
||||||
assert!(help.contains("/sandbox"));
|
|
||||||
assert!(help.contains("/model [model]"));
|
assert!(help.contains("/model [model]"));
|
||||||
assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
|
assert!(help.contains("/permissions [read-only|workspace-write|danger-full-access]"));
|
||||||
assert!(help.contains("/clear [--confirm]"));
|
assert!(help.contains("/clear [--confirm]"));
|
||||||
@@ -2701,8 +2625,8 @@ mod tests {
|
|||||||
assert_eq!(
|
assert_eq!(
|
||||||
names,
|
names,
|
||||||
vec![
|
vec![
|
||||||
"help", "status", "sandbox", "compact", "clear", "cost", "config", "memory",
|
"help", "status", "compact", "clear", "cost", "config", "memory", "init", "diff",
|
||||||
"init", "diff", "version", "export",
|
"version", "export",
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -2820,7 +2744,6 @@ mod tests {
|
|||||||
memory_file_count: 4,
|
memory_file_count: 4,
|
||||||
project_root: Some(PathBuf::from("/tmp")),
|
project_root: Some(PathBuf::from("/tmp")),
|
||||||
git_branch: Some("main".to_string()),
|
git_branch: Some("main".to_string()),
|
||||||
sandbox_status: runtime::SandboxStatus::default(),
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
assert!(status.contains("Status"));
|
assert!(status.contains("Status"));
|
||||||
@@ -2874,7 +2797,7 @@ mod tests {
|
|||||||
fn status_context_reads_real_workspace_metadata() {
|
fn status_context_reads_real_workspace_metadata() {
|
||||||
let context = status_context(None).expect("status context should load");
|
let context = status_context(None).expect("status context should load");
|
||||||
assert!(context.cwd.is_absolute());
|
assert!(context.cwd.is_absolute());
|
||||||
assert_eq!(context.discovered_config_files, 5);
|
assert!(context.discovered_config_files >= 3);
|
||||||
assert!(context.loaded_config_files <= context.discovered_config_files);
|
assert!(context.loaded_config_files <= context.discovered_config_files);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2982,17 +2905,3 @@ mod tests {
|
|||||||
assert!(done.contains("contents"));
|
assert!(done.contains("contents"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod sandbox_report_tests {
|
|
||||||
use super::format_sandbox_report;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn sandbox_report_renders_expected_fields() {
|
|
||||||
let report = format_sandbox_report(&runtime::SandboxStatus::default());
|
|
||||||
assert!(report.contains("Sandbox"));
|
|
||||||
assert!(report.contains("Enabled"));
|
|
||||||
assert!(report.contains("Filesystem mode"));
|
|
||||||
assert!(report.contains("Fallback reason"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ pub struct ColorTheme {
|
|||||||
inline_code: Color,
|
inline_code: Color,
|
||||||
link: Color,
|
link: Color,
|
||||||
quote: Color,
|
quote: Color,
|
||||||
|
table_border: Color,
|
||||||
spinner_active: Color,
|
spinner_active: Color,
|
||||||
spinner_done: Color,
|
spinner_done: Color,
|
||||||
spinner_failed: Color,
|
spinner_failed: Color,
|
||||||
@@ -35,6 +36,7 @@ impl Default for ColorTheme {
|
|||||||
inline_code: Color::Green,
|
inline_code: Color::Green,
|
||||||
link: Color::Blue,
|
link: Color::Blue,
|
||||||
quote: Color::DarkGrey,
|
quote: Color::DarkGrey,
|
||||||
|
table_border: Color::DarkCyan,
|
||||||
spinner_active: Color::Blue,
|
spinner_active: Color::Blue,
|
||||||
spinner_done: Color::Green,
|
spinner_done: Color::Green,
|
||||||
spinner_failed: Color::Red,
|
spinner_failed: Color::Red,
|
||||||
@@ -113,24 +115,70 @@ impl Spinner {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
enum ListKind {
|
||||||
|
Unordered,
|
||||||
|
Ordered { next_index: u64 },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
||||||
|
struct TableState {
|
||||||
|
headers: Vec<String>,
|
||||||
|
rows: Vec<Vec<String>>,
|
||||||
|
current_row: Vec<String>,
|
||||||
|
current_cell: String,
|
||||||
|
in_head: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TableState {
|
||||||
|
fn push_cell(&mut self) {
|
||||||
|
let cell = self.current_cell.trim().to_string();
|
||||||
|
self.current_row.push(cell);
|
||||||
|
self.current_cell.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn finish_row(&mut self) {
|
||||||
|
if self.current_row.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let row = std::mem::take(&mut self.current_row);
|
||||||
|
if self.in_head {
|
||||||
|
self.headers = row;
|
||||||
|
} else {
|
||||||
|
self.rows.push(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
||||||
struct RenderState {
|
struct RenderState {
|
||||||
emphasis: usize,
|
emphasis: usize,
|
||||||
strong: usize,
|
strong: usize,
|
||||||
quote: usize,
|
quote: usize,
|
||||||
list: usize,
|
list_stack: Vec<ListKind>,
|
||||||
|
table: Option<TableState>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RenderState {
|
impl RenderState {
|
||||||
fn style_text(&self, text: &str, theme: &ColorTheme) -> String {
|
fn style_text(&self, text: &str, theme: &ColorTheme) -> String {
|
||||||
|
let mut styled = text.to_string();
|
||||||
if self.strong > 0 {
|
if self.strong > 0 {
|
||||||
format!("{}", text.bold().with(theme.strong))
|
styled = format!("{}", styled.bold().with(theme.strong));
|
||||||
} else if self.emphasis > 0 {
|
}
|
||||||
format!("{}", text.italic().with(theme.emphasis))
|
if self.emphasis > 0 {
|
||||||
} else if self.quote > 0 {
|
styled = format!("{}", styled.italic().with(theme.emphasis));
|
||||||
format!("{}", text.with(theme.quote))
|
}
|
||||||
|
if self.quote > 0 {
|
||||||
|
styled = format!("{}", styled.with(theme.quote));
|
||||||
|
}
|
||||||
|
styled
|
||||||
|
}
|
||||||
|
|
||||||
|
fn capture_target_mut<'a>(&'a mut self, output: &'a mut String) -> &'a mut String {
|
||||||
|
if let Some(table) = self.table.as_mut() {
|
||||||
|
&mut table.current_cell
|
||||||
} else {
|
} else {
|
||||||
text.to_string()
|
output
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,6 +238,7 @@ impl TerminalRenderer {
|
|||||||
output.trim_end().to_string()
|
output.trim_end().to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_lines)]
|
||||||
fn render_event(
|
fn render_event(
|
||||||
&self,
|
&self,
|
||||||
event: Event<'_>,
|
event: Event<'_>,
|
||||||
@@ -203,12 +252,22 @@ impl TerminalRenderer {
|
|||||||
Event::Start(Tag::Heading { level, .. }) => self.start_heading(level as u8, output),
|
Event::Start(Tag::Heading { level, .. }) => self.start_heading(level as u8, output),
|
||||||
Event::End(TagEnd::Heading(..) | TagEnd::Paragraph) => output.push_str("\n\n"),
|
Event::End(TagEnd::Heading(..) | 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(..) | TagEnd::Item)
|
Event::End(TagEnd::BlockQuote(..)) => {
|
||||||
| Event::SoftBreak
|
state.quote = state.quote.saturating_sub(1);
|
||||||
| Event::HardBreak => output.push('\n'),
|
output.push('\n');
|
||||||
Event::Start(Tag::List(_)) => state.list += 1,
|
}
|
||||||
|
Event::End(TagEnd::Item) | Event::SoftBreak | Event::HardBreak => {
|
||||||
|
state.capture_target_mut(output).push('\n');
|
||||||
|
}
|
||||||
|
Event::Start(Tag::List(first_item)) => {
|
||||||
|
let kind = match first_item {
|
||||||
|
Some(index) => ListKind::Ordered { next_index: index },
|
||||||
|
None => ListKind::Unordered,
|
||||||
|
};
|
||||||
|
state.list_stack.push(kind);
|
||||||
|
}
|
||||||
Event::End(TagEnd::List(..)) => {
|
Event::End(TagEnd::List(..)) => {
|
||||||
state.list = state.list.saturating_sub(1);
|
state.list_stack.pop();
|
||||||
output.push('\n');
|
output.push('\n');
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Item) => Self::start_item(state, output),
|
Event::Start(Tag::Item) => Self::start_item(state, output),
|
||||||
@@ -232,57 +291,85 @@ impl TerminalRenderer {
|
|||||||
Event::Start(Tag::Strong) => state.strong += 1,
|
Event::Start(Tag::Strong) => state.strong += 1,
|
||||||
Event::End(TagEnd::Strong) => state.strong = state.strong.saturating_sub(1),
|
Event::End(TagEnd::Strong) => state.strong = state.strong.saturating_sub(1),
|
||||||
Event::Code(code) => {
|
Event::Code(code) => {
|
||||||
let _ = write!(
|
let rendered =
|
||||||
output,
|
format!("{}", format!("`{code}`").with(self.color_theme.inline_code));
|
||||||
"{}",
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
format!("`{code}`").with(self.color_theme.inline_code)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
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) => output.push_str(&html),
|
Event::Html(html) | Event::InlineHtml(html) => {
|
||||||
Event::FootnoteReference(reference) => {
|
state.capture_target_mut(output).push_str(&html);
|
||||||
let _ = write!(output, "[{reference}]");
|
}
|
||||||
|
Event::FootnoteReference(reference) => {
|
||||||
|
let _ = write!(state.capture_target_mut(output), "[{reference}]");
|
||||||
|
}
|
||||||
|
Event::TaskListMarker(done) => {
|
||||||
|
state
|
||||||
|
.capture_target_mut(output)
|
||||||
|
.push_str(if done { "[x] " } else { "[ ] " });
|
||||||
|
}
|
||||||
|
Event::InlineMath(math) | Event::DisplayMath(math) => {
|
||||||
|
state.capture_target_mut(output).push_str(&math);
|
||||||
}
|
}
|
||||||
Event::TaskListMarker(done) => output.push_str(if done { "[x] " } else { "[ ] " }),
|
|
||||||
Event::InlineMath(math) | Event::DisplayMath(math) => output.push_str(&math),
|
|
||||||
Event::Start(Tag::Link { dest_url, .. }) => {
|
Event::Start(Tag::Link { dest_url, .. }) => {
|
||||||
let _ = write!(
|
let rendered = format!(
|
||||||
output,
|
|
||||||
"{}",
|
"{}",
|
||||||
format!("[{dest_url}]")
|
format!("[{dest_url}]")
|
||||||
.underlined()
|
.underlined()
|
||||||
.with(self.color_theme.link)
|
.with(self.color_theme.link)
|
||||||
);
|
);
|
||||||
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
Event::Start(Tag::Image { dest_url, .. }) => {
|
Event::Start(Tag::Image { dest_url, .. }) => {
|
||||||
let _ = write!(
|
let rendered = format!(
|
||||||
output,
|
|
||||||
"{}",
|
"{}",
|
||||||
format!("[image:{dest_url}]").with(self.color_theme.link)
|
format!("[image:{dest_url}]").with(self.color_theme.link)
|
||||||
);
|
);
|
||||||
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
Event::Start(
|
Event::Start(Tag::Table(..)) => state.table = Some(TableState::default()),
|
||||||
Tag::Paragraph
|
Event::End(TagEnd::Table) => {
|
||||||
| Tag::Table(..)
|
if let Some(table) = state.table.take() {
|
||||||
| Tag::TableHead
|
output.push_str(&self.render_table(&table));
|
||||||
| Tag::TableRow
|
output.push_str("\n\n");
|
||||||
| Tag::TableCell
|
}
|
||||||
| Tag::MetadataBlock(..)
|
}
|
||||||
| _,
|
Event::Start(Tag::TableHead) => {
|
||||||
)
|
if let Some(table) = state.table.as_mut() {
|
||||||
| Event::End(
|
table.in_head = true;
|
||||||
TagEnd::Link
|
}
|
||||||
| TagEnd::Image
|
}
|
||||||
| TagEnd::Table
|
Event::End(TagEnd::TableHead) => {
|
||||||
| TagEnd::TableHead
|
if let Some(table) = state.table.as_mut() {
|
||||||
| TagEnd::TableRow
|
table.finish_row();
|
||||||
| TagEnd::TableCell
|
table.in_head = false;
|
||||||
| TagEnd::MetadataBlock(..)
|
}
|
||||||
| _,
|
}
|
||||||
) => {}
|
Event::Start(Tag::TableRow) => {
|
||||||
|
if let Some(table) = state.table.as_mut() {
|
||||||
|
table.current_row.clear();
|
||||||
|
table.current_cell.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Event::End(TagEnd::TableRow) => {
|
||||||
|
if let Some(table) = state.table.as_mut() {
|
||||||
|
table.finish_row();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Event::Start(Tag::TableCell) => {
|
||||||
|
if let Some(table) = state.table.as_mut() {
|
||||||
|
table.current_cell.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Event::End(TagEnd::TableCell) => {
|
||||||
|
if let Some(table) = state.table.as_mut() {
|
||||||
|
table.push_cell();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Event::Start(Tag::Paragraph | Tag::MetadataBlock(..) | _)
|
||||||
|
| Event::End(TagEnd::Link | TagEnd::Image | TagEnd::MetadataBlock(..) | _) => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -302,9 +389,19 @@ impl TerminalRenderer {
|
|||||||
let _ = write!(output, "{}", "│ ".with(self.color_theme.quote));
|
let _ = write!(output, "{}", "│ ".with(self.color_theme.quote));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_item(state: &RenderState, output: &mut String) {
|
fn start_item(state: &mut RenderState, output: &mut String) {
|
||||||
output.push_str(&" ".repeat(state.list.saturating_sub(1)));
|
let depth = state.list_stack.len().saturating_sub(1);
|
||||||
output.push_str("• ");
|
output.push_str(&" ".repeat(depth));
|
||||||
|
|
||||||
|
let marker = match state.list_stack.last_mut() {
|
||||||
|
Some(ListKind::Ordered { next_index }) => {
|
||||||
|
let value = *next_index;
|
||||||
|
*next_index += 1;
|
||||||
|
format!("{value}. ")
|
||||||
|
}
|
||||||
|
_ => "• ".to_string(),
|
||||||
|
};
|
||||||
|
output.push_str(&marker);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_code_block(&self, code_language: &str, output: &mut String) {
|
fn start_code_block(&self, code_language: &str, output: &mut String) {
|
||||||
@@ -328,7 +425,7 @@ impl TerminalRenderer {
|
|||||||
fn push_text(
|
fn push_text(
|
||||||
&self,
|
&self,
|
||||||
text: &str,
|
text: &str,
|
||||||
state: &RenderState,
|
state: &mut RenderState,
|
||||||
output: &mut String,
|
output: &mut String,
|
||||||
code_buffer: &mut String,
|
code_buffer: &mut String,
|
||||||
in_code_block: bool,
|
in_code_block: bool,
|
||||||
@@ -336,10 +433,82 @@ impl TerminalRenderer {
|
|||||||
if in_code_block {
|
if in_code_block {
|
||||||
code_buffer.push_str(text);
|
code_buffer.push_str(text);
|
||||||
} else {
|
} else {
|
||||||
output.push_str(&state.style_text(text, &self.color_theme));
|
let rendered = state.style_text(text, &self.color_theme);
|
||||||
|
state.capture_target_mut(output).push_str(&rendered);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn render_table(&self, table: &TableState) -> String {
|
||||||
|
let mut rows = Vec::new();
|
||||||
|
if !table.headers.is_empty() {
|
||||||
|
rows.push(table.headers.clone());
|
||||||
|
}
|
||||||
|
rows.extend(table.rows.iter().cloned());
|
||||||
|
|
||||||
|
if rows.is_empty() {
|
||||||
|
return String::new();
|
||||||
|
}
|
||||||
|
|
||||||
|
let column_count = rows.iter().map(Vec::len).max().unwrap_or(0);
|
||||||
|
let widths = (0..column_count)
|
||||||
|
.map(|column| {
|
||||||
|
rows.iter()
|
||||||
|
.filter_map(|row| row.get(column))
|
||||||
|
.map(|cell| visible_width(cell))
|
||||||
|
.max()
|
||||||
|
.unwrap_or(0)
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
let border = format!("{}", "│".with(self.color_theme.table_border));
|
||||||
|
let separator = widths
|
||||||
|
.iter()
|
||||||
|
.map(|width| "─".repeat(*width + 2))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(&format!("{}", "┼".with(self.color_theme.table_border)));
|
||||||
|
let separator = format!("{border}{separator}{border}");
|
||||||
|
|
||||||
|
let mut output = String::new();
|
||||||
|
if !table.headers.is_empty() {
|
||||||
|
output.push_str(&self.render_table_row(&table.headers, &widths, true));
|
||||||
|
output.push('\n');
|
||||||
|
output.push_str(&separator);
|
||||||
|
if !table.rows.is_empty() {
|
||||||
|
output.push('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (index, row) in table.rows.iter().enumerate() {
|
||||||
|
output.push_str(&self.render_table_row(row, &widths, false));
|
||||||
|
if index + 1 < table.rows.len() {
|
||||||
|
output.push('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
output
|
||||||
|
}
|
||||||
|
|
||||||
|
fn render_table_row(&self, row: &[String], widths: &[usize], is_header: bool) -> String {
|
||||||
|
let border = format!("{}", "│".with(self.color_theme.table_border));
|
||||||
|
let mut line = String::new();
|
||||||
|
line.push_str(&border);
|
||||||
|
|
||||||
|
for (index, width) in widths.iter().enumerate() {
|
||||||
|
let cell = row.get(index).map_or("", String::as_str);
|
||||||
|
line.push(' ');
|
||||||
|
if is_header {
|
||||||
|
let _ = write!(line, "{}", cell.bold().with(self.color_theme.heading));
|
||||||
|
} else {
|
||||||
|
line.push_str(cell);
|
||||||
|
}
|
||||||
|
let padding = width.saturating_sub(visible_width(cell));
|
||||||
|
line.push_str(&" ".repeat(padding + 1));
|
||||||
|
line.push_str(&border);
|
||||||
|
}
|
||||||
|
|
||||||
|
line
|
||||||
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn highlight_code(&self, code: &str, language: &str) -> String {
|
pub fn highlight_code(&self, code: &str, language: &str) -> String {
|
||||||
let syntax = self
|
let syntax = self
|
||||||
@@ -372,32 +541,36 @@ impl TerminalRenderer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
fn visible_width(input: &str) -> usize {
|
||||||
mod tests {
|
strip_ansi(input).chars().count()
|
||||||
use super::{Spinner, TerminalRenderer};
|
}
|
||||||
|
|
||||||
fn strip_ansi(input: &str) -> String {
|
fn strip_ansi(input: &str) -> String {
|
||||||
let mut output = String::new();
|
let mut output = String::new();
|
||||||
let mut chars = input.chars().peekable();
|
let mut chars = input.chars().peekable();
|
||||||
|
|
||||||
while let Some(ch) = chars.next() {
|
while let Some(ch) = chars.next() {
|
||||||
if ch == '\u{1b}' {
|
if ch == '\u{1b}' {
|
||||||
if chars.peek() == Some(&'[') {
|
if chars.peek() == Some(&'[') {
|
||||||
chars.next();
|
chars.next();
|
||||||
for next in chars.by_ref() {
|
for next in chars.by_ref() {
|
||||||
if next.is_ascii_alphabetic() {
|
if next.is_ascii_alphabetic() {
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
output.push(ch);
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
output.push(ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
output
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
output
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::{strip_ansi, Spinner, TerminalRenderer};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn renders_markdown_with_styling_and_lists() {
|
fn renders_markdown_with_styling_and_lists() {
|
||||||
let terminal_renderer = TerminalRenderer::new();
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
@@ -422,6 +595,34 @@ mod tests {
|
|||||||
assert!(markdown_output.contains('\u{1b}'));
|
assert!(markdown_output.contains('\u{1b}'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn renders_ordered_and_nested_lists() {
|
||||||
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
|
let markdown_output =
|
||||||
|
terminal_renderer.render_markdown("1. first\n2. second\n - nested\n - child");
|
||||||
|
let plain_text = strip_ansi(&markdown_output);
|
||||||
|
|
||||||
|
assert!(plain_text.contains("1. first"));
|
||||||
|
assert!(plain_text.contains("2. second"));
|
||||||
|
assert!(plain_text.contains(" • nested"));
|
||||||
|
assert!(plain_text.contains(" • child"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn renders_tables_with_alignment() {
|
||||||
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
|
let markdown_output = terminal_renderer
|
||||||
|
.render_markdown("| Name | Value |\n| ---- | ----- |\n| alpha | 1 |\n| beta | 22 |");
|
||||||
|
let plain_text = strip_ansi(&markdown_output);
|
||||||
|
let lines = plain_text.lines().collect::<Vec<_>>();
|
||||||
|
|
||||||
|
assert_eq!(lines[0], "│ Name │ Value │");
|
||||||
|
assert_eq!(lines[1], "│───────┼───────│");
|
||||||
|
assert_eq!(lines[2], "│ alpha │ 1 │");
|
||||||
|
assert_eq!(lines[3], "│ beta │ 22 │");
|
||||||
|
assert!(markdown_output.contains('\u{1b}'));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn spinner_advances_frames() {
|
fn spinner_advances_frames() {
|
||||||
let terminal_renderer = TerminalRenderer::new();
|
let terminal_renderer = TerminalRenderer::new();
|
||||||
|
|||||||
@@ -62,11 +62,7 @@ pub fn mvp_tool_specs() -> Vec<ToolSpec> {
|
|||||||
"timeout": { "type": "integer", "minimum": 1 },
|
"timeout": { "type": "integer", "minimum": 1 },
|
||||||
"description": { "type": "string" },
|
"description": { "type": "string" },
|
||||||
"run_in_background": { "type": "boolean" },
|
"run_in_background": { "type": "boolean" },
|
||||||
"dangerouslyDisableSandbox": { "type": "boolean" },
|
"dangerouslyDisableSandbox": { "type": "boolean" }
|
||||||
"namespaceRestrictions": { "type": "boolean" },
|
|
||||||
"isolateNetwork": { "type": "boolean" },
|
|
||||||
"filesystemMode": { "type": "string", "enum": ["off", "workspace-only", "allow-list"] },
|
|
||||||
"allowedMounts": { "type": "array", "items": { "type": "string" } }
|
|
||||||
},
|
},
|
||||||
"required": ["command"],
|
"required": ["command"],
|
||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
@@ -2218,7 +2214,6 @@ fn execute_shell_command(
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: None,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2256,7 +2251,6 @@ fn execute_shell_command(
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: None,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if started.elapsed() >= Duration::from_millis(timeout_ms) {
|
if started.elapsed() >= Duration::from_millis(timeout_ms) {
|
||||||
@@ -2287,7 +2281,6 @@ Command exceeded timeout of {timeout_ms} ms",
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: None,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
std::thread::sleep(Duration::from_millis(10));
|
std::thread::sleep(Duration::from_millis(10));
|
||||||
@@ -2314,7 +2307,6 @@ Command exceeded timeout of {timeout_ms} ms",
|
|||||||
structured_content: None,
|
structured_content: None,
|
||||||
persisted_output_path: None,
|
persisted_output_path: None,
|
||||||
persisted_output_size: None,
|
persisted_output_size: None,
|
||||||
sandbox_status: None,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user