@kennethsolomon/shipkit 3.10.1 → 3.11.0

package/skills/sk:setup-claude/templates/hooks/session-stop.sh

@@ -15,19 +15,12 @@ BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "unknown")
 # Count commits in this session (last hour)
 RECENT_COMMITS=$(git log --since="1 hour ago" --oneline 2>/dev/null | wc -l | tr -d ' ')
 
-# Get current workflow step
-CURRENT_STEP=""
-if [ -f "tasks/workflow-status.md" ]; then
-    CURRENT_STEP=$(grep -E ">>\s*next\s*<<" "tasks/workflow-status.md" 2>/dev/null | head -1 | sed 's/.*| //' | sed 's/ |.*//')
-fi
-
 # Append session end to progress.md
 {
     echo ""
     echo "### [$TIMESTAMP] Session ended"
     echo "- Branch: $BRANCH"
     echo "- Commits this session: $RECENT_COMMITS"
-    [ -n "$CURRENT_STEP" ] && echo "- Next step: $CURRENT_STEP"
 } >> "tasks/progress.md" 2>/dev/null
 
 exit 0

package/skills/sk:setup-claude/templates/hooks/suggest-compact.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# suggest-compact.sh — PreToolUse hook for Edit/Write
+# Tracks tool call count and suggests /compact at threshold.
+
+set -uo pipefail
+
+THRESHOLD="${SHIPKIT_COMPACT_THRESHOLD:-50}"
+REPEAT_INTERVAL=25
+
+# Use a session-scoped counter file
+COUNTER_FILE="/tmp/shipkit-tool-count-${PPID:-$$}"
+
+# Read current count
+COUNT=0
+if [[ -f "$COUNTER_FILE" ]]; then
+  COUNT=$(cat "$COUNTER_FILE" 2>/dev/null || echo "0")
+fi
+
+COUNT=$((COUNT + 1))
+echo "$COUNT" > "$COUNTER_FILE"
+
+# Check if we should suggest compaction
+if [[ $COUNT -eq $THRESHOLD ]]; then
+  echo ""
+  echo "HINT: You've made $COUNT+ tool calls this session."
+  echo "Consider running /compact if context feels heavy."
+elif [[ $COUNT -gt $THRESHOLD ]]; then
+  PAST_THRESHOLD=$((COUNT - THRESHOLD))
+  if [[ $((PAST_THRESHOLD % REPEAT_INTERVAL)) -eq 0 ]]; then
+    echo ""
+    echo "HINT: $COUNT tool calls this session. Consider /compact."
+  fi
+fi
+
+exit 0

package/skills/sk:setup-claude/tests/test_apply_setup_claude.py

@@ -129,40 +129,9 @@ class TestApplySetupClaude(unittest.TestCase):
                 )
             self.assertEqual(rc, 0)
 
+            # workflow-status.md should NOT be created (removed from workflow)
             wf_path = repo_root / "tasks" / "workflow-status.md"
-            self.assertTrue(wf_path.exists())
-            content = wf_path.read_text(encoding="utf-8")
-            self.assertIn(">> next <<", content)
-            self.assertIn("/brainstorm", content)
-            self.assertIn("/finish-feature", content)
-            self.assertIn("/release", content)
-            # All 14 steps present
-            self.assertIn("| 14 |", content)
-
-    def test_workflow_status_not_overwritten_on_rerun(self):
-        mod = _load_apply_module()
-        skill_root = Path(__file__).resolve().parents[1]
-
-        with tempfile.TemporaryDirectory() as td:
-            repo_root = Path(td)
-            (repo_root / "package.json").write_text(json.dumps({"name": "demo"}), encoding="utf-8")
-
-            # First run creates the file
-            buf = io.StringIO()
-            with contextlib.redirect_stdout(buf):
-                mod.apply(repo_root, skill_root, update_generated=False, dry_run=False, detection=mod.detect(repo_root))
-
-            # Simulate user progress by modifying the file
-            wf_path = repo_root / "tasks" / "workflow-status.md"
-            custom_content = wf_path.read_text(encoding="utf-8").replace(">> next <<", "done")
-            wf_path.write_text(custom_content, encoding="utf-8")
-
-            # Second run should NOT overwrite
-            buf = io.StringIO()
-            with contextlib.redirect_stdout(buf):
-                mod.apply(repo_root, skill_root, update_generated=False, dry_run=False, detection=mod.detect(repo_root))
-
-            self.assertEqual(wf_path.read_text(encoding="utf-8"), custom_content)
+            self.assertFalse(wf_path.exists())
 
     def test_existing_custom_claude_md_writes_sidecar(self):
         mod = _load_apply_module()

