diff --git a/.claude/commands/fix-ci-commit.md b/.claude/commands/fix-ci-commit.md
new file mode 100644
index 0000000..9ecf8f4
--- /dev/null
+++ b/.claude/commands/fix-ci-commit.md
@@ -0,0 +1,56 @@
+---
+description: Fix CI failures and commit changes (for use when branch already exists)
+allowed_tools: "Read, Write, Edit, MultiEdit, Bash, Grep, Glob, TodoWrite"
+---
+
+# Fix CI Failures and Commit
+
+You are on a branch that was created to fix CI failures. Your task is to fix the issues and commit the changes.
+
+## CI Failure Information
+
+$ARGUMENTS
+
+## Your Tasks
+
+1. **Analyze the failures** - Understand what went wrong from the logs
+2. **Fix the issues** - Make the necessary code changes
+3. **Commit your fixes** - Use git to commit all changes
+
+## Step-by-Step Instructions
+
+### 1. Fix the Issues
+
+Based on the error logs:
+- Fix syntax errors
+- Fix formatting issues  
+- Fix test failures
+- Fix any other CI problems
+
+### 2. Commit Your Changes (REQUIRED)
+
+After fixing ALL issues, you MUST:
+
+```bash
+# Stage all changes
+git add -A
+
+# Commit with descriptive message
+git commit -m "Fix CI failures
+
+- Fixed syntax errors
+- Fixed formatting issues  
+- Fixed test failures
+[List actual fixes made]"
+```
+
+**IMPORTANT**: You MUST use the Bash tool to run the git add and git commit commands above. The workflow expects you to commit your changes.
+
+### 3. Verify (Optional)
+
+If possible, run verification commands:
+- `bun run format:check` for formatting
+- `bun test` for tests
+- `bun run typecheck` for TypeScript
+
+Begin by analyzing the failure logs and then fix the issues.
\ No newline at end of file
diff --git a/.claude/commands/fix-ci.md b/.claude/commands/fix-ci.md
index 2257c30..05f4420 100644
--- a/.claude/commands/fix-ci.md
+++ b/.claude/commands/fix-ci.md
@@ -42,11 +42,11 @@ Requirements:
 
 ## Step 4: Commit Changes
 
-After applying fixes:
-1. Stage all modified files with `git add -A` or `git add .`
-2. Commit with a descriptive message using `git commit -m "Fix CI failures: <description>"`
+After applying ALL fixes, use the Bash tool to:
+1. Run: `git add -A` to stage all modified files
+2. Run: `git commit -m "Fix CI failures: <description>"` to commit the changes
 3. Include details about which CI jobs/tests were fixed in the commit message
-4. Important: Always commit your changes even if you're already on a branch
+4. Important: You MUST use the Bash tool to run these git commands to commit your changes
 
 ## Step 5: Verify Fixes Locally
 
diff --git a/.github/workflows/auto-fix-ci.yml b/.github/workflows/auto-fix-ci.yml
index 9f5df9c..465234e 100644
--- a/.github/workflows/auto-fix-ci.yml
+++ b/.github/workflows/auto-fix-ci.yml
@@ -80,7 +80,7 @@ jobs:
         uses: km-anthropic/claude-code-action@v1-dev
         with:
           prompt: |
-            /fix-ci Failed CI Run: ${{ fromJSON(steps.failure_details.outputs.result).runUrl }}
+            /fix-ci-commit Failed CI Run: ${{ fromJSON(steps.failure_details.outputs.result).runUrl }}
             Failed Jobs: ${{ join(fromJSON(steps.failure_details.outputs.result).failedJobs, ', ') }}
             
             Error logs:
diff --git a/slash-commands/fix-ci-commit.md b/slash-commands/fix-ci-commit.md
new file mode 100644
index 0000000..9ecf8f4
--- /dev/null
+++ b/slash-commands/fix-ci-commit.md
@@ -0,0 +1,56 @@
+---
+description: Fix CI failures and commit changes (for use when branch already exists)
+allowed_tools: "Read, Write, Edit, MultiEdit, Bash, Grep, Glob, TodoWrite"
+---
+
+# Fix CI Failures and Commit
+
+You are on a branch that was created to fix CI failures. Your task is to fix the issues and commit the changes.
+
+## CI Failure Information
+
+$ARGUMENTS
+
+## Your Tasks
+
+1. **Analyze the failures** - Understand what went wrong from the logs
+2. **Fix the issues** - Make the necessary code changes
+3. **Commit your fixes** - Use git to commit all changes
+
+## Step-by-Step Instructions
+
+### 1. Fix the Issues
+
+Based on the error logs:
+- Fix syntax errors
+- Fix formatting issues  
+- Fix test failures
+- Fix any other CI problems
+
+### 2. Commit Your Changes (REQUIRED)
+
+After fixing ALL issues, you MUST:
+
+```bash
+# Stage all changes
+git add -A
+
+# Commit with descriptive message
+git commit -m "Fix CI failures
+
+- Fixed syntax errors
+- Fixed formatting issues  
+- Fixed test failures
+[List actual fixes made]"
+```
+
+**IMPORTANT**: You MUST use the Bash tool to run the git add and git commit commands above. The workflow expects you to commit your changes.
+
+### 3. Verify (Optional)
+
+If possible, run verification commands:
+- `bun run format:check` for formatting
+- `bun test` for tests
+- `bun run typecheck` for TypeScript
+
+Begin by analyzing the failure logs and then fix the issues.
\ No newline at end of file