Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ai-stuff/claude/scripts/require-jira-key.sh

This file was deleted.

4 changes: 0 additions & 4 deletions ai-stuff/claude/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,6 @@
{
"type": "command",
"command": "rtk hook claude"
},
{
"type": "command",
"command": "~/.claude/scripts/require-jira-key.sh"
}
]
}
Expand Down
3 changes: 1 addition & 2 deletions ai-stuff/skills/create-pr/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Create a PR/MR with optional VCS hint to skip detection. Permission system handl
7. Extract ticket from branch name if present (e.g., `feature/DEVX-123-something`)
8. Craft title:
- If Jira ticket found: `DEVX-123: Title here` (normal sentence casing!)
- If no ticket: Use conventional commit format: `feat|fix|docs|refactor|...: Title here`, and prefix the create command with `JIRA_SKIP=1` (`JIRA_SKIP=1 gh pr create ...` or `JIRA_SKIP=1 glab mr create ...`) so the require-jira-key hook lets it through. Never stop or call `log-work` because a key is missing.
- If no ticket: Use conventional commit format: `feat|fix|docs|refactor|...: Title here`
9. Build body with mandatory sections: Summary, Changes, Additional Notes
10. For GitHub: Push branch with `git push -u origin HEAD` before PR creation (handles both worktree and main repo)
11. Execute the pr/mr create command (permission system prompts user)
Expand All @@ -147,7 +147,6 @@ Create a PR/MR with optional VCS hint to skip detection. Permission system handl
- If in worktree: Check whether commits need to sync to main repo first (cherry-pick or reset target branch)
- If PR/MR exists: Use `gh pr edit` or `glab mr update` to update title and description
- If no PR/MR: Use `gh pr create` or `glab mr create` to create new
- **No Jira key**: prefix the create command with `JIRA_SKIP=1`. If the hook still blocks it, retry once with the prefix, never fail the PR over a missing key
- **GitHub**: Push branch first with `git push -u origin HEAD` before creating PR (works in both worktree and main)
- **GitLab**: Push handled by `glab mr create --push` (works in both worktree and main)
- Permission system will prompt user for confirmation
Expand Down
6 changes: 3 additions & 3 deletions ai-stuff/skills/log-work/SKILL.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: log-work
description: Create a DEVX story for work already done on the current branch, written as a to-do, and move it to Code Review. Use when a PR or MR has no Jira key, a hook asks for one, or the user says "log this work" or "make a ticket for what I did".
description: Create a DEVX story for work already done on the current branch, written as a to-do, and move it to Code Review. Use only when the user explicitly says "log this work" or "make a ticket for what I did". Never invoke it from create-pr.
allowed-tools: Bash(git log:*), Bash(git diff:*), Bash(git branch:*), AskUserQuestion, mcp__claude_ai_Atlassian_MCP__createJiraIssue, mcp__claude_ai_Atlassian_MCP__transitionJiraIssue, Read
---

Expand All @@ -20,11 +20,11 @@ Read [jira config](../_shared/config/jira-config.md). Never call lookup APIs.
3. Call `AskUserQuestion` before creating anything. Put the drafted summary and reason in the question text, header `Jira`, with these options:
- **Create story (Recommended)**: create it as drafted
- **Use existing ticket**: the user types the key via "Other"
- **Skip ticket**: open the PR without a Jira key
- **Skip ticket**: don't create anything
4. Act on the answer:
- **Create story**: continue to step 5. If the user typed edits via "Other", apply them first.
- **Use existing ticket**: reply with that key and stop.
- **Skip ticket**: reply `JIRA_SKIP=1` and stop. The caller prefixes the PR command with it (`JIRA_SKIP=1 gh pr create ...`) so the hook lets it through.
- **Skip ticket**: stop.
5. Call `createJiraIssue`:
- cloudId `56552dac-b6cf-4e59-aa06-5e075dca9f8e`, projectKey `DEVX`, issueTypeName `Story`
- assignee `currentUserAccountId` from the config
Expand Down
1 change: 0 additions & 1 deletion makefiles/claude.mk
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ claude-scripts: claude-dirs ## Symlink Claude Code scripts (statusline, hooks, e
$(call symlink,ai-stuff/claude/scripts/session-start.sh,${CLAUDE_HOME}/scripts/session-start.sh)
$(call symlink,ai-stuff/_shared/scripts/auto-approve-tools.sh,${CLAUDE_HOME}/scripts/auto-approve-tools.sh)
$(call symlink,ai-stuff/claude/scripts/notify.sh,${CLAUDE_HOME}/scripts/notify.sh)
$(call symlink,ai-stuff/claude/scripts/require-jira-key.sh,${CLAUDE_HOME}/scripts/require-jira-key.sh)
$(call symlink,ai-stuff/_shared/scripts/focus-iterm.applescript,${CLAUDE_HOME}/scripts/focus-iterm.applescript)
@chmod +x ${CLAUDE_HOME}/scripts/*.sh

Expand Down
Loading