git-chopstick-core 0.1.8 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.1.10] — 2026-06-13
+
+### Added
+- **`getRepositorySummary(path)`**: New helper combining `getRepositoryType` + `git rev-parse HEAD` + `getCurrentBranch` into one call. Returns `{ path, head, currentBranch? }` or `null` for bare/missing repos.
+- **`getRemoteUrl(path, name)`**: Path-based helper using `git config --get remote.<name>.url`. `getRemoteURL(repository, name)` now delegates to it.
+- **`spawnGit` progress example**: `examples/spawn-git-progress.ts` demonstrating how to wire `spawnGit` to `CheckoutProgressParser`, `FetchProgressParser`, `PushProgressParser`, `PullProgressParser`, and `CloneProgressParser`.
+- **Integration tests**: 18 new tests covering `getRepositorySummary` (5), `getRemoteUrl` (3), `getRemotesFromPath` (2), `addRemote`/`removeRemote`/`setRemoteURL` (4), `merge` (2), `rebase` (1), and `stash` (1). Total: 31 tests.
+
+### Changed
+- **README**: Updated API reference with `getRepositorySummary` and `getRemoteUrl`/`getRemoteURL` exports.
+
+---
+
+## [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 +155,8 @@
 
 ---
 
+[0.1.10]: https://github.com/parkiyong/git-chopstick-core/releases/tag/v0.1.10
+[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 +166,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.10...HEAD

package/README.md

@@ -228,12 +228,12 @@ try {
 | `rebase` | `rebase`, `continueRebase`, `abortRebase`, `rebaseInteractive`, `getRebaseInternalState`, `getRebaseSnapshot` | Rebase operations |
 | `reflog` | `getRecentBranches`, `getBranchCheckouts` | Reflog inspection |
 | `refs` | `formatAsLocalRef`, `getSymbolicRef` | Ref manipulation |
-| `remote` | `getRemotes`, `addRemote`, `removeRemote` | Remote management |
+| `remote` | `getRemotes`, `addRemote`, `removeRemote`, `getRemoteURL`, `getRemoteUrl`, `getRemotesFromPath`, `setRemoteURL` | Remote management |
 | `reorder` | `reorder` | Interactive rebase reordering |
 | `reset` | `reset`, `resetPaths`, `unstageAll` | Reset operations |
 | `revert` | `revertCommit` | Revert a commit |
 | `rev-list` | `getAheadBehind`, `getBranchAheadBehind`, `revRange`, `revSymmetricDifference` | Commit range queries |
-| `rev-parse` | `getRepositoryType`, `getCurrentBranch`, `getUpstreamRefForRef`, `getCurrentUpstreamRef` | Rev parsing / branch detection |
+| `rev-parse` | `getRepositoryType`, `getCurrentBranch`, `getRepositorySummary`, `getUpstreamRefForRef`, `getCurrentUpstreamRef` | Rev parsing / branch detection |
 | `rm` | `removeConflictedFile` | Remove files |
 | `squash` | `squash` | Interactive rebase squashing |
 | `stage` | `stageManualConflictResolution`, `stageResolvedConflictFiles` | Stage conflict resolutions |
@@ -341,6 +341,7 @@ npm pack --dry-run
 npx tsx examples/get-status.ts /path/to/repo
 npx tsx examples/branch-operations.ts /path/to/repo
 npx tsx examples/create-commit.ts /path/to/repo
+npx tsx examples/spawn-git-progress.ts /path/to/repo
 ```
 
 ## Status

package/dist/git/remote.d.ts

@@ -21,6 +21,12 @@ export declare function setRemoteURL(repository: Repository, name: string, url:
  * Returns null if the remote could not be found
  */
 export declare function getRemoteURL(repository: Repository, name: string): Promise<string | null>;
+/**
+ * Get the URL for a remote by name using a path string.
+ *
+ * Returns null if the remote could not be found.
+ */
+export declare function getRemoteUrl(path: string, name: string): Promise<string | null>;
 /**
  * Update the HEAD ref of the remote, which is the default branch.
  *

package/dist/git/remote.js

@@ -45,11 +45,19 @@ export async function setRemoteURL(repository, name, url) {
  * Returns null if the remote could not be found
  */
 export async function getRemoteURL(repository, name) {
-    const result = await git(['remote', 'get-url', name], repository.path, 'getRemoteURL', { successExitCodes: new Set([0, 2, 128]) });
+    return getRemoteUrl(repository.path, name);
+}
+/**
+ * Get the URL for a remote by name using a path string.
+ *
+ * Returns null if the remote could not be found.
+ */
+export async function getRemoteUrl(path, name) {
+    const result = await git(['config', '--get', `remote.${name}.url`], path, 'getRemoteUrl', { successExitCodes: new Set([0, 1]) });
     if (result.exitCode !== 0) {
         return null;
     }
-    return result.stdout;
+    return result.stdout.trim();
 }
 /**
  * Update the HEAD ref of the remote, which is the default branch.

package/dist/git/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/git/remote.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../src/git/remote.ts"],"names":[],"mappings":"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"}

package/dist/git/rev-parse.d.ts

@@ -29,3 +29,23 @@ export declare const getCurrentUpstreamRemoteName: (path: string) => Promise<str
  * or `undefined` if HEAD is detached.
  */
 export declare function getCurrentBranch(path: string): Promise<string | undefined>;
+/**
+ * Summary of a repository opened at a path.
+ */
+export interface RepositorySummary {
+    /** The resolved repository path. */
+    path: string;
+    /** The full SHA of HEAD. */
+    head: string;
+    /** The current branch name, or undefined if HEAD is detached. */
+    currentBranch?: string;
+}
+/**
+ * Get a summary of a repository at the given path in a single call.
+ *
+ * This replaces the common pattern of calling `getRepositoryType` +
+ * `git rev-parse HEAD` + `getCurrentBranch` separately.
+ *
+ * Returns `null` for missing, bare, or unsafe repositories.
+ */
+export declare function getRepositorySummary(path: string): Promise<RepositorySummary | null>;

package/dist/git/rev-parse.js

@@ -75,4 +75,30 @@ export async function getCurrentBranch(path) {
     }
     return result.stdout.trim();
 }
+/**
+ * Get a summary of a repository at the given path in a single call.
+ *
+ * This replaces the common pattern of calling `getRepositoryType` +
+ * `git rev-parse HEAD` + `getCurrentBranch` separately.
+ *
+ * Returns `null` for missing, bare, or unsafe repositories.
+ */
+export async function getRepositorySummary(path) {
+    const repoType = await getRepositoryType(path);
+    if (repoType.kind !== 'regular') {
+        return null;
+    }
+    const headResult = await git(['rev-parse', 'HEAD'], path, 'getRepositorySummary', {
+        successExitCodes: new Set([0, 128]),
+    });
+    if (headResult.exitCode !== 0) {
+        return null;
+    }
+    const currentBranch = await getCurrentBranch(path);
+    return {
+        path: repoType.topLevelWorkingDirectory,
+        head: headResult.stdout.trim(),
+        currentBranch,
+    };
+}
 //# sourceMappingURL=rev-parse.js.map

package/dist/git/rev-parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"rev-parse.js","sourceRoot":"","sources":["../../src/git/rev-parse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rev-parse.js","sourceRoot":"","sources":["../../src/git/rev-parse.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-chopstick-core",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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,28 @@ import { join } from 'path'
 import {
   Repository, getStatus, getCommits, getBranches,
   createCommit, createBranch, deleteLocalBranch, renameBranch,
-  getCurrentBranch, getRepositoryType,
+  getCurrentBranch, getRepositoryType, getRepositorySummary,
+  getRemoteUrl, getRemotesFromPath, getAllTags,
+  addRemote, removeRemote, setRemoteURL,
+  merge, MergeResult,
+  rebase, RebaseResult,
+  getStashes, createDesktopStashEntry, popStashEntry,
 } 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')
+  const fixture = setupFixtureRepo()
+  repoPath = fixture.repoPath
+  repo = fixture.repo
 
-  // 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)
+  // Set a remote URL so getRemoteUrl / getRemotesFromPath have a known value
+  // (the bundle clone already creates an origin remote pointing to the bundle file)
+  git(repoPath, 'remote set-url origin https://github.com/user/repo.git')
 })
 
 describe('getRepositoryType', () => {
@@ -52,16 +48,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 +64,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 +86,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 +145,199 @@ 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)
+  })
+})
+
+describe('getRepositorySummary', () => {
+  it('returns path, head, and currentBranch for a normal repo', async () => {
+    const summary = await getRepositorySummary(repoPath)
+    expect(summary).toBeTruthy()
+    expect(summary!.path).toBe(repoPath)
+    // HEAD should be a 40-char hex SHA
+    expect(summary!.head).toMatch(/^[a-f0-9]{40}$/)
+    expect(summary!.currentBranch).toBe('main')
+  })
+
+  it('returns currentBranch as undefined when HEAD is detached', async () => {
+    git(repoPath, 'checkout --detach')
+    const summary = await getRepositorySummary(repoPath)
+    expect(summary).toBeTruthy()
+    expect(summary!.path).toBe(repoPath)
+    expect(summary!.head).toMatch(/^[a-f0-9]{40}$/)
+    expect(summary!.currentBranch).toBeUndefined()
+    // Reset back for subsequent tests
+    git(repoPath, 'checkout main')
+  })
+
+  it('returns null for a bare repository', async () => {
+    const barePath = mkdtempSync(join(tmpdir(), 'gcctest-bare-'))
+    execSync(`git init --bare ${barePath}`, { stdio: 'pipe' })
+    const summary = await getRepositorySummary(barePath)
+    expect(summary).toBeNull()
+    execSync(`rm -rf ${barePath}`)
+  })
+
+  it('returns null for a non-existent path', async () => {
+    const summary = await getRepositorySummary('/nonexistent/path')
+    expect(summary).toBeNull()
+  })
+
+  it('returns null for a path that exists but is not a git repo', async () => {
+    const nonRepoPath = mkdtempSync(join(tmpdir(), 'gcctest-nonrepo-'))
+    const summary = await getRepositorySummary(nonRepoPath)
+    expect(summary).toBeNull()
+    execSync(`rm -rf ${nonRepoPath}`)
+  })
+})
+
+describe('getRemoteUrl', () => {
+  it('returns the URL for an existing remote', async () => {
+    const url = await getRemoteUrl(repoPath, 'origin')
+    expect(url).toBe('https://github.com/user/repo.git')
+  })
+
+  it('returns null for a non-existent remote', async () => {
+    const url = await getRemoteUrl(repoPath, 'nonexistent')
+    expect(url).toBeNull()
+  })
+
+  it('returns null for a non-repo path', async () => {
+    const nonRepoPath = mkdtempSync(join(tmpdir(), 'gcctest-nonrepo-'))
+    const url = await getRemoteUrl(nonRepoPath, 'origin')
+    expect(url).toBeNull()
+    execSync(`rm -rf ${nonRepoPath}`)
+  })
+})
+
+describe('getRemotesFromPath', () => {
+  it('lists all remotes for a valid repo', async () => {
+    const remotes = await getRemotesFromPath(repoPath)
+    expect(remotes.length).toBeGreaterThanOrEqual(1)
+    const origin = remotes.find(r => r.name === 'origin')
+    expect(origin).toBeTruthy()
+    expect(origin!.url).toBe('https://github.com/user/repo.git')
+  })
+
+  it('returns an empty array for a non-repo path', async () => {
+    const nonRepoPath = mkdtempSync(join(tmpdir(), 'gcctest-nonrepo-'))
+    const remotes = await getRemotesFromPath(nonRepoPath)
+    expect(remotes).toEqual([])
+    execSync(`rm -rf ${nonRepoPath}`)
+  })
+})
+
+describe('addRemote', () => {
+  it('adds a new remote and returns it', async () => {
+    const remote = await addRemote(repo, 'upstream', 'https://github.com/upstream/repo.git')
+    expect(remote.name).toBe('upstream')
+    expect(remote.url).toBe('https://github.com/upstream/repo.git')
+
+    // Verify it was persisted
+    const url = await getRemoteUrl(repoPath, 'upstream')
+    expect(url).toBe('https://github.com/upstream/repo.git')
+  })
+})
+
+describe('setRemoteURL', () => {
+  it('updates the URL of an existing remote', async () => {
+    const result = await setRemoteURL(repo, 'origin', 'https://github.com/user/new-repo.git')
+    expect(result).toBe(true)
+
+    // Verify it was changed
+    const url = await getRemoteUrl(repoPath, 'origin')
+    expect(url).toBe('https://github.com/user/new-repo.git')
+  })
+})
+
+describe('removeRemote', () => {
+  it('removes an existing remote silently', async () => {
+    // First confirm the remote exists
+    const beforeUrl = await getRemoteUrl(repoPath, 'upstream')
+    expect(beforeUrl).toBe('https://github.com/upstream/repo.git')
+
+    await removeRemote(repo, 'upstream')
+
+    // Verify it's gone
+    const afterUrl = await getRemoteUrl(repoPath, 'upstream')
+    expect(afterUrl).toBeNull()
+  })
+
+  it('silently succeeds when removing a non-existent remote', async () => {
+    // Should not throw
+    await expect(removeRemote(repo, 'nonexistent')).resolves.toBeUndefined()
+  })
+})
+
+describe('merge', () => {
+  it('merges feature/two into main', async () => {
+    const result = await merge(repo, 'feature/two')
+    expect(result).toBe(MergeResult.Success)
+  })
+
+  it('returns AlreadyUpToDate when merging an already-merged branch', async () => {
+    const result = await merge(repo, 'feature/two')
+    expect(result).toBe(MergeResult.AlreadyUpToDate)
+  })
+})
+
+describe('rebase', () => {
+  it('rebases feature/two onto feature/one', async () => {
+    // Get Branch objects with tip.sha required by the rebase API
+    const branches = await getBranches(repo)
+    const baseBranch = branches.find(b => b.nameWithoutRemote === 'feature/one')!
+    const targetBranch = branches.find(b => b.nameWithoutRemote === 'feature/two')!
+    expect(baseBranch).toBeTruthy()
+    expect(targetBranch).toBeTruthy()
+
+    const result = await rebase(repo, baseBranch, targetBranch)
+    expect(result).toBe(RebaseResult.CompletedWithoutError)
+  })
+})
+
+describe('stash', () => {
+  it('creates a stash entry and pops it back', async () => {
+    // Create a working directory change to stash
+    writeFileSync(join(repoPath, 'stash-test.txt'), 'stash me')
+    git(repoPath, 'add stash-test.txt')
+
+    // Create a stash entry
+    const created = await createDesktopStashEntry(repo, 'main', [], null)
+    expect(created).toBe(true)
+
+    // List stashes — should include our new entry
+    const stashes = await getStashes(repo)
+    expect(stashes.desktopEntries.length).toBeGreaterThanOrEqual(1)
+    const stashSha = stashes.desktopEntries[0].stashSha
+    expect(stashSha).toBeTruthy()
+
+    // Pop it back — changes should be restored
+    await popStashEntry(repo, stashSha)
+    const statusAfterPop = await getStatus(repo)
+    expect(statusAfterPop).toBeTruthy()
+    const stashFile = statusAfterPop!.workingDirectory.files.find(
+      f => f.path === 'stash-test.txt'
+    )
+    expect(stashFile).toBeTruthy()
+
+    // Clean up: discard the restored file (stash pop restores to working tree, not index)
+    git(repoPath, 'checkout -- stash-test.txt')
+  })
+})
+
 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.