Skip to content

Fix: remove hook runtime context tmp .json files #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidabram merged 5 commits into from
Jun 30, 2026
Merged

Fix: remove hook runtime context tmp .json files #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c80994c
hooks: Remove diff-trace tmp artifact persistence
ivke995 Jun 29, 2026
dd1e7c1
hooks: Remove post-commit tmp artifact writer
ivke995 Jun 29, 2026
ae4203c
plans: Mark hook artifact cleanup task complete
ivke995 Jun 29, 2026
cead43e
Update current-state context to reflect that hook-runtime persistence
ivke995 Jun 29, 2026
d038c54
plans: Mark T05 complete with validation report for hook artifact rem…
ivke995 Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
274 changes: 10 additions & 264 deletions cli/src/services/hooks/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::collections::BTreeMap;
use std::fs::{self, OpenOptions};
use std::io::{self, ErrorKind, Read, Write};
use std::fs;
use std::io::{self, Read};
use std::path::{Path, PathBuf};
use std::process::Command;
use std::time::{SystemTime, UNIX_EPOCH};
Expand All @@ -20,6 +19,7 @@ use crate::services::agent_trace_db::{
SessionModelAttribution, SessionModelUpsert, PAYLOAD_TYPE_PATCH, PAYLOAD_TYPE_STRUCTURED,
};
use crate::services::checkout;
use crate::services::config;
use crate::services::observability::traits::Logger;
use crate::services::patch::{
combine_patches as combine_patches_fn, intersect_patches as intersect_patches_fn,
Expand All @@ -29,15 +29,13 @@ use crate::services::structured_patch::{
build_claude_post_tool_use_patch, derive_claude_structured_patch,
ClaudeStructuredPatchDerivationResult, PatchBuildResult,
};
use crate::services::{config, default_paths::RepoPaths};
pub mod command;
pub mod lifecycle;

pub const NAME: &str = "hooks";
pub const CANONICAL_SCE_COAUTHOR_TRAILER: &str = "Co-authored-by: SCE <sce@crocoder.dev>";
const CLAUDE_CLI_BINARY: &str = "claude";

const MAX_TRACE_FILE_CREATE_ATTEMPTS: u64 = 1_000_000;
type PayloadValidationError = fn(&str) -> String;

#[derive(Clone, Debug, Eq, PartialEq)]
Expand Down Expand Up @@ -158,13 +156,6 @@ impl ConversationTracePersistenceSummary {
}
}

#[allow(dead_code)]
struct TraceArtifactPayload {
trace_directory: PathBuf,
trace_name: String,
serialized: String,
artifact_description: &'static str,
}
/// Required `sce hooks diff-trace` STDIN payload shape:
/// `{ sessionID, diff, time, model_id?, tool_name, tool_version }`.
///
Expand Down Expand Up @@ -200,7 +191,9 @@ fn run_hooks_subcommand_in_repo(
HookSubcommand::PostCommit {
vcs_type,
remote_url,
} => run_post_commit_subcommand_with_trace(repository_root, *vcs_type, remote_url.clone()),
} => {
run_post_commit_subcommand_with_trace(repository_root, *vcs_type, remote_url.as_deref())
}
HookSubcommand::PostRewrite { rewrite_method } => {
run_post_rewrite_subcommand_with_trace(repository_root, subcommand, rewrite_method)
}
Expand Down Expand Up @@ -739,7 +732,6 @@ where
);
}
}
persist_diff_trace_payload(repository_root, payload)?;
let agent_trace_db_result = persist_diff_trace_payload_to_agent_trace_db(
repository_root,
payload,
Expand All @@ -762,11 +754,11 @@ where

if agent_trace_db_persisted {
Ok(String::from(
"diff-trace hook intake persisted payload to AgentTraceDb and context/tmp.",
"diff-trace hook intake persisted payload to AgentTraceDb.",
))
} else {
Ok(String::from(
"diff-trace hook intake persisted payload to context/tmp; AgentTraceDb persistence failed.",
"diff-trace hook intake completed; AgentTraceDb persistence failed.",
))
}
}
Expand Down Expand Up @@ -1369,25 +1361,6 @@ fn required_field<'a>(
})
}

