mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-07 14:06:42 +02:00
fix: resolve merge conflicts with origin/main (v0.4.3 + v0.4.4)
Merge origin/main which added: - v0.4.3: /document-release skill, simplified AskUserQuestion (always ELI16), runtime branch detection via _BRANCH preamble variable - v0.4.4: 60-min update check TTL, --force flag for gstack-update-check Resolved conflicts: - VERSION: keep 0.6.0 (our version, above 0.4.4) - CHANGELOG: all entries preserved (0.6.0 > 0.4.4 > 0.4.3 > 0.4.2) - TODOS.md: keep both sections (Brainstorm/Design + Document-Release) - test/skill-validation.test.ts: include all three new skills in arrays (brainstorm, debug, document-release) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -177,6 +177,7 @@ describe('Update check preamble', () => {
|
||||
'plan-ceo-review/SKILL.md', 'plan-eng-review/SKILL.md',
|
||||
'retro/SKILL.md',
|
||||
'brainstorm/SKILL.md', 'debug/SKILL.md',
|
||||
'document-release/SKILL.md',
|
||||
];
|
||||
|
||||
for (const skill of skillsWithUpdateCheck) {
|
||||
@@ -398,6 +399,7 @@ describe('No hardcoded branch names in SKILL templates', () => {
|
||||
'qa/SKILL.md.tmpl',
|
||||
'plan-ceo-review/SKILL.md.tmpl',
|
||||
'retro/SKILL.md.tmpl',
|
||||
'document-release/SKILL.md.tmpl',
|
||||
];
|
||||
|
||||
// Patterns that indicate hardcoded 'main' in git commands
|
||||
@@ -481,6 +483,7 @@ describe('v0.4.1 preamble features', () => {
|
||||
'plan-ceo-review/SKILL.md', 'plan-eng-review/SKILL.md',
|
||||
'retro/SKILL.md',
|
||||
'brainstorm/SKILL.md', 'debug/SKILL.md',
|
||||
'document-release/SKILL.md',
|
||||
];
|
||||
|
||||
for (const skill of skillsWithPreamble) {
|
||||
@@ -493,7 +496,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');
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user