patchy-cli 0.0.9 → 0.0.10-pr.201.67b5de9

package/README.md

@@ -46,7 +46,8 @@ Create a folder for the fork: `mkdir spoon-knife-fork && cd spoon-knife-fork`
   "patches_dir": "./patches/",
   "clones_dir": "./clones/",
   "target_repo": "spoon-knife",
-  "ref": "main"
+  "base_revision": "d0dd1f61b33d64e29d8bc1372a94ef6a2fee76a9",
+  "upstream_branch": "main"
 }
 ```
 
@@ -94,7 +95,7 @@ Patchy will prompt you to create your first **patch set**, let's name it: 'first
 
 ### Reapplying patches:
 
-Reset the current upstream repo `patchy repo reset main`, which will reset everything to `main`:
+Reset the current upstream repo with `patchy repo reset`, which will reset everything to `base_revision`:
 
 ```
 ./
@@ -138,7 +139,7 @@ Or via npm:
 
 ```sh
 npm install -g patchy-cli
-patchy-cli
+patchy
 ```
 
 Or use directly without installing:
@@ -175,8 +176,11 @@ patchy init
   // 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
+  // Git SHA or tag to use as the base for patches.
+  "base_revision": "abc123def", // Override: --base-revision | env: PATCHY_BASE_REVISION
+
+  // Remote branch to track for updates (e.g., "main"). Used by `patchy base` to find new commits/tags.
+  "upstream_branch": "main" // Override: --upstream-branch | env: PATCHY_UPSTREAM_BRANCH
 }
 ```
 Precedence: CLI flags > Environment variables > `patchy.json`
@@ -185,7 +189,7 @@ 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 `target_repo`:
+Patches are stored in the `patches/` directory (customizable via [`patches_dir`](#patchyjson-reference)):
 
 ```
 ./
@@ -199,8 +203,11 @@ The `patches/` directory (customizable via [`patches_dir`](#patchyjson-reference
 │       └── 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.
 
+Within each patch set files follow the same folder structure as in the `source_repo`.
+
 **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)
@@ -223,39 +230,42 @@ Note: `patchy generate` is destructive and will remove any unneeded files in the
 
 ### `patchy apply`
 
-Apply patch files from `patches/` into `target_repo`. Patch sets are applied in alphabetical order.
+Apply patch files from `patches/` into `target_repo`. Patch sets are applied in alphabetical order, with each patch set committed automatically.
 
 ```sh
-patchy apply [--only <patch-set>] [--until <patch-set>] [--target-repo] [--patches-dir] [--dry-run]
+patchy apply [--only <patch-set>] [--until <patch-set>] [--all] [--edit] [--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 |
+| `--all` | Commit all patch sets without prompting |
+| `--edit` | Leave the last patch set uncommitted for manual review |
 
 ### `patchy repo reset`
 
-Hard reset the Git working tree of `target_repo`. Discards local changes.
+Hard reset the Git working tree of `target_repo` to `base_revision`. Discards all local changes and patch commits.
 
 ```sh
-patchy repo reset [--target-repo]
+patchy repo reset [--base-revision] [--target-repo]
 ```
 
-### `patchy repo checkout --ref <git-ref>`
+### `patchy repo clone`
 
-Check out a specific Git ref (branch, tag, or SHA) in `target_repo`.
+Clone a repository into a subdirectory of `clones_dir` and checkout `base_revision`. The target directory is derived from the repo name.
 
 ```sh
-patchy repo checkout --ref main [--target-repo]
+patchy repo clone [--source-repo] [--clones-dir] [--base-revision]
 ```
 
-### `patchy repo clone`
+### `patchy base [revision]`
 
-Clone a repository into a subdirectory of `clones_dir`. The target directory is derived from the repo name.
+View or update the `base_revision` in config.
 
 ```sh
-patchy repo clone [--source-repo] [--clones-dir] [--ref]
+patchy base              # Interactive
+patchy base abc123def    # Set base_revision to the specified SHA or tag
 ```
 
 ## License

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchy-cli",
-  "version": "0.0.9",
+  "version": "0.0.10-pr.201.67b5de9",
   "description": "A CLI tool for managing Git patch workflows.",
   "type": "module",
   "bin": {
@@ -16,11 +16,11 @@
     "build-single": "bun run ./scripts/build.ts --single",
     "check": "bun run scripts/check.ts",
     "check-fix": "biome check --write --error-on-warnings --diagnostic-level=warn",
+    "misc-checks": "bun run scripts/misc-checks.ts",
     "changeset": "changeset",
     "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",
@@ -29,11 +29,11 @@
     "test-coverage": "bun test --coverage"
   },
   "devDependencies": {
-    "@biomejs/biome": "=2.3.8",
+    "@biomejs/biome": "=2.3.10",
     "@changesets/changelog-github": "=0.5.2",
     "@changesets/cli": "=2.29.8",
     "@types/node": "=24.10.3",
-    "@typescript/native-preview": "=7.0.0-dev.20251213.1",
+    "@typescript/native-preview": "=7.0.0-dev.20251222.1",
     "bun-types": "=1.3.4",
     "knip": "=5.73.4",
     "lefthook": "=2.0.11",
@@ -64,11 +64,11 @@
     "url": "https://github.com/richardgill/patchy"
   },
   "optionalDependencies": {
-    "patchy-cli-linux-x64": "0.0.9",
-    "patchy-cli-linux-arm64": "0.0.9",
-    "patchy-cli-darwin-x64": "0.0.9",
-    "patchy-cli-darwin-arm64": "0.0.9",
-    "patchy-cli-windows-x64": "0.0.9"
+    "patchy-cli-linux-x64": "0.0.10-pr.201.67b5de9",
+    "patchy-cli-linux-arm64": "0.0.10-pr.201.67b5de9",
+    "patchy-cli-darwin-x64": "0.0.10-pr.201.67b5de9",
+    "patchy-cli-darwin-arm64": "0.0.10-pr.201.67b5de9",
+    "patchy-cli-windows-x64": "0.0.10-pr.201.67b5de9"
   },
   "publishConfig": {
     "access": "public"

package/schema.json

@@ -19,7 +19,10 @@
     "patch_set": {
       "type": "string"
     },
-    "ref": {
+    "base_revision": {
+      "type": "string"
+    },
+    "upstream_branch": {
       "type": "string"
     },
     "verbose": {