package/skills/sk:setup-optimizer/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: sk:setup-optimizer
-description: "Diagnose, update workflow, enrich, and maintain CLAUDE.md. The single command to keep any CLAUDE.md current."
+description: "Diagnose, update workflow, deploy hooks, enrich CLAUDE.md, and keep project infrastructure current. The single command for ongoing ShipKit maintenance."
 triggers:
   - optimize claude
   - optimize setup
@@ -20,14 +20,15 @@ allowed-tools:
 
 ## Overview
 
-The single command to keep your CLAUDE.md current. Diagnoses problems, updates the workflow to the latest version, scans your codebase, and enriches with project context — all while preserving your customizations.
+The single command to keep your entire ShipKit project infrastructure current. Diagnoses problems, updates the workflow, deploys missing hooks, scans your codebase, and enriches CLAUDE.md with project context — all while preserving your customizations.
 
 ### What It Does
 
 1. **Diagnoses** — finds missing sections, stale info, inconsistencies, and gaps
 2. **Updates workflow** — refreshes the workflow section to the latest template version
-3. **Discovers** — scans project structure, docs, and workflows
-4. **Enriches** — merges discoveries into CLAUDE.md while preserving your edits
+3. **Deploys hooks** — installs missing hooks and updates settings.json wiring
+4. **Discovers** — scans project structure, docs, and workflows
+5. **Enriches** — merges discoveries into CLAUDE.md while preserving your edits
 
 ## Usage
 
@@ -43,9 +44,11 @@ Before making any changes, runs a diagnostic pass on the existing CLAUDE.md:
 - **Stale content** — detects outdated info (stale model/route counts, removed dependencies, old command names like `/laravel-lint` instead of `/sk:lint`)
 - **Inconsistencies** — compares documented vs actual project state (directories, scripts, workflows)
 - **Section completeness** — flags sections that exist but are empty or have only placeholder text
-- **Outdated workflow** — checks if the workflow matches the current 21-step TDD flow with hard gates
-- **Missing commands** — checks for `sk:start`, `sk:autopilot`, `sk:team` in the Commands table
+- **Outdated workflow** — checks if the workflow matches the current 8-step flow with `/sk:gates` as single gate step
+- **Missing commands** — checks for `sk:start`, `sk:autopilot`, `sk:team`, `sk:learn`, `sk:context-budget`, `sk:health`, `sk:save-session`, `sk:resume-session`, `sk:safety-guard`, `sk:eval` in the Commands table
 - **Auto-skip rules** — checks for auto-skip detection rules in the workflow section
+- **Stale tracker references** — checks for `tasks/workflow-status.md` references (removed — progress tracked via git branch + todo.md checkboxes)
+- **Missing hooks** — checks if `.claude/hooks/` exists and contains both core and enhanced hooks
 
 Reports findings before proceeding. If issues are found, they inform subsequent steps.
 
@@ -53,17 +56,17 @@ Reports findings before proceeding. If issues are found, they inform subsequent
 
 If the workflow section is outdated or missing, replace it with the latest version:
 
-**Current workflow (21 steps, TDD with hard gates):**
+**Current workflow (8 steps, TDD with `/sk:gates` as single gate step):**
 ```
-Read → Explore → Design → Accessibility → Plan → Branch → Migrate → Write Tests → Implement → Lint → Verify Tests → Security → Performance → Review → E2E Tests → Finish → Sync Features
+Explore → Design → Plan → Branch → Write Tests + Implement → Commit → Gates → Finalize
 ```
 
 **What gets updated:**
