mirror of
https://github.com/garrytan/gstack.git
synced 2026-05-02 03:35:09 +02:00
daaec21c2c
Renames the combined E2E test to match the new skill split: - checkpoint-save-resume → context-save-writes-file Extracts the Save flow from context-save/SKILL.md, asserts a file gets written with valid YAML frontmatter. - New: context-restore-loads-latest Seeds two saved-context files with different YYYYMMDD-HHMMSS prefixes AND scrambled filesystem mtimes (so mtime DISAGREES with filename order). Hand-feeds the restore flow and asserts the newer- by-filename file is loaded. Locks in the "newest by filename prefix, not mtime" guarantee. touchfiles.ts: old 'checkpoint-save-resume' key removed from both E2E_TOUCHFILES and E2E_TIERS maps; new keys added to both. Leaving a key in one map but not the other silently breaks test selection. Golden baselines (claude/codex/factory ship skill) regenerated to match the new preamble routing rules from the previous commit.
366 lines
15 KiB
TypeScript
366 lines
15 KiB
TypeScript
import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
|
|
import { runSkillTest } from './helpers/session-runner';
|
|
import {
|
|
ROOT, runId, evalsEnabled,
|
|
describeIfSelected, testConcurrentIfSelected,
|
|
copyDirSync, logCost, recordE2E,
|
|
createEvalCollector, finalizeEvalCollector,
|
|
} from './helpers/e2e-helpers';
|
|
import { spawnSync } from 'child_process';
|
|
import * as fs from 'fs';
|
|
import * as path from 'path';
|
|
import * as os from 'os';
|
|
|
|
const evalCollector = createEvalCollector('e2e-session-intelligence');
|
|
|
|
// --- Session Intelligence E2E ---
|
|
// Tests the core contract: timeline events flow in, context recovery flows out,
|
|
// /context-save + /context-restore round-trip.
|
|
|
|
describeIfSelected('Session Intelligence E2E', [
|
|
'timeline-event-flow', 'context-recovery-artifacts',
|
|
'context-save-writes-file', 'context-restore-loads-latest',
|
|
], () => {
|
|
let workDir: string;
|
|
let gstackHome: string;
|
|
let slug: string;
|
|
|
|
beforeAll(() => {
|
|
workDir = fs.mkdtempSync(path.join(os.tmpdir(), 'skill-e2e-session-intel-'));
|
|
gstackHome = path.join(workDir, '.gstack-home');
|
|
|
|
// Init git repo
|
|
const run = (cmd: string, args: string[]) =>
|
|
spawnSync(cmd, args, { cwd: workDir, stdio: 'pipe', timeout: 5000 });
|
|
run('git', ['init', '-b', 'main']);
|
|
run('git', ['config', 'user.email', 'test@test.com']);
|
|
run('git', ['config', 'user.name', 'Test']);
|
|
fs.writeFileSync(path.join(workDir, 'app.ts'), 'console.log("hello");\n');
|
|
run('git', ['add', '.']);
|
|
run('git', ['commit', '-m', 'initial']);
|
|
|
|
// Copy bin scripts needed by timeline and checkpoint
|
|
const binDir = path.join(workDir, 'bin');
|
|
fs.mkdirSync(binDir, { recursive: true });
|
|
for (const script of [
|
|
'gstack-timeline-log', 'gstack-timeline-read', 'gstack-slug',
|
|
'gstack-learnings-log', 'gstack-learnings-search',
|
|
]) {
|
|
const src = path.join(ROOT, 'bin', script);
|
|
if (fs.existsSync(src)) {
|
|
fs.copyFileSync(src, path.join(binDir, script));
|
|
fs.chmodSync(path.join(binDir, script), 0o755);
|
|
}
|
|
}
|
|
|
|
// Compute slug (same logic as gstack-slug without git remote)
|
|
slug = path.basename(workDir).replace(/[^a-zA-Z0-9._-]/g, '');
|
|
});
|
|
|
|
afterAll(() => {
|
|
try { fs.rmSync(workDir, { recursive: true, force: true }); } catch {}
|
|
finalizeEvalCollector(evalCollector);
|
|
});
|
|
|
|
// --- Test 1: Timeline event flow ---
|
|
// Write a timeline event via gstack-timeline-log, read it back via gstack-timeline-read.
|
|
// This is the foundational data flow test: events go in, they come back out.
|
|
testConcurrentIfSelected('timeline-event-flow', async () => {
|
|
const projectDir = path.join(gstackHome, 'projects', slug);
|
|
fs.mkdirSync(projectDir, { recursive: true });
|
|
|
|
// Write two events via the binary
|
|
const logBin = path.join(workDir, 'bin', 'gstack-timeline-log');
|
|
const readBin = path.join(workDir, 'bin', 'gstack-timeline-read');
|
|
const env = { ...process.env, GSTACK_HOME: gstackHome };
|
|
const opts = { cwd: workDir, env, stdio: 'pipe' as const, timeout: 10000 };
|
|
|
|
spawnSync(logBin, [JSON.stringify({
|
|
skill: 'review', event: 'started', branch: 'main', session: 'test-1',
|
|
})], opts);
|
|
spawnSync(logBin, [JSON.stringify({
|
|
skill: 'review', event: 'completed', branch: 'main',
|
|
outcome: 'success', duration_s: 120, session: 'test-1',
|
|
})], opts);
|
|
|
|
// Read via gstack-timeline-read
|
|
const readResult = spawnSync(readBin, ['--branch', 'main'], opts);
|
|
const readOutput = readResult.stdout?.toString() || '';
|
|
|
|
// Verify timeline.jsonl exists and has content
|
|
const timelinePath = path.join(projectDir, 'timeline.jsonl');
|
|
expect(fs.existsSync(timelinePath)).toBe(true);
|
|
|
|
const lines = fs.readFileSync(timelinePath, 'utf-8').trim().split('\n');
|
|
expect(lines.length).toBe(2);
|
|
|
|
// Verify the events are valid JSON with expected fields
|
|
const event1 = JSON.parse(lines[0]);
|
|
expect(event1.skill).toBe('review');
|
|
expect(event1.event).toBe('started');
|
|
expect(event1.ts).toBeDefined();
|
|
|
|
const event2 = JSON.parse(lines[1]);
|
|
expect(event2.event).toBe('completed');
|
|
expect(event2.outcome).toBe('success');
|
|
|
|
// Verify gstack-timeline-read output includes the events
|
|
expect(readOutput).toContain('review');
|
|
|
|
recordE2E(evalCollector, 'timeline event flow', 'Session Intelligence E2E', {
|
|
output: readOutput,
|
|
exitReason: 'success',
|
|
duration: 0,
|
|
toolCalls: [],
|
|
browseErrors: [],
|
|
costEstimate: { inputChars: 0, outputChars: 0, estimatedTokens: 0, estimatedCost: 0, turnsUsed: 0 },
|
|
transcript: [],
|
|
model: 'direct',
|
|
firstResponseMs: 0,
|
|
maxInterTurnMs: 0,
|
|
}, { passed: true });
|
|
|
|
console.log(`Timeline flow: ${lines.length} events written, read output ${readOutput.length} chars`);
|
|
}, 30_000);
|
|
|
|
// --- Test 2: Context recovery with seeded artifacts ---
|
|
// Seed CEO plans and timeline events, then run a skill and verify the preamble
|
|
// outputs "RECENT ARTIFACTS" and "LAST_SESSION".
|
|
testConcurrentIfSelected('context-recovery-artifacts', async () => {
|
|
const projectDir = path.join(gstackHome, 'projects', slug);
|
|
fs.mkdirSync(path.join(projectDir, 'ceo-plans'), { recursive: true });
|
|
|
|
// Seed a CEO plan
|
|
fs.writeFileSync(
|
|
path.join(projectDir, 'ceo-plans', '2026-03-31-test-feature.md'),
|
|
'---\nstatus: ACTIVE\n---\n# CEO Plan: Test Feature\nThis is a test plan.\n',
|
|
);
|
|
|
|
// Seed timeline with a completed event on main branch
|
|
const timelineEntry = JSON.stringify({
|
|
ts: new Date().toISOString(),
|
|
skill: 'ship',
|
|
event: 'completed',
|
|
branch: 'main',
|
|
outcome: 'success',
|
|
duration_s: 60,
|
|
session: 'prior-session',
|
|
});
|
|
fs.writeFileSync(path.join(projectDir, 'timeline.jsonl'), timelineEntry + '\n');
|
|
|
|
// Copy the /learn skill (lightweight, tier-2 skill that runs context recovery)
|
|
copyDirSync(path.join(ROOT, 'learn'), path.join(workDir, 'learn'));
|
|
|
|
const result = await runSkillTest({
|
|
prompt: `Read the file learn/SKILL.md for instructions.
|
|
|
|
Run the context recovery check — the preamble should show recent artifacts.
|
|
|
|
IMPORTANT:
|
|
- Use GSTACK_HOME="${gstackHome}" as an environment variable when running bin scripts.
|
|
- The bin scripts are at ./bin/ (relative to this directory), not at ~/.claude/skills/gstack/bin/.
|
|
Replace any references to ~/.claude/skills/gstack/bin/ with ./bin/ when running commands.
|
|
- Do NOT use AskUserQuestion.
|
|
- Just run the preamble bash block and report what you see.
|
|
- Look for "RECENT ARTIFACTS" and "LAST_SESSION" in the output.`,
|
|
workingDirectory: workDir,
|
|
maxTurns: 10,
|
|
allowedTools: ['Bash', 'Read', 'Write', 'Edit', 'Grep', 'Glob'],
|
|
timeout: 120_000,
|
|
testName: 'context-recovery-artifacts',
|
|
runId,
|
|
});
|
|
|
|
logCost('context recovery', result);
|
|
|
|
const output = result.output.toLowerCase();
|
|
|
|
// The preamble should have found the seeded artifacts
|
|
const foundArtifacts = output.includes('recent artifacts') || output.includes('ceo-plans');
|
|
const foundLastSession = output.includes('last_session') || output.includes('ship');
|
|
const foundTimeline = output.includes('timeline') || output.includes('completed');
|
|
|
|
// At least the CEO plan or timeline should be visible
|
|
const foundCount = [foundArtifacts, foundLastSession, foundTimeline].filter(Boolean).length;
|
|
|
|
const exitOk = ['success', 'error_max_turns'].includes(result.exitReason);
|
|
|
|
recordE2E(evalCollector, 'context recovery', 'Session Intelligence E2E', result, {
|
|
passed: exitOk && foundCount >= 1,
|
|
});
|
|
|
|
expect(exitOk).toBe(true);
|
|
expect(foundCount).toBeGreaterThanOrEqual(1);
|
|
|
|
console.log(`Context recovery: artifacts=${foundArtifacts}, lastSession=${foundLastSession}, timeline=${foundTimeline}`);
|
|
}, 180_000);
|
|
|
|
// --- Test 3: /context-save writes a file ---
|
|
// Hand-feed the save section of context-save/SKILL.md to claude -p and verify
|
|
// a file gets written to the project's checkpoints dir with valid frontmatter.
|
|
testConcurrentIfSelected('context-save-writes-file', async () => {
|
|
const projectDir = path.join(gstackHome, 'projects', slug);
|
|
fs.mkdirSync(path.join(projectDir, 'checkpoints'), { recursive: true });
|
|
|
|
// Copy the /context-save skill
|
|
copyDirSync(path.join(ROOT, 'context-save'), path.join(workDir, 'context-save'));
|
|
|
|
// Add a staged change so /context-save has something to capture
|
|
fs.writeFileSync(path.join(workDir, 'feature.ts'), 'export function newFeature() { return true; }\n');
|
|
spawnSync('git', ['add', 'feature.ts'], { cwd: workDir, stdio: 'pipe', timeout: 5000 });
|
|
|
|
// Extract the save section from the skill template (before the List section)
|
|
const full = fs.readFileSync(path.join(ROOT, 'context-save', 'SKILL.md'), 'utf-8');
|
|
const saveStart = full.indexOf('## Save flow');
|
|
const listStart = full.indexOf('## List flow');
|
|
const saveSection = full.slice(saveStart, listStart > saveStart ? listStart : undefined);
|
|
|
|
const result = await runSkillTest({
|
|
prompt: `You are testing the /context-save skill. Follow these instructions to save a context file.
|
|
|
|
${saveSection.slice(0, 2000)}
|
|
|
|
IMPORTANT:
|
|
- Use GSTACK_HOME="${gstackHome}" as an environment variable when running bin scripts.
|
|
- The bin scripts are at ./bin/ (relative to this directory), not at ~/.claude/skills/gstack/bin/.
|
|
Replace any references to ~/.claude/skills/gstack/bin/ with ./bin/ when running commands.
|
|
- Save the file to ${projectDir}/checkpoints/ with a filename like "20260401-test-context.md".
|
|
- Include YAML frontmatter with status, branch, and timestamp.
|
|
- Include a summary of what's being worked on (you can see from git status).
|
|
- Do NOT use AskUserQuestion.`,
|
|
workingDirectory: workDir,
|
|
maxTurns: 10,
|
|
allowedTools: ['Bash', 'Read', 'Write', 'Edit', 'Grep', 'Glob'],
|
|
timeout: 120_000,
|
|
testName: 'context-save-writes-file',
|
|
runId,
|
|
});
|
|
|
|
logCost('context-save', result);
|
|
|
|
// Check that a context file was created
|
|
const checkpointDir = path.join(projectDir, 'checkpoints');
|
|
const files = fs.existsSync(checkpointDir)
|
|
? fs.readdirSync(checkpointDir).filter(f => f.endsWith('.md'))
|
|
: [];
|
|
|
|
const exitOk = ['success', 'error_max_turns'].includes(result.exitReason);
|
|
const fileCreated = files.length > 0;
|
|
|
|
let fileContent = '';
|
|
if (fileCreated) {
|
|
fileContent = fs.readFileSync(path.join(checkpointDir, files[0]), 'utf-8');
|
|
}
|
|
|
|
const hasYamlFrontmatter = fileContent.includes('---') && fileContent.includes('status:');
|
|
const hasBranch = fileContent.includes('branch:') || fileContent.includes('main');
|
|
|
|
recordE2E(evalCollector, 'context-save writes file', 'Session Intelligence E2E', result, {
|
|
passed: exitOk && fileCreated && hasYamlFrontmatter,
|
|
});
|
|
|
|
expect(exitOk).toBe(true);
|
|
expect(fileCreated).toBe(true);
|
|
expect(hasYamlFrontmatter).toBe(true);
|
|
|
|
console.log(`context-save: ${files.length} files created, YAML frontmatter: ${hasYamlFrontmatter}, branch: ${hasBranch}`);
|
|
}, 180_000);
|
|
|
|
// --- Test 4: /context-restore loads the newest file across branches ---
|
|
// Seed two saved-context files with different YYYYMMDD-HHMMSS prefixes and
|
|
// different branches in their frontmatter. Hand-feed the restore section to
|
|
// claude -p. Verify the agent identifies the newer file (by filename prefix)
|
|
// and presents its content, regardless of the current branch.
|
|
testConcurrentIfSelected('context-restore-loads-latest', async () => {
|
|
const projectDir = path.join(gstackHome, 'projects', slug);
|
|
const checkpointDir = path.join(projectDir, 'checkpoints');
|
|
fs.mkdirSync(checkpointDir, { recursive: true });
|
|
|
|
// Copy the /context-restore skill
|
|
copyDirSync(path.join(ROOT, 'context-restore'), path.join(workDir, 'context-restore'));
|
|
|
|
// Seed two files: older on branch-a (title "old-work"), newer on branch-b
|
|
// (title "newer-wintermute-work"). Current branch (main) matches neither.
|
|
const olderFile = path.join(checkpointDir, '20260101-120000-old-work.md');
|
|
const newerFile = path.join(checkpointDir, '20260202-130000-newer-wintermute-work.md');
|
|
fs.writeFileSync(olderFile, `---
|
|
status: in-progress
|
|
branch: branch-a
|
|
timestamp: 2026-01-01T12:00:00-07:00
|
|
---
|
|
|
|
## Working on: old work
|
|
|
|
### Summary
|
|
This is older work on branch-a.
|
|
|
|
### Remaining Work
|
|
1. Should NOT be loaded by default restore.
|
|
`);
|
|
fs.writeFileSync(newerFile, `---
|
|
status: in-progress
|
|
branch: branch-b
|
|
timestamp: 2026-02-02T13:00:00-07:00
|
|
---
|
|
|
|
## Working on: newer wintermute work
|
|
|
|
### Summary
|
|
This is the newest saved context. Cross-branch restore should load THIS file.
|
|
|
|
### Remaining Work
|
|
1. Finish the wintermute integration.
|
|
`);
|
|
|
|
// Deliberately scramble mtimes so filesystem mtime DISAGREES with filename
|
|
// prefix — this proves we're using filename ordering, not ls -1t.
|
|
const pastOlderMtime = Math.floor(Date.now() / 1000); // now (newest mtime)
|
|
const pastNewerMtime = pastOlderMtime - 60 * 60 * 24 * 30; // 30 days ago
|
|
fs.utimesSync(olderFile, pastOlderMtime, pastOlderMtime);
|
|
fs.utimesSync(newerFile, pastNewerMtime, pastNewerMtime);
|
|
|
|
// Extract the restore-flow section from the skill template
|
|
const full = fs.readFileSync(path.join(ROOT, 'context-restore', 'SKILL.md'), 'utf-8');
|
|
const restoreStart = full.indexOf('## Restore flow');
|
|
const importantStart = full.indexOf('## Important Rules', restoreStart);
|
|
const restoreSection = full.slice(restoreStart, importantStart > restoreStart ? importantStart : undefined);
|
|
|
|
const result = await runSkillTest({
|
|
prompt: `You are testing the /context-restore skill. Follow these instructions to restore the most recent saved context.
|
|
|
|
${restoreSection.slice(0, 2500)}
|
|
|
|
IMPORTANT:
|
|
- Use GSTACK_HOME="${gstackHome}" as an environment variable when running bin scripts.
|
|
- The bin scripts are at ./bin/ (relative to this directory), not at ~/.claude/skills/gstack/bin/.
|
|
- Look in ${checkpointDir} for saved context files.
|
|
- Current branch is "main" — do NOT filter by current branch. Load across all branches.
|
|
- The newest file by YYYYMMDD-HHMMSS prefix is the canonical "most recent". Filesystem mtime has been scrambled — do not use it.
|
|
- Do NOT use AskUserQuestion. Just present the content of the newest file.`,
|
|
workingDirectory: workDir,
|
|
maxTurns: 8,
|
|
allowedTools: ['Bash', 'Read', 'Grep', 'Glob'],
|
|
timeout: 120_000,
|
|
testName: 'context-restore-loads-latest',
|
|
runId,
|
|
});
|
|
|
|
logCost('context-restore', result);
|
|
|
|
const output = result.output ?? '';
|
|
const loadedNewer = output.includes('newer wintermute work') || output.includes('wintermute integration');
|
|
const loadedOlder = output.includes('old work') && !output.includes('newer');
|
|
const exitOk = ['success', 'error_max_turns'].includes(result.exitReason);
|
|
|
|
recordE2E(evalCollector, 'context-restore loads latest', 'Session Intelligence E2E', result, {
|
|
passed: exitOk && loadedNewer && !loadedOlder,
|
|
});
|
|
|
|
expect(exitOk).toBe(true);
|
|
expect(loadedNewer).toBe(true);
|
|
expect(loadedOlder).toBe(false);
|
|
|
|
console.log(`context-restore: loadedNewer=${loadedNewer}, loadedOlder=${loadedOlder}`);
|
|
}, 180_000);
|
|
});
|