prjct-cli 0.44.0 → 0.44.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.44.1] - 2026-01-29
+
+### Fixed: Workflow Templates with Mandatory Steps (PRJ-143)
+
+Templates now enforce step-by-step workflows with explicit blocking conditions.
+
+**Problem:** Claude was skipping workflow steps (pushing directly to main, skipping PRs, etc.)
+
+**Solution:** Added ⛔ BLOCKING conditions to critical templates:
+- `ship.md` - Must check branch, create PR, bump version
+- `merge.md` - Must verify PR approval and CI status
+- `task.md` - Pre-flight checks before branch creation
+- `git.md` - Block commits/pushes on main/master
+
+**Also Fixed:**
+- Commit footer simplified to `Generated with [p/](https://www.prjct.app/)` (no emoji, no provider-specific line)
+- All provider templates updated (Claude, Gemini, Cursor, Antigravity, Windsurf)
+- Global CLAUDE.md strengthened with git workflow rules
+
 ## [0.44.0] - 2026-01-29
 
 ### Feature: Workflow State Machine (PRJ-139)

package/core/commands/shipping.ts

@@ -217,7 +217,7 @@ export class ShippingCommands extends PrjctCommandsBase {
     try {
       await toolRegistry.get('Bash')!('git add .')
 
-      const commitMsg = `feat: ${feature}\n\n🤖 Generated with [p/](https://www.prjct.app/)\nDesigned for [Claude](https://www.anthropic.com/claude)`
+      const commitMsg = `feat: ${feature}\n\nGenerated with [p/](https://www.prjct.app/)`
 
       await toolRegistry.get('Bash')!(`git commit -m "${commitMsg.replace(/"/g, '\\"')}"`)
 

package/core/infrastructure/ai-provider.ts

@@ -283,45 +283,20 @@ export function hasProviderConfig(provider: AIProviderName): boolean {
  * Get provider-specific branding
  */
 export function getProviderBranding(provider: AIProviderName): ProviderBranding {
-  const config = Providers[provider]
-
-  if (provider === 'gemini') {
-    return {
-      commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Gemini](${config.websiteUrl})`,
-      signature: '⚡ prjct + Gemini',
-    }
-  }
-
-  if (provider === 'cursor') {
-    return {
-      commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Built with [Cursor](${config.websiteUrl})`,
-      signature: '⚡ prjct + Cursor',
-    }
-  }
-
-  if (provider === 'antigravity') {
-    return {
-      commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Powered by [Antigravity](${config.websiteUrl})`,
-      signature: '⚡ prjct + Antigravity',
-    }
-  }
-
-  if (provider === 'windsurf') {
-    return {
-      commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Built with [Windsurf](${config.websiteUrl})`,
-      signature: '⚡ prjct + Windsurf',
-    }
+  // Generic commit footer for all providers
+  const commitFooter = `Generated with [p/](https://www.prjct.app/)`
+
+  const signatures: Record<AIProviderName, string> = {
+    claude: '⚡ prjct + Claude',
+    gemini: '⚡ prjct + Gemini',
+    cursor: '⚡ prjct + Cursor',
+    antigravity: '⚡ prjct + Antigravity',
+    windsurf: '⚡ prjct + Windsurf',
   }
 
-  // Default: Claude
   return {
-    commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](${config.websiteUrl})`,
-    signature: '⚡ prjct + Claude',
+    commitFooter,
+    signature: signatures[provider] || '⚡ prjct',
   }
 }
 

package/core/utils/branding.ts

@@ -65,9 +65,8 @@ const branding: Branding = {
     footer: '⚡ prjct'
   },
 
-  // Default Git commit footer (Claude - for backward compatibility)
-  commitFooter: `🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](https://www.anthropic.com/claude)`,
+  // Default Git commit footer (generic)
+  commitFooter: `Generated with [p/](https://www.prjct.app/)`,
 
   // URLs
   urls: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prjct-cli",
-  "version": "0.44.0",
+  "version": "0.44.1",
   "description": "Context layer for AI agents. Project context for Claude Code, Gemini CLI, and more.",
   "main": "core/index.ts",
   "bin": {

package/templates/commands/git.md

@@ -1,5 +1,5 @@
 ---
-allowed-tools: [Bash, Read, Write]
+allowed-tools: [Bash, Read, Write, AskUserQuestion]
 description: 'Smart git operations with context'
 architecture: 'Write-Through (JSON → MD → Events)'
 storage-layer: true
@@ -8,11 +8,11 @@ source-of-truth: 'storage/state.json'
 
 # /p:git - Smart Git Operations
 
-## Architecture: Write-Through Pattern
+## ⛔ MANDATORY WORKFLOW - FOLLOW STEPS IN ORDER
 
-Reads from **Storage (JSON)** as source of truth.
+**All git operations through prjct MUST follow these rules.**
 
-**Source of Truth**: `storage/state.json`
+---
 
 ## Usage
 
@@ -23,6 +23,33 @@ Reads from **Storage (JSON)** as source of truth.
 /p:git undo         # Undo last commit
 ```
 
+## ⛔ GLOBAL BLOCKING RULES
+
+### Rule 1: Protected Branch Check (ALL OPERATIONS)
+
+```bash
+CURRENT_BRANCH=$(git branch --show-current)
+```
+
+**⛔ IF branch is `main` or `master`:**
+```
+For commit: STOP. "Cannot commit on main. Create a feature branch."
+For push: STOP. "Cannot push to main. Use p. ship to create PR."
+ABORT the operation entirely.
+```
+
+### Rule 2: Dirty Working Directory
+
+```bash
+git status --porcelain
+```
+
+**⛔ IF uncommitted changes AND operation is push/sync:**
+```
+STOP. "Uncommitted changes detected. Commit first with p. git commit."
+ABORT.
+```
+
 ## Context Variables
 - `{projectId}`: From `.prjct/prjct.config.json`
 - `{globalPath}`: `~/.prjct-cli/projects/{projectId}`
@@ -31,65 +58,129 @@ Reads from **Storage (JSON)** as source of truth.
 
 ## Flow: commit
 
-### Step 1: Validate Branch
-READ: `.prjct/prjct.config.json` → extract `projectId`
-SET: `{globalPath}` = `~/.prjct-cli/projects/{projectId}`
+### Step 1: Pre-flight Checks (BLOCKING)
+
+```bash
+# Get current branch
+CURRENT_BRANCH=$(git branch --show-current)
+```
+
+**⛔ IF on main/master:**
+```
+STOP. DO NOT PROCEED.
+OUTPUT: "Cannot commit on protected branch: {currentBranch}"
+OUTPUT: "Create a feature branch first with: p. task 'description'"
+ABORT.
+```
+
+```bash
+# Check for changes
+git status --porcelain
+```
+
+**⛔ IF no changes:**
+```
+STOP. DO NOT PROCEED.
+OUTPUT: "Nothing to commit."
+ABORT.
+```
+
+### Step 2: Show Plan and Get Approval (BLOCKING)
+
+```bash
+git diff --stat
+```
+
+```
+OUTPUT:
+"""
+## Commit Plan
+
+Branch: {currentBranch}
+Changes:
+{git diff --stat output}
 
-READ: `{globalPath}/storage/state.json`
-IF currentTask AND currentTask.branch:
-  SET: {expectedBranch} = currentTask.branch.name
-ELSE:
-  SET: {expectedBranch} = null
+Will create commit with prjct footer.
+Proceed? (yes/no)
+"""
 
-BASH: `git branch --show-current`
-SET: {currentBranch} = result
+WAIT for explicit approval.
+DO NOT assume.
+```
 
-IF {currentBranch} == "main" OR {currentBranch} == "master":
-  OUTPUT:
-  ```
-  ⚠️ Cannot commit on protected branch: {currentBranch}
+### Step 3: Stage and Commit
 
-  Start a task first with /p:now "task name" to create a feature branch.
-  ```
-  STOP
+```bash
+git add .
+git commit -m "$(cat <<'EOF'
+{type}: {description}
 
-IF {expectedBranch} AND {currentBranch} != {expectedBranch}:
-  OUTPUT:
-  ```
-  ⚠️ Branch mismatch
+Generated with [p/](https://www.prjct.app/)
+EOF
+)"
+```
 
-  Current: {currentBranch}
-  Expected: {expectedBranch}
+**⛔ The prjct footer is MANDATORY. No exceptions.**
 
-  Switch to the correct branch: git checkout {expectedBranch}
-  ```
-  STOP
+### Step 4: Log to Memory
 
-### Step 2: Stage and Commit
-1. Git: `add .` → stage changes
-2. Create: commit message with prjct metadata
-3. Commit: with message
-4. Log: `memory/events.jsonl`
+APPEND to `{globalPath}/memory/events.jsonl`
 
 ## Flow: push
 
-### Step 1: Check Protected Branch
-BASH: `git branch --show-current`
-SET: {currentBranch} = result
+### Step 1: Pre-flight Checks (BLOCKING)
+
+```bash
+CURRENT_BRANCH=$(git branch --show-current)
+```
+
+**⛔ IF on main/master:**
+```
+STOP. DO NOT PROCEED.
+OUTPUT: "Cannot push directly to main/master."
+OUTPUT: "Use `p. ship` to create a Pull Request instead."
+ABORT.
+```
+
+```bash
+git status --porcelain
+```
+
+**⛔ IF uncommitted changes:**
+```
+STOP. DO NOT PROCEED.
+OUTPUT: "Uncommitted changes detected. Commit first."
+ABORT.
+```
+
+### Step 2: Show Plan and Get Approval (BLOCKING)
 
-IF {currentBranch} == "main" OR {currentBranch} == "master":
-  OUTPUT:
-  ```
-  ⚠️ Cannot push directly to protected branch: {currentBranch}
+```bash
+git log origin/{currentBranch}..HEAD --oneline 2>/dev/null || git log --oneline -3
+```
+
+```
+OUTPUT:
+"""
+## Push Plan
 
-  Use /p:ship to create a Pull Request instead.
-  ```
-  STOP
+Branch: {currentBranch}
+Commits to push:
+{commits}
+
+Proceed? (yes/no)
+"""
+
+WAIT for explicit approval.
+```
+
+### Step 3: Execute Push
+
+```bash
+git push -u origin {currentBranch}
+```
 
-### Step 2: Push
-1. Git: `status` → verify clean
-2. Git: `push -u origin {currentBranch}` with branch tracking
-3. Handle: errors (upstream, conflicts)
+**IF push fails:** Show error and STOP. Do not retry automatically.
 
 ## Flow: sync
 
@@ -106,20 +197,18 @@ IF {currentBranch} == "main" OR {currentBranch} == "master":
 
 {details if any}
 
-🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](https://www.anthropic.com/claude)
+Generated with [p/](https://www.prjct.app/)
 
 ```
 
-**NON-NEGOTIABLE: The `🤖 Generated with [p/]` line MUST appear in ALL commits.**
+**NON-NEGOTIABLE: The `Generated with [p/]` line MUST appear in ALL commits.**
 
 Use HEREDOC for proper formatting:
 ```bash
 git commit -m "$(cat <<'EOF'
 {type}: {description}
 
-🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](https://www.anthropic.com/claude)
+Generated with [p/](https://www.prjct.app/)
 
 EOF
 )"

package/templates/commands/merge.md

@@ -1,38 +1,146 @@
 ---
-allowed-tools: [Bash, Read, Write]
+allowed-tools: [Bash, Read, Write, AskUserQuestion]
 ---
 
 # p. merge
 
+## ⛔ MANDATORY WORKFLOW - DO NOT SKIP ANY STEP
+
+---
+
+### STEP 1: Pre-flight Checks (BLOCKING)
+
+```bash
+# 1a. Check if there's an active task with a PR
+```
+
+**⛔ IF no `currentTask`:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "No active task. Use p. task first."
+ABORT.
+```
+
+**⛔ IF no PR number in task state:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "No PR found. Run p. ship first to create a PR."
+ABORT.
+```
+
+---
+
+### STEP 2: Check PR Status (BLOCKING)
+
 ```bash
-prjct context merge
+gh pr view {prNumber} --json reviewDecision,mergeable,state,statusCheckRollup
+```
+
+**⛔ IF PR is not approved:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "PR needs approval. Get reviews first."
+Show: gh pr view {prNumber} --web
+ABORT.
+```
+
+**⛔ IF PR has merge conflicts:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "PR has conflicts. Resolve them first:
+  git checkout {branch}
+  git pull origin main
+  # fix conflicts
+  git push"
+ABORT.
+```
+
+**⛔ IF CI checks are failing:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "CI checks are failing. Fix them first."
+Show failing checks.
+ABORT.
+```
+
+---
+
+### STEP 3: Show Plan and Get Approval (BLOCKING)
+
+Show the user:
+```
+## Merge Plan
+
+PR: #{prNumber} - {title}
+Branch: {branch} → main
+Strategy: squash
+
+Will do:
+1. Merge PR with squash
+2. Delete feature branch
+3. Update local main
+
+Proceed? (yes/no)
 ```
 
-IF no `currentTask` → "No active task"
-IF no PR → "Run p. review first"
+**⛔ WAIT for explicit approval. Do not assume.**
+
+---
+
+### STEP 4: Execute Merge
 
 ```bash
-gh pr view {prNumber} --json reviewDecision,mergeable,state
+gh pr merge {prNumber} --squash --delete-branch
 ```
 
-IF not approved → "Get approvals first"
-IF has conflicts → "Resolve conflicts first"
+---
+
+### STEP 5: Update Local
 
 ```bash
-gh pr merge {prNumber} --squash --auto
-git checkout main && git pull
+git checkout main
+git pull origin main
+```
+
+---
+
+### STEP 6: Update Task State
+
+- Set `currentTask.status = "merged"`
+- Set `currentTask.mergedAt = {now}`
+- Clear PR reference
+
+---
+
+### STEP 7: Update Linear (if applicable)
+
+IF `currentTask.linearId`:
 ```
+Update Linear issue status to "Done" or "Merged"
+Add comment: "PR #{prNumber} merged"
+```
+
+---
 
-Delete branch if created by prjct
+## Output Format
 
-**Output**:
 ```
-✅ PR Merged
+✅ Merged: {title}
 
 PR: #{prNumber}
 Strategy: squash
+Branch: {branch} (deleted)
 
 Next:
-- Release → `p. ship`
 - New task → `p. task "description"`
+- See backlog → `p. next`
 ```
+
+---
+
+## ⛔ VIOLATIONS
+
+- ❌ Merging without PR approval
+- ❌ Merging with failing CI
+- ❌ Merging with conflicts
+- ❌ Not waiting for user approval

package/templates/commands/review.md

@@ -151,7 +151,7 @@ ELSE:
 {mcpScore}/100
 
 ---
-🤖 Generated with [p/](https://www.prjct.app/)
+Generated with [p/](https://www.prjct.app/)
 """
   
   BASH: `gh pr create --title "{prTitle}" --base {baseBranch} --body "$(cat <<'PREOF'

package/templates/commands/ship.md

@@ -4,50 +4,195 @@ allowed-tools: [Read, Write, Bash, AskUserQuestion]
 
 # p. ship "$ARGUMENTS"
 
+## ⛔ MANDATORY WORKFLOW - DO NOT SKIP ANY STEP
+
+**CRITICAL: Execute steps IN ORDER. Each step MUST complete before proceeding.**
+
+---
+
+### STEP 1: Pre-flight Checks (BLOCKING)
+
+```bash
+# 1a. Check current branch
+BRANCH=$(git branch --show-current)
+```
+
+**⛔ IF branch is `main` or `master`:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "Cannot ship from main branch. Create a feature branch first."
+ABORT the ship command entirely.
+```
+
 ```bash
-prjct context ship $ARGUMENTS
+# 1b. Check GitHub auth
+gh auth status
 ```
 
-IF `currentTask` active → Ask: "Complete and ship?" or "Cancel"
+**⛔ IF not authenticated:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "GitHub CLI not authenticated. Run: gh auth login"
+ABORT the ship command entirely.
+```
 
 ```bash
-git status --porcelain  # No changes? STOP
-git diff --stat HEAD
+# 1c. Check for changes
+git status --porcelain
 ```
 
-Run lint/tests if configured
+**⛔ IF no changes:**
+```
+STOP. DO NOT PROCEED.
+Tell user: "No changes to ship."
+ABORT the ship command entirely.
+```
+
+---
 
-IF not trivial → Review for security issues, error handling
+### STEP 2: Show Plan and Get Approval (BLOCKING)
 
-Version bump (patch default, minor for feat:, major for BREAKING)
-Update CHANGELOG.md
+**⛔ DO NOT execute any commits/pushes until user explicitly approves.**
+
+Show the user:
+```
+## Ship Plan
+
+Branch: {branch}
+Changes:
+{git diff --stat}
+
+Will do:
+1. Run tests (if configured)
+2. Bump version (patch/minor/major)
+3. Update CHANGELOG.md
+4. Commit with prjct footer
+5. Push branch
+6. Create PR to main
+
+Proceed? (yes/no)
+```
+
+**⛔ WAIT for explicit "yes" or approval. Do not assume.**
+
+---
+
+### STEP 3: Quality Checks
 
 ```bash
-gh auth status  # Not auth? STOP
-git branch --show-current  # On main? STOP
+# Run tests if package.json has test script
+npm test 2>/dev/null || bun test 2>/dev/null || echo "No tests configured"
 ```
 
-Commit with footer:
+```bash
+# Run lint if configured
+npm run lint 2>/dev/null || echo "No lint configured"
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](https://www.anthropic.com/claude)
+
+---
+
+### STEP 4: Version Bump (REQUIRED)
+
+Determine version bump type:
+- `fix:` commits → **patch** (0.0.X)
+- `feat:` commits → **minor** (0.X.0)
+- `BREAKING:` in commits → **major** (X.0.0)
+
+```bash
+# Read current version
+OLD_VERSION=$(node -p "require('./package.json').version")
+
+# Calculate new version and update package.json
+# Use npm version OR manual edit
 ```
 
+---
+
+### STEP 5: Update CHANGELOG.md (REQUIRED)
+
+Add entry at top of CHANGELOG.md:
+```markdown
+## [X.X.X] - YYYY-MM-DD
+
+### {Fixed/Added/Changed}
+- {description of changes}
+```
+
+---
+
+### STEP 6: Commit (REQUIRED FORMAT)
+
+```bash
+git add .
+git commit -m "$(cat <<'EOF'
+{type}: {description}
+
+{body if needed}
+
+Generated with [p/](https://www.prjct.app/)
+EOF
+)"
+```
+
+**⛔ The prjct footer MUST be included. No exceptions.**
+
+---
+
+### STEP 7: Push and Create PR (REQUIRED)
+
 ```bash
-git add . && git commit && git push -u origin {branch}
-gh pr create --title "feat: {feature}" --base main
+git push -u origin {branch}
+gh pr create --title "{type}: {description}" --base main --body "$(cat <<'EOF'
+## Summary
+{bullet points}
+
+## Changes
+{what changed}
+
+## Test Plan
+{how to verify}
+
+Generated with [p/](https://www.prjct.app/)
+EOF
+)"
 ```
 
-**Output**:
+---
+
+### STEP 8: Update Linear/Issue Tracker (if applicable)
+
+If task has `linearId`:
+- Update issue status to "In Review" or appropriate state
+- Add comment with PR link
+
+---
+
+## Output Format
+
 ```
 🚀 Shipped: {feature}
 
 Version: {old} → {new}
 PR: {url}
-CI: {status}
+Branch: {branch}
 
 Next:
-- CI failed? → Fix and push again
-- Merge ready? → `p. merge` or merge in GitHub
-- New task? → `p. task "description"`
+- Review PR → {url}
+- Merge when ready → `p. merge`
 ```
+
+---
+
+## ⛔ VIOLATIONS
+
+**If you skip ANY step, you are BREAKING the prjct workflow.**
+
+Common violations:
+- ❌ Committing directly to main
+- ❌ Pushing without creating PR
+- ❌ Skipping version bump
+- ❌ Skipping CHANGELOG update
+- ❌ Not waiting for user approval
+- ❌ Missing prjct footer in commit
+
+**These violations make prjct useless. Follow the workflow.**

package/templates/commands/sync.md

@@ -18,7 +18,7 @@ READ: {globalPath}/project.json → check integrations.linear.enabled
 
 IF integrations.linear.enabled:
   # Sync Linear issues to local cache
-  RUN: bun core/cli/linear.ts --project {projectId} sync
+  RUN: bun $PRJCT_CLI/core/cli/linear.ts --project {projectId} sync
 
   # Result stored in {globalPath}/storage/issues.json
   # Contains all assigned issues from Linear

package/templates/commands/task.md

@@ -4,10 +4,62 @@ allowed-tools: [Read, Write, Bash, Task, Glob, Grep, AskUserQuestion]
 
 # p. task "$ARGUMENTS"
 
+## ⛔ MANDATORY PRE-FLIGHT CHECKS
+
+**Execute these checks BEFORE any task creation:**
+
+### Check 1: Validate Arguments
+
+```
+IF $ARGUMENTS is empty:
+  ASK: "What task do you want to start?"
+  WAIT for response
+  DO NOT proceed with empty task
+```
+
+### Check 2: Check for Active Task
+
+```
+READ: {globalPath}/storage/state.json
+
+IF currentTask exists AND currentTask.status == "active":
+  OUTPUT:
+  """
+  ⚠️ Active task detected: {currentTask.description}
+
+  Options:
+  1. Complete current task first → `p. done`
+  2. Pause current task → `p. pause`
+  3. Switch anyway (current task will be paused)
+  """
+
+  ASK: "What would you like to do?"
+  WAIT for explicit choice
+  DO NOT automatically switch tasks
+```
+
+### Check 3: Validate Git State
+
 ```bash
-prjct context task $ARGUMENTS
+git status --porcelain
+```
+
+```
+IF uncommitted changes exist:
+  OUTPUT:
+  """
+  ⚠️ You have uncommitted changes:
+  {list of files}
+
+  Commit or stash them before starting a new task.
+  """
+
+  ASK: "Would you like to commit these changes first?"
+  WAIT for response
 ```
 
+---
+
 ## Step 0: Detect Issue Tracker Reference
 
 IF `$ARGUMENTS` matches pattern `/^[A-Z]+-\d+$/` (e.g., PRJ-123, PROJ-456):
@@ -20,7 +72,7 @@ IF integrations.linear.enabled:
   # Linear issue detected - use LOCAL-FIRST approach
   # Try local cache first (issues.json), then API if not found
 
-  RUN: bun core/cli/linear.ts --project {projectId} get-local "$ARGUMENTS"
+  RUN: bun $PRJCT_CLI/core/cli/linear.ts --project {projectId} get-local "$ARGUMENTS"
 
   IF issue found in local cache:
     USE cached issue data (no API call needed)
@@ -67,14 +119,59 @@ ELSE:
 
 ## Main Flow
 
-IF `currentTask` active → Ask: complete, pause, or cancel?
+### Step A: Show Plan and Get Approval (BLOCKING)
 
+**⛔ DO NOT create branches or modify state without user approval.**
+
+```
+OUTPUT:
+"""
+## Task Plan
+
+Description: $ARGUMENTS
+Type: {classified type}
+Branch: {type}/{slug}
+
+Will do:
+1. Create feature branch from current branch
+2. Initialize task tracking in state.json
+3. Break down into subtasks
+4. {If Linear: Update issue status to In Progress}
+
+Proceed? (yes/no)
+"""
+
+WAIT for explicit "yes" or approval
+DO NOT assume
+```
+
+### Step B: Explore Codebase
+
+```
 USE Task(Explore) → find similar code, affected files
-READ `agents[].filePath` → get patterns
-Classify: feature|bug|improvement|refactor|chore
-Break into subtasks
+READ agents/*.md → get domain patterns
+```
+
+### Step C: Classify Task
 
-IF on main → `git checkout -b {type}/{slug}`
+Determine type: feature | bug | improvement | refactor | chore
+
+### Step D: Create Branch (if needed)
+
+```bash
+CURRENT_BRANCH=$(git branch --show-current)
+```
+
+```
+IF CURRENT_BRANCH == "main" OR CURRENT_BRANCH == "master":
+  OUTPUT: "Creating feature branch: {type}/{slug}"
+
+  git checkout -b {type}/{slug}
+
+  IF git command fails:
+    OUTPUT: "Failed to create branch. Check git status."
+    STOP
+```
 
 ```bash
 prjct work "$ARGUMENTS"

package/templates/global/ANTIGRAVITY.md

@@ -79,12 +79,10 @@ node -e "console.log(require('crypto').randomUUID())"
 **Every commit made with prjct MUST include this footer:**
 
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Powered by [Antigravity](https://gemini.google.com/app/antigravity)
-
+Generated with [p/](https://www.prjct.app/)
 ```
 
-**This is NON-NEGOTIABLE. The prjct signature (`🤖 Generated with [p/]`) must appear in ALL commits.**
+**This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**
 
 ### 5. Storage Rules (CROSS-AGENT COMPATIBILITY)
 

package/templates/global/CLAUDE.md

@@ -5,7 +5,7 @@
 
 ## HOW TO USE PRJCT (Read This First)
 
-When user types `p. <command>`, load the template from `templates/commands/{command}.md` and execute it intelligently.
+When user types `p. <command>`, load the template from `templates/commands/{command}.md` and execute it.
 
 ```
 p. sync     → templates/commands/sync.md
@@ -14,39 +14,70 @@ p. done     → templates/commands/done.md
 p. ship X   → templates/commands/ship.md
 ```
 
-**Key Insight**: Templates are GUIDANCE, not scripts. Use your intelligence to adapt them to the situation.
-
 ---
 
-## CRITICAL RULES
+## ⛔ CRITICAL RULES - READ BEFORE EVERY COMMAND
 
-### 0. PLAN BEFORE ACTION (NON-NEGOTIABLE)
+### 0. FOLLOW TEMPLATES STEP BY STEP (NON-NEGOTIABLE)
 
-**For ANY prjct task, you MUST create a plan and get user approval BEFORE executing.**
+**Templates are MANDATORY WORKFLOWS, not suggestions.**
 
 ```
-EVERY prjct command (p. task, p. sync, p. ship, etc.):
-1. STOP - Do not execute anything yet
-2. ANALYZE - Read relevant files, understand scope
-3. PLAN - Write a clear plan with:
-   - What will be done
-   - Files that will be modified
-   - Potential risks
-4. ASK - Present plan to user and wait for explicit approval
-5. EXECUTE - Only after user says "yes", "approved", "go ahead", etc.
+⛔ BEFORE executing ANY p. command:
+1. READ the template file COMPLETELY
+2. FOLLOW each step IN ORDER
+3. DO NOT skip steps - even "obvious" ones
+4. DO NOT take shortcuts - even for "simple" tasks
+5. STOP at any ⛔ BLOCKING condition
 ```
 
-**NEVER:**
-- Execute code changes without showing a plan first
-- Assume approval - wait for explicit confirmation
-- Skip the plan step for "simple" tasks
+**WHY THIS MATTERS:**
+- Skipping steps breaks the prjct workflow for ALL users
+- "Intelligent adaptation" is NOT permission to skip steps
+- Every step exists for a reason
+- If you skip steps, prjct becomes useless
+
+### ⛔ BLOCKING CONDITIONS
+
+When a template says "STOP" or has a ⛔ symbol:
+```
+1. HALT execution immediately
+2. TELL the user why you stopped
+3. DO NOT proceed until the condition is resolved
+4. DO NOT work around the blocker
+```
+
+**Examples of blockers:**
+- `p. ship` on main branch → STOP, tell user to create branch
+- `gh auth status` fails → STOP, tell user to authenticate
+- No changes to commit → STOP, tell user nothing to ship
+
+### GIT WORKFLOW RULES (CRITICAL)
 
-**ALWAYS:**
-- Show the plan in a clear, readable format
-- Wait for user response before proceeding
-- If user asks questions, answer them before executing
+**⛔ NEVER commit directly to main/master**
+- Always create a feature branch first
+- Always create a PR for review
+- Direct pushes to main are FORBIDDEN
 
-This rule applies to ALL prjct operations. No exceptions.
+**⛔ NEVER push without a PR**
+- All changes go through pull requests
+- No exceptions for "small fixes"
+
+**⛔ NEVER skip version bump on ship**
+- Every ship requires version update
+- Every ship requires CHANGELOG entry
+
+### PLAN BEFORE DESTRUCTIVE ACTIONS
+
+For commands that modify git state (ship, merge, done):
+```
+1. Show the user what will happen
+2. List all changes/files affected
+3. WAIT for explicit approval ("yes", "proceed", "do it")
+4. Only then execute
+```
+
+**DO NOT assume approval. WAIT for it.**
 
 ---
 
@@ -79,12 +110,10 @@ bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(re
 **Every commit made with prjct MUST include this footer:**
 
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Claude](https://www.anthropic.com/claude)
-
+Generated with [p/](https://www.prjct.app/)
 ```
 
-**This is NON-NEGOTIABLE. The prjct signature (`🤖 Generated with [p/]`) must appear in ALL commits.**
+**This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**
 
 ### 5. Storage Rules (CROSS-AGENT COMPATIBILITY)
 
@@ -256,7 +285,7 @@ Next: [suggested action]
 
 5. **Prefer prjct CLI over raw commands**:
    ```
-   GOOD: bun core/cli/linear.ts list
+   GOOD: bun $PRJCT_CLI/core/cli/linear.ts list
    BAD:  curl -X POST https://api.linear.app/graphql...
    ```
 

package/templates/global/CURSOR.mdc

@@ -99,9 +99,7 @@ node -e "console.log(require('crypto').randomUUID())"
 **Every commit made with prjct MUST include this footer:**
 
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Built with [Cursor](https://www.cursor.com/)
-
+Generated with [p/](https://www.prjct.app/)
 ```
 
 **This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**

package/templates/global/GEMINI.md

@@ -79,12 +79,10 @@ bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(re
 **Every commit made with prjct MUST include this footer:**
 
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Designed for [Gemini](https://geminicli.com/)
-
+Generated with [p/](https://www.prjct.app/)
 ```
 
-**This is NON-NEGOTIABLE. The prjct signature (`🤖 Generated with [p/]`) must appear in ALL commits.**
+**This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**
 
 ### 5. Storage Rules (CROSS-AGENT COMPATIBILITY)
 

package/templates/global/WINDSURF.md

@@ -99,9 +99,7 @@ node -e "console.log(require('crypto').randomUUID())"
 **Every commit made with prjct MUST include this footer:**
 
 ```
-🤖 Generated with [p/](https://www.prjct.app/)
-Built with [Windsurf](https://www.windsurf.com/)
-
+Generated with [p/](https://www.prjct.app/)
 ```
 
 **This is NON-NEGOTIABLE. The prjct signature must appear in ALL commits.**

package/templates/subagents/workflow/prjct-shipper.md

@@ -64,8 +64,7 @@ Fix issues and try again.
 
    {body if needed}
 
-   🤖 Generated with [p/](https://www.prjct.app/)
-   Designed for [Claude](https://www.anthropic.com/claude)
+   Generated with [p/](https://www.prjct.app/)
    ```
 3. Commit: `git commit -m "{message}"`
 4. Push: `git push origin {current-branch}`