git-jira-shortcuts 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 chipallen2
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,130 @@
+# git-jira-shortcuts
+
+Git + Jira workflow shortcuts for zsh — interactive branch switching, auto-prefixed commits, Jira integration, and more.
+
+## Install
+
+```bash
+npm install -g git-jira-shortcuts
+git-jira-shortcuts init
+source ~/.zshrc
+```
+
+The `init` command will walk you through configuration and add the necessary source lines to your `~/.zshrc`.
+
+## Configuration
+
+Running `git-jira-shortcuts init` creates `~/.git-jira-shortcuts.env` with:
+
+| Variable | Required | Description |
+|----------|----------|-------------|
+| `GJS_TICKET_PREFIX` | Yes | Jira project key (e.g. `MOTOMATE`, `PROJ`) |
+| `GJS_JIRA_DOMAIN` | Yes | Jira domain (e.g. `yourco.atlassian.net`) |
+| `GJS_JIRA_API_TOKEN` | Yes | Base64-encoded Jira API token |
+| `GJS_BRANCH_WEBHOOK_URL` | No | Optional webhook for branch name generation |
+
+### Generating your Jira API token
+
+1. Go to [Atlassian API tokens](https://id.atlassian.com/manage-profile/security/api-tokens)
+2. Create a new token
+3. Base64-encode it:
+   ```bash
+   echo -n "your-email@company.com:your-api-token" | base64
+   ```
+4. Paste the result during `git-jira-shortcuts init`
+
+## Commands
+
+### Status & Info
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `gs` | `gstatus` | Clean git status with remote sync info |
+| `glist` | `gl` | List files pending in this branch |
+| `grecent` | — | Show recently checked out branches (last 10) |
+| `grepos` | `repos` | Show all repo clones and their current branch |
+| `ghelp` | — | Show all available commands |
+
+### Branching
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `gswitch [branch]` | `gw` | Switch branches with interactive picker (↑/↓ arrows) |
+| `gstart <branch\|ticket#>` | `gt`, `gcreate` | Create or switch to branch, auto-names from Jira |
+| `gdelete [branch]` | `gdel` | Delete feature branch if clean and pushed |
+| `gmerge [branch]` | `gm` | Merge branch into current if no conflicts |
+
+### Committing & Pushing
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `gcfast <message>` | `gf` | Stage all, commit (skip hooks), push. Auto-prefixes ticket ID. |
+| `gcommit <message>` | `gc` | Stage all, commit (with hooks), push. Auto-prefixes ticket ID. |
+| `gpush [branch]` | `gpu` | Push with upstream tracking |
+| `gp` | — | Pull without rebase or editor |
+
+### Utilities
+| Command | Alias | Description |
+|---------|-------|-------------|
+| `greset [file]` | `gr` | Reset a file with confirmation (interactive if no file given) |
+| `gdiff [branch]` | — | List files changed vs target branch + GitHub compare link |
+| `testJira` | `tj` | Test Jira API connection |
+
+## Features
+
+### Interactive branch picker
+When you run `gswitch`, `gdelete`, or `gmerge` without a branch name, you get an arrow-key menu of your recent branches:
+
+```
+Switch to branch (↑/↓ select, Enter confirm, q cancel):
+  ● feature-branch-1
+  ○ feature-branch-2
+  ○ develop
+```
+
+### Ticket number shortcuts
+Type a ticket number instead of a full branch name:
+```bash
+gw 1234          # Switches to PROJ-1234-* branch
+gstart 1234      # Creates PROJ-1234-<jira-title> branch
+```
+
+### Auto-prefixed commits
+When on a ticket branch, commit messages are auto-prefixed:
+```bash
+gc fix the bug   # Commits as "PROJ-1234: fix the bug"
+```
+
+### Branch shorthand
+- `m` → `master`
+- `d` → `develop`
+
+## Update
+
+```bash
+npm update -g git-jira-shortcuts
+```
+
+## Reconfigure
+
+```bash
+git-jira-shortcuts init
+source ~/.zshrc
+```
+
+## CLI
+
+```bash
+git-jira-shortcuts init       # Interactive setup wizard
+git-jira-shortcuts path       # Print path to shell script
+git-jira-shortcuts --version  # Print version
+git-jira-shortcuts --help     # Show help
+```
+
+## Requirements
+
+- zsh
+- Node.js >= 16
+- `jq` (for Jira JSON parsing)
+- `curl` (for Jira API calls)
+
+## License
+
+MIT

package/bin/cli.js

@@ -0,0 +1,206 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const fs = require('fs');
+const readline = require('readline');
+const os = require('os');
+
+const SHELL_SCRIPT = path.resolve(__dirname, '..', 'shell', 'git-extras.sh');
+const ENV_FILE = path.join(os.homedir(), '.git-jira-shortcuts.env');
+const ZSHRC = path.join(os.homedir(), '.zshrc');
+const SOURCE_MARKER = '# git-jira-shortcuts';
+const PKG = require(path.resolve(__dirname, '..', 'package.json'));
+
+// ── helpers ──────────────────────────────────────────────────────────
+
+function ask(rl, question, defaultVal) {
+  const suffix = defaultVal ? ` (${defaultVal})` : '';
+  return new Promise((resolve) => {
+    rl.question(`${question}${suffix}: `, (answer) => {
+      resolve(answer.trim() || defaultVal || '');
+    });
+  });
+}
+
+function readExistingEnv() {
+  if (!fs.existsSync(ENV_FILE)) return {};
+  const content = fs.readFileSync(ENV_FILE, 'utf8');
+  const vars = {};
+  for (const line of content.split('\n')) {
+    const m = line.match(/^export\s+(\w+)="(.*)"/);
+    if (m) vars[m[1]] = m[2];
+  }
+  return vars;
+}
+
+function writeEnvFile(vars) {
+  const lines = [
+    '# git-jira-shortcuts configuration',
+    `# Generated by git-jira-shortcuts init on ${new Date().toISOString()}`,
+    '',
+    `export GJS_TICKET_PREFIX="${vars.GJS_TICKET_PREFIX || ''}"`,
+    `export GJS_JIRA_DOMAIN="${vars.GJS_JIRA_DOMAIN || ''}"`,
+    `export GJS_JIRA_API_TOKEN="${vars.GJS_JIRA_API_TOKEN || ''}"`,
+    `export GJS_BRANCH_WEBHOOK_URL="${vars.GJS_BRANCH_WEBHOOK_URL || ''}"`,
+    '',
+  ];
+  fs.writeFileSync(ENV_FILE, lines.join('\n'), 'utf8');
+}
+
+function ensureZshrcSourceLines() {
+  let content = '';
+  if (fs.existsSync(ZSHRC)) {
+    content = fs.readFileSync(ZSHRC, 'utf8');
+  }
+
+  if (content.includes(SOURCE_MARKER)) {
+    console.log('  ~/.zshrc already has source lines — skipping.');
+    return;
+  }
+
+  const block = [
+    '',
+    SOURCE_MARKER,
+    '[ -f ~/.git-jira-shortcuts.env ] && source ~/.git-jira-shortcuts.env',
+    'source "$(git-jira-shortcuts path)"',
+    '',
+  ].join('\n');
+
+  fs.appendFileSync(ZSHRC, block, 'utf8');
+  console.log('  ✅ Source lines added to ~/.zshrc');
+}
+
+// ── commands ─────────────────────────────────────────────────────────
+
+async function runInit() {
+  const existing = readExistingEnv();
+  const hasExisting = Object.keys(existing).length > 0;
+
+  console.log('');
+  console.log('🔧 git-jira-shortcuts init');
+  console.log('─'.repeat(40));
+
+  if (hasExisting) {
+    console.log('  Found existing config at ~/.git-jira-shortcuts.env');
+    console.log('  Press Enter to keep current values shown in parentheses.');
+    console.log('');
+  }
+
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  try {
+    const ticketPrefix = await ask(
+      rl,
+      '  Jira project key (e.g. MOTOMATE, PROJ)',
+      existing.GJS_TICKET_PREFIX
+    );
+
+    const jiraDomain = await ask(
+      rl,
+      '  Jira domain (e.g. yourco.atlassian.net)',
+      existing.GJS_JIRA_DOMAIN
+    );
+
+    console.log('');
+    console.log('  To generate a Jira API token:');
+    console.log('    1. Go to https://id.atlassian.com/manage-profile/security/api-tokens');
+    console.log('    2. Create a token');
+    console.log('    3. Base64-encode it: echo -n "email:token" | base64');
+    console.log('');
+
+    const jiraToken = await ask(
+      rl,
+      '  Jira API token (base64)',
+      existing.GJS_JIRA_API_TOKEN
+    );
+
+    const webhookUrl = await ask(
+      rl,
+      '  Branch name webhook URL (optional, Enter to skip)',
+      existing.GJS_BRANCH_WEBHOOK_URL
+    );
+
+    console.log('');
+    console.log('  Writing config...');
+
+    writeEnvFile({
+      GJS_TICKET_PREFIX: ticketPrefix,
+      GJS_JIRA_DOMAIN: jiraDomain,
+      GJS_JIRA_API_TOKEN: jiraToken,
+      GJS_BRANCH_WEBHOOK_URL: webhookUrl,
+    });
+    console.log('  ✅ Config written to ~/.git-jira-shortcuts.env');
+
+    ensureZshrcSourceLines();
+
+    console.log('');
+    console.log('  🎉 Setup complete! Reload your shell:');
+    console.log('     source ~/.zshrc');
+    console.log('');
+    console.log('  Then try:');
+    console.log('     ghelp        — list all commands');
+    console.log('     testJira     — verify Jira connection');
+    console.log('');
+  } finally {
+    rl.close();
+  }
+}
+
+function runPath() {
+  console.log(SHELL_SCRIPT);
+}
+
+function runHelp() {
+  console.log(`
+git-jira-shortcuts v${PKG.version}
+Git + Jira workflow shortcuts for zsh
+
+Usage:
+  git-jira-shortcuts init       Interactive setup wizard
+  git-jira-shortcuts path       Print path to shell script (used by source)
+  git-jira-shortcuts --version  Print version
+  git-jira-shortcuts --help     Show this help
+
+After init, these zsh commands are available:
+  gs        Clean git status          gw/gswitch   Switch branches
+  gf/gcfast Fast commit + push        gc/gcommit   Commit + push
+  gt/gstart Create branch from Jira   gm/gmerge    Safe merge
+  gpu/gpush Push with tracking        gdel/gdelete Delete branch
+  gl/glist  List pending files        gr/greset    Reset files
+  gdiff     Diff vs target branch     grecent      Recent branches
+  grepos    Show all repo branches    testJira     Test Jira API
+  ghelp     Show all commands
+`);
+}
+
+// ── main ─────────────────────────────────────────────────────────────
+
+const command = process.argv[2];
+
+switch (command) {
+  case 'init':
+    runInit().catch((err) => {
+      console.error('Error during init:', err.message);
+      process.exit(1);
+    });
+    break;
+  case 'path':
+    runPath();
+    break;
+  case '--version':
+  case '-v':
+    console.log(PKG.version);
+    break;
+  case '--help':
+  case '-h':
+  case undefined:
+    runHelp();
+    break;
+  default:
+    console.error(`Unknown command: ${command}`);
+    runHelp();
+    process.exit(1);
+}

package/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "git-jira-shortcuts",
+  "version": "1.0.0",
+  "description": "Git + Jira workflow shortcuts for zsh — interactive branch switching, auto-prefixed commits, Jira integration, and more.",
+  "author": "chipallen2",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chipallen2/git-jira-shortcuts.git"
+  },
+  "bin": {
+    "git-jira-shortcuts": "./bin/cli.js"
+  },
+  "files": [
+    "bin/",
+    "shell/",
+    "README.md"
+  ],
+  "keywords": [
+    "git",
+    "jira",
+    "shortcuts",
+    "zsh",
+    "cli",
+    "branch",
+    "workflow"
+  ],
+  "engines": {
+    "node": ">=16"
+  }
+}

