patchy-cli 0.0.6 → 0.0.7-pr.173.c4e5bf0

package/README.md

@@ -13,7 +13,7 @@
 
 # Patchy 🩹
 
-> A CLI for generating and applying patches to git repositories.
+A CLI for generating and applying patches to git repositories.
 
 ## Patches vs forks
 
@@ -42,10 +42,10 @@ Create a folder for the fork: `mkdir spoon-knife-fork && cd spoon-knife-fork`
 `patchy init` creates your config: `./patchy.json` ([full reference](#patchyjson-reference))
 ```json5
 {
-  "repo_url": "https://github.com/octocat/spoon-knife",
+  "source_repo": "https://github.com/octocat/spoon-knife",
   "patches_dir": "./patches/",
   "clones_dir": "./clones/",
-  "repo_dir": "spoon-knife",
+  "target_repo": "spoon-knife",
   "ref": "main"
 }
 ```
@@ -74,6 +74,7 @@ echo "new file" > clones/spoon-knife/path/to/newFile.txt
 
 To generate the patches for the changes run `patchy generate`:
 
+Patchy will prompt you to create your first **patch set**, let's name it: 'first-patch-set'
 
 ```
 ./
@@ -82,10 +83,12 @@ To generate the patches for the changes run `patchy generate`:
 │       ├── path/to/existingFile.txt
 │       └── path/to/newFile.txt
 ├── patches/
-│   ├── path/to/existingFile.txt.diff
-│   └── path/to/newFile.txt
+│   └── 001-first-patch-set/ (created)
+│       ├── path/to/existingFile.txt.diff (generated)
+│       └── path/to/newFile.txt (generated)
 └── patchy.json
 ```
+
 - **Edits** are stored as `.diff` files e.g. `existingFile.txt.diff`.
 - **New files** are copied as regular files e.g. `newFile.txt` (easier to inspect and edit directly). 
 
@@ -99,8 +102,9 @@ Reset the current upstream repo `patchy repo reset main`, which will reset every
 │   └── spoon-knife/  <<< reset
 │       ├── path/to/existingFile.txt
 ├── patches/
-│   ├── path/to/existingFile.txt.diff
-│   └── path/to/newFile.txt
+│   └── 001-first-patch-set/
+│       ├── path/to/existingFile.txt.diff
+│       └── path/to/newFile.txt
 └── patchy.json
 ```
 
@@ -113,8 +117,9 @@ Apply the patches back to the cloned repo with: `patchy apply`
 │       ├── path/to/existingFile.txt (modified)
 │       └── path/to/newFile.txt (added)
 ├── patches/
-│   ├── path/to/existingFile.txt.diff
-│   └── path/to/newFile.txt
+│   └── 001-first-patch-set/
+│       ├── path/to/existingFile.txt.diff
+│       └── path/to/newFile.txt
 └── patchy.json
 ```
 
@@ -154,18 +159,22 @@ patchy init
 
 ```jsonc
 {
-  // Git URL to clone from.
-  "repo_url": "https://github.com/example/repo.git", // Override: --repo-url | env: PATCHY_REPO_URL
-
-  // Path to repo you're generating patches from or applying patches to.
-  "repo_dir": "~/repos/repo", // Override: --repo-dir | env: PATCHY_REPO_DIR
-
+  // Git URL or local file path to clone from.
+  "source_repo": "https://github.com/example/repo.git", // Override: --source-repo | env: PATCHY_SOURCE_REPO
   // Directory containing patch files.
   "patches_dir": "./patches/", // Override: --patches-dir | env: PATCHY_PATCHES_DIR
 
-  // Parent directory for cloning repos. You can easily clone more repos here from repo_url.
+  // Default directory for cloning repos.
   "clones_dir": "./clones/", // Override: --clones-dir | env: PATCHY_CLONES_DIR
 
+  // Path to repo you're generating patches from or applying patches to.
+  // Can be relative to clones_dir: <clones_dir>/<target_repo> or absolute.
+  "target_repo": "repo", // Override: --target-repo | env: PATCHY_TARGET_REPO
+
+  // Patch set to generate into (subdirectory of patches_dir).
+  // If not set, prompts interactively or errors in non-interactive mode.
+  "patch_set": "001-security-fixes", // Override: --patch-set | env: PATCHY_PATCH_SET
+
   // Git ref to checkout (branch, tag, SHA).
   "ref": "main" // Override: --ref | env: PATCHY_REF
 }
@@ -176,68 +185,77 @@ Precedence: CLI flags > Environment variables > `patchy.json`
 
 ## Patch file layout
 
-The `patches/` directory (customizable via [`patches_dir`](#patchyjson-reference)) uses the same folder structure as `repo_dir`:
+The `patches/` directory (customizable via [`patches_dir`](#patchyjson-reference)) uses the same folder structure as `target_repo`:
 
 ```
 ./
 ├── patches/
-│   ├── path/to/existingFile.txt.diff
-│   └── path/to/newFile.txt
+│   └── 001-first-patch-set/
+│       ├── path/to/existingFile.txt.diff
+│       └── path/to/newFile.txt
 ├── clones/
 │   └── repo-clone-1/
 │       ├── path/to/existingFile.txt (modified)
 │       └── path/to/newFile.txt (added)
 └── patchy.json
 ```
+Patches are grouped into **patch sets** for organizing related changes. Patch sets have numeric prefixes (e.g., `001-auth`, `002-ui`) and are applied in order.
 
 **Two types of patch files:**
 - **`.diff` files** — For modified existing files (generated via `git diff HEAD`)
 - **Plain files** — For newly added files (copied verbatim for easier inspection and editing)
 
-`patchy generate` automatically removes stale files in `patches/` that no longer correspond to changes in `repo_dir`.
+`patchy generate` automatically removes stale files in `patches/<patch-set>` that no longer correspond to changes in `target_repo`.
 
 ## Commands
 
 ### `patchy generate`
 
-Generate `.diff` files and new files into `./patches/` based on current `git diff` in `repo_dir`.
+Generate `.diff` files and new files into `./patches/<patch-set>/` based on current `git diff` in `target_repo`.
 
 ```sh
-patchy generate [--repo-dir] [--patches-dir] [--dry-run]
+patchy generate [--patch-set] [--target-repo] [--patches-dir] [--dry-run]
 ```
 
-Note: `patchy generate` is destructive and will remove any unneeded files in your `./patches/` folder.
+If `--patch-set` is not provided (and not set via env/config), prompts to select an existing patch set or create a new one.
+
+Note: `patchy generate` is destructive and will remove any unneeded files in the patch set directory.
 
 ### `patchy apply`
 
-Apply patch files from `patches/` into `repo_dir`.
+Apply patch files from `patches/` into `target_repo`. Patch sets are applied in alphabetical order.
 
 ```sh
-patchy apply [--repo-dir] [--patches-dir] [--dry-run]
+patchy apply [--only <patch-set>] [--until <patch-set>] [--target-repo] [--patches-dir] [--dry-run]
 ```
 
+| Flag | Description |
+|------|-------------|
+| `--only <name>` | Apply only the specified patch set |
+| `--until <name>` | Apply patch sets up to and including the specified one |
+
 ### `patchy repo reset`
 
-Hard reset the Git working tree of `repo_dir`. Discards local changes.
+Hard reset the Git working tree of `target_repo`. Discards local changes.
 
 ```sh
-patchy repo reset [--repo-dir]
+patchy repo reset [--target-repo]
 ```
 
 ### `patchy repo checkout --ref <git-ref>`
 
-Check out a specific Git ref (branch, tag, or SHA) in `repo_dir`.
+Check out a specific Git ref (branch, tag, or SHA) in `target_repo`.
 
 ```sh
-patchy repo checkout --ref main [--repo-dir]
+patchy repo checkout --ref main [--target-repo]
 ```
 
-### `patchy repo clone --url <git-url>`
+### `patchy repo clone`
 
 Clone a repository into a subdirectory of `clones_dir`. The target directory is derived from the repo name.
 
 ```sh
-patchy repo clone [--clones-dir] [--ref] [--repo-url] 
+patchy repo clone [--source-repo] [--clones-dir] [--ref]
 ```
 
 ## License

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchy-cli",
-  "version": "0.0.6",
+  "version": "0.0.7-pr.173.c4e5bf0",
   "description": "A CLI tool for managing Git patch workflows.",
   "type": "module",
   "bin": {
@@ -20,6 +20,7 @@
     "changeset-version": "changeset version",
     "dev": "bun run src/cli.ts",
     "knip": "knip-bun",
+    "lint-versions": "syncpack lint",
     "local-ci": "bun run scripts/local-ci.ts",
     "prepare": "[ -n \"$CI\" ] || lefthook install",
     "typecheck": "tsgo --noEmit",
@@ -36,10 +37,11 @@
     "bun-types": "=1.3.4",
     "knip": "=5.73.4",
     "lefthook": "=2.0.11",
+    "syncpack": "=13.0.4",
     "typescript": "=5.9.3"
   },
   "dependencies": {
-    "@clack/prompts": "1.0.0-alpha.8",
+    "@clack/prompts": "=1.0.0-alpha.8",
     "@stricli/core": "=1.2.4",
     "chalk": "=5.6.2",
     "diff": "=8.0.2",
@@ -62,11 +64,11 @@
     "url": "https://github.com/richardgill/patchy"
   },
   "optionalDependencies": {
-    "patchy-cli-linux-x64": "0.0.6",
-    "patchy-cli-linux-arm64": "0.0.6",
-    "patchy-cli-darwin-x64": "0.0.6",
-    "patchy-cli-darwin-arm64": "0.0.6",
-    "patchy-cli-windows-x64": "0.0.6"
+    "patchy-cli-linux-x64": "0.0.7-pr.173.c4e5bf0",
+    "patchy-cli-linux-arm64": "0.0.7-pr.173.c4e5bf0",
+    "patchy-cli-darwin-x64": "0.0.7-pr.173.c4e5bf0",
+    "patchy-cli-darwin-arm64": "0.0.7-pr.173.c4e5bf0",
+    "patchy-cli-windows-x64": "0.0.7-pr.173.c4e5bf0"
   },
   "publishConfig": {
     "access": "public"

package/schema.json

@@ -4,10 +4,10 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "type": "object",
   "properties": {
-    "repo_url": {
+    "source_repo": {
       "type": "string"
     },
-    "repo_dir": {
+    "target_repo": {
       "type": "string"
     },
     "clones_dir": {
@@ -16,6 +16,9 @@
     "patches_dir": {
       "type": "string"
     },
+    "patch_set": {
+      "type": "string"
+    },
     "ref": {
       "type": "string"
     },