mirror of
https://github.com/affaan-m/ECC.git
synced 2026-10-18 14:07:33 +02:00
Merge upstream/main into feat/gateguard-fewer-round-trips
Brings in the three commits main gained since the branch's merge base: the 2.2.3 release, retiring the Everything Claude Code name for ECC, and the ja-JP sponsor update. 227 files arrive from main; two conflicted. CHANGELOG.md: the branch had added an Unreleased section and main a released 2.2.3 section, both at the top. Both are kept verbatim with Unreleased above 2.2.3, since none of the branch's entries shipped in that release. manifests/context-packs/skill-triggers@1.json: both sides had recomputed registryDigest from the same earlier value to different results, and neither is the digest of the merged tree. It is recomputed with loadContextRegistry over the merged tree and only that field changes; triggers and triggersDigest are untouched on both sides. validate-context-profiles passes. All twelve CI validators pass. The full suite reports 44 failures in seven files; 43 of them fail by name and count identically on an unmodified upstream/main, and the remaining one, plugin-hook-bootstrap, fails only inside run-all and passes in isolation on both trees. The merge introduces no failing test that main does not already have.
This commit is contained in:
@@ -1167,7 +1167,7 @@ if (
|
||||
assert.strictEqual(syncResult.status, 0, `${syncResult.stdout}\n${syncResult.stderr}`);
|
||||
|
||||
const syncedAgents = fs.readFileSync(agentsPath, 'utf8');
|
||||
assert.match(syncedAgents, /^# Everything Claude Code \(ECC\) — Agent Instructions/m);
|
||||
assert.match(syncedAgents, /^# ECC — Agent Instructions/m);
|
||||
assert.match(syncedAgents, /^# Codex Supplement \(From ECC \.codex\/AGENTS\.md\)/m);
|
||||
|
||||
const syncedConfig = fs.readFileSync(configPath, 'utf8');
|
||||
|
||||
@@ -46,7 +46,7 @@ function runProcess(args = [], options = {}) {
|
||||
function seedMinimalRepo(rootDir, overrides = {}) {
|
||||
const files = {
|
||||
'package.json': JSON.stringify({
|
||||
name: 'everything-claude-code',
|
||||
name: 'ecc-universal',
|
||||
files: ['scripts/observability-readiness.js'],
|
||||
scripts: {
|
||||
'harness:audit': 'node scripts/harness-audit.js',
|
||||
|
||||
@@ -28,7 +28,7 @@ function writeFile(rootDir, relativePath, content) {
|
||||
function seedRepo(rootDir, overrides = {}) {
|
||||
const files = {
|
||||
'package.json': JSON.stringify({
|
||||
name: 'everything-claude-code',
|
||||
name: 'ecc-universal',
|
||||
files: [
|
||||
'scripts/observability-readiness.js',
|
||||
'scripts/operator-readiness-dashboard.js',
|
||||
|
||||
@@ -31,7 +31,7 @@ function writeFile(rootDir, relativePath, content) {
|
||||
function seedRepo(rootDir, overrides = {}) {
|
||||
const files = {
|
||||
'package.json': JSON.stringify({
|
||||
name: 'everything-claude-code',
|
||||
name: 'ecc-universal',
|
||||
scripts: {
|
||||
'platform:audit': 'node scripts/platform-audit.js',
|
||||
'discussion:audit': 'node scripts/discussion-audit.js',
|
||||
|
||||
@@ -176,7 +176,7 @@ function runTests() {
|
||||
const output = new SkillCreateOutput('repo');
|
||||
const logs = captureLog(() => output.footer());
|
||||
const combined = logs.join('\n');
|
||||
assert.ok(combined.includes('Everything Claude Code'), 'Should include project name');
|
||||
assert.ok(combined.includes('ECC'), 'Should include project name');
|
||||
})) passed++; else failed++;
|
||||
|
||||
// progressBar edge cases (tests the clamp fix)
|
||||
|
||||
Reference in New Issue
Block a user