Skip to content

armgit / ECC

Public Imported from GitHub
0

The agent harness performance optimization system. Skills, instincts, memory, security, and research-first development for Claude Code, Codex, Opencode, Cursor and beyond.

fix(context): keep illustrative skill requests on the proposal path

Yann Robertoa70b9795d132
diff --git a/scripts/lib/context-selection.js b/scripts/lib/context-selection.js
index 535376c09..5253b5be2 100644
--- a/scripts/lib/context-selection.js
+++ b/scripts/lib/context-selection.js
@@ -33,7 +33,8 @@ const FALLBACK_MARGIN = 1.1;
// v7: independent directives scope negation and imperatives allow question punctuation.
// v8: only recognized request/rejection scopes can authorize coordinated directives.
// v9: neutral task preambles do not suppress a later explicit skill request.
-const ROUTING_POLICY_VERSION = 9;
+// v10: illustrative instructions do not supply or withdraw a direct request.
+const ROUTING_POLICY_VERSION = 10;
const TASK_KEYS = new Set(['sessionId', 'taskId', 'revision', 'phase', 'query', 'explicitIds', 'proposedIds', 'noWorkflow']);
const DIRECTIVE_VERB = /\b(use|apply|invoke|run|follow|load)\s+(the\s+)?/i;
@@ -42,6 +43,7 @@ const DIRECTIVE_REJECTION = /^(?:please )?(?:(?:(?:do )?not|never) (?:use|apply|
const DIRECTIVE_NAME_PREFIX = new RegExp(DIRECTIVE_REQUEST.source + '\\s+(?:the\\s+)?(?:skill\\s*)?$');
const QUESTION_START = /^(?!do not\b)(can|could|would|should|shall|will|may|might|must|ought|do|does|did|is|are|why|how|what|when|where|which)\b/;
const REPORTED_INSTRUCTION = /\b(say|says|said|reads|told|mentions?|quoted?|document|states?|stated|recommends?|recommended|asserts?|asserted)\b/;
+const EXAMPLE_PREFIX = /^(?:for (?:example|instance)|as an example|to illustrate)\b/;
// Subject-led statements may describe someone else's instructions or intentions.
const SUBJECT_PREFIX = /^(?:the|a|an|i|you|he|she|it|we|they|my|your|his|her|its|our|their|this|that|these|those)\b/;
// Rejections keep their whole list until another instruction/question begins.
@@ -88,7 +90,9 @@ function citationFor(candidate, query, nativeName) {
if (aliases.some(({ name }) => new RegExp('\\b' + name + '\\b').test(text))) citation = 'indirect';
return part.replace(/[^.!?;\n]/g, ' ');
});
- for (const clause of unquoted.match(/[^.!?;\n]+[.!?;\n]*/g) || []) {
+ // Keep the illustrative abbreviation together when its periods would split clauses.
+ const expanded = unquoted.replace(/\be\.g\.(?=\s|[,;:!?]|$)/gi, 'for example');
+ for (const clause of expanded.match(/[^.!?;\n]+[.!?;\n]*/g) || []) {
// Keep comma boundaries for directive scope without changing alias normalization.
const text = clause.split(',').map(normalizedQueryName).join(', ');
const mentions = aliases.flatMap(({ name, exact }) => [...text.matchAll(new RegExp('\\b' + name + '\\b', 'g'))]
@@ -97,6 +101,7 @@ function citationFor(candidate, query, nativeName) {
const prefix = text.slice(0, mention.index);
const scopes = prefix.split(ADMISSION_BOUNDARY);
const instructionPrefix = prefix.split(INSTRUCTION_BOUNDARY).at(-1);
+ const example = scopes.some(scope => EXAMPLE_PREFIX.test(scope));
// A task preamble such as "fix the bug" does not change a later request.
// Only preceding scopes may be neutral: an embedded instruction, question,
// or subject-led statement still needs review. The final scope must remain
@@ -107,7 +112,7 @@ function citationFor(candidate, query, nativeName) {
const question = (!DIRECTIVE_REQUEST.test(text) && QUESTION_START.test(text))
|| (!DIRECTIVE_REQUEST.test(instructionPrefix)
&& (QUESTION_START.test(instructionPrefix) || clause.includes('?')));
- if (question || REPORTED_INSTRUCTION.test(prefix) || /^\s*["'\u201c\u2018\x60]/.test(clause)) {
+ if (example || question || REPORTED_INSTRUCTION.test(prefix) || /^\s*["'\u201c\u2018\x60]/.test(clause)) {
if (citation === 'none') citation = 'indirect';
} else if (/\b(do not|never|no|not|avoid)\b/.test(instructionPrefix)) {
citation = 'indirect';
diff --git a/tests/lib/context-profile-launch.test.js b/tests/lib/context-profile-launch.test.js
index 2e77cbd56..2d7610fe8 100644
--- a/tests/lib/context-profile-launch.test.js
+++ b/tests/lib/context-profile-launch.test.js
@@ -183,6 +183,14 @@ for (const query of ["Don't use the feature skill.", 'Don\u2019t use the feature
'Fix the bug, ought we to repair it and use feature?',
'Fix the bug, must we repair it and use feature?',
'Fix the bug, feature.',
+ 'For example, use feature',
+ 'For instance, use feature.',
+ 'As an example, use feature.',
+ 'To illustrate, use feature.',
+ 'Fix the bug, for example, use feature.',
+ 'For example, use feature and use feature.',
+ 'e.g., use feature.',
+ 'E.g. use feature.',
'Do not use feature and shared guidance.',
"Use feature, don't use feature.",
"Use feature and don't use feature.",
@@ -232,6 +240,13 @@ for (const [query, skill] of [
['Shall we use shared guidance? Use feature.', 'feature'],
['Use feature. The spec states do not use feature and use shared guidance.', 'feature'],
['The spec states do not use feature and use shared guidance. Use feature.', 'feature'],
+ ['Use feature. For example, use shared guidance.', 'feature'],
+ ['For example, use shared guidance. Use feature.', 'feature'],
+ ["Use feature. For example, don't use feature.", 'feature'],
+ ['Use feature to build an example.', 'feature'],
+ ['Fix the example, use feature.', 'feature'],
+ ['Fix e.g.js, use feature.', 'feature'],
+ ["Use feature. E.g., don't use feature.", 'feature'],
]) {
test('an unambiguous final directive injects context without a proposal: ' + query, () => withFixture(repoRoot => {
const phases = [];
diff --git a/tests/lib/context-selection.test.js b/tests/lib/context-selection.test.js
index 7320c1f24..2ec8c5529 100644
--- a/tests/lib/context-selection.test.js
+++ b/tests/lib/context-selection.test.js
@@ -485,26 +485,50 @@ for (const prefix of ["Don't use database-migrations.", 'Do not use database-mig
});
}
-test('routing policy changes invalidate receipts created by the old citation policy', () => withFixture(repoRoot => {
- const query = 'Use standard tools, shall we use feature?';
- const first = resolve(repoRoot, { query, explicitIds: ['skill:feature'] });
- const { digestObject } = require('../../scripts/lib/context-profile-support');
- const { compileContextProfile } = require('../../scripts/lib/context-profiles');
- const plan = compileContextProfile({ repoRoot, selectionMode: 'auto' });
- const bindingDigest = digestObject({ sessionId: 'session-1', taskId: 'task-1', revision: 1,
- phase: 'implement', planDigest: plan.planDigest, routingPolicyVersion: 7,
- triggersDigest: digestObject({}), queryDigest: digestObject(query) });
- const { receiptDigest: _receiptDigest, ...receipt } = first.receipt;
- const oldReceipt = { ...receipt, bindingDigest, explicitIds: [],
- selectionDigest: digestObject({ bindingDigest, selectedIds: ['skill:feature'], explicitIds: [] }) };
- const previous = { ...oldReceipt, receiptDigest: digestObject(oldReceipt) };
- const result = resolve(repoRoot, { query }, { previous, load: true });
- assert.equal(result.reused, false);
- assert.notEqual(result.receipt.bindingDigest, previous.bindingDigest);
- assert.deepEqual(result.selectedIds, []);
- assert.deepEqual(result.loadedIds, []);
- assert.equal(result.fallback, null);
-}));
+for (const query of [
+ 'For example, use feature',
+ 'For instance, use feature.',
+ 'As an example, use feature.',
+ 'To illustrate, use feature.',
+ 'Fix the bug, for example, use feature.',
+ 'For example, use feature and use feature.',
+ 'e.g., use feature.',
+ 'E.g. use feature.',
+]) {
+ test('an illustrative citation needs an agent decision: ' + query, () => withFixture(repoRoot => {
+ const result = resolve(repoRoot, { query }, { load: true });
+ assert.ok(result.candidates.some(candidate => candidate.id === 'skill:feature'));
+ assert.deepEqual(result.selectedIds, []);
+ assert.deepEqual(result.loadedIds, []);
+ assert.equal(result.reason, 'agent-selection-required');
+ assert.equal(result.fallback, null);
+ }));
+}
+
+for (const [routingPolicyVersion, query] of [
+ [7, 'Use standard tools, shall we use feature?'],
+ [9, 'For example, use feature'],
+]) {
+ test('an old policy ' + routingPolicyVersion + ' selected receipt is invalidated after policy changes', () => withFixture(repoRoot => {
+ const first = resolve(repoRoot, { query, explicitIds: ['skill:feature'] });
+ const { digestObject } = require('../../scripts/lib/context-profile-support');
+ const { compileContextProfile } = require('../../scripts/lib/context-profiles');
+ const plan = compileContextProfile({ repoRoot, selectionMode: 'auto' });
+ const bindingDigest = digestObject({ sessionId: 'session-1', taskId: 'task-1', revision: 1,
+ phase: 'implement', planDigest: plan.planDigest, routingPolicyVersion,
+ triggersDigest: digestObject({}), queryDigest: digestObject(query) });
+ const { receiptDigest: _receiptDigest, ...receipt } = first.receipt;
+ const oldReceipt = { ...receipt, bindingDigest, explicitIds: [],
+ selectionDigest: digestObject({ bindingDigest, selectedIds: ['skill:feature'], explicitIds: [] }) };
+ const previous = { ...oldReceipt, receiptDigest: digestObject(oldReceipt) };
+ const result = resolve(repoRoot, { query }, { previous, load: true });
+ assert.equal(result.reused, false);
+ assert.notEqual(result.receipt.bindingDigest, previous.bindingDigest);
+ assert.deepEqual(result.selectedIds, []);
+ assert.deepEqual(result.loadedIds, []);
+ assert.equal(result.fallback, null);
+ }));
+}
for (const [routingPolicyVersion, query, expectedId] of [
[6, "Don't use feature, use shared guidance.", 'skill:shared'],
@@ -555,6 +579,13 @@ for (const query of [
'The docs say never use feature. Use feature.',
'Use feature. The docs say never use feature.',
'Use feature to inspect the essay.',
+ 'Use feature. For example, use shared guidance.',
+ 'For example, use shared guidance. Use feature.',
+ "Use feature. For example, don't use feature.",
+ 'Use feature to build an example.',
+ 'Fix the example, use feature.',
+ 'Fix e.g.js, use feature.',
+ "Use feature. E.g., don't use feature.",
]) {
test('a genuine directive survives surrounding discussion: ' + query, () => withFixture(repoRoot => {
const result = resolve(repoRoot, { query }, { load: true });