Compare commits
7 Commits
rcc/ant-to
...
rcc/hook-p
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c38eac7a90 | ||
|
|
197065bfc8 | ||
|
|
555a245456 | ||
|
|
9efd029e26 | ||
|
|
eb89fc95e7 | ||
|
|
94199beabb | ||
|
|
ac6c5d00a8 |
@@ -37,13 +37,29 @@ 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>,
|
||||||
permission_mode: Option<ResolvedPermissionMode>,
|
permission_mode: Option<ResolvedPermissionMode>,
|
||||||
|
permission_rules: RuntimePermissionRuleConfig,
|
||||||
sandbox: SandboxConfig,
|
sandbox: SandboxConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
|
pub struct RuntimeHookConfig {
|
||||||
|
pre_tool_use: Vec<String>,
|
||||||
|
post_tool_use: Vec<String>,
|
||||||
|
post_tool_use_failure: Vec<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
|
pub struct RuntimePermissionRuleConfig {
|
||||||
|
allow: Vec<String>,
|
||||||
|
deny: Vec<String>,
|
||||||
|
ask: 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>,
|
||||||
@@ -221,12 +237,14 @@ 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,
|
||||||
},
|
},
|
||||||
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)?,
|
||||||
|
permission_rules: parse_optional_permission_rules(&merged_value)?,
|
||||||
sandbox: parse_optional_sandbox_config(&merged_value)?,
|
sandbox: parse_optional_sandbox_config(&merged_value)?,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -278,6 +296,11 @@ 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()
|
||||||
@@ -293,6 +316,11 @@ impl RuntimeConfig {
|
|||||||
self.feature_config.permission_mode
|
self.feature_config.permission_mode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn permission_rules(&self) -> &RuntimePermissionRuleConfig {
|
||||||
|
&self.feature_config.permission_rules
|
||||||
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn sandbox(&self) -> &SandboxConfig {
|
pub fn sandbox(&self) -> &SandboxConfig {
|
||||||
&self.feature_config.sandbox
|
&self.feature_config.sandbox
|
||||||
@@ -300,6 +328,17 @@ 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
|
||||||
@@ -320,12 +359,69 @@ impl RuntimeFeatureConfig {
|
|||||||
self.permission_mode
|
self.permission_mode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn permission_rules(&self) -> &RuntimePermissionRuleConfig {
|
||||||
|
&self.permission_rules
|
||||||
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn sandbox(&self) -> &SandboxConfig {
|
pub fn sandbox(&self) -> &SandboxConfig {
|
||||||
&self.sandbox
|
&self.sandbox
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl RuntimeHookConfig {
|
||||||
|
#[must_use]
|
||||||
|
pub fn new(
|
||||||
|
pre_tool_use: Vec<String>,
|
||||||
|
post_tool_use: Vec<String>,
|
||||||
|
post_tool_use_failure: Vec<String>,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
pre_tool_use,
|
||||||
|
post_tool_use,
|
||||||
|
post_tool_use_failure,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn post_tool_use_failure(&self) -> &[String] {
|
||||||
|
&self.post_tool_use_failure
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RuntimePermissionRuleConfig {
|
||||||
|
#[must_use]
|
||||||
|
pub fn new(allow: Vec<String>, deny: Vec<String>, ask: Vec<String>) -> Self {
|
||||||
|
Self { allow, deny, ask }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn allow(&self) -> &[String] {
|
||||||
|
&self.allow
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn deny(&self) -> &[String] {
|
||||||
|
&self.deny
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn ask(&self) -> &[String] {
|
||||||
|
&self.ask
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl McpConfigCollection {
|
impl McpConfigCollection {
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn servers(&self) -> &BTreeMap<String, ScopedMcpServerConfig> {
|
pub fn servers(&self) -> &BTreeMap<String, ScopedMcpServerConfig> {
|
||||||
@@ -424,6 +520,48 @@ 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(),
|
||||||
|
post_tool_use_failure: optional_string_array(
|
||||||
|
hooks,
|
||||||
|
"PostToolUseFailure",
|
||||||
|
"merged settings.hooks",
|
||||||
|
)?
|
||||||
|
.unwrap_or_default(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_optional_permission_rules(
|
||||||
|
root: &JsonValue,
|
||||||
|
) -> Result<RuntimePermissionRuleConfig, ConfigError> {
|
||||||
|
let Some(object) = root.as_object() else {
|
||||||
|
return Ok(RuntimePermissionRuleConfig::default());
|
||||||
|
};
|
||||||
|
let Some(permissions) = object.get("permissions").and_then(JsonValue::as_object) else {
|
||||||
|
return Ok(RuntimePermissionRuleConfig::default());
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(RuntimePermissionRuleConfig {
|
||||||
|
allow: optional_string_array(permissions, "allow", "merged settings.permissions")?
|
||||||
|
.unwrap_or_default(),
|
||||||
|
deny: optional_string_array(permissions, "deny", "merged settings.permissions")?
|
||||||
|
.unwrap_or_default(),
|
||||||
|
ask: optional_string_array(permissions, "ask", "merged settings.permissions")?
|
||||||
|
.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> {
|
||||||
@@ -783,7 +921,7 @@ mod tests {
|
|||||||
.expect("write user compat config");
|
.expect("write user compat config");
|
||||||
fs::write(
|
fs::write(
|
||||||
home.join("settings.json"),
|
home.join("settings.json"),
|
||||||
r#"{"model":"sonnet","env":{"A2":"1"},"hooks":{"PreToolUse":["base"]},"permissions":{"defaultMode":"plan"}}"#,
|
r#"{"model":"sonnet","env":{"A2":"1"},"hooks":{"PreToolUse":["base"]},"permissions":{"defaultMode":"plan","allow":["Read"],"deny":["Bash(rm -rf)"]}}"#,
|
||||||
)
|
)
|
||||||
.expect("write user settings");
|
.expect("write user settings");
|
||||||
fs::write(
|
fs::write(
|
||||||
@@ -793,7 +931,7 @@ mod tests {
|
|||||||
.expect("write project compat config");
|
.expect("write project compat config");
|
||||||
fs::write(
|
fs::write(
|
||||||
cwd.join(".claude").join("settings.json"),
|
cwd.join(".claude").join("settings.json"),
|
||||||
r#"{"env":{"C":"3"},"hooks":{"PostToolUse":["project"]},"mcpServers":{"project":{"command":"uvx","args":["project"]}}}"#,
|
r#"{"env":{"C":"3"},"hooks":{"PostToolUse":["project"],"PostToolUseFailure":["project-failure"]},"permissions":{"ask":["Edit"]},"mcpServers":{"project":{"command":"uvx","args":["project"]}}}"#,
|
||||||
)
|
)
|
||||||
.expect("write project settings");
|
.expect("write project settings");
|
||||||
fs::write(
|
fs::write(
|
||||||
@@ -836,6 +974,18 @@ 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_eq!(
|
||||||
|
loaded.hooks().post_tool_use_failure(),
|
||||||
|
&["project-failure".to_string()]
|
||||||
|
);
|
||||||
|
assert_eq!(loaded.permission_rules().allow(), &["Read".to_string()]);
|
||||||
|
assert_eq!(
|
||||||
|
loaded.permission_rules().deny(),
|
||||||
|
&["Bash(rm -rf)".to_string()]
|
||||||
|
);
|
||||||
|
assert_eq!(loaded.permission_rules().ask(), &["Edit".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,7 +4,11 @@ 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::permissions::{PermissionOutcome, PermissionPolicy, PermissionPrompter};
|
use crate::config::RuntimeFeatureConfig;
|
||||||
|
use crate::hooks::{HookAbortSignal, HookProgressReporter, HookRunResult, HookRunner};
|
||||||
|
use crate::permissions::{
|
||||||
|
PermissionContext, 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};
|
||||||
|
|
||||||
@@ -94,6 +98,9 @@ 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,
|
||||||
|
hook_abort_signal: HookAbortSignal,
|
||||||
|
hook_progress_reporter: Option<Box<dyn HookProgressReporter>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<C, T> ConversationRuntime<C, T>
|
impl<C, T> ConversationRuntime<C, T>
|
||||||
@@ -108,6 +115,26 @@ 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]
|
||||||
|
#[allow(clippy::needless_pass_by_value)]
|
||||||
|
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 {
|
||||||
@@ -118,6 +145,9 @@ 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),
|
||||||
|
hook_abort_signal: HookAbortSignal::default(),
|
||||||
|
hook_progress_reporter: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +157,93 @@ where
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn with_hook_abort_signal(mut self, hook_abort_signal: HookAbortSignal) -> Self {
|
||||||
|
self.hook_abort_signal = hook_abort_signal;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn with_hook_progress_reporter(
|
||||||
|
mut self,
|
||||||
|
hook_progress_reporter: Box<dyn HookProgressReporter>,
|
||||||
|
) -> Self {
|
||||||
|
self.hook_progress_reporter = Some(hook_progress_reporter);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_pre_tool_use_hook(&mut self, tool_name: &str, input: &str) -> HookRunResult {
|
||||||
|
if let Some(reporter) = self.hook_progress_reporter.as_mut() {
|
||||||
|
self.hook_runner.run_pre_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
Some(reporter.as_mut()),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
self.hook_runner.run_pre_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_post_tool_use_hook(
|
||||||
|
&mut self,
|
||||||
|
tool_name: &str,
|
||||||
|
input: &str,
|
||||||
|
output: &str,
|
||||||
|
is_error: bool,
|
||||||
|
) -> HookRunResult {
|
||||||
|
if let Some(reporter) = self.hook_progress_reporter.as_mut() {
|
||||||
|
self.hook_runner.run_post_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
is_error,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
Some(reporter.as_mut()),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
self.hook_runner.run_post_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
is_error,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_post_tool_use_failure_hook(
|
||||||
|
&mut self,
|
||||||
|
tool_name: &str,
|
||||||
|
input: &str,
|
||||||
|
output: &str,
|
||||||
|
) -> HookRunResult {
|
||||||
|
if let Some(reporter) = self.hook_progress_reporter.as_mut() {
|
||||||
|
self.hook_runner.run_post_tool_use_failure_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
Some(reporter.as_mut()),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
self.hook_runner.run_post_tool_use_failure_with_context(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
output,
|
||||||
|
Some(&self.hook_abort_signal),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_lines)]
|
||||||
pub fn run_turn(
|
pub fn run_turn(
|
||||||
&mut self,
|
&mut self,
|
||||||
user_input: impl Into<String>,
|
user_input: impl Into<String>,
|
||||||
@@ -176,33 +293,85 @@ where
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (tool_use_id, tool_name, input) in pending_tool_uses {
|
for (tool_use_id, tool_name, input) in pending_tool_uses {
|
||||||
let permission_outcome = if let Some(prompt) = prompter.as_mut() {
|
let pre_hook_result = self.run_pre_tool_use_hook(&tool_name, &input);
|
||||||
self.permission_policy
|
let effective_input = pre_hook_result
|
||||||
.authorize(&tool_name, &input, Some(*prompt))
|
.updated_input()
|
||||||
|
.map_or_else(|| input.clone(), ToOwned::to_owned);
|
||||||
|
let permission_context = PermissionContext::new(
|
||||||
|
pre_hook_result.permission_override(),
|
||||||
|
pre_hook_result.permission_reason().map(ToOwned::to_owned),
|
||||||
|
);
|
||||||
|
|
||||||
|
let permission_outcome = if pre_hook_result.is_cancelled() {
|
||||||
|
PermissionOutcome::Deny {
|
||||||
|
reason: format_hook_message(
|
||||||
|
&pre_hook_result,
|
||||||
|
&format!("PreToolUse hook cancelled tool `{tool_name}`"),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
} else if pre_hook_result.is_denied() {
|
||||||
|
PermissionOutcome::Deny {
|
||||||
|
reason: format_hook_message(
|
||||||
|
&pre_hook_result,
|
||||||
|
&format!("PreToolUse hook denied tool `{tool_name}`"),
|
||||||
|
),
|
||||||
|
}
|
||||||
|
} else if let Some(prompt) = prompter.as_mut() {
|
||||||
|
self.permission_policy.authorize_with_context(
|
||||||
|
&tool_name,
|
||||||
|
&effective_input,
|
||||||
|
&permission_context,
|
||||||
|
Some(*prompt),
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
self.permission_policy.authorize(&tool_name, &input, None)
|
self.permission_policy.authorize_with_context(
|
||||||
|
&tool_name,
|
||||||
|
&effective_input,
|
||||||
|
&permission_context,
|
||||||
|
None,
|
||||||
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
let result_message = match permission_outcome {
|
let result_message = match permission_outcome {
|
||||||
PermissionOutcome::Allow => {
|
PermissionOutcome::Allow => {
|
||||||
match self.tool_executor.execute(&tool_name, &input) {
|
let (mut output, mut is_error) =
|
||||||
Ok(output) => ConversationMessage::tool_result(
|
match self.tool_executor.execute(&tool_name, &effective_input) {
|
||||||
tool_use_id,
|
Ok(output) => (output, false),
|
||||||
tool_name,
|
Err(error) => (error.to_string(), true),
|
||||||
output,
|
};
|
||||||
|
output = merge_hook_feedback(pre_hook_result.messages(), output, false);
|
||||||
|
|
||||||
|
let post_hook_result = if is_error {
|
||||||
|
self.run_post_tool_use_failure_hook(
|
||||||
|
&tool_name,
|
||||||
|
&effective_input,
|
||||||
|
&output,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
self.run_post_tool_use_hook(
|
||||||
|
&tool_name,
|
||||||
|
&effective_input,
|
||||||
|
&output,
|
||||||
false,
|
false,
|
||||||
),
|
)
|
||||||
Err(error) => ConversationMessage::tool_result(
|
};
|
||||||
|
if post_hook_result.is_denied() || post_hook_result.is_cancelled() {
|
||||||
|
is_error = true;
|
||||||
|
}
|
||||||
|
output = merge_hook_feedback(
|
||||||
|
post_hook_result.messages(),
|
||||||
|
output,
|
||||||
|
post_hook_result.is_denied() || post_hook_result.is_cancelled(),
|
||||||
|
);
|
||||||
|
|
||||||
|
ConversationMessage::tool_result(tool_use_id, tool_name, output, is_error)
|
||||||
|
}
|
||||||
|
PermissionOutcome::Deny { reason } => ConversationMessage::tool_result(
|
||||||
tool_use_id,
|
tool_use_id,
|
||||||
tool_name,
|
tool_name,
|
||||||
error.to_string(),
|
merge_hook_feedback(pre_hook_result.messages(), reason, true),
|
||||||
true,
|
true,
|
||||||
),
|
),
|
||||||
}
|
|
||||||
}
|
|
||||||
PermissionOutcome::Deny { reason } => {
|
|
||||||
ConversationMessage::tool_result(tool_use_id, tool_name, reason, true)
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
self.session.messages.push(result_message.clone());
|
self.session.messages.push(result_message.clone());
|
||||||
tool_results.push(result_message);
|
tool_results.push(result_message);
|
||||||
@@ -290,6 +459,32 @@ 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)]
|
||||||
@@ -329,6 +524,7 @@ 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,
|
||||||
@@ -503,6 +699,143 @@ 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(),
|
||||||
|
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'")],
|
||||||
|
Vec::new(),
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
|
||||||
|
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;
|
||||||
@@ -581,4 +914,14 @@ 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()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
853
rust/crates/runtime/src/hooks.rs
Normal file
853
rust/crates/runtime/src/hooks.rs
Normal file
@@ -0,0 +1,853 @@
|
|||||||
|
use std::ffi::OsStr;
|
||||||
|
use std::io::Write;
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
use std::sync::{
|
||||||
|
atomic::{AtomicBool, Ordering},
|
||||||
|
Arc,
|
||||||
|
};
|
||||||
|
use std::thread;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use serde_json::{json, Value};
|
||||||
|
|
||||||
|
use crate::config::{RuntimeFeatureConfig, RuntimeHookConfig};
|
||||||
|
use crate::permissions::PermissionOverride;
|
||||||
|
|
||||||
|
pub type HookPermissionDecision = PermissionOverride;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum HookEvent {
|
||||||
|
PreToolUse,
|
||||||
|
PostToolUse,
|
||||||
|
PostToolUseFailure,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HookEvent {
|
||||||
|
#[must_use]
|
||||||
|
pub fn as_str(self) -> &'static str {
|
||||||
|
match self {
|
||||||
|
Self::PreToolUse => "PreToolUse",
|
||||||
|
Self::PostToolUse => "PostToolUse",
|
||||||
|
Self::PostToolUseFailure => "PostToolUseFailure",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub enum HookProgressEvent {
|
||||||
|
Started {
|
||||||
|
event: HookEvent,
|
||||||
|
tool_name: String,
|
||||||
|
command: String,
|
||||||
|
},
|
||||||
|
Completed {
|
||||||
|
event: HookEvent,
|
||||||
|
tool_name: String,
|
||||||
|
command: String,
|
||||||
|
},
|
||||||
|
Cancelled {
|
||||||
|
event: HookEvent,
|
||||||
|
tool_name: String,
|
||||||
|
command: String,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
pub trait HookProgressReporter {
|
||||||
|
fn on_event(&mut self, event: &HookProgressEvent);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default)]
|
||||||
|
pub struct HookAbortSignal {
|
||||||
|
aborted: Arc<AtomicBool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HookAbortSignal {
|
||||||
|
#[must_use]
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self::default()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn abort(&self) {
|
||||||
|
self.aborted.store(true, Ordering::SeqCst);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn is_aborted(&self) -> bool {
|
||||||
|
self.aborted.load(Ordering::SeqCst)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct HookRunResult {
|
||||||
|
denied: bool,
|
||||||
|
cancelled: bool,
|
||||||
|
messages: Vec<String>,
|
||||||
|
permission_override: Option<PermissionOverride>,
|
||||||
|
permission_reason: Option<String>,
|
||||||
|
updated_input: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HookRunResult {
|
||||||
|
#[must_use]
|
||||||
|
pub fn allow(messages: Vec<String>) -> Self {
|
||||||
|
Self {
|
||||||
|
denied: false,
|
||||||
|
cancelled: false,
|
||||||
|
messages,
|
||||||
|
permission_override: None,
|
||||||
|
permission_reason: None,
|
||||||
|
updated_input: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn is_denied(&self) -> bool {
|
||||||
|
self.denied
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn is_cancelled(&self) -> bool {
|
||||||
|
self.cancelled
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn messages(&self) -> &[String] {
|
||||||
|
&self.messages
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn permission_override(&self) -> Option<PermissionOverride> {
|
||||||
|
self.permission_override
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn permission_decision(&self) -> Option<HookPermissionDecision> {
|
||||||
|
self.permission_override
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn permission_reason(&self) -> Option<&str> {
|
||||||
|
self.permission_reason.as_deref()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn updated_input(&self) -> Option<&str> {
|
||||||
|
self.updated_input.as_deref()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn updated_input_json(&self) -> Option<&str> {
|
||||||
|
self.updated_input()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
|
pub struct HookRunner {
|
||||||
|
config: RuntimeHookConfig,
|
||||||
|
}
|
||||||
|
|
||||||
|
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_pre_tool_use_with_context(tool_name, tool_input, None, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_pre_tool_use_with_context(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
reporter: Option<&mut dyn HookProgressReporter>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
Self::run_commands(
|
||||||
|
HookEvent::PreToolUse,
|
||||||
|
self.config.pre_tool_use(),
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
None,
|
||||||
|
false,
|
||||||
|
abort_signal,
|
||||||
|
reporter,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_pre_tool_use_with_signal(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
self.run_pre_tool_use_with_context(tool_name, tool_input, abort_signal, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: &str,
|
||||||
|
is_error: bool,
|
||||||
|
) -> HookRunResult {
|
||||||
|
self.run_post_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
tool_output,
|
||||||
|
is_error,
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use_with_context(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: &str,
|
||||||
|
is_error: bool,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
reporter: Option<&mut dyn HookProgressReporter>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
Self::run_commands(
|
||||||
|
HookEvent::PostToolUse,
|
||||||
|
self.config.post_tool_use(),
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
Some(tool_output),
|
||||||
|
is_error,
|
||||||
|
abort_signal,
|
||||||
|
reporter,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use_with_signal(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: &str,
|
||||||
|
is_error: bool,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
self.run_post_tool_use_with_context(
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
tool_output,
|
||||||
|
is_error,
|
||||||
|
abort_signal,
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use_failure(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_error: &str,
|
||||||
|
) -> HookRunResult {
|
||||||
|
self.run_post_tool_use_failure_with_context(tool_name, tool_input, tool_error, None, None)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use_failure_with_context(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_error: &str,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
reporter: Option<&mut dyn HookProgressReporter>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
Self::run_commands(
|
||||||
|
HookEvent::PostToolUseFailure,
|
||||||
|
self.config.post_tool_use_failure(),
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
Some(tool_error),
|
||||||
|
true,
|
||||||
|
abort_signal,
|
||||||
|
reporter,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn run_post_tool_use_failure_with_signal(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_error: &str,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
self.run_post_tool_use_failure_with_context(
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
tool_error,
|
||||||
|
abort_signal,
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
|
fn run_commands(
|
||||||
|
event: HookEvent,
|
||||||
|
commands: &[String],
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: Option<&str>,
|
||||||
|
is_error: bool,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
mut reporter: Option<&mut dyn HookProgressReporter>,
|
||||||
|
) -> HookRunResult {
|
||||||
|
if commands.is_empty() {
|
||||||
|
return HookRunResult::allow(Vec::new());
|
||||||
|
}
|
||||||
|
|
||||||
|
if abort_signal.is_some_and(HookAbortSignal::is_aborted) {
|
||||||
|
return HookRunResult {
|
||||||
|
denied: false,
|
||||||
|
cancelled: true,
|
||||||
|
messages: vec![format!(
|
||||||
|
"{} hook cancelled before execution",
|
||||||
|
event.as_str()
|
||||||
|
)],
|
||||||
|
permission_override: None,
|
||||||
|
permission_reason: None,
|
||||||
|
updated_input: None,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let payload = hook_payload(event, tool_name, tool_input, tool_output, is_error).to_string();
|
||||||
|
let mut result = HookRunResult::allow(Vec::new());
|
||||||
|
|
||||||
|
for command in commands {
|
||||||
|
if let Some(reporter) = reporter.as_deref_mut() {
|
||||||
|
reporter.on_event(&HookProgressEvent::Started {
|
||||||
|
event,
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
command: command.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
match Self::run_command(
|
||||||
|
command,
|
||||||
|
event,
|
||||||
|
tool_name,
|
||||||
|
tool_input,
|
||||||
|
tool_output,
|
||||||
|
is_error,
|
||||||
|
&payload,
|
||||||
|
abort_signal,
|
||||||
|
) {
|
||||||
|
HookCommandOutcome::Allow { parsed } => {
|
||||||
|
if let Some(reporter) = reporter.as_deref_mut() {
|
||||||
|
reporter.on_event(&HookProgressEvent::Completed {
|
||||||
|
event,
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
command: command.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
merge_parsed_hook_output(&mut result, parsed);
|
||||||
|
}
|
||||||
|
HookCommandOutcome::Deny { parsed } => {
|
||||||
|
if let Some(reporter) = reporter.as_deref_mut() {
|
||||||
|
reporter.on_event(&HookProgressEvent::Completed {
|
||||||
|
event,
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
command: command.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
merge_parsed_hook_output(&mut result, parsed);
|
||||||
|
result.denied = true;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
HookCommandOutcome::Warn { message } => {
|
||||||
|
if let Some(reporter) = reporter.as_deref_mut() {
|
||||||
|
reporter.on_event(&HookProgressEvent::Completed {
|
||||||
|
event,
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
command: command.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
result.messages.push(message);
|
||||||
|
}
|
||||||
|
HookCommandOutcome::Cancelled { message } => {
|
||||||
|
if let Some(reporter) = reporter.as_deref_mut() {
|
||||||
|
reporter.on_event(&HookProgressEvent::Cancelled {
|
||||||
|
event,
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
command: command.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
result.cancelled = true;
|
||||||
|
result.messages.push(message);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::too_many_arguments)]
|
||||||
|
fn run_command(
|
||||||
|
command: &str,
|
||||||
|
event: HookEvent,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: Option<&str>,
|
||||||
|
is_error: bool,
|
||||||
|
payload: &str,
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
) -> HookCommandOutcome {
|
||||||
|
let mut child = shell_command(command);
|
||||||
|
child.stdin(Stdio::piped());
|
||||||
|
child.stdout(Stdio::piped());
|
||||||
|
child.stderr(Stdio::piped());
|
||||||
|
child.env("HOOK_EVENT", event.as_str());
|
||||||
|
child.env("HOOK_TOOL_NAME", tool_name);
|
||||||
|
child.env("HOOK_TOOL_INPUT", tool_input);
|
||||||
|
child.env("HOOK_TOOL_IS_ERROR", if is_error { "1" } else { "0" });
|
||||||
|
if let Some(tool_output) = tool_output {
|
||||||
|
child.env("HOOK_TOOL_OUTPUT", tool_output);
|
||||||
|
}
|
||||||
|
|
||||||
|
match child.output_with_stdin(payload.as_bytes(), abort_signal) {
|
||||||
|
Ok(CommandExecution::Finished(output)) => {
|
||||||
|
let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||||
|
let parsed = parse_hook_output(&stdout);
|
||||||
|
match output.status.code() {
|
||||||
|
Some(0) => {
|
||||||
|
if parsed.deny {
|
||||||
|
HookCommandOutcome::Deny { parsed }
|
||||||
|
} else {
|
||||||
|
HookCommandOutcome::Allow { parsed }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Some(2) => HookCommandOutcome::Deny {
|
||||||
|
parsed: parsed.with_fallback_message(format!(
|
||||||
|
"{} hook denied tool `{tool_name}`",
|
||||||
|
event.as_str()
|
||||||
|
)),
|
||||||
|
},
|
||||||
|
Some(code) => HookCommandOutcome::Warn {
|
||||||
|
message: format_hook_warning(
|
||||||
|
command,
|
||||||
|
code,
|
||||||
|
parsed.primary_message(),
|
||||||
|
stderr.as_str(),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
None => HookCommandOutcome::Warn {
|
||||||
|
message: format!(
|
||||||
|
"{} hook `{command}` terminated by signal while handling `{tool_name}`",
|
||||||
|
event.as_str()
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(CommandExecution::Cancelled) => HookCommandOutcome::Cancelled {
|
||||||
|
message: format!(
|
||||||
|
"{} hook `{command}` cancelled while handling `{tool_name}`",
|
||||||
|
event.as_str()
|
||||||
|
),
|
||||||
|
},
|
||||||
|
Err(error) => HookCommandOutcome::Warn {
|
||||||
|
message: format!(
|
||||||
|
"{} hook `{command}` failed to start for `{tool_name}`: {error}",
|
||||||
|
event.as_str()
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum HookCommandOutcome {
|
||||||
|
Allow { parsed: ParsedHookOutput },
|
||||||
|
Deny { parsed: ParsedHookOutput },
|
||||||
|
Warn { message: String },
|
||||||
|
Cancelled { message: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
|
struct ParsedHookOutput {
|
||||||
|
messages: Vec<String>,
|
||||||
|
deny: bool,
|
||||||
|
permission_override: Option<PermissionOverride>,
|
||||||
|
permission_reason: Option<String>,
|
||||||
|
updated_input: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ParsedHookOutput {
|
||||||
|
fn with_fallback_message(mut self, fallback: String) -> Self {
|
||||||
|
if self.messages.is_empty() {
|
||||||
|
self.messages.push(fallback);
|
||||||
|
}
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn primary_message(&self) -> Option<&str> {
|
||||||
|
self.messages.first().map(String::as_str)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn merge_parsed_hook_output(target: &mut HookRunResult, parsed: ParsedHookOutput) {
|
||||||
|
target.messages.extend(parsed.messages);
|
||||||
|
if parsed.permission_override.is_some() {
|
||||||
|
target.permission_override = parsed.permission_override;
|
||||||
|
}
|
||||||
|
if parsed.permission_reason.is_some() {
|
||||||
|
target.permission_reason = parsed.permission_reason;
|
||||||
|
}
|
||||||
|
if parsed.updated_input.is_some() {
|
||||||
|
target.updated_input = parsed.updated_input;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_hook_output(stdout: &str) -> ParsedHookOutput {
|
||||||
|
if stdout.is_empty() {
|
||||||
|
return ParsedHookOutput::default();
|
||||||
|
}
|
||||||
|
|
||||||
|
let Ok(Value::Object(root)) = serde_json::from_str::<Value>(stdout) else {
|
||||||
|
return ParsedHookOutput {
|
||||||
|
messages: vec![stdout.to_string()],
|
||||||
|
..ParsedHookOutput::default()
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut parsed = ParsedHookOutput::default();
|
||||||
|
|
||||||
|
if let Some(message) = root.get("systemMessage").and_then(Value::as_str) {
|
||||||
|
parsed.messages.push(message.to_string());
|
||||||
|
}
|
||||||
|
if let Some(message) = root.get("reason").and_then(Value::as_str) {
|
||||||
|
parsed.messages.push(message.to_string());
|
||||||
|
}
|
||||||
|
if root.get("continue").and_then(Value::as_bool) == Some(false)
|
||||||
|
|| root.get("decision").and_then(Value::as_str) == Some("block")
|
||||||
|
{
|
||||||
|
parsed.deny = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(Value::Object(specific)) = root.get("hookSpecificOutput") {
|
||||||
|
if let Some(Value::String(additional_context)) = specific.get("additionalContext") {
|
||||||
|
parsed.messages.push(additional_context.clone());
|
||||||
|
}
|
||||||
|
if let Some(decision) = specific.get("permissionDecision").and_then(Value::as_str) {
|
||||||
|
parsed.permission_override = match decision {
|
||||||
|
"allow" => Some(PermissionOverride::Allow),
|
||||||
|
"deny" => Some(PermissionOverride::Deny),
|
||||||
|
"ask" => Some(PermissionOverride::Ask),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if let Some(reason) = specific
|
||||||
|
.get("permissionDecisionReason")
|
||||||
|
.and_then(Value::as_str)
|
||||||
|
{
|
||||||
|
parsed.permission_reason = Some(reason.to_string());
|
||||||
|
}
|
||||||
|
if let Some(updated_input) = specific.get("updatedInput") {
|
||||||
|
parsed.updated_input = serde_json::to_string(updated_input).ok();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if parsed.messages.is_empty() {
|
||||||
|
parsed.messages.push(stdout.to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed
|
||||||
|
}
|
||||||
|
|
||||||
|
fn hook_payload(
|
||||||
|
event: HookEvent,
|
||||||
|
tool_name: &str,
|
||||||
|
tool_input: &str,
|
||||||
|
tool_output: Option<&str>,
|
||||||
|
is_error: bool,
|
||||||
|
) -> Value {
|
||||||
|
match event {
|
||||||
|
HookEvent::PostToolUseFailure => json!({
|
||||||
|
"hook_event_name": event.as_str(),
|
||||||
|
"tool_name": tool_name,
|
||||||
|
"tool_input": parse_tool_input(tool_input),
|
||||||
|
"tool_input_json": tool_input,
|
||||||
|
"tool_error": tool_output,
|
||||||
|
"tool_result_is_error": true,
|
||||||
|
}),
|
||||||
|
_ => 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,
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_tool_input(tool_input: &str) -> 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: Stdio) -> &mut Self {
|
||||||
|
self.command.stdin(cfg);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stdout(&mut self, cfg: Stdio) -> &mut Self {
|
||||||
|
self.command.stdout(cfg);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stderr(&mut self, cfg: 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],
|
||||||
|
abort_signal: Option<&HookAbortSignal>,
|
||||||
|
) -> std::io::Result<CommandExecution> {
|
||||||
|
let mut child = self.command.spawn()?;
|
||||||
|
if let Some(mut child_stdin) = child.stdin.take() {
|
||||||
|
child_stdin.write_all(stdin)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
loop {
|
||||||
|
if abort_signal.is_some_and(HookAbortSignal::is_aborted) {
|
||||||
|
let _ = child.kill();
|
||||||
|
let _ = child.wait_with_output();
|
||||||
|
return Ok(CommandExecution::Cancelled);
|
||||||
|
}
|
||||||
|
|
||||||
|
match child.try_wait()? {
|
||||||
|
Some(_) => return child.wait_with_output().map(CommandExecution::Finished),
|
||||||
|
None => thread::sleep(Duration::from_millis(20)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum CommandExecution {
|
||||||
|
Finished(std::process::Output),
|
||||||
|
Cancelled,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use std::thread;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
HookAbortSignal, HookEvent, HookProgressEvent, HookProgressReporter, HookRunResult,
|
||||||
|
HookRunner,
|
||||||
|
};
|
||||||
|
use crate::config::{RuntimeFeatureConfig, RuntimeHookConfig};
|
||||||
|
use crate::permissions::PermissionOverride;
|
||||||
|
|
||||||
|
struct RecordingReporter {
|
||||||
|
events: Vec<HookProgressEvent>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HookProgressReporter for RecordingReporter {
|
||||||
|
fn on_event(&mut self, event: &HookProgressEvent) {
|
||||||
|
self.events.push(event.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn allows_exit_code_zero_and_captures_stdout() {
|
||||||
|
let runner = HookRunner::new(RuntimeHookConfig::new(
|
||||||
|
vec![shell_snippet("printf 'pre ok'")],
|
||||||
|
Vec::new(),
|
||||||
|
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(),
|
||||||
|
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(),
|
||||||
|
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")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_pre_hook_permission_override_and_updated_input() {
|
||||||
|
let runner = HookRunner::new(RuntimeHookConfig::new(
|
||||||
|
vec![shell_snippet(
|
||||||
|
r#"printf '%s' '{"systemMessage":"updated","hookSpecificOutput":{"permissionDecision":"allow","permissionDecisionReason":"hook ok","updatedInput":{"command":"git status"}}}'"#,
|
||||||
|
)],
|
||||||
|
Vec::new(),
|
||||||
|
Vec::new(),
|
||||||
|
));
|
||||||
|
|
||||||
|
let result = runner.run_pre_tool_use("bash", r#"{"command":"pwd"}"#);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
result.permission_override(),
|
||||||
|
Some(PermissionOverride::Allow)
|
||||||
|
);
|
||||||
|
assert_eq!(result.permission_reason(), Some("hook ok"));
|
||||||
|
assert_eq!(result.updated_input(), Some(r#"{"command":"git status"}"#));
|
||||||
|
assert!(result.messages().iter().any(|message| message == "updated"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn runs_post_tool_use_failure_hooks() {
|
||||||
|
let runner = HookRunner::new(RuntimeHookConfig::new(
|
||||||
|
Vec::new(),
|
||||||
|
Vec::new(),
|
||||||
|
vec![shell_snippet("printf 'failure hook ran'")],
|
||||||
|
));
|
||||||
|
|
||||||
|
let result =
|
||||||
|
runner.run_post_tool_use_failure("bash", r#"{"command":"false"}"#, "command failed");
|
||||||
|
|
||||||
|
assert!(!result.is_denied());
|
||||||
|
assert_eq!(result.messages(), &["failure hook ran".to_string()]);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn abort_signal_cancels_long_running_hook_and_reports_progress() {
|
||||||
|
let runner = HookRunner::new(RuntimeHookConfig::new(
|
||||||
|
vec![shell_snippet("sleep 5")],
|
||||||
|
Vec::new(),
|
||||||
|
Vec::new(),
|
||||||
|
));
|
||||||
|
let abort_signal = HookAbortSignal::new();
|
||||||
|
let abort_signal_for_thread = abort_signal.clone();
|
||||||
|
let mut reporter = RecordingReporter { events: Vec::new() };
|
||||||
|
|
||||||
|
thread::spawn(move || {
|
||||||
|
thread::sleep(Duration::from_millis(100));
|
||||||
|
abort_signal_for_thread.abort();
|
||||||
|
});
|
||||||
|
|
||||||
|
let result = runner.run_pre_tool_use_with_context(
|
||||||
|
"bash",
|
||||||
|
r#"{"command":"sleep 5"}"#,
|
||||||
|
Some(&abort_signal),
|
||||||
|
Some(&mut reporter),
|
||||||
|
);
|
||||||
|
|
||||||
|
assert!(result.is_cancelled());
|
||||||
|
assert!(reporter.events.iter().any(|event| matches!(
|
||||||
|
event,
|
||||||
|
HookProgressEvent::Started {
|
||||||
|
event: HookEvent::PreToolUse,
|
||||||
|
..
|
||||||
|
}
|
||||||
|
)));
|
||||||
|
assert!(reporter.events.iter().any(|event| matches!(
|
||||||
|
event,
|
||||||
|
HookProgressEvent::Cancelled {
|
||||||
|
event: HookEvent::PreToolUse,
|
||||||
|
..
|
||||||
|
}
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(windows)]
|
||||||
|
fn shell_snippet(script: &str) -> String {
|
||||||
|
script.replace('\'', "\"")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn shell_snippet(script: &str) -> String {
|
||||||
|
script.to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ 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;
|
||||||
@@ -26,8 +27,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, ScopedMcpServerConfig,
|
ResolvedPermissionMode, RuntimeConfig, RuntimeFeatureConfig, RuntimeHookConfig,
|
||||||
CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
RuntimePermissionRuleConfig, ScopedMcpServerConfig, CLAUDE_CODE_SETTINGS_SCHEMA_NAME,
|
||||||
};
|
};
|
||||||
pub use conversation::{
|
pub use conversation::{
|
||||||
ApiClient, ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, StaticToolExecutor,
|
ApiClient, ApiRequest, AssistantEvent, ConversationRuntime, RuntimeError, StaticToolExecutor,
|
||||||
@@ -38,6 +39,9 @@ pub use file_ops::{
|
|||||||
GrepSearchInput, GrepSearchOutput, ReadFileOutput, StructuredPatchHunk, TextFilePayload,
|
GrepSearchInput, GrepSearchOutput, ReadFileOutput, StructuredPatchHunk, TextFilePayload,
|
||||||
WriteFileOutput,
|
WriteFileOutput,
|
||||||
};
|
};
|
||||||
|
pub use hooks::{
|
||||||
|
HookAbortSignal, HookEvent, HookProgressEvent, HookProgressReporter, 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,
|
||||||
@@ -62,8 +66,8 @@ pub use oauth::{
|
|||||||
PkceChallengeMethod, PkceCodePair,
|
PkceChallengeMethod, PkceCodePair,
|
||||||
};
|
};
|
||||||
pub use permissions::{
|
pub use permissions::{
|
||||||
PermissionMode, PermissionOutcome, PermissionPolicy, PermissionPromptDecision,
|
PermissionContext, PermissionMode, PermissionOutcome, PermissionOverride, PermissionPolicy,
|
||||||
PermissionPrompter, PermissionRequest,
|
PermissionPromptDecision, PermissionPrompter, PermissionRequest,
|
||||||
};
|
};
|
||||||
pub use prompt::{
|
pub use prompt::{
|
||||||
load_system_prompt, prepend_bullets, ContextFile, ProjectContext, PromptBuildError,
|
load_system_prompt, prepend_bullets, ContextFile, ProjectContext, PromptBuildError,
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
use serde_json::Value;
|
||||||
|
|
||||||
|
use crate::config::RuntimePermissionRuleConfig;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
pub enum PermissionMode {
|
pub enum PermissionMode {
|
||||||
ReadOnly,
|
ReadOnly,
|
||||||
@@ -22,12 +26,49 @@ impl PermissionMode {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
|
pub enum PermissionOverride {
|
||||||
|
Allow,
|
||||||
|
Deny,
|
||||||
|
Ask,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq, Default)]
|
||||||
|
pub struct PermissionContext {
|
||||||
|
override_decision: Option<PermissionOverride>,
|
||||||
|
override_reason: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PermissionContext {
|
||||||
|
#[must_use]
|
||||||
|
pub fn new(
|
||||||
|
override_decision: Option<PermissionOverride>,
|
||||||
|
override_reason: Option<String>,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
override_decision,
|
||||||
|
override_reason,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn override_decision(&self) -> Option<PermissionOverride> {
|
||||||
|
self.override_decision
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn override_reason(&self) -> Option<&str> {
|
||||||
|
self.override_reason.as_deref()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct PermissionRequest {
|
pub struct PermissionRequest {
|
||||||
pub tool_name: String,
|
pub tool_name: String,
|
||||||
pub input: String,
|
pub input: String,
|
||||||
pub current_mode: PermissionMode,
|
pub current_mode: PermissionMode,
|
||||||
pub required_mode: PermissionMode,
|
pub required_mode: PermissionMode,
|
||||||
|
pub reason: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
@@ -50,6 +91,9 @@ pub enum PermissionOutcome {
|
|||||||
pub struct PermissionPolicy {
|
pub struct PermissionPolicy {
|
||||||
active_mode: PermissionMode,
|
active_mode: PermissionMode,
|
||||||
tool_requirements: BTreeMap<String, PermissionMode>,
|
tool_requirements: BTreeMap<String, PermissionMode>,
|
||||||
|
allow_rules: Vec<PermissionRule>,
|
||||||
|
deny_rules: Vec<PermissionRule>,
|
||||||
|
ask_rules: Vec<PermissionRule>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PermissionPolicy {
|
impl PermissionPolicy {
|
||||||
@@ -58,6 +102,9 @@ impl PermissionPolicy {
|
|||||||
Self {
|
Self {
|
||||||
active_mode,
|
active_mode,
|
||||||
tool_requirements: BTreeMap::new(),
|
tool_requirements: BTreeMap::new(),
|
||||||
|
allow_rules: Vec::new(),
|
||||||
|
deny_rules: Vec::new(),
|
||||||
|
ask_rules: Vec::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,6 +119,26 @@ impl PermissionPolicy {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn with_permission_rules(mut self, config: &RuntimePermissionRuleConfig) -> Self {
|
||||||
|
self.allow_rules = config
|
||||||
|
.allow()
|
||||||
|
.iter()
|
||||||
|
.map(|rule| PermissionRule::parse(rule))
|
||||||
|
.collect();
|
||||||
|
self.deny_rules = config
|
||||||
|
.deny()
|
||||||
|
.iter()
|
||||||
|
.map(|rule| PermissionRule::parse(rule))
|
||||||
|
.collect();
|
||||||
|
self.ask_rules = config
|
||||||
|
.ask()
|
||||||
|
.iter()
|
||||||
|
.map(|rule| PermissionRule::parse(rule))
|
||||||
|
.collect();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn active_mode(&self) -> PermissionMode {
|
pub fn active_mode(&self) -> PermissionMode {
|
||||||
self.active_mode
|
self.active_mode
|
||||||
@@ -90,38 +157,121 @@ impl PermissionPolicy {
|
|||||||
&self,
|
&self,
|
||||||
tool_name: &str,
|
tool_name: &str,
|
||||||
input: &str,
|
input: &str,
|
||||||
mut prompter: Option<&mut dyn PermissionPrompter>,
|
prompter: Option<&mut dyn PermissionPrompter>,
|
||||||
) -> PermissionOutcome {
|
) -> PermissionOutcome {
|
||||||
let current_mode = self.active_mode();
|
self.authorize_with_context(tool_name, input, &PermissionContext::default(), prompter)
|
||||||
let required_mode = self.required_mode_for(tool_name);
|
|
||||||
if current_mode == PermissionMode::Allow || current_mode >= required_mode {
|
|
||||||
return PermissionOutcome::Allow;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let request = PermissionRequest {
|
#[must_use]
|
||||||
tool_name: tool_name.to_string(),
|
#[allow(clippy::too_many_lines)]
|
||||||
input: input.to_string(),
|
pub fn authorize_with_context(
|
||||||
|
&self,
|
||||||
|
tool_name: &str,
|
||||||
|
input: &str,
|
||||||
|
context: &PermissionContext,
|
||||||
|
prompter: Option<&mut dyn PermissionPrompter>,
|
||||||
|
) -> PermissionOutcome {
|
||||||
|
if let Some(rule) = Self::find_matching_rule(&self.deny_rules, tool_name, input) {
|
||||||
|
return PermissionOutcome::Deny {
|
||||||
|
reason: format!(
|
||||||
|
"Permission to use {tool_name} has been denied by rule '{}'",
|
||||||
|
rule.raw
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let current_mode = self.active_mode();
|
||||||
|
let required_mode = self.required_mode_for(tool_name);
|
||||||
|
let ask_rule = Self::find_matching_rule(&self.ask_rules, tool_name, input);
|
||||||
|
let allow_rule = Self::find_matching_rule(&self.allow_rules, tool_name, input);
|
||||||
|
|
||||||
|
match context.override_decision() {
|
||||||
|
Some(PermissionOverride::Deny) => {
|
||||||
|
return PermissionOutcome::Deny {
|
||||||
|
reason: context.override_reason().map_or_else(
|
||||||
|
|| format!("tool '{tool_name}' denied by hook"),
|
||||||
|
ToOwned::to_owned,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
Some(PermissionOverride::Ask) => {
|
||||||
|
let reason = context.override_reason().map_or_else(
|
||||||
|
|| format!("tool '{tool_name}' requires approval due to hook guidance"),
|
||||||
|
ToOwned::to_owned,
|
||||||
|
);
|
||||||
|
return Self::prompt_or_deny(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
current_mode,
|
current_mode,
|
||||||
required_mode,
|
required_mode,
|
||||||
};
|
Some(reason),
|
||||||
|
prompter,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
Some(PermissionOverride::Allow) => {
|
||||||
|
if let Some(rule) = ask_rule {
|
||||||
|
let reason = format!(
|
||||||
|
"tool '{tool_name}' requires approval due to ask rule '{}'",
|
||||||
|
rule.raw
|
||||||
|
);
|
||||||
|
return Self::prompt_or_deny(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
current_mode,
|
||||||
|
required_mode,
|
||||||
|
Some(reason),
|
||||||
|
prompter,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if allow_rule.is_some()
|
||||||
|
|| current_mode == PermissionMode::Allow
|
||||||
|
|| current_mode >= required_mode
|
||||||
|
{
|
||||||
|
return PermissionOutcome::Allow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(rule) = ask_rule {
|
||||||
|
let reason = format!(
|
||||||
|
"tool '{tool_name}' requires approval due to ask rule '{}'",
|
||||||
|
rule.raw
|
||||||
|
);
|
||||||
|
return Self::prompt_or_deny(
|
||||||
|
tool_name,
|
||||||
|
input,
|
||||||
|
current_mode,
|
||||||
|
required_mode,
|
||||||
|
Some(reason),
|
||||||
|
prompter,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if allow_rule.is_some()
|
||||||
|
|| current_mode == PermissionMode::Allow
|
||||||
|
|| current_mode >= required_mode
|
||||||
|
{
|
||||||
|
return PermissionOutcome::Allow;
|
||||||
|
}
|
||||||
|
|
||||||
if current_mode == PermissionMode::Prompt
|
if current_mode == PermissionMode::Prompt
|
||||||
|| (current_mode == PermissionMode::WorkspaceWrite
|
|| (current_mode == PermissionMode::WorkspaceWrite
|
||||||
&& required_mode == PermissionMode::DangerFullAccess)
|
&& required_mode == PermissionMode::DangerFullAccess)
|
||||||
{
|
{
|
||||||
return match prompter.as_mut() {
|
let reason = Some(format!(
|
||||||
Some(prompter) => match prompter.decide(&request) {
|
|
||||||
PermissionPromptDecision::Allow => PermissionOutcome::Allow,
|
|
||||||
PermissionPromptDecision::Deny { reason } => PermissionOutcome::Deny { reason },
|
|
||||||
},
|
|
||||||
None => PermissionOutcome::Deny {
|
|
||||||
reason: format!(
|
|
||||||
"tool '{tool_name}' requires approval to escalate from {} to {}",
|
"tool '{tool_name}' requires approval to escalate from {} to {}",
|
||||||
current_mode.as_str(),
|
current_mode.as_str(),
|
||||||
required_mode.as_str()
|
required_mode.as_str()
|
||||||
),
|
));
|
||||||
},
|
return Self::prompt_or_deny(
|
||||||
};
|
tool_name,
|
||||||
|
input,
|
||||||
|
current_mode,
|
||||||
|
required_mode,
|
||||||
|
reason,
|
||||||
|
prompter,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
PermissionOutcome::Deny {
|
PermissionOutcome::Deny {
|
||||||
@@ -132,14 +282,191 @@ impl PermissionPolicy {
|
|||||||
),
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn prompt_or_deny(
|
||||||
|
tool_name: &str,
|
||||||
|
input: &str,
|
||||||
|
current_mode: PermissionMode,
|
||||||
|
required_mode: PermissionMode,
|
||||||
|
reason: Option<String>,
|
||||||
|
mut prompter: Option<&mut dyn PermissionPrompter>,
|
||||||
|
) -> PermissionOutcome {
|
||||||
|
let request = PermissionRequest {
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
input: input.to_string(),
|
||||||
|
current_mode,
|
||||||
|
required_mode,
|
||||||
|
reason: reason.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
match prompter.as_mut() {
|
||||||
|
Some(prompter) => match prompter.decide(&request) {
|
||||||
|
PermissionPromptDecision::Allow => PermissionOutcome::Allow,
|
||||||
|
PermissionPromptDecision::Deny { reason } => PermissionOutcome::Deny { reason },
|
||||||
|
},
|
||||||
|
None => PermissionOutcome::Deny {
|
||||||
|
reason: reason.unwrap_or_else(|| {
|
||||||
|
format!(
|
||||||
|
"tool '{tool_name}' requires approval to run while mode is {}",
|
||||||
|
current_mode.as_str()
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_matching_rule<'a>(
|
||||||
|
rules: &'a [PermissionRule],
|
||||||
|
tool_name: &str,
|
||||||
|
input: &str,
|
||||||
|
) -> Option<&'a PermissionRule> {
|
||||||
|
rules.iter().find(|rule| rule.matches(tool_name, input))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
struct PermissionRule {
|
||||||
|
raw: String,
|
||||||
|
tool_name: String,
|
||||||
|
matcher: PermissionRuleMatcher,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
enum PermissionRuleMatcher {
|
||||||
|
Any,
|
||||||
|
Exact(String),
|
||||||
|
Prefix(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PermissionRule {
|
||||||
|
fn parse(raw: &str) -> Self {
|
||||||
|
let trimmed = raw.trim();
|
||||||
|
let open = find_first_unescaped(trimmed, '(');
|
||||||
|
let close = find_last_unescaped(trimmed, ')');
|
||||||
|
|
||||||
|
if let (Some(open), Some(close)) = (open, close) {
|
||||||
|
if close == trimmed.len() - 1 && open < close {
|
||||||
|
let tool_name = trimmed[..open].trim();
|
||||||
|
let content = &trimmed[open + 1..close];
|
||||||
|
if !tool_name.is_empty() {
|
||||||
|
let matcher = parse_rule_matcher(content);
|
||||||
|
return Self {
|
||||||
|
raw: trimmed.to_string(),
|
||||||
|
tool_name: tool_name.to_string(),
|
||||||
|
matcher,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Self {
|
||||||
|
raw: trimmed.to_string(),
|
||||||
|
tool_name: trimmed.to_string(),
|
||||||
|
matcher: PermissionRuleMatcher::Any,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn matches(&self, tool_name: &str, input: &str) -> bool {
|
||||||
|
if self.tool_name != tool_name {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
match &self.matcher {
|
||||||
|
PermissionRuleMatcher::Any => true,
|
||||||
|
PermissionRuleMatcher::Exact(expected) => {
|
||||||
|
extract_permission_subject(input).is_some_and(|candidate| candidate == *expected)
|
||||||
|
}
|
||||||
|
PermissionRuleMatcher::Prefix(prefix) => extract_permission_subject(input)
|
||||||
|
.is_some_and(|candidate| candidate.starts_with(prefix)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn parse_rule_matcher(content: &str) -> PermissionRuleMatcher {
|
||||||
|
let unescaped = unescape_rule_content(content.trim());
|
||||||
|
if unescaped.is_empty() || unescaped == "*" {
|
||||||
|
PermissionRuleMatcher::Any
|
||||||
|
} else if let Some(prefix) = unescaped.strip_suffix(":*") {
|
||||||
|
PermissionRuleMatcher::Prefix(prefix.to_string())
|
||||||
|
} else {
|
||||||
|
PermissionRuleMatcher::Exact(unescaped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unescape_rule_content(content: &str) -> String {
|
||||||
|
content
|
||||||
|
.replace(r"\(", "(")
|
||||||
|
.replace(r"\)", ")")
|
||||||
|
.replace(r"\\", r"\")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_first_unescaped(value: &str, needle: char) -> Option<usize> {
|
||||||
|
let mut escaped = false;
|
||||||
|
for (idx, ch) in value.char_indices() {
|
||||||
|
if ch == '\\' {
|
||||||
|
escaped = !escaped;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if ch == needle && !escaped {
|
||||||
|
return Some(idx);
|
||||||
|
}
|
||||||
|
escaped = false;
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn find_last_unescaped(value: &str, needle: char) -> Option<usize> {
|
||||||
|
let chars = value.char_indices().collect::<Vec<_>>();
|
||||||
|
for (pos, (idx, ch)) in chars.iter().enumerate().rev() {
|
||||||
|
if *ch != needle {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut backslashes = 0;
|
||||||
|
for (_, prev) in chars[..pos].iter().rev() {
|
||||||
|
if *prev == '\\' {
|
||||||
|
backslashes += 1;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if backslashes % 2 == 0 {
|
||||||
|
return Some(*idx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_permission_subject(input: &str) -> Option<String> {
|
||||||
|
let parsed = serde_json::from_str::<Value>(input).ok();
|
||||||
|
if let Some(Value::Object(object)) = parsed {
|
||||||
|
for key in [
|
||||||
|
"command",
|
||||||
|
"path",
|
||||||
|
"file_path",
|
||||||
|
"filePath",
|
||||||
|
"notebook_path",
|
||||||
|
"notebookPath",
|
||||||
|
"url",
|
||||||
|
"pattern",
|
||||||
|
"code",
|
||||||
|
"message",
|
||||||
|
] {
|
||||||
|
if let Some(value) = object.get(key).and_then(Value::as_str) {
|
||||||
|
return Some(value.to_string());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
(!input.trim().is_empty()).then(|| input.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::{
|
use super::{
|
||||||
PermissionMode, PermissionOutcome, PermissionPolicy, PermissionPromptDecision,
|
PermissionContext, PermissionMode, PermissionOutcome, PermissionOverride, PermissionPolicy,
|
||||||
PermissionPrompter, PermissionRequest,
|
PermissionPromptDecision, PermissionPrompter, PermissionRequest,
|
||||||
};
|
};
|
||||||
|
use crate::config::RuntimePermissionRuleConfig;
|
||||||
|
|
||||||
struct RecordingPrompter {
|
struct RecordingPrompter {
|
||||||
seen: Vec<PermissionRequest>,
|
seen: Vec<PermissionRequest>,
|
||||||
@@ -229,4 +556,120 @@ mod tests {
|
|||||||
PermissionOutcome::Deny { reason } if reason == "not now"
|
PermissionOutcome::Deny { reason } if reason == "not now"
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn applies_rule_based_denials_and_allows() {
|
||||||
|
let rules = RuntimePermissionRuleConfig::new(
|
||||||
|
vec!["bash(git:*)".to_string()],
|
||||||
|
vec!["bash(rm -rf:*)".to_string()],
|
||||||
|
Vec::new(),
|
||||||
|
);
|
||||||
|
let policy = PermissionPolicy::new(PermissionMode::ReadOnly)
|
||||||
|
.with_tool_requirement("bash", PermissionMode::DangerFullAccess)
|
||||||
|
.with_permission_rules(&rules);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
policy.authorize("bash", r#"{"command":"git status"}"#, None),
|
||||||
|
PermissionOutcome::Allow
|
||||||
|
);
|
||||||
|
assert!(matches!(
|
||||||
|
policy.authorize("bash", r#"{"command":"rm -rf /tmp/x"}"#, None),
|
||||||
|
PermissionOutcome::Deny { reason } if reason.contains("denied by rule")
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ask_rules_force_prompt_even_when_mode_allows() {
|
||||||
|
let rules = RuntimePermissionRuleConfig::new(
|
||||||
|
Vec::new(),
|
||||||
|
Vec::new(),
|
||||||
|
vec!["bash(git:*)".to_string()],
|
||||||
|
);
|
||||||
|
let policy = PermissionPolicy::new(PermissionMode::DangerFullAccess)
|
||||||
|
.with_tool_requirement("bash", PermissionMode::DangerFullAccess)
|
||||||
|
.with_permission_rules(&rules);
|
||||||
|
let mut prompter = RecordingPrompter {
|
||||||
|
seen: Vec::new(),
|
||||||
|
allow: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
let outcome = policy.authorize("bash", r#"{"command":"git status"}"#, Some(&mut prompter));
|
||||||
|
|
||||||
|
assert_eq!(outcome, PermissionOutcome::Allow);
|
||||||
|
assert_eq!(prompter.seen.len(), 1);
|
||||||
|
assert!(prompter.seen[0]
|
||||||
|
.reason
|
||||||
|
.as_deref()
|
||||||
|
.is_some_and(|reason| reason.contains("ask rule")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hook_allow_still_respects_ask_rules() {
|
||||||
|
let rules = RuntimePermissionRuleConfig::new(
|
||||||
|
Vec::new(),
|
||||||
|
Vec::new(),
|
||||||
|
vec!["bash(git:*)".to_string()],
|
||||||
|
);
|
||||||
|
let policy = PermissionPolicy::new(PermissionMode::ReadOnly)
|
||||||
|
.with_tool_requirement("bash", PermissionMode::DangerFullAccess)
|
||||||
|
.with_permission_rules(&rules);
|
||||||
|
let context = PermissionContext::new(
|
||||||
|
Some(PermissionOverride::Allow),
|
||||||
|
Some("hook approved".to_string()),
|
||||||
|
);
|
||||||
|
let mut prompter = RecordingPrompter {
|
||||||
|
seen: Vec::new(),
|
||||||
|
allow: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
let outcome = policy.authorize_with_context(
|
||||||
|
"bash",
|
||||||
|
r#"{"command":"git status"}"#,
|
||||||
|
&context,
|
||||||
|
Some(&mut prompter),
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(outcome, PermissionOutcome::Allow);
|
||||||
|
assert_eq!(prompter.seen.len(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hook_deny_short_circuits_permission_flow() {
|
||||||
|
let policy = PermissionPolicy::new(PermissionMode::DangerFullAccess)
|
||||||
|
.with_tool_requirement("bash", PermissionMode::DangerFullAccess);
|
||||||
|
let context = PermissionContext::new(
|
||||||
|
Some(PermissionOverride::Deny),
|
||||||
|
Some("blocked by hook".to_string()),
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
policy.authorize_with_context("bash", "{}", &context, None),
|
||||||
|
PermissionOutcome::Deny {
|
||||||
|
reason: "blocked by hook".to_string(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hook_ask_forces_prompt() {
|
||||||
|
let policy = PermissionPolicy::new(PermissionMode::DangerFullAccess)
|
||||||
|
.with_tool_requirement("bash", PermissionMode::DangerFullAccess);
|
||||||
|
let context = PermissionContext::new(
|
||||||
|
Some(PermissionOverride::Ask),
|
||||||
|
Some("hook requested confirmation".to_string()),
|
||||||
|
);
|
||||||
|
let mut prompter = RecordingPrompter {
|
||||||
|
seen: Vec::new(),
|
||||||
|
allow: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
let outcome = policy.authorize_with_context("bash", "{}", &context, Some(&mut prompter));
|
||||||
|
|
||||||
|
assert_eq!(outcome, PermissionOutcome::Allow);
|
||||||
|
assert_eq!(prompter.seen.len(), 1);
|
||||||
|
assert_eq!(
|
||||||
|
prompter.seen[0].reason.as_deref(),
|
||||||
|
Some("hook requested confirmation")
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ rustyline = "15"
|
|||||||
runtime = { path = "../runtime" }
|
runtime = { path = "../runtime" }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
syntect = "5"
|
syntect = "5"
|
||||||
tokio = { version = "1", features = ["rt-multi-thread", "time"] }
|
tokio = { version = "1", features = ["rt-multi-thread", "signal", "time"] }
|
||||||
tools = { path = "../tools" }
|
tools = { path = "../tools" }
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ use std::io::{self, Read, Write};
|
|||||||
use std::net::TcpListener;
|
use std::net::TcpListener;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
use std::sync::mpsc::{self, Receiver, Sender};
|
||||||
|
use std::thread::{self, JoinHandle};
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
use api::{
|
use api::{
|
||||||
@@ -27,8 +29,8 @@ 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,
|
ConversationMessage, ConversationRuntime, MessageRole, OAuthAuthorizationRequest, OAuthConfig,
|
||||||
OAuthConfig, OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
OAuthTokenExchangeRequest, PermissionMode, PermissionPolicy, ProjectContext, RuntimeError,
|
||||||
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
Session, TokenUsage, ToolError, ToolExecutor, UsageTracker,
|
||||||
};
|
};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
@@ -984,6 +986,61 @@ struct LiveCli {
|
|||||||
session: SessionHandle,
|
session: SessionHandle,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct HookAbortMonitor {
|
||||||
|
stop_tx: Option<Sender<()>>,
|
||||||
|
join_handle: Option<JoinHandle<()>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HookAbortMonitor {
|
||||||
|
fn spawn(abort_signal: runtime::HookAbortSignal) -> Self {
|
||||||
|
Self::spawn_with_waiter(abort_signal, move |stop_rx, abort_signal| {
|
||||||
|
let Ok(runtime) = tokio::runtime::Builder::new_current_thread()
|
||||||
|
.enable_all()
|
||||||
|
.build()
|
||||||
|
else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
|
runtime.block_on(async move {
|
||||||
|
let wait_for_stop = tokio::task::spawn_blocking(move || {
|
||||||
|
let _ = stop_rx.recv();
|
||||||
|
});
|
||||||
|
|
||||||
|
tokio::select! {
|
||||||
|
result = tokio::signal::ctrl_c() => {
|
||||||
|
if result.is_ok() {
|
||||||
|
abort_signal.abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = wait_for_stop => {}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn spawn_with_waiter<F>(abort_signal: runtime::HookAbortSignal, wait_for_interrupt: F) -> Self
|
||||||
|
where
|
||||||
|
F: FnOnce(Receiver<()>, runtime::HookAbortSignal) + Send + 'static,
|
||||||
|
{
|
||||||
|
let (stop_tx, stop_rx) = mpsc::channel();
|
||||||
|
let join_handle = thread::spawn(move || wait_for_interrupt(stop_rx, abort_signal));
|
||||||
|
|
||||||
|
Self {
|
||||||
|
stop_tx: Some(stop_tx),
|
||||||
|
join_handle: Some(join_handle),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stop(mut self) {
|
||||||
|
if let Some(stop_tx) = self.stop_tx.take() {
|
||||||
|
let _ = stop_tx.send(());
|
||||||
|
}
|
||||||
|
if let Some(join_handle) = self.join_handle.take() {
|
||||||
|
let _ = join_handle.join();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl LiveCli {
|
impl LiveCli {
|
||||||
fn new(
|
fn new(
|
||||||
model: String,
|
model: String,
|
||||||
@@ -1039,7 +1096,34 @@ impl LiveCli {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn prepare_turn_runtime(
|
||||||
|
&self,
|
||||||
|
emit_output: bool,
|
||||||
|
) -> Result<
|
||||||
|
(
|
||||||
|
ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>,
|
||||||
|
HookAbortMonitor,
|
||||||
|
),
|
||||||
|
Box<dyn std::error::Error>,
|
||||||
|
> {
|
||||||
|
let hook_abort_signal = runtime::HookAbortSignal::new();
|
||||||
|
let runtime = build_runtime(
|
||||||
|
self.runtime.session().clone(),
|
||||||
|
self.model.clone(),
|
||||||
|
self.system_prompt.clone(),
|
||||||
|
true,
|
||||||
|
emit_output,
|
||||||
|
self.allowed_tools.clone(),
|
||||||
|
self.permission_mode,
|
||||||
|
)?
|
||||||
|
.with_hook_abort_signal(hook_abort_signal.clone());
|
||||||
|
let hook_abort_monitor = HookAbortMonitor::spawn(hook_abort_signal);
|
||||||
|
|
||||||
|
Ok((runtime, hook_abort_monitor))
|
||||||
|
}
|
||||||
|
|
||||||
fn run_turn(&mut self, input: &str) -> Result<(), Box<dyn std::error::Error>> {
|
fn run_turn(&mut self, input: &str) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
let (mut runtime, hook_abort_monitor) = self.prepare_turn_runtime(true)?;
|
||||||
let mut spinner = Spinner::new();
|
let mut spinner = Spinner::new();
|
||||||
let mut stdout = io::stdout();
|
let mut stdout = io::stdout();
|
||||||
spinner.tick(
|
spinner.tick(
|
||||||
@@ -1048,7 +1132,9 @@ impl LiveCli {
|
|||||||
&mut stdout,
|
&mut stdout,
|
||||||
)?;
|
)?;
|
||||||
let mut permission_prompter = CliPermissionPrompter::new(self.permission_mode);
|
let mut permission_prompter = CliPermissionPrompter::new(self.permission_mode);
|
||||||
let result = self.runtime.run_turn(input, Some(&mut permission_prompter));
|
let result = runtime.run_turn(input, Some(&mut permission_prompter));
|
||||||
|
hook_abort_monitor.stop();
|
||||||
|
self.runtime = runtime;
|
||||||
match result {
|
match result {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
spinner.finish(
|
spinner.finish(
|
||||||
@@ -1083,18 +1169,11 @@ impl LiveCli {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn run_prompt_json(&mut self, input: &str) -> Result<(), Box<dyn std::error::Error>> {
|
fn run_prompt_json(&mut self, input: &str) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let session = self.runtime.session().clone();
|
let (mut runtime, hook_abort_monitor) = self.prepare_turn_runtime(false)?;
|
||||||
let mut runtime = build_runtime(
|
|
||||||
session,
|
|
||||||
self.model.clone(),
|
|
||||||
self.system_prompt.clone(),
|
|
||||||
true,
|
|
||||||
false,
|
|
||||||
self.allowed_tools.clone(),
|
|
||||||
self.permission_mode,
|
|
||||||
)?;
|
|
||||||
let mut permission_prompter = CliPermissionPrompter::new(self.permission_mode);
|
let mut permission_prompter = CliPermissionPrompter::new(self.permission_mode);
|
||||||
let summary = runtime.run_turn(input, Some(&mut permission_prompter))?;
|
let result = runtime.run_turn(input, Some(&mut permission_prompter));
|
||||||
|
hook_abort_monitor.stop();
|
||||||
|
let summary = result?;
|
||||||
self.runtime = runtime;
|
self.runtime = runtime;
|
||||||
self.persist_session()?;
|
self.persist_session()?;
|
||||||
println!(
|
println!(
|
||||||
@@ -1903,6 +1982,15 @@ 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,
|
||||||
@@ -1913,13 +2001,52 @@ fn build_runtime(
|
|||||||
permission_mode: PermissionMode,
|
permission_mode: PermissionMode,
|
||||||
) -> Result<ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>, Box<dyn std::error::Error>>
|
) -> Result<ConversationRuntime<AnthropicRuntimeClient, CliToolExecutor>, Box<dyn std::error::Error>>
|
||||||
{
|
{
|
||||||
Ok(ConversationRuntime::new(
|
let feature_config = build_runtime_feature_config()?;
|
||||||
|
let mut runtime = ConversationRuntime::new_with_features(
|
||||||
session,
|
session,
|
||||||
AnthropicRuntimeClient::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, &feature_config),
|
||||||
system_prompt,
|
system_prompt,
|
||||||
))
|
feature_config,
|
||||||
|
);
|
||||||
|
if emit_output {
|
||||||
|
runtime = runtime.with_hook_progress_reporter(Box::new(CliHookProgressReporter));
|
||||||
|
}
|
||||||
|
Ok(runtime)
|
||||||
|
}
|
||||||
|
|
||||||
|
struct CliHookProgressReporter;
|
||||||
|
|
||||||
|
impl runtime::HookProgressReporter for CliHookProgressReporter {
|
||||||
|
fn on_event(&mut self, event: &runtime::HookProgressEvent) {
|
||||||
|
match event {
|
||||||
|
runtime::HookProgressEvent::Started {
|
||||||
|
event,
|
||||||
|
tool_name,
|
||||||
|
command,
|
||||||
|
} => eprintln!(
|
||||||
|
"[hook {event_name}] {tool_name}: {command}",
|
||||||
|
event_name = event.as_str()
|
||||||
|
),
|
||||||
|
runtime::HookProgressEvent::Completed {
|
||||||
|
event,
|
||||||
|
tool_name,
|
||||||
|
command,
|
||||||
|
} => eprintln!(
|
||||||
|
"[hook done {event_name}] {tool_name}: {command}",
|
||||||
|
event_name = event.as_str()
|
||||||
|
),
|
||||||
|
runtime::HookProgressEvent::Cancelled {
|
||||||
|
event,
|
||||||
|
tool_name,
|
||||||
|
command,
|
||||||
|
} => eprintln!(
|
||||||
|
"[hook cancelled {event_name}] {tool_name}: {command}",
|
||||||
|
event_name = event.as_str()
|
||||||
|
),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct CliPermissionPrompter {
|
struct CliPermissionPrompter {
|
||||||
@@ -1942,6 +2069,9 @@ impl runtime::PermissionPrompter for CliPermissionPrompter {
|
|||||||
println!(" Tool {}", request.tool_name);
|
println!(" Tool {}", request.tool_name);
|
||||||
println!(" Current mode {}", self.current_mode.as_str());
|
println!(" Current mode {}", self.current_mode.as_str());
|
||||||
println!(" Required mode {}", request.required_mode.as_str());
|
println!(" Required mode {}", request.required_mode.as_str());
|
||||||
|
if let Some(reason) = &request.reason {
|
||||||
|
println!(" Reason {reason}");
|
||||||
|
}
|
||||||
println!(" Input {}", request.input);
|
println!(" Input {}", request.input);
|
||||||
print!("Approve this tool call? [y/N]: ");
|
print!("Approve this tool call? [y/N]: ");
|
||||||
let _ = io::stdout().flush();
|
let _ = io::stdout().flush();
|
||||||
@@ -2354,13 +2484,15 @@ fn format_bash_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
.get("backgroundTaskId")
|
.get("backgroundTaskId")
|
||||||
.and_then(|value| value.as_str())
|
.and_then(|value| value.as_str())
|
||||||
{
|
{
|
||||||
lines[0].push_str(&format!(" backgrounded ({task_id})"));
|
use std::fmt::Write as _;
|
||||||
|
let _ = write!(lines[0], " backgrounded ({task_id})");
|
||||||
} else if let Some(status) = parsed
|
} else if let Some(status) = parsed
|
||||||
.get("returnCodeInterpretation")
|
.get("returnCodeInterpretation")
|
||||||
.and_then(|value| value.as_str())
|
.and_then(|value| value.as_str())
|
||||||
.filter(|status| !status.is_empty())
|
.filter(|status| !status.is_empty())
|
||||||
{
|
{
|
||||||
lines[0].push_str(&format!(" {status}"));
|
use std::fmt::Write as _;
|
||||||
|
let _ = write!(lines[0], " {status}");
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(stdout) = parsed.get("stdout").and_then(|value| value.as_str()) {
|
if let Some(stdout) = parsed.get("stdout").and_then(|value| value.as_str()) {
|
||||||
@@ -2382,15 +2514,15 @@ fn format_read_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
let path = extract_tool_path(file);
|
let path = extract_tool_path(file);
|
||||||
let start_line = file
|
let start_line = file
|
||||||
.get("startLine")
|
.get("startLine")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(1);
|
.unwrap_or(1);
|
||||||
let num_lines = file
|
let num_lines = file
|
||||||
.get("numLines")
|
.get("numLines")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
let total_lines = file
|
let total_lines = file
|
||||||
.get("totalLines")
|
.get("totalLines")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(num_lines);
|
.unwrap_or(num_lines);
|
||||||
let content = file
|
let content = file
|
||||||
.get("content")
|
.get("content")
|
||||||
@@ -2416,8 +2548,7 @@ fn format_write_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
let line_count = parsed
|
let line_count = parsed
|
||||||
.get("content")
|
.get("content")
|
||||||
.and_then(|value| value.as_str())
|
.and_then(|value| value.as_str())
|
||||||
.map(|content| content.lines().count())
|
.map_or(0, |content| content.lines().count());
|
||||||
.unwrap_or(0);
|
|
||||||
format!(
|
format!(
|
||||||
"{icon} \x1b[1;32m✏️ {} {path}\x1b[0m \x1b[2m({line_count} lines)\x1b[0m",
|
"{icon} \x1b[1;32m✏️ {} {path}\x1b[0m \x1b[2m({line_count} lines)\x1b[0m",
|
||||||
if kind == "create" { "Wrote" } else { "Updated" },
|
if kind == "create" { "Wrote" } else { "Updated" },
|
||||||
@@ -2448,7 +2579,7 @@ fn format_edit_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
let path = extract_tool_path(parsed);
|
let path = extract_tool_path(parsed);
|
||||||
let suffix = if parsed
|
let suffix = if parsed
|
||||||
.get("replaceAll")
|
.get("replaceAll")
|
||||||
.and_then(|value| value.as_bool())
|
.and_then(serde_json::Value::as_bool)
|
||||||
.unwrap_or(false)
|
.unwrap_or(false)
|
||||||
{
|
{
|
||||||
" (replace all)"
|
" (replace all)"
|
||||||
@@ -2476,7 +2607,7 @@ fn format_edit_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
fn format_glob_result(icon: &str, parsed: &serde_json::Value) -> String {
|
fn format_glob_result(icon: &str, parsed: &serde_json::Value) -> String {
|
||||||
let num_files = parsed
|
let num_files = parsed
|
||||||
.get("numFiles")
|
.get("numFiles")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
let filenames = parsed
|
let filenames = parsed
|
||||||
.get("filenames")
|
.get("filenames")
|
||||||
@@ -2500,11 +2631,11 @@ fn format_glob_result(icon: &str, parsed: &serde_json::Value) -> String {
|
|||||||
fn format_grep_result(icon: &str, parsed: &serde_json::Value) -> String {
|
fn format_grep_result(icon: &str, parsed: &serde_json::Value) -> String {
|
||||||
let num_matches = parsed
|
let num_matches = parsed
|
||||||
.get("numMatches")
|
.get("numMatches")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
let num_files = parsed
|
let num_files = parsed
|
||||||
.get("numFiles")
|
.get("numFiles")
|
||||||
.and_then(|value| value.as_u64())
|
.and_then(serde_json::Value::as_u64)
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
let content = parsed
|
let content = parsed
|
||||||
.get("content")
|
.get("content")
|
||||||
@@ -2663,12 +2794,14 @@ impl ToolExecutor for CliToolExecutor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn permission_policy(mode: PermissionMode) -> PermissionPolicy {
|
fn permission_policy(
|
||||||
tool_permission_specs()
|
mode: PermissionMode,
|
||||||
.into_iter()
|
feature_config: &runtime::RuntimeFeatureConfig,
|
||||||
.fold(PermissionPolicy::new(mode), |policy, spec| {
|
) -> PermissionPolicy {
|
||||||
policy.with_tool_requirement(spec.name, spec.required_permission)
|
tool_permission_specs().into_iter().fold(
|
||||||
})
|
PermissionPolicy::new(mode).with_permission_rules(feature_config.permission_rules()),
|
||||||
|
|policy, spec| policy.with_tool_requirement(spec.name, spec.required_permission),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn tool_permission_specs() -> Vec<ToolSpec> {
|
fn tool_permission_specs() -> Vec<ToolSpec> {
|
||||||
@@ -2817,12 +2950,17 @@ mod tests {
|
|||||||
normalize_permission_mode, parse_args, parse_git_status_metadata, print_help_to,
|
normalize_permission_mode, parse_args, parse_git_status_metadata, print_help_to,
|
||||||
push_output_block, render_config_report, render_memory_report, render_repl_help,
|
push_output_block, render_config_report, render_memory_report, render_repl_help,
|
||||||
resolve_model_alias, response_to_events, resume_supported_slash_commands, status_context,
|
resolve_model_alias, response_to_events, resume_supported_slash_commands, status_context,
|
||||||
CliAction, CliOutputFormat, SlashCommand, StatusUsage, DEFAULT_MODEL,
|
CliAction, CliOutputFormat, HookAbortMonitor, SlashCommand, StatusUsage, DEFAULT_MODEL,
|
||||||
};
|
};
|
||||||
use api::{MessageResponse, OutputContentBlock, Usage};
|
use api::{MessageResponse, OutputContentBlock, Usage};
|
||||||
use runtime::{AssistantEvent, ContentBlock, ConversationMessage, MessageRole, PermissionMode};
|
use runtime::{
|
||||||
|
AssistantEvent, ContentBlock, ConversationMessage, HookAbortSignal, MessageRole,
|
||||||
|
PermissionMode,
|
||||||
|
};
|
||||||
use serde_json::json;
|
use serde_json::json;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
use std::sync::mpsc;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn defaults_to_repl_when_no_args() {
|
fn defaults_to_repl_when_no_args() {
|
||||||
@@ -3481,4 +3619,43 @@ mod tests {
|
|||||||
if name == "read_file" && input == "{\"path\":\"rust/Cargo.toml\"}"
|
if name == "read_file" && input == "{\"path\":\"rust/Cargo.toml\"}"
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hook_abort_monitor_stops_without_aborting() {
|
||||||
|
let abort_signal = HookAbortSignal::new();
|
||||||
|
let (ready_tx, ready_rx) = mpsc::channel();
|
||||||
|
let monitor = HookAbortMonitor::spawn_with_waiter(
|
||||||
|
abort_signal.clone(),
|
||||||
|
move |stop_rx, abort_signal| {
|
||||||
|
ready_tx.send(()).expect("ready signal");
|
||||||
|
let _ = stop_rx.recv();
|
||||||
|
assert!(!abort_signal.is_aborted());
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
ready_rx.recv().expect("waiter should be ready");
|
||||||
|
monitor.stop();
|
||||||
|
|
||||||
|
assert!(!abort_signal.is_aborted());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn hook_abort_monitor_propagates_interrupt() {
|
||||||
|
let abort_signal = HookAbortSignal::new();
|
||||||
|
let (done_tx, done_rx) = mpsc::channel();
|
||||||
|
let monitor = HookAbortMonitor::spawn_with_waiter(
|
||||||
|
abort_signal.clone(),
|
||||||
|
move |_stop_rx, abort_signal| {
|
||||||
|
abort_signal.abort();
|
||||||
|
done_tx.send(()).expect("done signal");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
done_rx
|
||||||
|
.recv_timeout(Duration::from_secs(1))
|
||||||
|
.expect("interrupt should complete");
|
||||||
|
monitor.stop();
|
||||||
|
|
||||||
|
assert!(abort_signal.is_aborted());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ impl TerminalRenderer {
|
|||||||
) {
|
) {
|
||||||
match event {
|
match event {
|
||||||
Event::Start(Tag::Heading { level, .. }) => {
|
Event::Start(Tag::Heading { level, .. }) => {
|
||||||
self.start_heading(state, level as u8, output)
|
Self::start_heading(state, level as u8, output);
|
||||||
}
|
}
|
||||||
Event::End(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),
|
||||||
@@ -426,7 +426,7 @@ impl TerminalRenderer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn start_heading(&self, state: &mut RenderState, level: u8, output: &mut String) {
|
fn start_heading(state: &mut RenderState, level: u8, output: &mut String) {
|
||||||
state.heading_level = Some(level);
|
state.heading_level = Some(level);
|
||||||
if !output.is_empty() {
|
if !output.is_empty() {
|
||||||
output.push('\n');
|
output.push('\n');
|
||||||
|
|||||||
Reference in New Issue
Block a user