@haystackeditor/cli 0.12.0 → 0.12.2

package/dist/assets/hooks/llm-rules-template.md

@@ -7,19 +7,20 @@ These rules govern how LLM agents should interact with this codebase. They are e
 **Always use `haystack submit` instead of `gh pr create` or GitHub API.**
 
 ```bash
-# Auto-merge queue (default) - PR merges automatically if Haystack approves
+# Default submit - creates the PR from the current branch
 haystack submit
 
 # Request Haystack review - for complex/uncertain changes
 haystack submit --review
 ```
 
-This routes your PR through the Haystack auto-merge queue:
-1. Haystack analyzes your changes
-2. If approved: auto-merged
-3. If issues found: routed for review with feedback
+This routes your PR through Haystack's submit workflow:
+1. Haystack runs pre-PR triage on your changes
+2. Pushes the current branch and creates the PR
+3. Waits for analysis results by default
+4. Auto-merges only if the repo has auto-merge enabled and the PR is approved
 
-Do NOT use `gh pr create` - it bypasses the auto-merge queue.
+Do NOT use `gh pr create` - it bypasses Haystack's submit workflow.
 
 After submitting, use `haystack triage <pr-number>` to check analysis results (rating, findings, agent fix prompts). Use `--json` for machine-readable output.
 

package/dist/assets/hooks/scripts/pre-push.sh

@@ -14,7 +14,7 @@ if [ -n "$current_branch" ] && [ "$current_branch" != "main" ] && [ "$current_br
       # Check if this is an AI agent session (set by agent-context detector)
       if [ -n "$HAYSTACK_AGENT_SESSION" ] || [ -n "$CLAUDE_CODE" ] || [ -n "$CODEX_CLI" ] || [ -n "$CODEX_SHELL" ] || [ -n "$CODEX_THREAD_ID" ] || [ -n "$CODEX_CI" ]; then
         echo ""
-        echo "💡 Tip: Use 'haystack submit' to create PRs through the auto-merge queue."
+        echo "💡 Tip: Use 'haystack submit' to create PRs through Haystack's submit workflow."
         echo "   This enables automatic analysis and merge when approved."
         echo ""
       fi

package/dist/assets/skills/submit.md

@@ -6,20 +6,20 @@
 
 ## Why Use Haystack Submit?
 
-When you create PRs through Haystack, they enter the **auto-merge queue**:
+When you create PRs through Haystack, the CLI keeps PR creation inside Haystack's analysis workflow:
 
-1. **Haystack analyzes** your changes automatically
-2. **If approved**: PR is marked ready-to-merge and merged automatically
-3. **If issues found**: PR is routed for review with detailed feedback
-
-This is faster than waiting for human review on every change.
+1. **Runs pre-PR triage** on your current branch
+2. **Pushes that branch** to origin
+3. **Creates the PR** on GitHub
+4. **Waits for Haystack analysis** by default
+5. **Applies auto-merge** only if the repo has it enabled in `.haystack.json`
 
 ---
 
 ## Command Reference
 
 ```bash
-# Default: Submit to auto-merge queue
+# Default: Submit current branch and create the PR
 haystack submit
 
 # Optional alpha auto-fix for straightforward mechanical issues
@@ -53,9 +53,9 @@ haystack submit --body-file /tmp/pr-body.md
 
 ## When to Use Each Mode
 
-### Auto-Merge (Default)
+### Default Submit
 
-Use for straightforward changes that don't need human review:
+Use for straightforward changes that don't need explicit human review:
 
 - Bug fixes with clear scope
 - Small features with tests
@@ -67,6 +67,8 @@ Use for straightforward changes that don't need human review:
 haystack submit
 ```
 
+If the repo has `preferences.auto_merge` enabled in `.haystack.json`, the PR will also enter the auto-merge queue.
+
 ### Auto-Fix (Alpha, Discouraged)
 
 > **Do NOT default to `--auto-fix`.** It is an alpha feature.
@@ -86,8 +88,8 @@ haystack submit --auto-fix
 ### Review Mode
 
 > **Do NOT use `--review` unless the user explicitly asks for human review.**
-> The default auto-merge queue already runs full Haystack analysis. Using `--review`
-> blocks auto-merge until a human approves, which delays merging unnecessarily.
+> Plain `haystack submit` already runs full Haystack analysis. Using `--review`
+> blocks auto-merge when auto-merge is enabled, which delays merging unnecessarily.
 
 Use `--review` only when the user specifically requests human review:
 
@@ -107,8 +109,7 @@ haystack submit --review
 3. **Submit** via Haystack: `haystack submit`
 
 Haystack will:
-- Create a `haystack/<your-branch>` branch
-- Push to origin
+- Push your current branch to origin
 - Create the PR with appropriate labels
 - Trigger analysis automatically
 
@@ -130,7 +131,7 @@ This uses GitHub device flow - no tokens to copy/paste.
 
 - **Always use `haystack submit`** instead of `gh pr create` when working in Haystack-enabled repos
 - Prefer plain `haystack submit` by default; use `--auto-fix` only as an explicit alpha opt-in for straightforward mechanical issues
-- The command creates a `haystack/` prefixed branch automatically
+- The command uses your current branch as the PR head
 - Labels are applied automatically based on your chosen mode
 - You don't need to push manually - the command handles it
 - Use `haystack triage <pr>` to view full analysis results (rating, findings, agent fix prompts) for any PR at any time
@@ -150,13 +151,9 @@ Haystack Submit
 ✓ Repository: acme/webapp
   Current branch: fix-auth
   Base branch: main
-  Submission type: Auto-merge queue
-
-Creating branch haystack/fix-auth...
-✓ Created branch: haystack/fix-auth
 ✓ Branch pushed
 ✓ Pull request created: #142
-✓ Applied label: haystack:auto-merge
+✓ Auto-merge enabled for this PR
 
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
@@ -164,9 +161,8 @@ Pull Request Created!
 
   URL:    https://github.com/acme/webapp/pull/142
   Title:  Fix session expiry handling
-  Branch: haystack/fix-auth → main
-  Type:   Auto-merge queue
-  Label:  haystack:auto-merge
+  Branch: fix-auth → main
+  Merge:  Auto-merge if safe
 
 Haystack will analyze this PR and:
   • Auto-merge if approved

package/dist/index.js

@@ -38,7 +38,7 @@ const program = new Command();
 program
     .name('haystack')
     .description('Haystack CLI — automated PR review, triage, and merge queue')
-    .version('0.11.0');
+    .version('0.12.1');
 program
     .command('init')
     .description('Create .haystack.json configuration')
@@ -117,8 +117,9 @@ Pre-PR Triage:
   straightforward mechanical issues.
 
 Review Routing:
-  By default, PRs enter the auto-merge queue and merge automatically once
-  Haystack analysis passes. This is the correct default for most PRs.
+  If repo auto-merge is enabled in .haystack.json, plain \`haystack submit\`
+  enters the auto-merge queue after submission. Otherwise it still runs the
+  same Haystack analysis workflow without enabling auto-merge.
 
   ⚠ --auto-fix is currently alpha and discouraged by default. Prefer plain
   haystack submit unless you explicitly want the sandbox fixer to attempt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {