Commit

Smart Commit

Create a validated commit with proper service-scoped message format. Optional argument: $ARGUMENTS (commit message override).

Step 1: Detect Changed Files

# Staged changes
git diff --cached --name-only

# Unstaged changes (for reference)
git diff --name-only

# Untracked files
git ls-files --others --exclude-standard

If nothing is staged, show the user what's unstaged/untracked and ask what to stage.

Step 2: Map Changes to Services

Map every changed file to its service:

Step 3: Run Validation for Each Affected Service

For each affected service, run its validation command. Report results as a table:

| Service | Validation | Status |
|---------|-----------|--------|
| api-server | make validate | PASS/FAIL |

If any validation fails:

• Show the error output
• Ask the user: "Validation failed for {service}. Fix issues and retry, or commit anyway?"
• Do NOT proceed with commit unless user explicitly says to skip validation

Step 4: Generate Commit Message

If $ARGUMENTS is provided, use it as the commit subject but still prepend the semantic type and scope.

Format: type(scope): subject (per .github/semantic.yml)

Allowed types:

Allowed scopes (required):

Rules:

• Single scope: fix(ui): handle null pointer in settings page
• Ticket number scope: feat(NB-1234): add Azure onboarding flow
• Scope is required — if no dedicated scope matches, use a ticket number NB-xxx or nb-xxx

If no $ARGUMENTS, analyze the diff to generate an appropriate message. Present the proposed message to the user for confirmation before committing.

Step 5: Stage and Commit

IMPORTANT — Single commit per PR policy (main branch only): PRs targeting main MUST have exactly one commit. This does NOT apply to branches targeting test or prod (cherry-picks / promotions) — those can have multiple commits.

NEVER use git add -A or git add . — always add specific files:

git add <specific files>

Then determine the base branch and commit count:

# Detect base branch (default: main)
BASE_BRANCH="main"
COMMIT_COUNT=$(git log origin/${BASE_BRANCH}..HEAD --oneline 2>/dev/null | wc -l | tr -d ' ')

For branches targeting main, enforce single commit:

if [ "$COMMIT_COUNT" -eq 0 ]; then
  # First commit on this branch
  git commit -m "type(scope): subject"
elif [ "$COMMIT_COUNT" -eq 1 ]; then
  # Amend the existing single commit
  git commit --amend --no-edit  # or with -m "..." to update the message
else
  # Multiple commits exist — squash all into one
  git reset --soft origin/${BASE_BRANCH}
  git commit -m "type(scope): subject"
fi

• If amending or squashing, ask the user if the commit message should be updated to reflect the new changes.
• After squash, a --force-with-lease push will be needed (handled by the create-pr skill).

For branches targeting test or prod, just commit normally — no amend/squash.

Step 6: Output Summary

Committed: type(scope): subject
  {N} files changed, {A} insertions(+), {D} deletions(-)
  Services: {list}
  Validation: all passed