-- Workflow table (21 steps with correct commands: `/sk:write-tests`, `/sk:lint`, `/sk:test`, `/sk:accessibility`, `/sk:perf`, `/sk:e2e`, `/sk:start`, `/sk:autopilot`, `/sk:team`)
+- Workflow table (8 steps — `/sk:brainstorm`, `/sk:frontend-design` or `/sk:api-design`, `/sk:write-plan`, `/sk:branch`, `/sk:write-tests` + `/sk:execute-plan`, `/sk:smart-commit`, `/sk:gates`, `/sk:finish-feature`)
 - Step details (TDD red/green/verify descriptions)
-- Tracker rules (hard gates at 12, 14, 16, 20, 17; optional steps 4, 5, 8, 18, 21)
-- Step completion summary rule (NON-NEGOTIABLE)
-- Bug fix flow section
+- Workflow rules (auto-advance, conditional summary, auto-skip, squash gate commits)
+- Bug fix flow section (7 steps)
+- Hotfix flow section (6 steps)
 - Sub-Agent Patterns section (if missing)
 - Cross-Platform Tracking section (if missing)
 - Project Memory section (if missing)
@@ -73,6 +76,7 @@ Read → Explore → Design → Accessibility → Plan → Branch → Migrate
 - Fix & Retest Protocol section (if missing)
 - Requirement Change Flow section (if missing)
 - Auto-skip detection rules (if missing)
+- Remove `tasks/workflow-status.md` references (tracker removed)
 
 **What gets preserved:**
 - Everything marked with `<!-- LOCK -->` is never touched
@@ -87,6 +91,54 @@ Read → Explore → Design → Accessibility → Plan → Branch → Migrate
 4. Insert missing sections (Sub-Agent Patterns, Project Memory, etc.) in their correct positions
 5. Preserve all `<!-- LOCK -->` and project-specific sections
 
+### Step 1.5: Hooks Deployment
+
+After updating the workflow, check and deploy hooks:
+
+1. **Check if `.claude/hooks/` exists** — if not, create it
+2. **Check for core hooks** — `session-start.sh`, `session-stop.sh`, `pre-compact.sh`, `validate-commit.sh`, `validate-push.sh`, `log-agent.sh`
+3. **Check for enhanced hooks** — `config-protection.sh`, `post-edit-format.sh`, `console-log-warning.sh`, `cost-tracker.sh`, `suggest-compact.sh`, `safety-guard.sh`
+4. **Check `.claude/settings.json`** — verify hooks are wired correctly
+
+**Report status and prompt:**
+
+> "Hooks: [X/6 core, Y/6 enhanced] installed
+> Install missing hooks? [y/n]"
+
+**If yes:**
+
+1. **Locate templates** — resolve the ShipKit templates directory:
+   - `~/.claude/skills/sk:setup-claude/templates/hooks/` (symlinked install)
+   - Or the npm global path if installed via `npm install -g`
+
+2. **Deploy missing hook scripts** (create-if-missing, never overwrite existing):
+   ```bash
+   # For each missing hook file:
+   cp "$TEMPLATE_DIR/hooks/<hook>.sh" ".claude/hooks/<hook>.sh"
+   chmod +x ".claude/hooks/<hook>.sh"
+   ```
+
+3. **Update `.claude/settings.json`** — read the latest `settings.json.template` and merge new hook entries into the existing settings.json:
+   - **Preserve** existing hooks, permissions, statusline config
+   - **Add** only missing hook entries (new PreToolUse, PostToolUse, Stop entries)
+   - **Never remove** existing entries — additive merge only
+
+4. **Report what was deployed:**
+   ```
+   Deployed hooks:
+     + config-protection.sh (PreToolUse — blocks linter config edits)
+     + post-edit-format.sh (PostToolUse — auto-format after edits)
+     + console-log-warning.sh (Stop — warn on debug statements)
+     + cost-tracker.sh (Stop — session metadata logging)
+     + suggest-compact.sh (PreToolUse — compact suggestions)
+     + safety-guard.sh (PreToolUse — freeze/careful mode)
+     ~ Updated .claude/settings.json with new hook wiring
+   ```
+
+**If no:** skip hook deployment, continue to Step 2.
+
+**Idempotency:** Never overwrite existing hook files — the user may have customized them. Only deploy hooks that don't exist yet. For settings.json, merge additively.
+
 ### Step 2: Scan & Enrich
 
 After workflow update, proceeds with codebase discovery and enrichment:
