mirror of
https://github.com/affaan-m/ECC.git
synced 2026-08-17 21:15:40 +02:00
Gaurav DubeyandGitHub
c714dc5654
* fix(resolve-ecc-root): require ECC skills, not just scripts, before accepting a root (#2544) resolveEccRoot() accepted a candidate root on script-only evidence (scripts/lib/utils.js). A partial install that lands ECC's scripts into ~/.claude but not ECC's skills short-circuited at the standard-install branch, so skill-resolving callers built skills/... paths against a root where they do not exist and every command failed three layers away. For the default probe (skill consumers, reached via INLINE_RESOLVE) a candidate now qualifies only if it contains both the script tree and a sentinel ECC skill; the same stricter check guards the plugin-root and plugin-cache branches. An explicit caller probe is still honored exactly, so script consumers (e.g. session-start-bootstrap, which probes for the hook runner) are unaffected. Merely checking that skills/ exists is insufficient — a user's own ~/.claude/skills/ can be present with none of ECC's skills. Adds a regression test for the exact partial-install scenario and updates the resolver test fixtures to build complete roots. * test(resolve-ecc-root): cover partial exact-plugin and cache roots; DRY skill sentinel (#2544) Address CodeRabbit review on PR #2577: - Extend #2544 regression coverage to the exact-plugin and versioned plugin-cache branches, asserting the stricter both-sentinels predicate rejects a scripts-only root there too (not only for ~/.claude). - Extract the ECC_SKILL_SENTINEL constant in command-plugin-root.test.js and reuse it at both fixture setup sites instead of duplicating the literal.
87 lines
3.9 KiB
JavaScript
87 lines
3.9 KiB
JavaScript
'use strict';
|
|
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const os = require('os');
|
|
const assert = require('assert');
|
|
const { INLINE_RESOLVE } = require('../../scripts/lib/resolve-ecc-root');
|
|
|
|
// Sentinel ECC skill that resolveEccRoot() requires alongside the script tree
|
|
// before accepting a root; kept in sync with the module's DEFAULT_SKILL_PROBE.
|
|
const ECC_SKILL_SENTINEL = path.join('skills', 'continuous-learning-v2');
|
|
|
|
let passed = 0;
|
|
let failed = 0;
|
|
|
|
function test(name, fn) {
|
|
try {
|
|
fn();
|
|
console.log(`PASS ${name}`);
|
|
passed += 1;
|
|
} catch (error) {
|
|
console.error(`FAIL ${name}`);
|
|
console.error(error.stack || error.message || String(error));
|
|
failed += 1;
|
|
}
|
|
}
|
|
|
|
const sessionsDoc = fs.readFileSync(path.join(__dirname, '..', '..', 'commands', 'sessions.md'), 'utf8');
|
|
const skillHealthDoc = fs.readFileSync(path.join(__dirname, '..', '..', 'commands', 'skill-health.md'), 'utf8');
|
|
const instinctStatusDoc = fs.readFileSync(path.join(__dirname, '..', '..', 'commands', 'instinct-status.md'), 'utf8');
|
|
|
|
test('sessions command uses shared inline resolver in all node scripts', () => {
|
|
assert.strictEqual((sessionsDoc.match(/const _r = /g) || []).length, 6);
|
|
assert.strictEqual((sessionsDoc.match(/scripts','lib','resolve-ecc-root/g) || []).length, 6);
|
|
});
|
|
|
|
test('skill-health command uses shared inline resolver in all shell snippets', () => {
|
|
assert.strictEqual((skillHealthDoc.match(/var r=\(function/g) || []).length, 3);
|
|
assert.strictEqual((skillHealthDoc.match(/scripts','lib','resolve-ecc-root/g) || []).length, 3);
|
|
});
|
|
|
|
test('instinct-status command uses shared inline resolver (no stale legacy fallback) (#2037)', () => {
|
|
assert.strictEqual((instinctStatusDoc.match(/var r=\(function/g) || []).length, 1);
|
|
assert.strictEqual((instinctStatusDoc.match(/scripts','lib','resolve-ecc-root/g) || []).length, 1);
|
|
// The pre-fix template hard-coded the legacy path as a fallback when
|
|
// CLAUDE_PLUGIN_ROOT was unset. Asserting its absence prevents regression.
|
|
assert.ok(
|
|
!instinctStatusDoc.includes('python3 ~/.claude/skills/continuous-learning-v2/scripts/instinct-cli.py'),
|
|
'instinct-status should not hard-code the legacy ~/.claude install path as a fallback'
|
|
);
|
|
});
|
|
|
|
test('resolveEccRoot module covers current and legacy marketplace plugin roots', () => {
|
|
const { resolveEccRoot } = require('../../scripts/lib/resolve-ecc-root');
|
|
assert.ok(typeof resolveEccRoot === 'function');
|
|
|
|
const legacyHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ecc-marketplace-legacy-'));
|
|
try {
|
|
const legacyRoot = path.join(legacyHomeDir, '.claude', 'plugins', 'marketplaces', 'ecc');
|
|
fs.mkdirSync(path.join(legacyRoot, 'scripts', 'lib'), { recursive: true });
|
|
fs.writeFileSync(path.join(legacyRoot, 'scripts', 'lib', 'utils.js'), '// stub');
|
|
fs.mkdirSync(path.join(legacyRoot, ECC_SKILL_SENTINEL), { recursive: true });
|
|
assert.strictEqual(resolveEccRoot({ envRoot: '', homeDir: legacyHomeDir }), legacyRoot);
|
|
} finally {
|
|
fs.rmSync(legacyHomeDir, { recursive: true, force: true });
|
|
}
|
|
|
|
const cacheHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ecc-marketplace-cache-'));
|
|
try {
|
|
const cacheRoot = path.join(cacheHomeDir, '.claude', 'plugins', 'cache', 'ecc', 'affaan-m', '1.0.0');
|
|
fs.mkdirSync(path.join(cacheRoot, 'scripts', 'lib'), { recursive: true });
|
|
fs.writeFileSync(path.join(cacheRoot, 'scripts', 'lib', 'utils.js'), '// stub');
|
|
fs.mkdirSync(path.join(cacheRoot, ECC_SKILL_SENTINEL), { recursive: true });
|
|
assert.strictEqual(resolveEccRoot({ envRoot: '', homeDir: cacheHomeDir }), cacheRoot);
|
|
} finally {
|
|
fs.rmSync(cacheHomeDir, { recursive: true, force: true });
|
|
}
|
|
|
|
assert.ok(!INLINE_RESOLVE.includes('\\"'), 'Inline resolver should not require escaped double quotes');
|
|
assert.ok(INLINE_RESOLVE.includes("scripts','lib','resolve-ecc-root"));
|
|
});
|
|
|
|
console.log(`Passed: ${passed}`);
|
|
console.log(`Failed: ${failed}`);
|
|
|
|
process.exit(failed > 0 ? 1 : 0);
|