mach6-push

name	mach6-push
description	Commit changes, push to remote, and post a progress comment on the associated PR or issue. Stages files by name (never git add -A), matches existing commit style, auto-detects PR from branch. Usage: mach6-push [optional commit message]
argument-hint	[commit message]

mach6-push — Commit, Push, Progress Comment

User input: $ARGUMENTS

Global Rules

1. GitHub as shared memory — Progress is posted as PR/issue comments so any future session can pick up context.
2. HTML markers — Use <!-- mach6-progress --> as the first line of progress comment bodies.
3. No #N in comment bodies — Use "finding 3", "item 3", "stage 2" etc. instead.
4. Safe git — Never use git add -A or git add .. Stage files by name. Never stage secrets (.env, credentials, tokens, keys).
5. Task tracking — Use the update_task tool to show progress.
6. Non-interactive gh — Set GH_PAGER=cat and GH_EDITOR=cat before all gh commands to prevent interactive prompts from hanging the agent. Use --body-file instead of inline --body for all gh pr comment, gh pr create, and gh issue create calls to avoid shell interpretation of backticks.

Step 1: Set up task tracking

• title: "stage", description: "Stage changes"
• title: "commit", description: "Commit"
• title: "push", description: "Push to remote"
• title: "comment", description: "Post progress comment"

Step 2: Stage changes

Run git status and git diff to understand the current state.

• If you have context from this session about which files were modified, stage those by name.
• If files are already staged and look correct, proceed.
• If unclear (fresh session, no context), review all changes and ask the user what to stage.
• Never use git add -A or git add .
• Never stage secrets (.env, credentials, tokens, keys)

Update task: stage → completed, commit → in_progress.

Step 3: Commit

Check recent commit style:

git log --oneline -10

Generate a commit message that:

• Follows the repository's existing style
• Summarizes the nature of the changes
• Uses the user's override message if provided

git commit -m "<message>"

Update task: commit → completed, push → in_progress.

Step 4: Push

git push

If no upstream is set, use git push -u origin <branch>.

Update task: push → completed, comment → in_progress.

Step 5: Post progress comment

Detect the associated PR or issue:

1. Session context first: If an earlier mach6 command in this session targeted a specific PR or issue, use that.
2. PR detection: Try gh pr view --json number,url on current branch. If a PR exists, comment on it.
3. Branch name fallback: Check branch name for issue number pattern (e.g., feature/issue-55-*). If found, comment on that issue.
4. Skip gracefully: If neither works, skip commenting and inform the user.

If session context points to an issue but a PR also exists on the current branch, prefer the PR.

Post a progress comment:

cat > /tmp/gh-comment.md << 'MACH6_EOF'
<!-- mach6-progress -->
## Progress Update

<summary of changes in this batch>

**Commit:** \`<hash>\`

---
*Progress tracked by mach6*
MACH6_EOF
gh pr comment <number> --body-file /tmp/gh-comment.md

Update task: comment → completed.

Report: what was committed, where pushed, where the comment was posted (with link).

Suggest next step based on context:

• If on a feature branch with a PR: /skill:mach6-review <pr-number>
• If on a feature branch without a PR: /skill:mach6-plan <issue-number> to create one
• If on the default branch: issue-oriented next steps