Compare commits
4
Commits
c2a3a251b4
...
8d8da1b546
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d8da1b546 | ||
|
|
d008874c14 | ||
|
|
370649b3df | ||
|
|
f13aafb1dd |
@@ -8,7 +8,7 @@ description: >
|
||||
existing PR was updated. NEVER merges the PR into main — this skill only
|
||||
pushes to the branch and manages the PR lifecycle.
|
||||
user-invocable: true
|
||||
allowed-tools: Bash, Read, Grep, Glob, AskUserQuestion
|
||||
allowed-tools: Bash, Read, Grep, Glob, AskUserQuestion, Skill
|
||||
---
|
||||
|
||||
# Push PR Skill
|
||||
@@ -34,17 +34,29 @@ git branch --show-current
|
||||
|
||||
If on `main`, stop: "You're on main. Switch to a team branch first."
|
||||
|
||||
### 2. Check for unpushed commits
|
||||
### 2. Commit uncommitted changes
|
||||
|
||||
```bash
|
||||
git status
|
||||
```
|
||||
|
||||
If there are uncommitted changes (staged or unstaged), run the **commit skill**
|
||||
first. Use the `/commit` skill to group changes into logical commits with
|
||||
proper conventional commit messages. Wait for commit to complete before
|
||||
proceeding.
|
||||
|
||||
If the working tree is clean (no uncommitted changes), skip to step 3.
|
||||
|
||||
### 3. Check for unpushed commits
|
||||
|
||||
```bash
|
||||
git fetch --all
|
||||
git status
|
||||
git log --oneline origin/<branch>..<branch>
|
||||
```
|
||||
|
||||
If no unpushed commits, skip to step 4 (PR check).
|
||||
If no unpushed commits, skip to step 5 (PR check).
|
||||
|
||||
### 3. Check for conflicts with main
|
||||
### 4. Check for conflicts with main
|
||||
|
||||
```bash
|
||||
git merge-tree --write-tree origin/main HEAD 2>&1
|
||||
@@ -59,7 +71,7 @@ git merge origin/main --no-edit
|
||||
If merge conflicts, **stop and report** — let the user resolve.
|
||||
If clean, continue.
|
||||
|
||||
### 4. Push
|
||||
### 5. Push
|
||||
|
||||
```bash
|
||||
git push origin <branch>
|
||||
@@ -67,7 +79,7 @@ git push origin <branch>
|
||||
|
||||
If push fails, stop and report. Never force-push without explicit request.
|
||||
|
||||
### 5. Check for existing PR
|
||||
### 6. Check for existing PR
|
||||
|
||||
```bash
|
||||
tea pr list --login schweitz --repo jpmschweitzer/settled-reach --state open --output simple
|
||||
@@ -76,9 +88,9 @@ tea pr list --login schweitz --repo jpmschweitzer/settled-reach --state open --o
|
||||
Match current branch name in PR list.
|
||||
|
||||
- **PR exists**: Report "Pushed N commits to `<branch>`. PR #X updated." Done.
|
||||
- **No PR**: Continue to step 6.
|
||||
- **No PR**: Continue to step 7.
|
||||
|
||||
### 6. Create a new PR
|
||||
### 7. Create a new PR
|
||||
|
||||
```bash
|
||||
git log --oneline main..<branch>
|
||||
@@ -103,7 +115,7 @@ tea pr create \
|
||||
|
||||
Report PR URL when done.
|
||||
|
||||
### 7. Update ticket status to review
|
||||
### 8. Update ticket status to review
|
||||
|
||||
Scan all commit messages in the PR for ticket references (`#NNN`):
|
||||
|
||||
|
||||
@@ -8,6 +8,11 @@ Format based on [Keep a Changelog](https://keepachangelog.com/).
|
||||
|
||||
### Added
|
||||
- `project.yaml` — technical project descriptor with version, architecture, simulation, and content model as the canonical version source of truth
|
||||
- Scratchpad: asset generation pipeline idea (registry, status tracking, prompt versioning, pre-sprint cohesion)
|
||||
- Scratchpad: remote terminal proxy idea for mobile monitoring of Claude Code permission prompts and interactive elements
|
||||
|
||||
### Changed
|
||||
- `push-pr` skill now runs `/commit` first when uncommitted changes are detected
|
||||
|
||||
## [v0.1.9] — 2026-02-18
|
||||
|
||||
|
||||
@@ -7,4 +7,16 @@ Personal notes and random thoughts. Not acted upon unless explicitly instructed.
|
||||
- Pipeline to create postcards for each world — visuals for in-game dossiers
|
||||
- Investigate using Veo to create gate transition movies — based on planetary profiles, postcards, and game visual style
|
||||
- Capture discussion with Gemini about setting up a 3D to 2D pipeline
|
||||
- Improve asset generation pipeline: proper asset registry, status tracking per asset, prompt storage/versioning, pre-sprint prompt preparation pass to maintain visual/audio cohesion across batches
|
||||
- Remote terminal proxy for Claude Code — mobile notification + interaction bridge for monitoring progress away from desk. Full feature scope:
|
||||
- Capture permission prompts across all terminals/worktrees in a project
|
||||
- Push notifications to phone (Ntfy/Gotify/Pushover/custom — self-hostable)
|
||||
- Summary of last assistant message for context (what Claude is doing and why it's asking)
|
||||
- Support AskUserQuestion mode: render multiple-choice options, free-text input
|
||||
- Support permission approve/deny with the tool call details
|
||||
- Basically a full terminal proxy that adapts to Claude Code's interactive elements
|
||||
- Starting point: peon-ping already hooks into the right events (PermissionRequest, Notification, Stop, etc.) via ~/.claude/hooks/
|
||||
- Hook event JSON includes: hook_event_name, notification_type, session_id, cwd, permission_mode
|
||||
- Gap: hook event data may not include prompt content (tool call details, AskUser question text, multiple choice options) — investigate what's in the full event payload
|
||||
- Architecture: extend peon-ping's send_notification pattern to push to a remote service, add a response channel back to the terminal
|
||||
|
||||
|
||||
Reference in New Issue
Block a user