CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-09-27 23:21:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

v1.89.1.0 fix: remove continuous checkpoint commits (#2970)

Browse Source 
* v1.89.1.0 fix: remove continuous checkpoint commits and repair validation blockers

* fix: clarify shipping and engineering review recovery

* fix: interpret native no-change review descriptions

* test: separate descendant readiness from timeout delivery
This commit is contained in:
Garry Tan
2026-09-24 17:27:14 -04:00
committed by GitHub
parent 06ed920a97
commit 730a1017d1
103 changed files with 1819 additions and 2279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/workflow-excerpt.test.ts
+12 -39
View File
@@ -80,7 +80,7 @@ describe('workflow judge excerpts', () => {
expect(text).not.toContain('Steps 4-6:');
expect(text).toContain('During pre-flight, read the existing review log');
expect(text).toContain('Save the JSON `baseVersion` as `BASE_VERSION`');
expect(text).toContain("GIT_SEQUENCE_EDITOR='cp");
expect(text).not.toContain('GIT_SEQUENCE_EDITOR');
expect(text).not.toContain("--exec 'true'");
expect(text).not.toContain('-X ours');
expect(text).toContain('````text\nYou are running a ship-workflow');
@@ -163,13 +163,14 @@ describe('workflow judge excerpts', () => {
const { skillPath, startMarker, endMarker } = ENG_REVIEW_EXCERPT;
const eng = readWorkflowExcerpt(skillPath, startMarker, endMarker);
const stages = ['## Review preparation', '## Retrospective learning', '## Confidence Calibration', '## Decision procedure',
'### 1. Establish current state', '## Review Sections',
'### 1. Establish current state', '## Scope Challenge', '### A. Assess the target',
'### B. Resolve complexity selectors', '### C. Resolve findings', '## Review Sections',
'### 1. Architecture review', '### 2. Code quality review', '### 3. Test review', '### 4. Performance review']
.map(heading => eng.indexOf(heading));
expect(stages.every(index => index >= 0)).toBe(true);
expect(stages).toEqual([...stages].sort((a, b) => a - b));
expect(eng.match(/^## Decision procedure$/gm)).toHaveLength(1);
const procedure = eng.slice(eng.indexOf('## Decision procedure'), eng.indexOf('## Review Sections'));
const procedure = eng.slice(eng.indexOf('## Decision procedure'), eng.indexOf('## Scope Challenge'));
const headings = marked.lexer(procedure).filter(token => token.type === 'heading' && token.depth === 3);
expect(headings.map(token => token.text)).toEqual(['1. Establish current state', '2. Separate independent choices', '3. Compare one choice',
'4. Save the pending record', '5. Ask and wait', '6. Apply and refresh']);
@@ -326,41 +327,13 @@ console.log(JSON.stringify({calls, results}));
}
});
test('WIP squash example consumes the prepared todo and preserves file contents', () => {
const cwd = mkdtempSync(join(tmpdir(), 'ship-wip-example-'));
const env = {
...process.env, GIT_CONFIG_GLOBAL: '/dev/null', GIT_CONFIG_NOSYSTEM: '1',
GIT_AUTHOR_NAME: 'Test', GIT_AUTHOR_EMAIL: 'test@example.com',
GIT_COMMITTER_NAME: 'Test', GIT_COMMITTER_EMAIL: 'test@example.com',
};
const git = (...args: string[]) => {
const result = spawnSync('git', args, { cwd, env, encoding: 'utf8', timeout: 10_000 });
if (result.status !== 0) throw new Error(result.stderr || String(result.error));
return result.stdout.trim();
};
try {
git('init', '-b', 'main');
writeFileSync(join(cwd, 'file'), 'base\n');
git('add', 'file');
git('commit', '-m', 'base');
git('switch', '-c', 'feature');
for (const message of ['logical change', 'WIP: finish change', 'other logical change']) {
writeFileSync(join(cwd, 'file'), message + '\n');
git('commit', '-am', message);
}
const commits = git('rev-list', '--reverse', 'main..HEAD').split('\n');
const todo = join(cwd, '.git', 'prepared-todo');
writeFileSync(todo, commits.map((sha, i) => `${i === 1 ? 'fixup' : 'pick'} ${sha}`).join('\n') + '\n');
const source = readFileSync(join(import.meta.dir, '../ship/SKILL.md.tmpl'), 'utf8');
const snippet = source.match(/```bash\n(export WIP_TODO=[\s\S]*?)\n```/)![1]
.replace('<absolute path to prepared todo>', todo).replaceAll('origin/<base>', 'main');
const originalTree = git('rev-parse', 'HEAD^{tree}');
const result = spawnSync('bash', ['-c', snippet], { cwd, env, encoding: 'utf8', timeout: 10_000 });
expect(result.status, result.stderr).toBe(0);
expect(git('rev-list', '--count', 'main..HEAD')).toBe('2');
expect(git('rev-parse', 'HEAD^{tree}')).toBe(originalTree);
} finally {
rmSync(cwd, { recursive: true, force: true });
}
test('ship commits logical chunks without rewriting existing checkpoint commits', () => {
const text = readWorkflowExcerpt('ship/SKILL.md', '# Ship:', '## Important Rules');
const commit = text.slice(text.indexOf('## Step 15:'), text.indexOf('## Step 16:'));
expect(commit).toContain('Create small, logical commits');
expect(commit).toContain('If all changes are already committed, continue to Step 16');
expect(commit).toContain('Each commit must work independently');
expect(commit).not.toMatch(/rebase|reset|squash|fixup|WIP_TODO|gstack-context/);
expect(text).not.toContain('Step 15.0');
});
});