git-chopstick-core 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.1.9] — 2026-06-13
+
+### Added
+- **Test fixtures**: Created `src/__tests__/fixtures/test-repo.bundle` — a pre-built git bundle with 6 commits, 3 branches, and 1 tag for faster test setup. Added `src/__tests__/fixture-helpers.ts` with `setupFixtureRepo()` to clone the bundle in ~10ms instead of building a repo from scratch. Refactored integration tests to use the fixture.
+- **Release skill moved**: Moved from `docs/skills/release.md` to `.agents/skills/release-npm.md` and renamed to `release-npm`.
+- **Global default branch**: Set `git config --global init.defaultBranch main`.
+
+### Changed
+- **Fixture rebuild instructions**: Updated to use `git init -q` (relies on global `init.defaultBranch`).
+- **`prepublishOnly` now runs tests**: Integration tests run during `npm publish` to catch regressions before they ship.
+
+---
+
 ## [0.1.8] — 2026-06-13
 
 ### Added
@@ -129,6 +142,7 @@
 
 ---
 
+[0.1.9]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.9
 [0.1.8]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.8
 [0.1.7]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.7
 [0.1.6]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.6
@@ -138,4 +152,4 @@
 [0.1.2]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.2
 [0.1.1]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.1
 [0.1.0]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.0
-[Unreleased]: https://github.com/parkiyong/git-chopstick-core/compare/v0.1.8...HEAD
+[Unreleased]: https://github.com/parkiyong/git-chopstick-core/compare/v0.1.9...HEAD

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-chopstick-core",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/__tests__/fixture-helpers.ts

@@ -0,0 +1,105 @@
+/**
+ * To rebuild the fixture bundle:
+ *
+ *   cd /tmp && rm -rf fixture-builder && mkdir fixture-builder && cd fixture-builder
+ *   git init -q && git config user.email f@t.t && git config user.name F
+ *   echo '# Test Repo' > README.md && echo 'node_modules/' > .gitignore
+ *   git add .gitignore README.md && git commit -m 'initial: add README and gitignore'
+ *   echo 'hello' > hello.txt && mkdir -p src && echo 'console.log("hi")' > src/index.js
+ *   git add hello.txt src/index.js && git commit -m 'feat: add hello.txt and src/index.js'
+ *   echo 'world' > hello.txt && echo 'console.log("hello world")' > src/index.js
+ *   git add -A && git commit -m 'feat: update hello and src/index.js'
+ *   git checkout -b feature/one && echo 'feature one content' > feature-one.txt
+ *   git add feature-one.txt && git commit -m 'feat: feature one'
+ *   git checkout main && echo 'another change' > another.txt
+ *   git add another.txt && git commit -m 'feat: add another.txt'
+ *   git merge feature/one --no-ff --no-edit -m 'merge: feature/one into main'
+ *   git checkout -b feature/two && echo 'feature two content' > feature-two.txt
+ *   git add feature-two.txt && git commit -m 'feat: feature two'
+ *   git checkout main && git tag -a v0.1.0 -m 'v0.1.0'
+ *   git bundle create test-repo.bundle --all
+ *   cp test-repo.bundle <this-dir>/fixtures/
+ *
+ * This creates a bundle with 6 commits on main, 3 branches, and 1 annotated tag.
+ */
+import { mkdtempSync } from 'fs'
+import { execSync } from 'child_process'
+import { tmpdir } from 'os'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+import { Repository } from '../models/repository.js'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+/**
+ * Path to the pre-built fixture repo bundle.
+ */
+export const FIXTURE_BUNDLE_PATH = join(__dirname, 'fixtures', 'test-repo.bundle')
+
+/**
+ * Clone the fixture bundle to a temp directory, configure git identity,
+ * create local branches for all remote-tracking branches, and return
+ * the path and a Repository object.
+ *
+ * Use this in `beforeAll` for faster test setup — avoids creating a repo
+ * from scratch for every test suite.
+ */
+export function setupFixtureRepo(): { repoPath: string; repo: Repository } {
+  const repoPath = mkdtempSync(join(tmpdir(), 'gcctest-fixture-'))
+
+  execSync(`git clone "${FIXTURE_BUNDLE_PATH}" "${repoPath}"`, {
+    stdio: 'pipe',
+  })
+
+  execSync('git config user.email test@test.test', {
+    cwd: repoPath,
+    stdio: 'pipe',
+  })
+  execSync('git config user.name Test', {
+    cwd: repoPath,
+    stdio: 'pipe',
+  })
+
+  // Create local branches for all remote-tracking branches (bundle clones
+  // only create a local branch for HEAD — everything else becomes origin/*)
+  const localBranches = execSync(
+    'git branch --format="%(refname:short)"',
+    { cwd: repoPath, encoding: 'utf-8', stdio: 'pipe' }
+  )
+    .trim()
+    .split('\n')
+    .filter(Boolean)
+
+  const remoteBranches = execSync(
+    'git branch -r --format="%(refname:lstrip=3)"',
+    { cwd: repoPath, encoding: 'utf-8', stdio: 'pipe' }
+  )
+    .trim()
+    .split('\n')
+    .filter(Boolean)
+    .filter(b => b !== 'HEAD' && !localBranches.includes(b))
+
+  for (const branch of remoteBranches) {
+    execSync(`git branch --track "${branch}" "origin/${branch}"`, {
+      cwd: repoPath,
+      stdio: 'pipe',
+    })
+  }
+
+  const repo = new Repository(repoPath)
+  return { repoPath, repo }
+}
+
+/**
+ * Run a git command in the fixture repo.
+ */
+export function git(repoPath: string, args: string) {
+  execSync(`git ${args}`, { cwd: repoPath, stdio: 'pipe' })
+}
+
+/**
+ * Clean up a fixture repo directory.
+ */
+export function cleanupFixtureRepo(repoPath: string) {
+  execSync(`rm -rf ${repoPath}`)
+}

