Merge remote-tracking branch 'origin/main' into garrytan/document-skill

# Conflicts:
#	CHANGELOG.md

test/gen-skill-docs.test.ts

@@ -144,7 +144,18 @@ describe('gen-skill-docs', () => {
     const content = fs.readFileSync(path.join(ROOT, 'SKILL.md'), 'utf-8');
     expect(content).toContain('_SESSIONS');
     expect(content).toContain('RECOMMENDATION');
-    expect(content).toContain('ELI16');
+  });
+
+  test('generated SKILL.md contains branch detection', () => {
+    const content = fs.readFileSync(path.join(ROOT, 'SKILL.md'), 'utf-8');
+    expect(content).toContain('_BRANCH');
+    expect(content).toContain('git branch --show-current');
+  });
+
+  test('generated SKILL.md contains ELI16 simplification rules', () => {
+    const content = fs.readFileSync(path.join(ROOT, 'SKILL.md'), 'utf-8');
+    expect(content).toContain('No raw function names');
+    expect(content).toContain('plain English');
   });
 
   test('qa and qa-only templates use QA_METHODOLOGY placeholder', () => {

test/skill-validation.test.ts

@@ -494,7 +494,7 @@ describe('v0.4.1 preamble features', () => {
     test(`${skill} contains session awareness`, () => {
       const content = fs.readFileSync(path.join(ROOT, skill), 'utf-8');
       expect(content).toContain('_SESSIONS');
-      expect(content).toContain('ELI16');
+      expect(content).toContain('RECOMMENDATION');
     });
   }
 });