mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-04-13 13:23:31 +08:00
Compare commits
1 Commits
fix/ecc2-b
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b92288a27 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -44,7 +44,7 @@ jobs:
|
|||||||
# Package manager setup
|
# Package manager setup
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
if: matrix.pm == 'pnpm'
|
if: matrix.pm == 'pnpm'
|
||||||
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
|
uses: pnpm/action-setup@08c4be7e2e672a47d11bd04269e27e5f3e8529cb # v4
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/reusable-test.yml
vendored
2
.github/workflows/reusable-test.yml
vendored
@@ -36,7 +36,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
if: inputs.package-manager == 'pnpm'
|
if: inputs.package-manager == 'pnpm'
|
||||||
uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4
|
uses: pnpm/action-setup@08c4be7e2e672a47d11bd04269e27e5f3e8529cb # v4
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ use cron::Schedule as CronSchedule;
|
|||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use std::collections::{BTreeMap, HashMap, HashSet};
|
use std::collections::{BTreeMap, HashMap, HashSet};
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::fs::OpenOptions;
|
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::process::Stdio;
|
use std::process::Stdio;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
@@ -2984,28 +2983,7 @@ async fn spawn_session_runner_for_program(
|
|||||||
working_dir: &Path,
|
working_dir: &Path,
|
||||||
current_exe: &Path,
|
current_exe: &Path,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let stderr_log_path = background_runner_stderr_log_path(working_dir, session_id);
|
let child = Command::new(current_exe)
|
||||||
if let Some(parent) = stderr_log_path.parent() {
|
|
||||||
std::fs::create_dir_all(parent).with_context(|| {
|
|
||||||
format!(
|
|
||||||
"Failed to create ECC runner log directory {}",
|
|
||||||
parent.display()
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
}
|
|
||||||
let stderr_log = OpenOptions::new()
|
|
||||||
.create(true)
|
|
||||||
.append(true)
|
|
||||||
.open(&stderr_log_path)
|
|
||||||
.with_context(|| {
|
|
||||||
format!(
|
|
||||||
"Failed to open ECC runner stderr log {}",
|
|
||||||
stderr_log_path.display()
|
|
||||||
)
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let mut command = Command::new(current_exe);
|
|
||||||
command
|
|
||||||
.arg("run-session")
|
.arg("run-session")
|
||||||
.arg("--session-id")
|
.arg("--session-id")
|
||||||
.arg(session_id)
|
.arg(session_id)
|
||||||
@@ -3017,10 +2995,7 @@ async fn spawn_session_runner_for_program(
|
|||||||
.arg(working_dir)
|
.arg(working_dir)
|
||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
.stdout(Stdio::null())
|
.stdout(Stdio::null())
|
||||||
.stderr(Stdio::from(stderr_log));
|
.stderr(Stdio::null())
|
||||||
configure_background_runner_command(&mut command);
|
|
||||||
|
|
||||||
let child = command
|
|
||||||
.spawn()
|
.spawn()
|
||||||
.with_context(|| format!("Failed to spawn ECC runner from {}", current_exe.display()))?;
|
.with_context(|| format!("Failed to spawn ECC runner from {}", current_exe.display()))?;
|
||||||
|
|
||||||
@@ -3030,46 +3005,6 @@ async fn spawn_session_runner_for_program(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn background_runner_stderr_log_path(working_dir: &Path, session_id: &str) -> PathBuf {
|
|
||||||
working_dir
|
|
||||||
.join(".claude")
|
|
||||||
.join("ecc2")
|
|
||||||
.join("logs")
|
|
||||||
.join(format!("{session_id}.runner-stderr.log"))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
fn detached_creation_flags() -> u32 {
|
|
||||||
const DETACHED_PROCESS: u32 = 0x0000_0008;
|
|
||||||
const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200;
|
|
||||||
DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP
|
|
||||||
}
|
|
||||||
|
|
||||||
fn configure_background_runner_command(command: &mut Command) {
|
|
||||||
#[cfg(unix)]
|
|
||||||
{
|
|
||||||
use std::os::unix::process::CommandExt;
|
|
||||||
|
|
||||||
// Detach the runner from the caller's shell/session so it keeps
|
|
||||||
// processing a live harness session after `ecc-tui start` returns.
|
|
||||||
unsafe {
|
|
||||||
command.as_std_mut().pre_exec(|| {
|
|
||||||
if libc::setsid() == -1 {
|
|
||||||
return Err(std::io::Error::last_os_error());
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
{
|
|
||||||
use std::os::windows::process::CommandExt;
|
|
||||||
|
|
||||||
command.as_std_mut().creation_flags(detached_creation_flags());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_agent_command(
|
fn build_agent_command(
|
||||||
cfg: &Config,
|
cfg: &Config,
|
||||||
agent_type: &str,
|
agent_type: &str,
|
||||||
@@ -5097,22 +5032,6 @@ mod tests {
|
|||||||
anyhow::bail!("timed out waiting for {}", path.display());
|
anyhow::bail!("timed out waiting for {}", path.display());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn wait_for_text(path: &Path, needle: &str) -> Result<String> {
|
|
||||||
for _ in 0..200 {
|
|
||||||
if path.exists() {
|
|
||||||
let content = fs::read_to_string(path)
|
|
||||||
.with_context(|| format!("failed to read {}", path.display()))?;
|
|
||||||
if content.contains(needle) {
|
|
||||||
return Ok(content);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
thread::sleep(StdDuration::from_millis(20));
|
|
||||||
}
|
|
||||||
|
|
||||||
anyhow::bail!("timed out waiting for {}", path.display());
|
|
||||||
}
|
|
||||||
|
|
||||||
fn command_env_map(command: &Command) -> BTreeMap<String, String> {
|
fn command_env_map(command: &Command) -> BTreeMap<String, String> {
|
||||||
command
|
command
|
||||||
.as_std()
|
.as_std()
|
||||||
@@ -5128,63 +5047,6 @@ mod tests {
|
|||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(unix)]
|
|
||||||
#[tokio::test(flavor = "current_thread")]
|
|
||||||
async fn background_runner_command_starts_new_session() -> Result<()> {
|
|
||||||
let tempdir = TestDir::new("manager-detached-runner")?;
|
|
||||||
let script_path = tempdir.path().join("detached-runner.py");
|
|
||||||
let log_path = tempdir.path().join("detached-runner.log");
|
|
||||||
let script = format!(
|
|
||||||
"#!/usr/bin/env python3\nimport os\nimport pathlib\nimport time\n\npath = pathlib.Path(r\"{}\")\npath.write_text(f\"pid={{os.getpid()}} sid={{os.getsid(0)}}\", encoding=\"utf-8\")\ntime.sleep(30)\n",
|
|
||||||
log_path.display()
|
|
||||||
);
|
|
||||||
fs::write(&script_path, script)?;
|
|
||||||
let mut permissions = fs::metadata(&script_path)?.permissions();
|
|
||||||
permissions.set_mode(0o755);
|
|
||||||
fs::set_permissions(&script_path, permissions)?;
|
|
||||||
|
|
||||||
let mut command = Command::new(&script_path);
|
|
||||||
command
|
|
||||||
.stdin(Stdio::null())
|
|
||||||
.stdout(Stdio::null())
|
|
||||||
.stderr(Stdio::null());
|
|
||||||
configure_background_runner_command(&mut command);
|
|
||||||
|
|
||||||
let mut child = command.spawn()?;
|
|
||||||
let child_pid = child.id().context("detached child pid")? as i32;
|
|
||||||
let content = wait_for_text(&log_path, "sid=")?;
|
|
||||||
let sid = content
|
|
||||||
.split_whitespace()
|
|
||||||
.find_map(|part| part.strip_prefix("sid="))
|
|
||||||
.context("session id should be logged")?
|
|
||||||
.parse::<i32>()
|
|
||||||
.context("session id should parse")?;
|
|
||||||
let parent_sid = unsafe { libc::getsid(0) };
|
|
||||||
|
|
||||||
assert_eq!(sid, child_pid);
|
|
||||||
assert_ne!(sid, parent_sid);
|
|
||||||
|
|
||||||
let _ = child.kill().await;
|
|
||||||
let _ = child.wait().await;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn background_runner_stderr_log_path_is_session_scoped() {
|
|
||||||
let path =
|
|
||||||
background_runner_stderr_log_path(Path::new("/tmp/ecc-repo"), "session-123");
|
|
||||||
assert_eq!(
|
|
||||||
path,
|
|
||||||
PathBuf::from("/tmp/ecc-repo/.claude/ecc2/logs/session-123.runner-stderr.log")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(windows)]
|
|
||||||
#[test]
|
|
||||||
fn detached_creation_flags_include_detach_and_process_group() {
|
|
||||||
assert_eq!(detached_creation_flags(), 0x0000_0008 | 0x0000_0200);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn write_package_manager_project_files(
|
fn write_package_manager_project_files(
|
||||||
repo_root: &Path,
|
repo_root: &Path,
|
||||||
package_manager_field: Option<&str>,
|
package_manager_field: Option<&str>,
|
||||||
|
|||||||
@@ -359,72 +359,44 @@ function gitRepoRoot(cwd) {
|
|||||||
return runGit(['rev-parse', '--show-toplevel'], cwd);
|
return runGit(['rev-parse', '--show-toplevel'], cwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
const MAX_RELEVANT_PATCH_LINES = 6;
|
function repoRelativePath(repoRoot, filePath) {
|
||||||
|
const absolute = path.isAbsolute(filePath)
|
||||||
function candidateGitPaths(repoRoot, filePath) {
|
? path.resolve(filePath)
|
||||||
const resolvedRepoRoot = path.resolve(repoRoot);
|
: path.resolve(process.cwd(), filePath);
|
||||||
const candidates = [];
|
const relative = path.relative(repoRoot, absolute);
|
||||||
const pushCandidate = value => {
|
if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
|
||||||
const candidate = String(value || '').trim();
|
return null;
|
||||||
if (!candidate || candidates.includes(candidate)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
candidates.push(candidate);
|
|
||||||
};
|
|
||||||
|
|
||||||
const absoluteCandidates = path.isAbsolute(filePath)
|
|
||||||
? [path.resolve(filePath)]
|
|
||||||
: [
|
|
||||||
path.resolve(resolvedRepoRoot, filePath),
|
|
||||||
path.resolve(process.cwd(), filePath),
|
|
||||||
];
|
|
||||||
|
|
||||||
for (const absolute of absoluteCandidates) {
|
|
||||||
const relative = path.relative(resolvedRepoRoot, absolute);
|
|
||||||
if (!relative || relative.startsWith('..') || path.isAbsolute(relative)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
pushCandidate(relative);
|
|
||||||
pushCandidate(relative.split(path.sep).join('/'));
|
|
||||||
pushCandidate(absolute);
|
|
||||||
pushCandidate(absolute.split(path.sep).join('/'));
|
|
||||||
}
|
}
|
||||||
|
return relative.split(path.sep).join('/');
|
||||||
return candidates;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function patchPreviewFromGitDiff(repoRoot, pathCandidates) {
|
function patchPreviewFromGitDiff(repoRoot, repoRelative) {
|
||||||
for (const candidate of pathCandidates) {
|
const patch = runGit(
|
||||||
const patch = runGit(
|
['diff', '--no-ext-diff', '--no-color', '--unified=1', '--', repoRelative],
|
||||||
['diff', '--no-ext-diff', '--no-color', '--unified=1', '--', candidate],
|
repoRoot
|
||||||
repoRoot
|
|
||||||
);
|
|
||||||
if (!patch) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const relevant = patch
|
|
||||||
.split(/\r?\n/)
|
|
||||||
.filter(line =>
|
|
||||||
line.startsWith('@@')
|
|
||||||
|| (line.startsWith('+') && !line.startsWith('+++'))
|
|
||||||
|| (line.startsWith('-') && !line.startsWith('---'))
|
|
||||||
)
|
|
||||||
.slice(0, MAX_RELEVANT_PATCH_LINES);
|
|
||||||
|
|
||||||
if (relevant.length > 0) {
|
|
||||||
return relevant.join('\n');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
function trackedInGit(repoRoot, pathCandidates) {
|
|
||||||
return pathCandidates.some(candidate =>
|
|
||||||
runGit(['ls-files', '--error-unmatch', '--', candidate], repoRoot) !== null
|
|
||||||
);
|
);
|
||||||
|
if (!patch) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const relevant = patch
|
||||||
|
.split(/\r?\n/)
|
||||||
|
.filter(line =>
|
||||||
|
line.startsWith('@@')
|
||||||
|
|| (line.startsWith('+') && !line.startsWith('+++'))
|
||||||
|
|| (line.startsWith('-') && !line.startsWith('---'))
|
||||||
|
)
|
||||||
|
.slice(0, 6);
|
||||||
|
|
||||||
|
if (relevant.length === 0) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
return relevant.join('\n');
|
||||||
|
}
|
||||||
|
|
||||||
|
function trackedInGit(repoRoot, repoRelative) {
|
||||||
|
return runGit(['ls-files', '--error-unmatch', '--', repoRelative], repoRoot) !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function enrichFileEventFromWorkingTree(toolName, event) {
|
function enrichFileEventFromWorkingTree(toolName, event) {
|
||||||
@@ -437,14 +409,14 @@ function enrichFileEventFromWorkingTree(toolName, event) {
|
|||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
const pathCandidates = candidateGitPaths(repoRoot, event.path);
|
const repoRelative = repoRelativePath(repoRoot, event.path);
|
||||||
if (pathCandidates.length === 0) {
|
if (!repoRelative) {
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
||||||
const tool = String(toolName || '').trim().toLowerCase();
|
const tool = String(toolName || '').trim().toLowerCase();
|
||||||
const tracked = trackedInGit(repoRoot, pathCandidates);
|
const tracked = trackedInGit(repoRoot, repoRelative);
|
||||||
const patchPreview = patchPreviewFromGitDiff(repoRoot, pathCandidates) || event.patch_preview;
|
const patchPreview = patchPreviewFromGitDiff(repoRoot, repoRelative) || event.patch_preview;
|
||||||
const diffPreview = buildDiffPreviewFromPatchPreview(patchPreview) || event.diff_preview;
|
const diffPreview = buildDiffPreviewFromPatchPreview(patchPreview) || event.diff_preview;
|
||||||
|
|
||||||
if (tool.includes('write')) {
|
if (tool.includes('write')) {
|
||||||
|
|||||||
@@ -309,58 +309,6 @@ function runTests() {
|
|||||||
fs.rmSync(repoDir, { recursive: true, force: true });
|
fs.rmSync(repoDir, { recursive: true, force: true });
|
||||||
}) ? passed++ : failed++);
|
}) ? passed++ : failed++);
|
||||||
|
|
||||||
(test('resolves repo-relative paths even when the hook runs from a nested cwd', () => {
|
|
||||||
const tmpHome = makeTempDir();
|
|
||||||
const repoDir = fs.mkdtempSync(path.join(os.tmpdir(), 'session-activity-tracker-nested-repo-'));
|
|
||||||
|
|
||||||
spawnSync('git', ['init'], { cwd: repoDir, encoding: 'utf8' });
|
|
||||||
spawnSync('git', ['config', 'user.email', 'ecc@example.com'], { cwd: repoDir, encoding: 'utf8' });
|
|
||||||
spawnSync('git', ['config', 'user.name', 'ECC Tests'], { cwd: repoDir, encoding: 'utf8' });
|
|
||||||
|
|
||||||
const srcDir = path.join(repoDir, 'src');
|
|
||||||
const nestedCwd = path.join(repoDir, 'subdir');
|
|
||||||
fs.mkdirSync(srcDir, { recursive: true });
|
|
||||||
fs.mkdirSync(nestedCwd, { recursive: true });
|
|
||||||
|
|
||||||
const trackedFile = path.join(srcDir, 'app.ts');
|
|
||||||
fs.writeFileSync(trackedFile, 'const count = 1;\n', 'utf8');
|
|
||||||
spawnSync('git', ['add', 'src/app.ts'], { cwd: repoDir, encoding: 'utf8' });
|
|
||||||
spawnSync('git', ['commit', '-m', 'init'], { cwd: repoDir, encoding: 'utf8' });
|
|
||||||
|
|
||||||
fs.writeFileSync(trackedFile, 'const count = 2;\n', 'utf8');
|
|
||||||
|
|
||||||
const input = {
|
|
||||||
tool_name: 'Write',
|
|
||||||
tool_input: {
|
|
||||||
file_path: 'src/app.ts',
|
|
||||||
content: 'const count = 2;\n',
|
|
||||||
},
|
|
||||||
tool_output: { output: 'updated src/app.ts' },
|
|
||||||
};
|
|
||||||
const result = runScript(input, {
|
|
||||||
...withTempHome(tmpHome),
|
|
||||||
CLAUDE_HOOK_EVENT_NAME: 'PostToolUse',
|
|
||||||
ECC_SESSION_ID: 'ecc-session-nested-cwd',
|
|
||||||
}, {
|
|
||||||
cwd: nestedCwd,
|
|
||||||
});
|
|
||||||
assert.strictEqual(result.code, 0);
|
|
||||||
|
|
||||||
const metricsFile = path.join(tmpHome, '.claude', 'metrics', 'tool-usage.jsonl');
|
|
||||||
const row = JSON.parse(fs.readFileSync(metricsFile, 'utf8').trim());
|
|
||||||
assert.deepStrictEqual(row.file_events, [
|
|
||||||
{
|
|
||||||
path: 'src/app.ts',
|
|
||||||
action: 'modify',
|
|
||||||
diff_preview: 'const count = 1; -> const count = 2;',
|
|
||||||
patch_preview: '@@ -1 +1 @@\n-const count = 1;\n+const count = 2;',
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
fs.rmSync(tmpHome, { recursive: true, force: true });
|
|
||||||
fs.rmSync(repoDir, { recursive: true, force: true });
|
|
||||||
}) ? passed++ : failed++);
|
|
||||||
|
|
||||||
(test('prefers ECC_SESSION_ID over CLAUDE_SESSION_ID and redacts bash summaries', () => {
|
(test('prefers ECC_SESSION_ID over CLAUDE_SESSION_ID and redacts bash summaries', () => {
|
||||||
const tmpHome = makeTempDir();
|
const tmpHome = makeTempDir();
|
||||||
const input = {
|
const input = {
|
||||||
|
|||||||
@@ -49,9 +49,8 @@ function main() {
|
|||||||
const result = spawnSync("npm", ["pack", "--dry-run", "--json"], {
|
const result = spawnSync("npm", ["pack", "--dry-run", "--json"], {
|
||||||
cwd: repoRoot,
|
cwd: repoRoot,
|
||||||
encoding: "utf8",
|
encoding: "utf8",
|
||||||
shell: process.platform === "win32",
|
|
||||||
})
|
})
|
||||||
assert.strictEqual(result.status, 0, result.error?.message || result.stderr)
|
assert.strictEqual(result.status, 0, result.stderr)
|
||||||
|
|
||||||
const packOutput = JSON.parse(result.stdout)
|
const packOutput = JSON.parse(result.stdout)
|
||||||
const packagedPaths = new Set(packOutput[0]?.files?.map((file) => file.path) ?? [])
|
const packagedPaths = new Set(packOutput[0]?.files?.map((file) => file.path) ?? [])
|
||||||
|
|||||||
Reference in New Issue
Block a user