package/shell/git-extras.sh

@@ -0,0 +1,866 @@
+#!/usr/bin/env zsh
+# git-jira-shortcuts — Git + Jira workflow shortcuts for zsh
+# https://github.com/chipallen2/git-jira-shortcuts
+#
+# Configuration (set in ~/.git-jira-shortcuts.env):
+#   GJS_TICKET_PREFIX      — Jira project key (e.g. MOTOMATE, PROJ)
+#   GJS_JIRA_DOMAIN        — Jira domain (e.g. yourco.atlassian.net)
+#   GJS_JIRA_API_TOKEN     — Base64 Jira API token
+#   GJS_BRANCH_WEBHOOK_URL — Optional webhook for branch name generation
+#   GJS_REPOS              — Optional array of repo paths for grepos
+
+# Store path to this script for self-reference (used by ghelp)
+GJS_SHELL_SCRIPT_PATH="${0:A}"
+
+###
+### INTERNAL HELPERS
+###
+
+_gjs_get_recent_branches() {
+  local reflog=$(git reflog --all --format='%gd:%gs' 2>/dev/null)
+  [[ -z "$reflog" ]] && return 1
+  local current_branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  echo "$reflog" | grep "checkout:" | cut -d':' -f3- | \
+    sed 's/.*moving from .* to //' | \
+    awk -v cur="$current_branch" '!seen[$0]++ && $0 != cur' | \
+    head -10
+}
+
+_gjs_interactive_menu() {
+  local -a options=("$@")
+  local selected=1
+  local total=${#options[@]}
+
+  [[ $total -eq 0 ]] && return 1
+
+  tput civis >&2 2>/dev/null
+
+  for i in {1..$total}; do
+    if [[ $i -eq $selected ]]; then
+      printf "  \033[36m● %s\033[0m\n" "${options[$i]}" >&2
+    else
+      printf "  ○ %s\n" "${options[$i]}" >&2
+    fi
+  done
+
+  while true; do
+    read -rsk1 key
+    case "$key" in
+      $'\e')
+        read -rsk1 key2
+        read -rsk1 key3
+        case "$key3" in
+          A) ((selected > 1)) && ((selected--)) ;;
+          B) ((selected < total)) && ((selected++)) ;;
+        esac
+        ;;
+      $'\n')
+        break
+        ;;
+      q)
+        printf "\033[%dB" "$((total - selected))" >&2
+        tput cnorm >&2 2>/dev/null
+        return 1
+        ;;
+    esac
+
+    printf "\033[%dA" "$total" >&2
+    for i in {1..$total}; do
+      printf "\r\033[K" >&2
+      if [[ $i -eq $selected ]]; then
+        printf "  \033[36m● %s\033[0m\n" "${options[$i]}" >&2
+      else
+        printf "  ○ %s\n" "${options[$i]}" >&2
+      fi
+    done
+  done
+
+  tput cnorm >&2 2>/dev/null
+  echo "${options[$selected]}"
+}
+
+_gjs_is_ticket_number() {
+  [[ -n "$GJS_TICKET_PREFIX" ]] && [[ $1 =~ ^[0-9]{3,6}$ ]]
+}
+
+_gjs_branch_exists_local() {
+  git show-ref --verify --quiet "refs/heads/$1"
+}
+
+_gjs_branch_exists_remote() {
+  [[ -n "$(git ls-remote --heads origin "$1" 2>/dev/null)" ]]
+}
+
+_gjs_resolve_branch_input() {
+  local raw_input="$1"
+  local scope="${2:-any}"
+
+  if [[ -z "$raw_input" ]]; then
+    echo "$raw_input"
+    return 0
+  fi
+
+  if [[ "$raw_input" == "m" ]]; then
+    echo "master"
+    return 0
+  elif [[ "$raw_input" == "d" ]]; then
+    echo "develop"
+    return 0
+  fi
+
+  if ! _gjs_is_ticket_number "$raw_input"; then
+    echo "$raw_input"
+    return 0
+  fi
+
+  local prefix="${GJS_TICKET_PREFIX}-$raw_input"
+  local -a matches=()
+
+  if [[ "$scope" == "local" || "$scope" == "any" ]]; then
+    while IFS= read -r branch; do
+      [[ -z "$branch" ]] && continue
+      if [[ "$branch" == ${prefix}* && -z ${matches[(r)$branch]} ]]; then
+        matches+=("$branch")
+      fi
+    done < <(git branch --format="%(refname:short)")
+  fi
+
+  if [[ "$scope" == "remote" || "$scope" == "any" ]]; then
+    while IFS= read -r branch; do
+      [[ -z "$branch" || "$branch" == *"->"* ]] && continue
+      if [[ "$branch" == origin/${prefix}* ]]; then
+        local short_branch="${branch#origin/}"
+        if [[ -z ${matches[(r)$short_branch]} ]]; then
+          matches+=("$short_branch")
+        fi
+      fi
+    done < <(git branch -r --format="%(refname:short)")
+  fi
+
+  if (( ${#matches[@]} == 0 )); then
+    echo "❌ No branches found matching $prefix" >&2
+    return 1
+  fi
+
+  if (( ${#matches[@]} == 1 )); then
+    echo "${matches[1]}"
+    return 0
+  fi
+
+  echo "🔢 Multiple branches found for $prefix:" >&2
+  local i=1
+  for branch in "${matches[@]}"; do
+    echo "  $i) $branch" >&2
+    ((i++))
+  done
+
+  local choice
+  while true; do
+    read "choice?Select branch [1-${#matches[@]}]: "
+    if [[ "$choice" =~ '^[0-9]+$' ]] && (( choice >= 1 && choice <= ${#matches[@]} )); then
+      echo "${matches[$choice]}"
+      return 0
+    fi
+    echo "❌ Invalid selection." >&2
+  done
+}
+
+_gjs_sanitize_branch_name() {
+  local title="$1"
+  echo "$title" | tr '[:upper:]' '[:lower:]' | \
+    sed 's/[^a-z0-9]/-/g' | \
+    sed 's/--*/-/g' | \
+    sed 's/^-//' | \
+    sed 's/-$//' | \
+    cut -c1-50
+}
+
+_gjs_get_jira_story_title() {
+  local story_number="$1"
+
+  if [[ -z "$GJS_JIRA_API_TOKEN" ]]; then
+    echo "❌ GJS_JIRA_API_TOKEN not set. Run: git-jira-shortcuts init" >&2
+    return 1
+  fi
+  if [[ -z "$GJS_JIRA_DOMAIN" ]]; then
+    echo "❌ GJS_JIRA_DOMAIN not set. Run: git-jira-shortcuts init" >&2
+    return 1
+  fi
+  if [[ -z "$story_number" ]]; then
+    echo "❌ Story number is required" >&2
+    return 1
+  fi
+
+  local response
+  response=$(curl -sS \
+    -H "Authorization: Basic $GJS_JIRA_API_TOKEN" \
+    -H "Accept: application/json" \
+    "https://$GJS_JIRA_DOMAIN/rest/api/3/issue/${GJS_TICKET_PREFIX}-$story_number?fields=summary")
+
+  if [[ $? -ne 0 ]]; then
+    echo "❌ Jira API call failed." >&2
+    return 1
+  fi
+
+  local summary
+  summary=$(echo "$response" | jq -r '.fields.summary // empty')
+
+  if [[ -z "$summary" ]]; then
+    echo "❌ Could not find ${GJS_TICKET_PREFIX}-$story_number or extract title" >&2
+    return 1
+  fi
+
+  echo "$summary"
+}
+
+###
+### PUBLIC COMMANDS
+###
+
+grecent() { # grecent | Show recently checked out branches (last 10)
+  local reflog=$(git reflog --all --format='%gd:%gs' 2>/dev/null)
+  [[ -z "$reflog" ]] && echo "No git history found" && return 1
+  local current_branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  echo "$reflog" | grep "checkout:" | cut -d':' -f3- | \
+    sed 's/.*moving from .* to //' | \
+    awk -v cur="$current_branch" '!seen[$0]++ && $0 != cur' | \
+    head -10 | \
+    nl -nln | \
+    sed 's/^/  /'
+}
+
+unalias gs 2>/dev/null
+gs() { # gs | Clean git status with remote sync info
+  local branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  [[ -z "$branch" ]] && echo "Not a git repo" && return 1
+  echo "\033[1m$branch\033[0m"
+  local staged=$(git diff --cached --numstat 2>/dev/null | wc -l | tr -d ' ')
+  local unstaged=$(git diff --numstat 2>/dev/null | wc -l | tr -d ' ')
+  local untracked=$(git ls-files --others --exclude-standard 2>/dev/null | wc -l | tr -d ' ')
+  local pending=$((staged + unstaged + untracked))
+  git fetch --quiet 2>/dev/null
+  local behind=$(git rev-list --count HEAD..@{u} 2>/dev/null || echo 0)
+  local ahead=$(git rev-list --count @{u}..HEAD 2>/dev/null || echo 0)
+  if [[ $pending -gt 0 || $ahead -gt 0 ]]; then
+    echo "🔴 \033[31mFiles Pending\033[0m"
+  elif [[ $behind -gt 0 ]]; then
+    echo "🔵 \033[34mBehind\033[0m"
+  else
+    echo "✅ \033[32mUp to Date\033[0m"
+  fi
+}
+alias gstatus='gs' # gstatus | Alias for gs
+alias gp='git pull --no-rebase --no-edit' # gp | Pull without rebase or editor
+
+grepos() { # grepos | Show all repo clones and their current branch
+  [[ -z "${GJS_REPOS+x}" ]] && echo "GJS_REPOS not defined. Run: git-jira-shortcuts init" && return 1
+  local max_len=0
+  for entry in "${GJS_REPOS[@]}"; do
+    local label="${entry##*:}"
+    (( ${#label} > max_len )) && max_len=${#label}
+  done
+  for entry in "${GJS_REPOS[@]}"; do
+    local dir="${entry%:*}"
+    local label="${entry##*:}"
+    if [[ -d "$dir/.git" ]]; then
+      local branch=$(git -C "$dir" rev-parse --abbrev-ref HEAD 2>/dev/null)
+      printf "%-${max_len}s  %s\n" "$label" "${branch:-???}"
+    else
+      printf "%-${max_len}s  %s\n" "$label" "\033[31m(not found)\033[0m"
+    fi
+  done
+}
+alias repos='grepos' # grepos | Alias for grepos
+
+ghelp() { # ghelp | Show all git-jira-shortcuts commands
+  echo "🧠 GIT-JIRA-SHORTCUTS:"
+  echo "[arg] = Required  [*arg] = Optional  [arg=default] = Optional with default"
+  echo
+  local -a entries=()
+  grep -E "^(alias .*# |[a-zA-Z_]+\(\) \{ # )" "$GJS_SHELL_SCRIPT_PATH" | while IFS= read -r line; do
+    if [[ "$line" == alias* ]]; then
+      name=$(echo "$line" | sed 's/alias \([^=]*\)=.*/\1/')
+      comment=$(echo "$line" | sed 's/.*# \(.*\)/\1/')
+      entries+=("$name|$comment")
+    else
+      name=$(echo "$line" | sed 's/\([a-zA-Z_]*\)().*/\1/')
+      comment=$(echo "$line" | sed 's/.*# \(.*\)/\1/')
+      entries+=("$name|$comment")
+    fi
+  done
+  local max_name_len=0
+  local max_cmd_len=0
+  for entry in "${entries[@]}"; do
+    name="${entry%%|*}"
+    rest="${entry#*|}"
+    cmd="${rest%%|*}"
+    (( ${#name} > max_name_len )) && max_name_len=${#name}
+    (( ${#cmd} > max_cmd_len )) && max_cmd_len=${#cmd}
+  done
+  for entry in "${entries[@]}"; do
+    name="${entry%%|*}"
+    rest="${entry#*|}"
+    cmd="${rest%%|*}"
+    desc="${rest#*|}"
+    printf "%-*s | %-*s | %s\n" "$max_name_len" "$name" "$max_cmd_len" "$cmd" "$desc"
+  done | sort
+}
+
+gdiff() { # gdiff [*branch=m] | List files changed for PR to target branch + GitHub compare link
+  local target_input="${1:-m}"
+  local target
+  if ! target=$(_gjs_resolve_branch_input "$target_input" "any"); then
+    return 1
+  fi
+
+  local diff_ref="$target"
+  if _gjs_branch_exists_remote "$target" && ! _gjs_branch_exists_local "$target"; then
+    diff_ref="origin/$target"
+  fi
+
+  local current_branch=$(git rev-parse --abbrev-ref HEAD)
+  local changed_files=$(git --no-pager diff --name-only "$diff_ref"...HEAD)
+
+  if [[ -z "$changed_files" ]]; then
+    echo "No files changed vs $target"
+  else
+    local file_count=$(echo "$changed_files" | wc -l | tr -d ' ')
+    echo "$file_count files changed vs $target"
+    echo ""
+    echo "$changed_files"
+  fi
+
+  local remote_url=$(git remote get-url origin 2>/dev/null)
+  if [[ -n "$remote_url" ]]; then
+    local repo_path
+    if [[ "$remote_url" == git@github.com:* ]]; then
+      repo_path="${remote_url#git@github.com:}"
+    elif [[ "$remote_url" == https://github.com/* ]]; then
+      repo_path="${remote_url#https://github.com/}"
+    fi
+    repo_path="${repo_path%.git}"
+    if [[ -n "$repo_path" ]]; then
+      echo ""
+      echo "View full diff at:"
+      echo "https://github.com/${repo_path}/compare/${target}...${current_branch}?expand=1"
+    fi
+  fi
+}
+
+glist() { # glist | List files pending in this branch
+  git --no-pager status --short --untracked-files=all
+}
+alias gl='glist' # glist | Alias for glist
+
+greset() { # greset [*file] | Reset a specific file with confirmation (interactive if no file given)
+  local file="$1"
+  
+  _greset_file() {
+    local f="$1"
+    local file_status=$(git status --porcelain -- "$f" 2>/dev/null | head -1)
+    local index_status="${file_status:0:1}"
+    local worktree_status="${file_status:1:1}"
+    if [[ "$index_status" == "?" ]]; then
+      rm -rf "$f"
+    elif [[ "$index_status" == "A" ]]; then
+      git restore --staged "$f" 2>/dev/null
+      rm -rf "$f"
+    else
+      git restore --staged --worktree "$f" 2>/dev/null || git checkout HEAD -- "$f" 2>/dev/null
+    fi
+  }
+  
+  if [[ -z "$file" ]]; then
+    local files=()
+    local statuses=()
+    while IFS= read -r line; do
+      local fname="${line:3}"
+      if [[ "$fname" == *" -> "* ]]; then
+        fname="${fname##* -> }"
+      fi
+      files+=("$fname")
+      statuses+=("${line:0:2}")
+    done < <(git status --porcelain)
+    
+    if [[ ${#files[@]} -eq 0 ]]; then
+      echo "No modified files to reset."
+      return 0
+    fi
+    
+    echo "Select a file to reset:"
+    echo "  1) ALL (reset all files)"
+    local i=2
+    for f in "${files[@]}"; do
+      echo "  $i) $f"
+      ((i++))
+    done
+    
+    echo -n "Enter number: "
+    read choice
+    
+    if [[ "$choice" == "1" ]]; then
+      echo "Are you sure you want to reset ALL files? (Y/N)"
+      read -k user_input
+      echo
+      if [[ $user_input == "y" || $user_input == "Y" ]]; then
+        git restore --staged --worktree . 2>/dev/null
+        git clean -fd 2>/dev/null
+        echo "✅ Reset all files"
+      else
+        echo "❌ Cancelled"
+      fi
+      return 0
+    fi
+    
+    local idx=$((choice - 1))
+    if [[ $idx -lt 1 || $idx -gt ${#files[@]} ]]; then
+      echo "❌ Invalid selection"
+      return 1
+    fi
+    file="${files[$idx]}"
+  fi
+  
+  echo "Are you sure you want to reset $file? (Y/N)"
+  read -k user_input
+  echo
+  if [[ $user_input == "y" || $user_input == "Y" ]]; then
+    _greset_file "$file"
+    echo "✅ Reset $file"
+  else
+    echo "❌ Cancelled"
+  fi
+}
+alias gr='greset' # greset [*file] | Alias for greset
+
+gswitch() { # gswitch [*branch] [--force|-f] | Switch branches (optionally bypass local-dirty guard)
+  local force_switch=0
+  local -a positional=()
+  local arg
+  for arg in "$@"; do
+    case "$arg" in
+      --force|-f)
+        force_switch=1
+        ;;
+      *)
+        positional+=("$arg")
+        ;;
+    esac
+  done
+  set -- "${positional[@]}"
+
+  if [[ $force_switch -eq 0 && -n "$(git status --porcelain)" ]]; then
+    echo "⚠️  You have uncommitted changes. Commit or stash before switching."
+    echo "   Use 'gw --force [branch]' to bypass this check."
+    return 1
+  fi
+
+  local branch
+  branch=$(git rev-parse --abbrev-ref HEAD)
+  local unpushed
+  unpushed=$(git log origin/"$branch"..HEAD --oneline 2>/dev/null)
+
+  if [[ -n "$unpushed" ]]; then
+    echo "🚫 You have commits on '$branch' not pushed to origin. Push them first."
+    return 1
+  fi
+
+  if [[ -z "$1" ]]; then
+    local -a branches=()
+    while IFS= read -r b; do
+      branches+=("$b")
+    done < <(_gjs_get_recent_branches)
+
+    if [[ ${#branches[@]} -eq 0 ]]; then
+      echo "No recent branches found."
+      return 1
+    fi
+
+    echo "Switch to branch (↑/↓ select, Enter confirm, q cancel):"
+    local picked
+    if ! picked=$(_gjs_interactive_menu "${branches[@]}"); then
+      echo "Cancelled."
+      return 1
+    fi
+    set -- "$picked"
+  fi
+
+  local target_branch
+  if ! target_branch=$(_gjs_resolve_branch_input "$1" "any"); then
+    return 1
+  fi
+  
+  if git show-ref --verify --quiet refs/heads/"$target_branch"; then
+    git switch "$target_branch" || return 1
+  else
+    echo "📡 Branch not found locally, checking out from remote..."
+    git checkout -t origin/"$target_branch" || {
+      echo "❌ Failed to checkout branch '$target_branch' from remote."
+      return 1
+    }
+  fi
+  echo "⬇️  Pulling latest changes..."
+  git pull
+}
+alias gw='gswitch' # gswitch [*branch] | Alias for gswitch
+
+gcfast() { # gcfast [message] | Commit all, skip hooks, push (auto-prefix if ticket branch)
+  if [[ -z "$1" ]]; then
+    echo "Usage: gcfast \"commit message\""
+    return 1
+  fi
+
+  local message="$*"
+  local branch
+  branch=$(git rev-parse --abbrev-ref HEAD)
+
+  if [[ -n "$GJS_TICKET_PREFIX" ]]; then
+    local pattern="^${GJS_TICKET_PREFIX}-[0-9]+"
+    if [[ "$branch" =~ $pattern ]]; then
+      local jira_prefix="${MATCH}"
+      local msg_pattern="^${GJS_TICKET_PREFIX}-[0-9]+:"
+      if [[ ! "$message" =~ $msg_pattern ]]; then
+        message="$jira_prefix: $message"
+        echo "📝 Auto-prefixed commit message: \"$message\""
+      fi
+    fi
+  fi
+
+  echo "🧩 Staging all changes..."
+  git add .
+
+  echo "💬 Committing with message: \"$message\" (no-verify)"
+  if git commit -m "$message" --no-verify; then
+    echo "✅ Commit successful."
+  else
+    echo "ℹ️  Nothing to commit, checking if there are commits to push..."
+    if ! git log origin/"$branch".."$branch" --oneline | grep -q .; then
+      echo "❌ No commits to push and nothing to commit."
+      return 1
+    fi
+  fi
+
+  echo "🚀 Pushing branch '$branch' to origin..."
+  git push -u origin "$branch"
+}
+alias gf='gcfast' # gcfast [message] | Alias for gcfast
+
+gcommit() { # gcommit [message] | Commit all with hooks and auto-prefix, then push
+  if [[ -z "$1" ]]; then
+    echo "Usage: gcommit \"commit message\""
+    return 1
+  fi
+
+  local message="$*"
+  local branch
+  branch=$(git rev-parse --abbrev-ref HEAD)
+
+  if [[ -n "$GJS_TICKET_PREFIX" ]]; then
+    local pattern="^${GJS_TICKET_PREFIX}-[0-9]+"
+    if [[ "$branch" =~ $pattern ]]; then
+      local jira_prefix="${MATCH}"
+      local msg_pattern="^${GJS_TICKET_PREFIX}-[0-9]+:"
+      if [[ ! "$message" =~ $msg_pattern ]]; then
+        message="$jira_prefix: $message"
+        echo "📝 Auto-prefixed commit message: \"$message\""
+      fi
+    fi
+  fi
+
+  echo "🧩 Staging all changes..."
+  git add .
+
+  echo "💬 Committing with message: \"$message\""
+  if git commit -m "$message"; then
+    echo "✅ Commit successful."
+  else
+    echo "ℹ️  Nothing to commit, checking if there are commits to push..."
+    if ! git log origin/"$branch".."$branch" --oneline | grep -q .; then
+      echo "❌ No commits to push and nothing to commit."
+      return 1
+    fi
+  fi
+
+  echo "🚀 Pushing branch '$branch' to origin..."
+  git push -u origin "$branch"
+}
+alias gc='gcommit' # gcommit [message] | Alias for gcommit
+
+gstart() { # gstart [branch|ticket-number] | Create or switch to branch (Jira-aware)
+  local branch_input="$1"
+
+  if [[ -z "$branch_input" ]]; then
+    echo "Usage: gstart <branch-name|ticket-number>"
+    echo "  branch-name:    Full branch name or existing branch"
+    if [[ -n "$GJS_TICKET_PREFIX" ]]; then
+      echo "  ticket-number:  Numeric ID to auto-create ${GJS_TICKET_PREFIX}-#####-title branch"
+    fi
+    return 1
+  fi
+
+  local branch
+  
+  if _gjs_is_ticket_number "$branch_input"; then
+    echo "📋 Fetching Jira story title for ${GJS_TICKET_PREFIX}-$branch_input..."
+    local story_title
+    if ! story_title=$(_gjs_get_jira_story_title "$branch_input"); then
+      echo "❌ Failed to get story title. Using simple branch name."
+      branch="${GJS_TICKET_PREFIX}-$branch_input"
+    else
+      echo "📝 Story title: $story_title"
+      
+      if [[ -n "$GJS_BRANCH_WEBHOOK_URL" ]]; then
+        echo "📡 Getting branch suffix from webhook..."
+        local webhook_response
+        webhook_response=$(curl -s -X POST \
+          -H "Content-Type: application/json" \
+          -d "{\"storyTitle\": \"$story_title\"}" \
+          "$GJS_BRANCH_WEBHOOK_URL")
+        
+        if [[ $? -eq 0 ]]; then
+          local branch_name=$(echo "$webhook_response" | jq -r '.branchName // ""')
+          
+          if [[ -n "$branch_name" ]]; then
+            branch="${GJS_TICKET_PREFIX}-$branch_input-$branch_name"
+            echo "✅ Webhook provided branch suffix: $branch_name"
+          else
+            echo "⚠️  Webhook failed, using sanitized Jira title"
+            local sanitized_title
+            sanitized_title=$(_gjs_sanitize_branch_name "$story_title")
+            branch="${GJS_TICKET_PREFIX}-$branch_input-$sanitized_title"
+          fi
+        else
+          echo "❌ Failed to call webhook, using sanitized Jira title"
+          local sanitized_title
+          sanitized_title=$(_gjs_sanitize_branch_name "$story_title")
+          branch="${GJS_TICKET_PREFIX}-$branch_input-$sanitized_title"
+        fi
+      else
+        local sanitized_title
+        sanitized_title=$(_gjs_sanitize_branch_name "$story_title")
+        branch="${GJS_TICKET_PREFIX}-$branch_input-$sanitized_title"
+      fi
+      
+      echo "🌿 Created branch name: $branch"
+    fi
+  else
+    if ! branch=$(_gjs_resolve_branch_input "$branch_input" "any"); then
+      return 1
+    fi
+  fi
+
+  if _gjs_branch_exists_local "$branch"; then
+    git checkout "$branch" || return 1
+  elif _gjs_branch_exists_remote "$branch"; then
+    echo "📡 Branch not found locally, checking out from origin..."
+    git checkout -t "origin/$branch" || return 1
+  else
+    git checkout -b "$branch" || return 1
+  fi
+}
+alias gt='gstart' # gstart [branch] | Alias for gstart
+alias gcreate='gstart' # gstart [branch] | Alias for gstart
+
+gmerge() { # gmerge [*branch] | Merge branch into current branch if no conflicts
+  local branch_input="$1"
+  local current_branch=$(git rev-parse --abbrev-ref HEAD)
+  local branch
+
+  if [[ -z "$branch_input" ]]; then
+    local -a branches=()
+    while IFS= read -r b; do
+      branches+=("$b")
+    done < <(_gjs_get_recent_branches)
+
+    if [[ ${#branches[@]} -eq 0 ]]; then
+      echo "No recent branches found."
+      return 1
+    fi
+
+    echo "Merge into $current_branch from (↑/↓ select, Enter confirm, q cancel):"
+    local picked
+    if ! picked=$(_gjs_interactive_menu "${branches[@]}"); then
+      echo "Cancelled."
+      return 1
+    fi
+    branch_input="$picked"
+  fi
+
+  if ! branch=$(_gjs_resolve_branch_input "$branch_input" "any"); then
+    return 1
+  fi
+  
+  echo "🔍 Checking for potential conflicts with $branch..."
+  if [ -n "$(git status --porcelain)" ]; then
+    echo "❌ Current branch has uncommitted changes. Commit or stash changes first."
+    return 1
+  fi
+  
+  echo "🔄 Switching to $branch to pull latest changes..."
+  if _gjs_branch_exists_local "$branch"; then
+    if ! git checkout "$branch"; then
+      echo "❌ Failed to switch to $branch"
+      return 1
+    fi
+  else
+    if _gjs_branch_exists_remote "$branch"; then
+      echo "📡 Branch not found locally, checking out from origin..."
+      if ! git fetch origin "$branch"; then
+        echo "❌ Failed to fetch $branch from origin"
+        return 1
+      fi
+      if ! git checkout -t "origin/$branch"; then
+        echo "❌ Failed to checkout $branch from origin"
+        return 1
+      fi
+    else
+      echo "❌ Branch '$branch' not found locally or on origin."
+      return 1
+    fi
+  fi
+  
+  echo "⬇️  Pulling latest changes for $branch..."
+  if ! git pull; then
+    echo "❌ Failed to pull changes for $branch"
+    git checkout "$current_branch"
+    return 1
+  fi
+  
+  echo "🔄 Switching back to $current_branch..."
+  if ! git checkout "$current_branch"; then
+    echo "❌ Failed to switch back to $current_branch"
+    return 1
+  fi
+  
+  if git merge-tree $(git merge-base HEAD "$branch") HEAD "$branch" 2>/dev/null | grep -q "<<<<<<<"; then
+    echo "❌ Merge would create conflicts. Aborting merge."
+    return 1
+  fi
+  
+  echo "✅ No conflicts detected. Merging $branch into $current_branch..."
+  git merge "$branch" --no-edit
+}
+alias gm='gmerge' # gmerge [*branch] | Alias for gmerge
+
+gpush() { # gpush [*branch] | Push branch and create upstream tracking
+  local current_branch=$(git rev-parse --abbrev-ref HEAD)
+  local branch_input="$1"
+  local branch
+
+  if [ -z "$branch_input" ]; then
+    branch=$current_branch
+  else
+    if ! branch=$(_gjs_resolve_branch_input "$branch_input" "local"); then
+      return 1
+    fi
+  fi
+  
+  echo "🚀 Pushing branch '$branch' to origin with upstream tracking..."
+  git push -u origin "$branch"
+}
+alias gpu='gpush' # gpush [*branch] | Alias for gpush
+
+gdelete() { # gdelete [*branch] | Delete feature branch if clean and pushed
+  local current_branch=$(git rev-parse --abbrev-ref HEAD)
+  local branch_input="$1"
+  local branch
+
+  if [[ -z "$branch_input" ]]; then
+    local -a branches=()
+    while IFS= read -r b; do
+      branches+=("$b")
+    done < <(_gjs_get_recent_branches)
+
+    if [[ ${#branches[@]} -eq 0 ]]; then
+      echo "No recent branches found."
+      return 1
+    fi
+
+    echo "Delete branch (↑/↓ select, Enter confirm, q cancel):"
+    local picked
+    if ! picked=$(_gjs_interactive_menu "${branches[@]}"); then
+      echo "Cancelled."
+      return 1
+    fi
+    branch_input="$picked"
+  fi
+
+  if ! branch=$(_gjs_resolve_branch_input "$branch_input" "local"); then
+    return 1
+  fi
+  
+  if [ "$branch" = "master" ] || [ "$branch" = "develop" ]; then
+    echo "❌ Cannot delete master or develop branches."
+    return 1
+  fi
+  
+  echo "🔍 Checking if branch '$branch' is safe to delete..."
+  
+  if [ "$branch" = "$current_branch" ] && [ -n "$(git status --porcelain)" ]; then
+    echo "❌ Branch has uncommitted changes. Commit or stash changes first."
+    return 1
+  fi
+  
+  if ! git show-ref --verify --quiet refs/heads/"$branch"; then
+    echo "❌ Branch '$branch' does not exist locally."
+    return 1
+  fi
+  
+  if git log origin/"$branch".."$branch" --oneline 2>/dev/null | grep -q .; then
+    echo "❌ Branch has unpushed commits. Push changes first."
+    return 1
+  fi
+  
+  if ! git ls-remote --quiet origin "$branch" 2>/dev/null; then
+    echo "❌ Branch '$branch' does not exist on origin. Push branch first."
+    return 1
+  fi
+  
+  echo "✅ Branch is safe to delete."
+  
+  if [ "$current_branch" != "master" ]; then
+    echo "🔄 Switching to master branch..."
+    if ! git checkout master; then
+      echo "❌ Failed to switch to master branch. Aborting deletion."
+      return 1
+    fi
+  fi
+  
+  echo "🗑️  Deleting local branch '$branch'..."
+  git branch -d "$branch"
+}
+alias gdel='gdelete' # gdelete [*branch] | Alias for gdelete
+
+testJira() { # testJira | Test Jira API connection
+  echo "🧪 Testing Jira API connection..."
+  
+  if [[ -z "$GJS_JIRA_API_TOKEN" || -z "$GJS_JIRA_DOMAIN" || -z "$GJS_TICKET_PREFIX" ]]; then
+    echo "❌ Jira not configured. Run: git-jira-shortcuts init"
+    return 1
+  fi
+  
+  echo "📡 Testing API call to $GJS_JIRA_DOMAIN..."
+  local response
+  response=$(curl -sS \
+    -H "Authorization: Basic $GJS_JIRA_API_TOKEN" \
+    -H "Accept: application/json" \
+    "https://$GJS_JIRA_DOMAIN/rest/api/3/myself" 2>/dev/null)
+  
+  if [[ $? -ne 0 ]]; then
+    echo "❌ Jira API call failed. Token might be expired or malformed."
+    echo "   Run: git-jira-shortcuts init"
+    return 1
+  fi
+  
+  local display_name
+  display_name=$(echo "$response" | jq -r '.displayName // empty')
+  
+  if [[ -z "$display_name" ]]; then
+    echo "❌ Jira API test failed."
+    echo "$response"
+    return 1
+  fi
+  
+  echo "✅ Jira API is working! Authenticated as: $display_name"
+  return 0
+}
+alias tj='testJira' # testJira | Test Jira API connection