fn persist_diff_trace_payload(
repository_root: &Path,
payload: &DiffTracePayload,
) -> Result<PathBuf> {
let trace_directory = RepoPaths::new(repository_root).context_tmp_dir();
let serialized = format!(
"{}\n",
serde_json::to_string_pretty(payload)
.context("Failed to serialize diff-trace payload for persistence.")?
);

persist_serialized_trace_payload(
&trace_directory,
"diff-trace",
&serialized,
"diff-trace payload",
)
}

fn persist_diff_trace_payload_to_agent_trace_db(
repository_root: &Path,
payload: &DiffTracePayload,
Expand Down Expand Up @@ -1436,115 +1409,6 @@ fn diff_trace_db_time_ms(time: u64) -> Result<i64> {
})
}

fn persist_serialized_trace_payload(
trace_directory: &Path,
trace_name: &str,
serialized: &str,
artifact_description: &str,
) -> Result<PathBuf> {
persist_serialized_trace_payload_at(
trace_directory,
trace_name,
serialized,
artifact_description,
Utc::now(),
)
}

fn persist_serialized_trace_payload_at(
trace_directory: &Path,
trace_name: &str,
serialized: &str,
artifact_description: &str,
timestamp: DateTime<Utc>,
) -> Result<PathBuf> {
fs::create_dir_all(trace_directory).with_context(|| {
format!(
"Failed to create hook trace directory '{}'.",
trace_directory.display()
)
})?;

persist_trace_payload_with_retries(
trace_directory,
trace_name,
serialized,
artifact_description,
timestamp,
persist_trace_payload_to_file,
)
}

fn persist_trace_payload_with_retries<P>(
trace_directory: &Path,
trace_name: &str,
serialized: &str,
artifact_description: &str,
timestamp: DateTime<Utc>,
mut persist_file: P,
) -> Result<PathBuf>
where
P: FnMut(&Path, &str) -> io::Result<()>,
{
for attempt in 0..MAX_TRACE_FILE_CREATE_ATTEMPTS {
let file_path = trace_directory.join(build_trace_file_name(trace_name, timestamp, attempt));

match persist_file(&file_path, serialized) {
Ok(()) => return Ok(file_path),
Err(error) if error.kind() == ErrorKind::AlreadyExists => {}
Err(error) => {
return Err(error).with_context(|| {
format!(
"Failed to write {artifact_description} file '{}'.",
file_path.display()
)
});
}
}
}

bail!(
"Failed to write {artifact_description} file in '{}': exhausted {} collision-safe filename attempts.",
trace_directory.display(),
MAX_TRACE_FILE_CREATE_ATTEMPTS
)
}

fn persist_trace_payload_to_file(file_path: &Path, serialized: &str) -> io::Result<()> {
let mut file = OpenOptions::new()
.write(true)
.create_new(true)
.open(file_path)?;
file.write_all(serialized.as_bytes())?;

Ok(())
}

fn format_trace_timestamp(timestamp: DateTime<Utc>) -> String {
timestamp.format("%Y-%m-%dT%H-%M-%S-%3fZ").to_string()
}

fn build_trace_file_name(trace_name: &str, timestamp: DateTime<Utc>, attempt: u64) -> String {
let safe_name = sanitize_trace_name(trace_name);

format!(
"{}-{:06}-{}.json",
format_trace_timestamp(timestamp),
attempt,
safe_name
)
}

fn sanitize_trace_name(trace_name: &str) -> String {
trace_name
.chars()
.map(|character| match character {
'a'..='z' | 'A'..='Z' | '0'..='9' | '.' | '_' | '-' => character,
_ => '_',
})
.collect()
}