package/src/__tests__/integration.test.ts

@@ -6,32 +6,19 @@ import { join } from 'path'
 import {
   Repository, getStatus, getCommits, getBranches,
   createCommit, createBranch, deleteLocalBranch, renameBranch,
-  getCurrentBranch, getRepositoryType,
+  getCurrentBranch, getRepositoryType, getAllTags,
 } from '../index.js'
+import {
+  setupFixtureRepo, cleanupFixtureRepo, git,
+} from './fixture-helpers.js'
 
 let repoPath: string
 let repo: Repository
 
-function git(args: string) {
-  execSync(`git ${args}`, { cwd: repoPath, stdio: 'pipe' })
-}
-
-function writeFile(path: string, content: string) {
-  writeFileSync(join(repoPath, path), content)
-}
-
 beforeAll(() => {
-  repoPath = mkdtempSync(join(tmpdir(), 'gcctest-'))
-  git('init -q')
-  git('config user.email test@test.test')
-  git('config user.name Test')
-
-  // Create an initial commit so we have history for detached HEAD tests
-  writeFile('README.md', '# test')
-  git('add README.md')
-  git('commit -m "initial"')
-
-  repo = new Repository(repoPath)
+  const fixture = setupFixtureRepo()
+  repoPath = fixture.repoPath
+  repo = fixture.repo
 })
 
 describe('getRepositoryType', () => {
@@ -52,16 +39,15 @@ describe('getRepositoryType', () => {
 describe('getCurrentBranch', () => {
   it('returns the current branch name', async () => {
     const branch = await getCurrentBranch(repoPath)
-    expect(branch).toBeTruthy()
-    expect(typeof branch).toBe('string')
+    expect(branch).toBe('main')
   })
 
   it('returns undefined when HEAD is detached', async () => {
-    git('checkout --detach')
+    git(repoPath, 'checkout --detach')
     const branch = await getCurrentBranch(repoPath)
     expect(branch).toBeUndefined()
     // Reset back to a branch for subsequent tests
-    git('checkout -')
+    git(repoPath, 'checkout main')
   })
 })
 
@@ -69,12 +55,11 @@ describe('getStatus', () => {
   it('returns a status with branch info', async () => {
     const status = await getStatus(repo)
     expect(status).toBeTruthy()
-    expect(status!.currentBranch).toBeTruthy()
-    expect(typeof status!.currentBranch).toBe('string')
+    expect(status!.currentBranch).toBe('main')
   })
 
   it('detects untracked files', async () => {
-    writeFile('untracked.txt', 'hello')
+    writeFileSync(join(repoPath, 'untracked.txt'), 'hello')
     const status = await getStatus(repo)
     expect(status!.workingDirectory.files.length).toBeGreaterThanOrEqual(1)
     const untracked = status!.workingDirectory.files.find(
@@ -92,46 +77,57 @@ describe('getStatus', () => {
 })
 
 describe('getCommits', () => {
-  it('returns commits in order', async () => {
-    // Create another commit so we have history to read
-    writeFile('commits-test.txt', 'data')
-    git('add commits-test.txt')
-    git('commit -m "test commit for getCommits"')
-
+  it('returns commits in order (fixture has 6 commits reachable from main)', async () => {
     const commits = await getCommits(repo, 'HEAD', 10)
-    expect(commits.length).toBeGreaterThanOrEqual(1)
-    expect(commits[0].summary).toBe('test commit for getCommits')
+    expect(commits.length).toBe(6)
     expect(commits[0].sha).toBeTruthy()
     expect(commits[0].author).toBeTruthy()
+    // The most recent commit should be the merge
+    expect(commits[0].summary).toBe('merge: feature/one into main')
+    // The initial commit should be the last one
+    expect(commits[5].summary).toBe('initial: add README and gitignore')
+  })
+
+  it('returns commits for feature/two branch', async () => {
+    const commits = await getCommits(repo, 'feature/two', 10)
+    expect(commits.length).toBeGreaterThanOrEqual(1)
+    expect(commits[0].summary).toBe('feat: feature two')
   })
 })
 
 describe('Branch operations', () => {
-  it('creates, lists, renames, and deletes branches', async () => {
-    // Create a branch
+  it('includes feature/one and feature/two', async () => {
+    const branches = await getBranches(repo)
+    const names = branches.map(b => b.nameWithoutRemote)
+    expect(names).toContain('main')
+    expect(names).toContain('feature/one')
+    expect(names).toContain('feature/two')
+  })
+
+  it('creates, renames, and deletes a branch', async () => {
     await createBranch(repo, 'test-feature', 'HEAD')
     let branches = await getBranches(repo)
-    const names = branches.map(b => b.name)
+    const names = branches.map(b => b.nameWithoutRemote)
     expect(names).toContain('test-feature')
 
     // Rename the branch
-    const featureBranch = branches.find(b => b.name === 'test-feature')!
+    const featureBranch = branches.find(b => b.nameWithoutRemote === 'test-feature')!
     await renameBranch(repo, featureBranch, 'test-feature-renamed')
     branches = await getBranches(repo)
-    expect(branches.map(b => b.name)).toContain('test-feature-renamed')
-    expect(branches.map(b => b.name)).not.toContain('test-feature')
+    expect(branches.map(b => b.nameWithoutRemote)).toContain('test-feature-renamed')
+    expect(branches.map(b => b.nameWithoutRemote)).not.toContain('test-feature')
 
     // Delete the branch
     await deleteLocalBranch(repo, 'test-feature-renamed')
     branches = await getBranches(repo)
-    expect(branches.map(b => b.name)).not.toContain('test-feature-renamed')
+    expect(branches.map(b => b.nameWithoutRemote)).not.toContain('test-feature-renamed')
   })
 })
 
 describe('createCommit', () => {
   it('creates a commit with files', async () => {
-    writeFile('commit-test.txt', 'commit data')
-    git('add commit-test.txt')
+    writeFileSync(join(repoPath, 'commit-test.txt'), 'commit data')
+    git(repoPath, 'add commit-test.txt')
 
     const status = await getStatus(repo)
     const files = status!.workingDirectory.files.filter(
@@ -140,17 +136,23 @@ describe('createCommit', () => {
 
     const sha = await createCommit(repo, 'feat: add commit-test.txt', files)
     expect(sha).toBeTruthy()
-    // createCommit returns the abbreviated SHA from git commit output (7+ chars)
     expect(sha.length).toBeGreaterThanOrEqual(7)
 
-    // Verify the commit exists — the full SHA from getCommits should start
-    // with the abbreviated SHA returned by createCommit
+    // Verify the commit exists
     const commits = await getCommits(repo, 'HEAD', 5)
     expect(commits[0].sha.startsWith(sha)).toBe(true)
     expect(commits[0].summary).toBe('feat: add commit-test.txt')
   })
 })
 
+describe('Tag operations', () => {
+  it('lists tags from the fixture', async () => {
+    const tags = await getAllTags(repo)
+    expect(tags.size).toBeGreaterThanOrEqual(1)
+    expect(tags.has('v0.1.0')).toBe(true)
+  })
+})
+
 afterAll(() => {
-  execSync(`rm -rf ${repoPath}`)
+  cleanupFixtureRepo(repoPath)
 })

package/docs/skills/release.md

@@ -1,82 +0,0 @@
----
-name: release
-description: Automated release workflow for git-chopstick-core — version bump, changelog, build, validation, and npm publish.
----
-
-# Release: git-chopstick-core
-
-> Loaded via `skill("release")`. Run this whenever you need to publish a new release.
-
-## Process
-
-### 1. Read current state
-
-Read `package.json`, `CHANGELOG.md`, and run `git log --oneline -5` to understand what has changed since the last release.
-
-### 2. Determine version bump
-
-Check what has changed:
-
-- **Breaking API changes** (removed exports, changed signatures) → minor bump (0.x.0)
-- **New features** (new functions, new exports) → patch bump (0.0.x)
-- **Bug fixes, docs, internal refactoring** → patch bump (0.0.x)
-
-Current version: read from `package.json`. Bump accordingly.
-
-### 3. Update `CHANGELOG.md`
-
-Insert a new `## [VERSION] — YYYY-MM-DD` section at the top (below the `# Changelog` heading) with:
-
-- `### Added` — new features, exports, helpers
-- `### Changed` — behavioral changes, renames, config changes
-- `### Fixed` — bug fixes
-
-Then update the link references at the bottom:
-
-- Add `[VERSION]: https://github.com/parkiyong/git-chopstick-core/releases/tag/vVERSION`
-- Update `[Unreleased]: .../compare/vVERSION...HEAD`
-
-### 4. Bump `package.json`
-
-Update `"version"` field.
-
-### 5. Build and validate
-
-Run all of these (use parallel agents):
-
-- `npm run typecheck` — must pass with zero errors
-- `npm run build` — must produce a clean `dist/`
-- `npm test` — all integration tests must pass
-- `npm pack --dry-run` — confirm all of:
-  - `dist/` is included (expect ~351 files, ~700kB)
-  - `CHANGELOG.md`, `docs/`, and `src/__tests__/integration.test.ts` appear in the file list
-  - `package.json`, `README.md`, `LICENSE` are present (npm includes these automatically)
-  - No unexpected files are leaking through (check for test artifacts, `.ts` sources outside `dist/`)
-
-If any fail, fix before proceeding.
-
-### 6. Stage and commit
-
-```
-git add -A
-git commit -m "vVERSION: <short summary of changes>"
-```
-
-### 7. Push and publish
-
-```
-git push origin main
-npm publish
-```
-
-### 8. Verify
-
-- Confirm npm shows the new version: `npm view git-chopstick-core version`
-- Confirm the tag exists on GitHub: `git tag -l`
-- Suggest followup tasks
-
-## Notes
-
-- `prepublishOnly` runs `npm run typecheck && npm test && npm run build` automatically — integration tests must pass before publish can proceed. This catches API regressions, broken imports, and test failures before they ship.
-  You still validate in step 5 beforehand rather than relying solely on `prepublishOnly`.
-- If this is the first release in a session, run `setup-matt-pocock-skills` first to configure issue tracker context.