@@ -181,10 +233,11 @@ This content will never be regenerated.
 
 ## When to Use
 
-✅ **Use `/optimize-claude` when:**
+✅ **Use `/sk:setup-optimizer` when:**
+- ShipKit was updated and your project needs the latest hooks/commands
 - You've added new directories to your project
 - You've created documentation files
 - You want to refresh project context
-- Monthly maintenance of CLAUDE.md
+- Monthly maintenance of CLAUDE.md and hooks
 
-✅ **Safe to run multiple times during development** - Your customizations are always preserved!
+✅ **Safe to run multiple times** — existing customizations and hook files are never overwritten.

package/skills/sk:start/SKILL.md

@@ -30,10 +30,10 @@ Read the task description from arguments. Scan for signal keywords to determine
 
 | Signal Keywords | Detected Flow |
 |----------------|---------------|
-| bug, fix, broken, error, regression, failing, crash, wrong | `debug` (11 steps) |
-| urgent, prod down, hotfix, emergency, critical, production, incident | `hotfix` (11 steps) |
-| config, bump, typo, copy, rename, dependency, upgrade, version, docs | `fast-track` (10 steps) |
-| *(default — no special signals)* | `feature` (21 steps) |
+| bug, fix, broken, error, regression, failing, crash, wrong | `debug` (7 steps) |
+| urgent, prod down, hotfix, emergency, critical, production, incident | `hotfix` (6 steps) |
+| config, bump, typo, copy, rename, dependency, upgrade, version, docs | `fast-track` (5 steps) |
+| *(default — no special signals)* | `feature` (8 steps) |
 
 **Scope detection:**
 
@@ -53,6 +53,31 @@ Read the task description from arguments. Scan for signal keywords to determine
 | `backend` only | `solo` |
 | `unknown` | `solo` (default) |
 
+### Step 1.5 — Missing Context Detection (automatic, no prompt)
+
+After classification, scan the task description for gaps. This is informational only — does NOT block.
+
+**Critical context checks:**
+
+| Check | How to detect | Auto-resolve |
+|-------|--------------|--------------|
+| Tech stack specified? | Look for framework/language keywords | Auto-detect from package.json, composer.json, go.mod, Cargo.toml |
+| Acceptance criteria present? | Look for "should", "must", "when", "given" | Cannot auto-resolve — flag for user |
+| Scope boundaries stated? | Look for "only", "not", "exclude", "just" | Cannot auto-resolve — flag for user |
+| Security requirements? | Check if task involves auth, user data, payments, tokens | Flag: "This touches auth/user data — consider security requirements" |
+| Testing expectations? | Look for "test", "coverage", "spec" | Default: 100% coverage on new code (per workflow) |
+
+**If 3+ critical items are missing**, include in the recommendation output:
+
+```
+Missing Context (3 items — consider clarifying):
+  - No acceptance criteria detected
+  - No scope boundaries stated (what should NOT change?)
+  - Task involves user data but no security requirements mentioned
+```
+
+This check runs silently. If <3 items missing, no output.
+
 ### Step 2 — Recommend (one prompt, user confirms or overrides)
 
 Present the classification and recommendation:
@@ -60,7 +85,7 @@ Present the classification and recommendation:
 ```
 Detected: [Full-stack feature / Backend bug fix / Frontend hotfix / Small config change / etc.]
 Recommended:
-  Flow:   [feature (21 steps) / debug (11 steps) / hotfix (11 steps) / fast-track (10 steps)]
+  Flow:   [feature (8 steps) / debug (7 steps) / hotfix (6 steps) / fast-track (5 steps)]
   Mode:   [autopilot / manual]
   Agents: [team (backend + frontend + QA) / solo]
 
@@ -84,12 +109,10 @@ Wait for user response:
 
 ### Step 3 — Route (enters the chosen flow)
 
-1. Reset `tasks/workflow-status.md`:
-   - Set all steps to `not yet`
-   - Add metadata to the tracker header:
-     ```
-     > Mode: [autopilot/manual] | Agents: [team/solo] | Flow: [feature/debug/hotfix/fast-track]
-     ```
+1. Log the routing decision to terminal:
+   ```
+   Mode: [autopilot/manual] | Agents: [team/solo] | Flow: [feature/debug/hotfix/fast-track]
+   ```
 
 2. Dispatch to the chosen flow:
 

package/skills/sk:test/SKILL.md

@@ -126,12 +126,12 @@ Sub-agent 3: [FE command]
 - Read the failure output carefully — identify the root cause
 - Fix the failing **implementation code** or test setup, not the test assertions (tests define expected behavior)
 - Do NOT skip, mark incomplete, or delete failing tests
-- Auto-commit with message `fix(test): resolve failing tests` — do NOT ask the user
 - Re-run the failing suite
 - Loop until all pass
-- Fix the implementation and auto-commit. If the fix is a logic change (new behavior, changed contract), update the relevant tests to reflect the new behavior before committing.
+- If the fix is a logic change (new behavior, changed contract), update the relevant tests to reflect the new behavior.
+- Once all tests pass, make ONE squash commit: `fix(test): resolve failing tests` — do NOT ask the user
 
-> Gates own their commits — the fix-commit-rerun loop is fully internal. No manual commit step needed after this gate.
+> Squash gate commits — collect all fixes for the pass, then one commit. Do not commit after each individual fix.
 
 ### 5. Verify Coverage
 

package/skills/sk:setup-claude/templates/tasks/workflow-status.md.template

@@ -1,28 +0,0 @@
-# Workflow Status
-
-> Tracks progress through the development workflow. Reset this file when starting a new feature, bug fix, or task.
-> Updated automatically after every slash command. Do not edit manually.
-
-| # | Step | Status | Notes |
-|---|------|--------|-------|
-| 1 | Read Todo | >> next << | |
-| 2 | Read Lessons | not yet | |
-| 3 | Explore (`/sk:brainstorm`) | not yet | |
-| 4 | Design (`/sk:frontend-design` or `/sk:api-design`) | not yet | optional |
-| 5 | Accessibility (`/sk:accessibility`) | not yet | optional |
-| 6 | Plan (`/sk:write-plan`) | not yet | |
-| 7 | Branch (`/sk:branch`) | not yet | |
-| 8 | Migrate (`/sk:schema-migrate`) | not yet | optional |
-| 9 | Write Tests (`/sk:write-tests`) | not yet | |
-| 10 | Implement (`/sk:execute-plan`) | not yet | |
-| 11 | Commit (`/sk:smart-commit`) | not yet | |
-| 12 | **Lint + Dep Audit** (`/sk:lint`) | not yet | HARD GATE — loop until clean, gates own their commits |
-| 13 | **Verify Tests** (`/sk:test`) | not yet | HARD GATE — 100% coverage, gates own their commits |
-| 14 | **Security** (`/sk:security-check`) | not yet | HARD GATE — 0 issues, gates own their commits |
-| 15 | Performance (`/sk:perf`) | not yet | optional gate, gates own their commits |
-| 16 | **Review + Simplify** (`/sk:review`) | not yet | HARD GATE — 0 issues, gates own their commits |
-| 17 | **E2E** (`/sk:e2e`) | not yet | HARD GATE — all E2E scenarios must pass, gates own their commits |
-| 18 | Update (`/sk:update-task`) | not yet | |
-| 19 | Finalize (`/sk:finish-feature`) | not yet | |
-| 20 | Sync Features (`/sk:features`) | not yet | required — sync feature specs after ship |
-| 21 | Release (`/sk:release`) | not yet | optional |