fn run_pre_commit_subcommand_with_trace(repository_root: &Path) -> Result<String> {
run_pre_commit_subcommand(repository_root)
}
Expand Down Expand Up @@ -1983,19 +1847,9 @@ fn current_unix_time_ms() -> Result<i64> {
fn run_post_commit_subcommand_with_trace(
repository_root: &Path,
vcs_type: Option<AgentTraceVcsType>,
remote_url: Option<String>,
remote_url: Option<&str>,
) -> Result<String> {
let remote_url_value = remote_url.clone().unwrap_or_default();
let subcommand = HookSubcommand::PostCommit {
vcs_type,
remote_url,
};
let input = build_hook_trace_input_for_post_commit(repository_root);
let outcome = run_post_commit_subcommand(repository_root, vcs_type, &remote_url_value);

let _ = persist_hook_trace(repository_root, &subcommand, &input, &outcome);

outcome
run_post_commit_subcommand(repository_root, vcs_type, remote_url.unwrap_or_default())
}

fn run_post_rewrite_subcommand(repository_root: &Path, rewrite_method: &str) -> Result<String> {
Expand Down Expand Up @@ -2029,77 +1883,6 @@ fn hook_runtime_invocation_name(subcommand: &HookSubcommand) -> &'static str {
}
}

fn persist_hook_trace(
repository_root: &Path,
subcommand: &HookSubcommand,
input: &Value,
outcome: &Result<String>,
) -> Result<()> {
let trace_directory = RepoPaths::new(repository_root).context_tmp_dir();
let body = match outcome {
Ok(output) => json!({
"input": input,
"output": output,
}),
Err(error) => json!({
"input": input,
"error": error.to_string(),
}),
};

let serialized = format!(
"{}\n",
serde_json::to_string_pretty(&body).context("Failed to serialize hook trace.")?
);
persist_serialized_trace_payload(
&trace_directory,
hook_trace_name(subcommand),
&serialized,
"hook trace",
)?;

Ok(())
}

fn hook_trace_name(subcommand: &HookSubcommand) -> &'static str {
match subcommand {
HookSubcommand::PreCommit => "pre-commit",
HookSubcommand::CommitMsg { .. } => "commit-msg",
HookSubcommand::PostCommit { .. } => "post-commit",
HookSubcommand::PostRewrite { .. } => "post-rewrite",
HookSubcommand::DiffTrace => "diff-trace",
HookSubcommand::ConversationTrace => "conversation-trace",
HookSubcommand::SessionModel => "session-model",
}
}

fn build_hook_trace_input_for_post_commit(repository_root: &Path) -> Value {
let mut input = build_base_hook_trace_input("post-commit");
insert_head_commit_from_git(repository_root, &mut input);
Value::Object(input)
}

fn build_base_hook_trace_input(hook_name: &str) -> serde_json::Map<String, Value> {
let mut input = serde_json::Map::new();
input.insert("hook".to_string(), Value::String(hook_name.to_string()));
input.insert(
"git_env".to_string(),
Value::Object(
collect_git_environment()
.into_iter()
.map(|(key, value)| (key, Value::String(value)))
.collect(),
),
);
input
}

fn collect_git_environment() -> BTreeMap<String, String> {
std::env::vars()
.filter(|(key, _)| key.starts_with("GIT_"))
.collect()
}

fn read_hook_stdin() -> Result<String> {
let mut stdin_payload = String::new();
io::stdin()
Expand All @@ -2108,43 +1891,6 @@ fn read_hook_stdin() -> Result<String> {
Ok(stdin_payload)
}

fn insert_head_commit_from_git(repository_root: &Path, input: &mut serde_json::Map<String, Value>) {
insert_git_output(
repository_root,
&["rev-parse", "HEAD"],
"Failed to capture HEAD revision from git.",
input,
"head_oid_from_git",
"head_oid_from_git_read_error",
);
insert_git_output(
repository_root,
&["show", "--format=", "--patch", "--no-ext-diff", "HEAD"],
"Failed to capture HEAD patch from git.",
input,
"head_patch_from_git",
"head_patch_from_git_read_error",
);
}

fn insert_git_output(
repository_root: &Path,
args: &[&str],
context_message: &str,
input: &mut serde_json::Map<String, Value>,
output_key: &str,
error_key: &str,
) {
match run_git_command_capture_stdout(repository_root, args, context_message) {
Ok(stdout) => {
input.insert(output_key.to_string(), Value::String(stdout));
}
Err(error) => {
input.insert(error_key.to_string(), Value::String(error.to_string()));
}
}
}

fn run_git_command_capture_stdout(
repository_root: &Path,
args: &[&str],
Expand Down
2 changes: 1 addition & 1 deletion context/architecture.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading