/** * /context-save + /context-restore project identity (#3003), end to end. * * Runs the REAL bash blocks extracted from the generated context-save and * context-restore SKILL.md files (with ~/.claude/skills/gstack pointed at this * checkout) inside fixture repos, so the checkpoint stamp, the restore * classification and the helper modes are exercised together. The bug these * pin: GitLab repos in different groups (a/product/repo, b/product/repo) shared * one projects/product-repo/ bucket, and /context-restore in project B * presented project A's checkpoint as the latest one, with nothing failing. */ import { describe, test, expect, beforeEach, afterEach } from 'bun:test'; import { spawnSync } from 'child_process'; import * as fs from 'fs'; import * as os from 'os'; import * as path from 'path'; const ROOT = path.resolve(import.meta.dir, '..'); const SLUG_BIN = path.join(ROOT, 'bin', 'gstack-slug'); function bashBlockAfter(skillFile: string, heading: string, contains?: string): string { const md = fs.readFileSync(path.join(ROOT, skillFile), 'utf-8'); const start = md.indexOf(heading); if (start < 0) throw new Error(`${skillFile}: heading not found: ${heading}`); const re = /```bash\n([\s\S]*?)```/g; re.lastIndex = start; for (let m = re.exec(md); m; m = re.exec(md)) { if (!contains || m[1].includes(contains)) return m[1].replaceAll('~/.claude/skills/gstack', ROOT); } throw new Error(`${skillFile}: no bash block after ${heading}`); } const SAVE_PATH_BLOCK = bashBlockAfter('context-save/SKILL.md', '### Step 4: Write saved-context file').replace( 'TIMESTAMP=$(date +%Y%m%d-%H%M%S)', 'TIMESTAMP="$TEST_TIMESTAMP"', ); const STAMP_BLOCK = bashBlockAfter('context-save/SKILL.md', '### Step 4: Write saved-context file', '--stamp-checkpoint'); const RESTORE_BLOCK = bashBlockAfter('context-restore/SKILL.md', '### Step 1: Find saved contexts'); let tmp: string; let home: string; function env(extra: Record = {}): Record { const out: Record = {}; for (const [k, v] of Object.entries(process.env)) if (v !== undefined) out[k] = v; delete out.GSTACK_PROJECT_SLUG; delete out.GSTACK_STATE_ROOT; delete out.GSTACK_STATE_DIR; delete out.CURRENT_BRANCH; delete out.CLAUDE_PROJECT_DIR; return { ...out, HOME: tmp, GSTACK_HOME: home, ...extra }; } function sh(script: string, cwd: string, extra: Record = {}) { const r = spawnSync('bash', ['-c', script], { cwd, env: env(extra), encoding: 'utf-8', timeout: 30_000 }); return { stdout: r.stdout ?? '', stderr: r.stderr ?? '', status: r.status ?? -1 }; } function repo(name: string, origin?: string): string { const dir = path.join(tmp, name); fs.mkdirSync(dir, { recursive: true }); for (const args of [['init', '-q', '-b', 'main'], ...(origin ? [['remote', 'add', 'origin', origin]] : [])]) { const r = spawnSync('git', args, { cwd: dir, encoding: 'utf-8', timeout: 30_000 }); if (r.status !== 0) throw new Error(`git ${args.join(' ')}: ${r.stderr}`); } return dir; } /** The context-save flow: path block, the agent's Write, then the stamp block. */ function save(cwd: string, title: string, timestamp: string, branch = 'main', extra: Record = {}): string { const paths = sh(SAVE_PATH_BLOCK, cwd, { TITLE_RAW: title, TEST_TIMESTAMP: timestamp }); expect(paths.status).toBe(0); const file = paths.stdout.match(/^FILE=(.+)$/m)![1]; fs.writeFileSync(file, `---\nstatus: in-progress\nbranch: ${branch}\ntimestamp: ${timestamp}\n---\n\n## Working on: ${title}\n`); const stamp = sh(STAMP_BLOCK.replace('FILE=""', `FILE=${JSON.stringify(file)}`), cwd, extra); expect(stamp.stdout).toContain('STAMPED'); return file; } function restore(cwd: string, branch = 'main') { const r = sh(RESTORE_BLOCK, cwd, { CURRENT_BRANCH: branch }); expect(r.status).toBe(0); const lines = r.stdout.split('\n').filter(Boolean); const candidates = lines.filter((l) => l.startsWith('/')); return { out: r.stdout, lines, candidates, latest: candidates[0] }; } function legacyCheckpoint(bucket: string, name: string, branch = 'main'): string { const dir = path.join(home, 'projects', bucket, 'checkpoints'); fs.mkdirSync(dir, { recursive: true }); const file = path.join(dir, name); fs.writeFileSync(file, `---\nstatus: in-progress\nbranch: ${branch}\n---\n\n## Working on: ${name}\n`); return file; } beforeEach(() => { tmp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'ctx-identity-'))); home = path.join(tmp, '.gstack'); }); afterEach(() => { fs.rmSync(tmp, { recursive: true, force: true }); }); describe('context-save stamps the project identity', () => { test('checkpoint frontmatter gets the canonical remote and physical root; credentials never reach disk', () => { const secret = ['sentinel', 'pw', '55120'].join('-'); const a = repo('a', `https://deploy-bot:${secret}@GitLab.com:8443/customer-a/product/repo.git`); const file = save(a, 'auth refactor', '20261001-100000'); expect(file.startsWith(path.join(home, 'projects', 'product-repo-5eca1fe041984543', 'checkpoints'))).toBe(true); const text = fs.readFileSync(file, 'utf-8'); const frontmatter = text.split('---')[1]; expect(frontmatter).toContain('\nremote: gitlab.com/customer-a/product/repo\n'); expect(frontmatter).toContain(`\nproject_root: ${a}\n`); expect(text).toContain('## Working on: auth refactor'); const leaks = spawnSync('grep', ['-rl', secret, home], { encoding: 'utf-8', timeout: 10_000 }); expect(leaks.stdout).toBe(''); }); test('re-stamping replaces stale identity lines instead of duplicating them', () => { const a = repo('a', 'git@gitlab.com:customer-a/product/repo.git'); const file = save(a, 'x', '20261001-100000'); fs.writeFileSync(file, fs.readFileSync(file, 'utf-8').replace('remote: gitlab.com/customer-a/product/repo', 'remote: bogus')); const r = spawnSync('bash', [SLUG_BIN, '--stamp-checkpoint', file], { cwd: a, env: env(), encoding: 'utf-8', timeout: 30_000 }); expect(r.status).toBe(0); const fm = fs.readFileSync(file, 'utf-8').split('---')[1]; expect(fm.match(/^remote:/gm)?.length).toBe(1); expect(fm.match(/^project_root:/gm)?.length).toBe(1); expect(fm).toContain('remote: gitlab.com/customer-a/product/repo'); }); }); describe('context-restore never presents another project checkpoint as latest', () => { test('nested groups: B restores after A saved — A is not presented, the old shared bucket is reported', () => { const a = repo('a', 'git@gitlab.com:customer-a/product/repo.git'); const b = repo('b', 'https://gitlab.com/customer-b/product/repo.git'); // Before the fix both projects filed into projects/product-repo/. legacyCheckpoint('product-repo', '20260901-090000-old-a-work.md'); const aFile = save(a, 'customer a migration', '20261001-120000'); const r = restore(b); expect(r.out).not.toContain(aFile); expect(r.out).not.toContain('old-a-work'); expect(r.out).toContain('NO_CHECKPOINTS'); expect(r.out).toContain('PROJECT_IDENTITY: gitlab.com/customer-b/product/repo'); expect(r.out).toContain('LEGACY_BUCKET: projects/product-repo holds 1 earlier checkpoint(s)'); const own = restore(a); expect(own.latest).toBe(aFile); }); test('two projects still sharing one bucket: the foreign newer checkpoint is never "latest"', () => { // github.com/product/repo and gitlab.com/product/repo are 2-segment remotes // and so keep the same slug (product-repo); identity tells them apart. const gh = repo('gh', 'https://github.com/product/repo.git'); const gl = repo('gl', 'git@gitlab.com:product/repo.git'); const own = save(gl, 'gitlab work', '20261001-090000'); const foreign = save(gh, 'github work', '20261001-110000'); expect(path.dirname(own)).toBe(path.dirname(foreign)); const r = restore(gl); expect(r.latest).toBe(own); expect(r.candidates).not.toContain(foreign); expect(r.lines).toContain(`FOREIGN ${foreign}`); expect(r.out).toContain('SHARED_BUCKET: 1 checkpoint(s) here were saved by another project'); // With no checkpoint of its own, gh's view of gl's bucket shows nothing as latest. fs.rmSync(foreign); const other = restore(gh); expect(other.latest).toBeUndefined(); expect(other.out).toContain('NO_VERIFIED_CHECKPOINTS'); expect(other.lines).toContain(`FOREIGN ${own}`); }); test('unstamped checkpoints: trusted in an unshared bucket, UNVERIFIED once another project wrote there', () => { const gh = repo('gh', 'https://github.com/product/repo.git'); const gl = repo('gl', 'git@gitlab.com:product/repo.git'); const old = legacyCheckpoint('product-repo', '20260901-090000-pre-stamp.md'); expect(restore(gh).latest).toBe(old); const foreign = save(gl, 'gitlab work', '20261001-110000'); const r = restore(gh); expect(r.latest).toBeUndefined(); expect(r.lines).toContain(`UNVERIFIED ${old}`); expect(r.lines).toContain(`FOREIGN ${foreign}`); }); test('same remote, different checkout (workspace handoff): restorable, with ROOT_DIFFERS as info', () => { const first = repo('workspace-1', 'git@github.com:acme/app.git'); const second = repo('workspace-2', 'https://github.com/acme/app'); const file = save(first, 'handoff', '20261001-100000', 'feat-x'); const r = restore(second, 'main'); expect(r.latest).toBe(file); expect(r.lines).toContain(`ROOT_DIFFERS ${file}`); expect(r.out).not.toContain('FOREIGN'); }); test('no remote: identity is the project root', () => { const one = repo('solo'); const file = save(one, 'local only', '20261001-100000'); expect(fs.readFileSync(file, 'utf-8')).not.toMatch(/^remote:/m); expect(restore(one).latest).toBe(file); const elsewhere = repo('elsewhere'); const r = sh(RESTORE_BLOCK, elsewhere, { CURRENT_BRANCH: 'main', GSTACK_PROJECT_SLUG: 'solo' }); expect(r.stdout).toContain('NO_VERIFIED_CHECKPOINTS'); expect(r.stdout).toContain(`FOREIGN ${file}`); }); }); describe('gstack-slug --adopt-legacy', () => { function adopt(cwd: string, ...args: string[]) { const r = spawnSync('bash', [SLUG_BIN, '--adopt-legacy', ...args], { cwd, env: env(), encoding: 'utf-8', timeout: 30_000, stdio: ['ignore', 'pipe', 'pipe'], }); return { stdout: r.stdout ?? '', status: r.status ?? -1 }; } test('lists the old bucket with labels and copies only what is named; foreign and traversal refused', () => { const a = repo('a', 'git@gitlab.com:customer-a/product/repo.git'); const b = repo('b', 'git@gitlab.com:customer-b/product/repo.git'); const oldBucket = path.join(home, 'projects', 'product-repo'); const unstamped = legacyCheckpoint('product-repo', '20260901-090000-unknown.md'); // Stamped checkpoints in the old bucket (written by A and B), via the real stamp. const mine = legacyCheckpoint('product-repo', '20260902-090000-mine.md'); const theirs = legacyCheckpoint('product-repo', '20260903-090000-theirs.md'); spawnSync('bash', [SLUG_BIN, '--stamp-checkpoint', mine], { cwd: a, env: env(), timeout: 30_000 }); spawnSync('bash', [SLUG_BIN, '--stamp-checkpoint', theirs], { cwd: b, env: env(), timeout: 30_000 }); fs.writeFileSync(path.join(oldBucket, 'question-preferences.json'), '{"review-finding-fix":"never-ask"}'); fs.writeFileSync(path.join(oldBucket, 'learnings.jsonl'), '{"x":1}\n'); const before = spawnSync('bash', ['-c', 'find . -type f | sort | xargs cat | cksum'], { cwd: oldBucket, encoding: 'utf-8', timeout: 10_000 }).stdout; const list = adopt(a); expect(list.status).toBe(0); expect(list.stdout).toContain('checkpoints/20260902-090000-mine.md [checkpoint: matching this project]'); expect(list.stdout).toContain('checkpoints/20260903-090000-theirs.md [checkpoint: another project (not copyable)]'); expect(list.stdout).toContain('checkpoints/20260901-090000-unknown.md [checkpoint: unknown project'); expect(list.stdout).toContain('question-preferences.json [no project identity'); expect(list.stdout).toContain('Nothing copied.'); const newBucket = path.join(home, 'projects', 'product-repo-5eca1fe041984543'); expect(fs.existsSync(path.join(newBucket, 'question-preferences.json'))).toBe(false); const copy = adopt( a, '--copy', 'checkpoints/20260902-090000-mine.md', 'question-preferences.json', 'checkpoints/20260903-090000-theirs.md', '../product-repo/learnings.jsonl', ); expect(copy.stdout).toContain('COPIED checkpoints/20260902-090000-mine.md'); expect(copy.stdout).toContain('COPIED question-preferences.json'); expect(copy.stdout).toContain('SKIPPED checkpoints/20260903-090000-theirs.md'); expect(copy.stdout).toContain('REFUSED ../product-repo/learnings.jsonl'); expect(copy.status).toBe(1); expect(fs.readFileSync(path.join(newBucket, 'question-preferences.json'), 'utf-8')).toContain('never-ask'); expect(fs.existsSync(path.join(newBucket, 'checkpoints', '20260903-090000-theirs.md'))).toBe(false); expect(fs.existsSync(path.join(newBucket, 'learnings.jsonl'))).toBe(false); expect(fs.existsSync(path.join(newBucket, 'checkpoints', path.basename(unstamped)))).toBe(false); // Never overwrites, never touches the old bucket. const again = adopt(a, '--copy', 'question-preferences.json'); expect(again.stdout).toContain('SKIPPED question-preferences.json'); const after = spawnSync('bash', ['-c', 'find . -type f | sort | xargs cat | cksum'], { cwd: oldBucket, encoding: 'utf-8', timeout: 10_000 }).stdout; expect(after).toBe(before); // The adopted checkpoint is now A's latest on restore. expect(restore(a).latest).toBe(path.join(newBucket, 'checkpoints', '20260902-090000-mine.md')); }); test('a project whose slug did not change has nothing to adopt', () => { const gh = repo('gh', 'https://github.com/acme/app.git'); const r = adopt(gh); expect(r.status).toBe(0); expect(r.stdout).toContain("Nothing to adopt: this project's slug (acme-app) did not change."); }); }); describe('context-restore offers newer checkpoints it used to skip (#3065)', () => { function git(cwd: string, ...args: string[]) { const r = spawnSync('git', args, { cwd, encoding: 'utf-8', timeout: 30_000 }); if (r.status !== 0) throw new Error(`git ${args.join(' ')}: ${r.stderr}`); } /** A main tree with one commit (fixture-local identity) so worktrees can be added. */ function mainTree(name: string, origin: string): string { const dir = repo(name, origin); git(dir, 'config', 'user.name', 'Fixture'); git(dir, 'config', 'user.email', 'fixture@example.com'); git(dir, 'commit', '-q', '--allow-empty', '-m', 'init'); return dir; } function worktree(main: string, at: string, branch: string): string { git(main, 'worktree', 'add', '-q', '-b', branch, at); return fs.realpathSync(at); } const pointers = (bucket: string) => { const dir = path.join(home, 'projects', bucket, 'checkpoint-pointers'); return fs.existsSync(dir) ? fs.readdirSync(dir).map((f) => path.join(dir, f)) : []; }; describe('case 1: saved in a nested repo, restored in its non-git parent', () => { function layout() { const mono = path.join(tmp, 'mono'); fs.mkdirSync(mono); const pkg = repo('mono/pkg', 'git@gitlab.example.com:grp/sub/repo.git'); const stale = save(mono, 'old mono notes', '20260920-100000'); return { mono, pkg, stale }; } test('with $CLAUDE_PROJECT_DIR set, the save leaves a pointer and restore offers the newer checkpoint', () => { const { mono, pkg, stale } = layout(); const fresh = save(pkg, 'pkg feature', '20261001-100000', 'main', { CLAUDE_PROJECT_DIR: mono }); expect(path.basename(path.dirname(path.dirname(fresh)))).toMatch(/^sub-repo-[0-9a-f]{16}$/); const [ptr] = pointers('mono'); expect(ptr).toBeDefined(); expect(JSON.parse(fs.readFileSync(ptr, 'utf-8'))).toEqual({ checkpoint: fresh, bucket: path.basename(path.dirname(path.dirname(fresh))), project_root: pkg, }); const r = restore(mono); expect(r.latest).toBe(stale); expect(r.lines).toContain(`POINTER ${fresh}`); }); test('without $CLAUDE_PROJECT_DIR no pointer is written, and the below-cwd scan still finds it', () => { const { mono, pkg, stale } = layout(); const fresh = save(pkg, 'pkg feature', '20261001-100000'); expect(pointers('mono')).toEqual([]); const r = restore(mono); expect(r.latest).toBe(stale); expect(r.lines).toContain(`BELOW_CWD ${fresh}`); expect(r.out).not.toContain('POINTER'); }); test('a save from the starting directory itself writes no pointer', () => { const { pkg } = layout(); save(pkg, 'pkg feature', '20261001-100000', 'main', { CLAUDE_PROJECT_DIR: pkg }); expect(fs.existsSync(path.join(home, 'projects'))).toBe(true); for (const bucket of fs.readdirSync(path.join(home, 'projects'))) expect(pointers(bucket)).toEqual([]); }); test('checkpoints not below the cwd are not offered, and the scan reads only the 200 newest', () => { const { mono, pkg } = layout(); const sibling = repo('elsewhere', 'git@github.com:acme/elsewhere.git'); const outside = save(sibling, 'sibling work', '20261002-100000'); const below = save(pkg, 'pkg feature', '20261001-100000'); expect(restore(mono).out).not.toContain(outside); expect(restore(mono).lines).toContain(`BELOW_CWD ${below}`); // 200 newer checkpoints of another project push the below-cwd one out of the read window. const dir = path.dirname(outside); for (let i = 0; i < 200; i++) { fs.writeFileSync(path.join(dir, `20261003-${String(100000 + i)}-n${i}.md`), `---\nbranch: main\nproject_root: ${sibling}\n---\n`); } expect(restore(mono).out).not.toContain('BELOW_CWD'); }); test('from $HOME, each project below shows only its newest checkpoint', () => { const { pkg } = layout(); const older = save(pkg, 'first pass', '20261001-100000'); const newer = save(pkg, 'second pass', '20261002-100000'); const r = sh(RESTORE_BLOCK, tmp, { CURRENT_BRANCH: 'main' }); expect(r.stdout).toContain(`BELOW_CWD ${newer}`); expect(r.stdout).not.toContain(older); }); test('inside a git repo the below-cwd scan does not run', () => { const outer = repo('outer'); const inner = repo('outer/inner', 'git@github.com:acme/inner.git'); const file = save(inner, 'inner work', '20261001-100000'); expect(restore(outer).out).not.toContain(file); // A pointer from a session that started in the outer repo still surfaces it. save(inner, 'inner work 2', '20261002-100000', 'main', { CLAUDE_PROJECT_DIR: outer }); expect(restore(outer).out).toMatch(/^POINTER .*20261002-100000-inner-work-2\.md$/m); }); }); describe('case 2: another branch of the same repository holds a newer checkpoint for the task', () => { test('a ticket worktree below the main tree: restore shows the newer continuation, branch order unchanged', () => { const main = mainTree('app', 'git@github.com:acme/app.git'); const plan = save(main, 'Login plan', '20261001-100000', 'master'); const wt = worktree(main, path.join(main, '.worktrees', 't12'), 'feature/12-login'); const impl = save(wt, 'Implement login', '20261003-100000', 'feature/12-login'); expect(fs.readFileSync(impl, 'utf-8')).toContain(`\nworktree: ${wt}\n`); expect(fs.readFileSync(plan, 'utf-8')).not.toContain('worktree:'); const r = restore(main, 'master'); expect(r.latest).toBe(plan); expect(r.lines).toContain(`NEWER_TASK ${impl}`); }); test('same normalized title, or the same ticket token, on a worktree outside the main tree', () => { const main = mainTree('app', 'git@github.com:acme/app.git'); const plan = save(main, 'Auth refactor', '20261001-100000', 'master'); const wt = worktree(main, path.join(tmp, 'app-auth'), 'auth-work'); const cont = save(wt, '2026-10-03 auth-refactor!', '20261003-100000', 'auth-work'); expect(restore(main, 'master').lines).toContain(`NEWER_TASK ${cont}`); fs.rmSync(cont); fs.rmSync(plan); save(main, 'PROJ-42 wip', '20261001-110000', 'master'); const ticket = save(wt, 'wip', '20261003-110000', 'feature/PROJ-42-x'); expect(restore(main, 'master').lines).toContain(`NEWER_TASK ${ticket}`); }); test('negative controls: generic titles alone, older saves, unrelated sibling worktrees', () => { const main = mainTree('app', 'git@github.com:acme/app.git'); const wtA = worktree(main, path.join(main, '.worktrees', 'a'), 'feat-a'); const wtB = worktree(main, path.join(main, '.worktrees', 'b'), 'feat-b'); const outside = worktree(main, path.join(tmp, 'app-x'), 'feat-x'); save(main, 'wip', '20261001-100000', 'master'); save(outside, 'WIP', '20261003-100000', 'feat-x'); expect(restore(main, 'master').out).not.toContain('NEWER_TASK'); // An older matching checkpoint is not a continuation. save(outside, 'Payments', '20260901-100000', 'feat-x'); save(main, 'payments', '20261002-100000', 'master'); expect(restore(main, 'master').out).not.toContain('NEWER_TASK'); // A sibling worktree's own save is never displaced by another worktree's newer one. const own = save(wtA, 'Search box', '20261004-100000', 'feat-a'); save(wtB, 'Billing export', '20261005-100000', 'feat-b'); const r = restore(wtA, 'feat-a'); expect(r.latest).toBe(own); expect(r.out).not.toContain('NEWER_TASK'); }); }); });