Merge branch 'master' of github.com:fbosch/dotfiles

Author: fbosch

.config/fish/functions/ai_commit.fish

@@ -51,13 +51,20 @@ Branch: $branch_name" >$temp_prompt
     if test -n "$ticket_number"
         echo "Ticket: $ticket_number" >>$temp_prompt
     end
-    set skill_file "$HOME/.config/opencode/skills/ai-commit/SKILL.md"
+    set -l skill_dir "$HOME/.config/opencode/skills/ai-commit"
+    set -l skill_file "$skill_dir/SKILL.md"
     if not test -f "$skill_file"
-        gum style --foreground 1 " Skill not found: $skill_file"
+        set skill_file "$skill_dir/skill.md"
+    end
+    if not test -f "$skill_file"
+        gum style --foreground 1 " Skill not found: $skill_dir/SKILL.md"
         rm -f $temp_prompt $temp_diff
         return 1
     end
-    set skill_body (sed '1,/^---$/d' "$skill_file" | sed '1,/^---$/d')
+    set -l skill_body (sed '1,/^---$/d' "$skill_file" | sed '1,/^---$/d')
+    if test -z "$skill_body"
+        set skill_body (cat "$skill_file")
+    end
     echo "
 $skill_body
 

.config/fish/functions/ai_pr.fish

@@ -116,7 +116,7 @@ Diff below. Describe ONLY visible substantive changes. Skip trivial changes enti
     if test -n "$branch_hint"
         set prompt "$prompt\nBranch type: $branch_hint"
     end
-    set prompt "$prompt\n\nOutput: First line = PR title in format: $commitizen_type(#$ticket_number): description (max 72 chars total). Blank line. Then markdown PR description in $language_name. All text in $language_name. No explanations."
+    set prompt "$prompt\n\nCRITICAL: Your entire response must be ONLY the PR content. The first character you output must be the first character of the PR title. Do not output any thoughts, explanations, or analysis.\n\nFormat:\nLine 1: $commitizen_type(#$ticket_number): description (max 72 chars)\nLine 2: blank\nLine 3+: Markdown PR body in $language_name"
     set temp_prompt (mktemp -t opencode_prompt.XXXXXX)
     set temp_output (mktemp -t opencode_output.XXXXXX)
     echo "$prompt" >$temp_prompt

.config/fish/functions/killport.fish

@@ -0,0 +1,79 @@
+function killport --description 'Kill the process listening on a specific port'
+    set -l options h/help f/force
+    argparse -n killport $options -- $argv
+    or return
+
+    if set -q _flag_help
+        echo "Usage: killport [OPTIONS] PORT"
+        echo "Kill the process listening on the specified port"
+        echo ""
+        echo "Options:"
+        echo "  -h, --help   Show this help message"
+        echo "  -f, --force  Skip confirmation prompt"
+        return 0
+    end
+
+    if test (count $argv) -ne 1
+        echo "killport: exactly one port number required" >&2
+        echo "Usage: killport [OPTIONS] PORT" >&2
+        return 1
+    end
+
+    set -l port $argv[1]
+
+    # Validate port number
+    if not string match -qr '^\d+$' -- $port
+        echo "killport: invalid port number '$port'" >&2
+        return 1
+    end
+
+    if test $port -lt 1 -o $port -gt 65535
+        echo "killport: port must be between 1 and 65535" >&2
+        return 1
+    end
+
+    # Find process using the port
+    set -l pid (lsof -ti :$port 2>/dev/null)
+
+    if test -z "$pid"
+        echo "killport: no process found listening on port $port" >&2
+        return 1
+    end
+
+    # Get process details
+    set -l process_info (ps -p $pid -o comm= 2>/dev/null)
+    
+    if test -z "$process_info"
+        set process_info "Unknown"
+    end
+
+    # Confirm before killing (unless --force is set)
+    if not set -q _flag_force
+        if command -v gum >/dev/null
+            if not gum confirm "Kill process: $process_info [PID: $pid] on port $port?"
+                echo "Cancelled"
+                return 0
+            end
+        else
+            # Fallback to read if gum is not available
+            read -P "Kill process: $process_info [PID: $pid] on port $port? [y/N] " -l response
+            if not string match -qir '^y(es)?$' -- $response
+                echo "Cancelled"
+                return 0
+            end
+        end
+    end
+
+    # Kill the process
+    if kill $pid 2>/dev/null
+        echo "Killed: $process_info [PID: $pid] on port $port"
+    else
+        # Try with force if regular kill failed
+        if kill -9 $pid 2>/dev/null
+            echo "Force killed: $process_info [PID: $pid] on port $port"
+        else
+            echo "killport: failed to kill PID $pid" >&2
+            return 1
+        end
+    end
+end

.config/opencode/skills/ai-pr/SKILL.md

@@ -25,7 +25,9 @@ description: Generate concise PR descriptions from git diffs and commit context.
 - Breaking Changes section: include only when diff obviously breaks behavior.
 
 ## Output
+**CRITICAL: Your response must contain ONLY the PR content below. Do not include ANY explanatory text, thoughts, analysis, or meta-commentary before or after the PR content.**
+
 - First line is the PR title only.
 - Blank line after title.
 - Then markdown PR description using the provided section headings.
-- Output only the final content, no explanations.
+- Do not output anything else.