@miller-tech/uap 1.13.17 → 1.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/bin/cli.js +6 -0
- package/dist/bin/cli.js.map +1 -1
- package/dist/cli/worktree.d.ts +3 -1
- package/dist/cli/worktree.d.ts.map +1 -1
- package/dist/cli/worktree.js +83 -0
- package/dist/cli/worktree.js.map +1 -1
- package/dist/coordination/service.d.ts +1 -0
- package/dist/coordination/service.d.ts.map +1 -1
- package/dist/coordination/service.js +56 -6
- package/dist/coordination/service.js.map +1 -1
- package/docs/reference/UAP_CLI_REFERENCE.md +26 -6
- package/package.json +1 -1
|
@@ -231,7 +231,7 @@ uap worktree create hotfix-auth-bug --from develop
|
|
|
231
231
|
|
|
232
232
|
#### `uap worktree pr`
|
|
233
233
|
|
|
234
|
-
Create a pull request for the
|
|
234
|
+
Create a pull request for a worktree. This command now syncs the branch with `origin/master` before push/PR creation to reduce mergeability issues.
|
|
235
235
|
|
|
236
236
|
```bash
|
|
237
237
|
uap worktree pr <worktree-id> [options]
|
|
@@ -239,15 +239,35 @@ uap worktree pr <worktree-id> [options]
|
|
|
239
239
|
|
|
240
240
|
**Options:**
|
|
241
241
|
|
|
242
|
-
- `--
|
|
243
|
-
- `--body, -b` - PR body file or text
|
|
244
|
-
- `--base, -B` - Target branch (default: main)
|
|
242
|
+
- `--draft` - Create as draft PR
|
|
245
243
|
|
|
246
244
|
**Example:**
|
|
247
245
|
|
|
248
246
|
```bash
|
|
249
|
-
uap worktree pr 123
|
|
250
|
-
uap worktree pr 123 --
|
|
247
|
+
uap worktree pr 123
|
|
248
|
+
uap worktree pr 123 --draft
|
|
249
|
+
```
|
|
250
|
+
|
|
251
|
+
#### `uap worktree finish`
|
|
252
|
+
|
|
253
|
+
Recommended completion flow for worktrees. This command enforces the safe sequence to prevent sync/merge problems:
|
|
254
|
+
|
|
255
|
+
1. Sync branch with `origin/master`
|
|
256
|
+
2. Push branch
|
|
257
|
+
3. Create PR if missing
|
|
258
|
+
4. Merge PR
|
|
259
|
+
5. Auto-clean local worktree and branch
|
|
260
|
+
|
|
261
|
+
If GitHub cannot delete the local branch due worktree branch locks, `uap worktree finish` automatically falls back to merge + local cleanup, so local branch deletion still completes.
|
|
262
|
+
|
|
263
|
+
```bash
|
|
264
|
+
uap worktree finish <worktree-id>
|
|
265
|
+
```
|
|
266
|
+
|
|
267
|
+
**Example:**
|
|
268
|
+
|
|
269
|
+
```bash
|
|
270
|
+
uap worktree finish 123
|
|
251
271
|
```
|
|
252
272
|
|
|
253
273
|
#### `uap worktree cleanup`
|