mirror of
https://github.com/affaan-m/ECC.git
synced 2026-08-17 21:15:40 +02:00
* fix(hooks,lib): fix hook detection and parsing edge cases
- auto-tmux-dev: dev\b -> dev(?![\w-]) so one-shot dev-build/dev-docs scripts
are not detached into tmux; align command shapes (yarn run dev, bun dev) with
pre-bash-dev-server-block.js DEV_PATTERN.
- pre-bash-commit-quality: skip obvious non-secret placeholders (env refs,
${...}, <...>, whitelisted tokens) in the api-key rule without suppressing
real high-entropy secrets; make -m message extraction quote- and
escaped-quote-aware so `-m "fix: \"x\""` / apostrophes are not truncated.
- pre-compact: annotate the CURRENT worktree's session (match **Worktree:** /
legacy **Project:**) instead of the newest *-session.tmp across all projects,
layered onto the LLM-summary flow from #2388; a present-but-blank Worktree
header is treated as non-legacy (no foreign project fallback).
- shell-substitution: stop double-appending a trailing backslash in an
unterminated backtick span.
- utils readStdinJson: on overflow, settle and resolve {} immediately (clear
timer + listeners) instead of waiting for end/timeout and parsing a partial
prefix; surface the overflow on stderr.
Regression tests added/extended (new tests/hooks/pre-compact.test.js).
Addresses review feedback on #2405. The earlier block-no-verify change was
dropped: its message-value skip on merge/cherry-pick/am/rebase would let
`git rebase -m --no-verify` bypass the hook (rebase's -m is the boolean
--merge), a false-negative worse than the contrived false-positive it fixed.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
* fix(ci): align hook fixtures and drain oversized stdin
---------
Co-authored-by: djpjronline-netizen <276112803+djpjronline-netizen@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Co-authored-by: haelyra <49814733+haelyra@users.noreply.github.com>
106 lines
4.8 KiB
JavaScript
106 lines
4.8 KiB
JavaScript
'use strict';
|
|
/**
|
|
* Tests for scripts/hooks/pre-compact.js — worktree-aware active-session
|
|
* selection. The sessions dir is shared across projects/worktrees, so the
|
|
* hook must annotate the CURRENT worktree's session, not whichever file is
|
|
* newest by mtime. selectActiveSessionPath takes an injectable reader so the
|
|
* selection logic is tested without touching the filesystem.
|
|
*/
|
|
|
|
const assert = require('assert');
|
|
const { selectActiveSessionPath } = require('../../scripts/hooks/pre-compact');
|
|
|
|
let passed = 0;
|
|
let failed = 0;
|
|
|
|
function test(name, fn) {
|
|
try {
|
|
fn();
|
|
console.log(` ✓ ${name}`);
|
|
return true;
|
|
} catch (err) {
|
|
console.log(` ✗ ${name}`);
|
|
console.log(` ${err.message}`);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// Reader built from a path -> content map (returns null for unknown/unreadable).
|
|
function reader(map) {
|
|
return (p) => (Object.prototype.hasOwnProperty.call(map, p) ? map[p] : null);
|
|
}
|
|
|
|
const A = '/ecc-pre-compact-test/work/projA';
|
|
const B = '/ecc-pre-compact-test/work/projB';
|
|
|
|
if (test('selects the session matching the current worktree, not the newest', () => {
|
|
const sessions = [
|
|
{ path: '/sessions/newest-session.tmp' }, // newest, different worktree
|
|
{ path: '/sessions/older-session.tmp' }, // older, our worktree
|
|
];
|
|
const map = {
|
|
'/sessions/newest-session.tmp': `**Project:** projB\n**Worktree:** ${B}\n`,
|
|
'/sessions/older-session.tmp': `**Project:** projA\n**Worktree:** ${A}\n`,
|
|
};
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), '/sessions/older-session.tmp');
|
|
})) passed++; else failed++;
|
|
|
|
if (test('returns null when no session matches the current worktree (no foreign write)', () => {
|
|
const sessions = [{ path: '/sessions/b-session.tmp' }];
|
|
const map = { '/sessions/b-session.tmp': `**Project:** projB\n**Worktree:** ${B}\n` };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), null);
|
|
})) passed++; else failed++;
|
|
|
|
if (test('falls back to a legacy session (no Worktree header) with matching project name', () => {
|
|
const sessions = [{ path: '/sessions/legacy-session.tmp' }];
|
|
const map = { '/sessions/legacy-session.tmp': '**Project:** projA\n' };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), '/sessions/legacy-session.tmp');
|
|
})) passed++; else failed++;
|
|
|
|
if (test('does not project-match a session that has an explicit non-matching Worktree', () => {
|
|
const sessions = [{ path: '/sessions/x-session.tmp' }];
|
|
const map = { '/sessions/x-session.tmp': `**Project:** projA\n**Worktree:** ${B}\n` };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), null);
|
|
})) passed++; else failed++;
|
|
|
|
if (test('does not project-match a session whose Worktree header is present but blank', () => {
|
|
// A blank/whitespace Worktree header is NOT a legacy session, so it must not
|
|
// fall back to project-name matching and attach to a foreign session.
|
|
const sessions = [{ path: '/sessions/blank-session.tmp' }];
|
|
const map = { '/sessions/blank-session.tmp': '**Project:** projA\n**Worktree:** \n' };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), null);
|
|
})) passed++; else failed++;
|
|
|
|
if (test('does not project-match a session whose Worktree header has no value and no space', () => {
|
|
// Same as above but the header is bare `**Worktree:**\n` (no trailing space) —
|
|
// (.+) would have missed this; (.*) registers it as a present-but-empty header.
|
|
const sessions = [{ path: '/sessions/blank-header.tmp' }];
|
|
const map = { '/sessions/blank-header.tmp': '**Project:** projA\n**Worktree:**\n' };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), null);
|
|
})) passed++; else failed++;
|
|
|
|
if (test('worktree match wins over a newer session AND over a legacy project match', () => {
|
|
const sessions = [
|
|
{ path: '/sessions/legacy-session.tmp' }, // newest, legacy, same project
|
|
{ path: '/sessions/wt-session.tmp' }, // older, exact worktree
|
|
];
|
|
const map = {
|
|
'/sessions/legacy-session.tmp': '**Project:** projA\n',
|
|
'/sessions/wt-session.tmp': `**Worktree:** ${A}\n`,
|
|
};
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), '/sessions/wt-session.tmp');
|
|
})) passed++; else failed++;
|
|
|
|
if (test('skips unreadable session files', () => {
|
|
const sessions = [{ path: '/sessions/bad-session.tmp' }, { path: '/sessions/good-session.tmp' }];
|
|
const map = { '/sessions/good-session.tmp': `**Worktree:** ${A}\n` };
|
|
assert.strictEqual(selectActiveSessionPath(sessions, A, 'projA', reader(map)), '/sessions/good-session.tmp');
|
|
})) passed++; else failed++;
|
|
|
|
if (test('returns null for an empty session list', () => {
|
|
assert.strictEqual(selectActiveSessionPath([], A, 'projA', reader({})), null);
|
|
})) passed++; else failed++;
|
|
|
|
console.log(`\nResults: Passed: ${passed}, Failed: ${failed}`);
|
|
process.exit(failed > 0 ? 1 : 0);
|