jfl 0.1.0 → 0.2.0

package/scripts/session/test-session-sync.sh

@@ -0,0 +1,320 @@
+#!/usr/bin/env bash
+#
+# Rigorous tests for session-sync.sh
+# Tests both positive cases AND anti-tests (what should NOT happen)
+#
+# @purpose Test session-sync.sh before committing (work-loss prevention)
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+TEST_DIR="/tmp/jfl-session-sync-test-$$"
+REPO_DIR="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || echo ".")"
+REPO_DIR="${REPO_DIR%/.git}"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+TESTS_PASSED=0
+TESTS_FAILED=0
+
+pass() {
+    echo -e "${GREEN}✓${NC} $1"
+    TESTS_PASSED=$((TESTS_PASSED + 1))
+}
+
+fail() {
+    echo -e "${RED}✗${NC} $1"
+    TESTS_FAILED=$((TESTS_FAILED + 1))
+}
+
+section() {
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo -e "${BLUE}$1${NC}"
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+}
+
+cleanup() {
+    rm -rf "$TEST_DIR" 2>/dev/null || true
+}
+
+trap cleanup EXIT
+
+# ==============================================================================
+# Test 1: Script Safety Checks
+# ==============================================================================
+
+test_safety_checks() {
+    section "Test 1: Safety Checks (prevent data loss)"
+
+    # Check for uncommitted changes protection
+    if grep -q "has uncommitted changes AND is behind" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Protects against pulling over uncommitted changes"
+    else
+        fail "No protection for uncommitted changes + pull"
+    fi
+
+    # Check that it uses 'set -e' for failure propagation
+    if head -10 "$SCRIPT_DIR/session-sync.sh" | grep -q "set -e"; then
+        pass "Uses 'set -e' for error propagation"
+    else
+        fail "Doesn't use 'set -e' - errors may be silent"
+    fi
+
+    # Check that it exits with error code on failure
+    if grep -q "exit 1" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Exits with error code on failure"
+    else
+        fail "Doesn't exit with error - CI/CD won't catch failures"
+    fi
+
+    # Anti-test: Verify it doesn't use --force flags
+    if grep -E "git pull.*--force|git reset --hard" "$SCRIPT_DIR/session-sync.sh" >/dev/null; then
+        fail "DANGER: Uses destructive git commands (--force, --hard)"
+    else
+        pass "Doesn't use destructive git commands"
+    fi
+
+    # Check for graceful network failure handling
+    if grep -q "Could not fetch.*no network" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Handles network failures gracefully"
+    else
+        fail "No graceful handling of network failures"
+    fi
+}
+
+# ==============================================================================
+# Test 2: Detached HEAD Handling
+# ==============================================================================
+
+test_detached_head() {
+    section "Test 2: Detached HEAD Handling (submodules)"
+
+    # Check if script detects detached HEAD
+    if grep -q "detached HEAD state" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Detects detached HEAD state"
+    else
+        fail "Doesn't detect detached HEAD"
+    fi
+
+    # Check if it attempts to fix detached HEAD
+    if grep -A5 "detached HEAD" "$SCRIPT_DIR/session-sync.sh" | grep -q "checkout main"; then
+        pass "Attempts to fix detached HEAD automatically"
+    else
+        fail "Doesn't auto-fix detached HEAD"
+    fi
+
+    # Anti-test: Verify it doesn't force checkout (would lose work)
+    if grep -E "git checkout.*-f|git checkout.*--force" "$SCRIPT_DIR/session-sync.sh" >/dev/null; then
+        fail "DANGER: Uses force checkout (loses uncommitted work)"
+    else
+        pass "Doesn't use force checkout"
+    fi
+}
+
+# ==============================================================================
+# Test 3: Submodule vs Symlink Detection
+# ==============================================================================
+
+test_product_detection() {
+    section "Test 3: Product Detection (submodule vs symlink)"
+
+    # Check for submodule detection (has .git FILE)
+    if grep -q "It's a submodule" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Detects submodules correctly (.git as file)"
+    else
+        fail "Doesn't detect submodules"
+    fi
+
+    # Check for symlink detection
+    if grep -q "\[ -L \"\$PRODUCT_PATH\" \]" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Detects symlinks correctly"
+    else
+        fail "Doesn't detect symlinks"
+    fi
+
+    # Check for missing product handling
+    if grep -q "Initializing product submodule" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Handles missing product gracefully"
+    else
+        fail "Doesn't handle missing product"
+    fi
+
+    # Check for symlink deprecation warning
+    if grep -q "product/ is a symlink, not a submodule" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Warns about legacy symlink usage"
+    else
+        fail "Doesn't warn about symlinks (legacy pattern)"
+    fi
+}
+
+# ==============================================================================
+# Test 4: Failure Tracking
+# ==============================================================================
+
+test_failure_tracking() {
+    section "Test 4: Failure Tracking (exit codes)"
+
+    # Check that failures are tracked
+    if grep -q "FAILURES=0" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Initializes failure counter"
+    else
+        fail "Doesn't track failures"
+    fi
+
+    # Check that failures increment counter
+    if grep -q "FAILURES=\$((FAILURES + 1))" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Increments failure counter on errors"
+    else
+        fail "Doesn't increment failure counter"
+    fi
+
+    # Check that exit code reflects failures
+    if grep -A5 "if.*FAILURES.*-gt 0" "$SCRIPT_DIR/session-sync.sh" | grep -q "exit 1"; then
+        pass "Exits with code 1 when failures occur"
+    else
+        fail "Doesn't exit with error code on failures"
+    fi
+}
+
+# ==============================================================================
+# Test 5: Integration with Current Repo
+# ==============================================================================
+
+test_current_repo_integration() {
+    section "Test 5: Integration with Current Repo"
+
+    cd "$REPO_DIR"
+
+    # Test that script runs without crashing
+    if "$SCRIPT_DIR/session-sync.sh" >/dev/null 2>&1; then
+        pass "Script runs successfully on current repo"
+    else
+        exit_code=$?
+        if [[ $exit_code -eq 1 ]]; then
+            # Check if failure was due to uncommitted changes (safe failure)
+            output=$("$SCRIPT_DIR/session-sync.sh" 2>&1 || true)
+            if echo "$output" | grep -q "uncommitted changes"; then
+                pass "Script correctly fails on uncommitted changes"
+            else
+                fail "Script failed for unknown reason (exit code 1)"
+            fi
+        else
+            fail "Script crashed with exit code $exit_code"
+        fi
+    fi
+
+    # Test that it doesn't modify uncommitted changes
+    before_status=$(git status --porcelain)
+    "$SCRIPT_DIR/session-sync.sh" >/dev/null 2>&1 || true
+    after_status=$(git status --porcelain)
+
+    if [[ "$before_status" == "$after_status" ]]; then
+        pass "Doesn't modify uncommitted changes"
+    else
+        fail "DANGER: Modified uncommitted changes!"
+    fi
+}
+
+# ==============================================================================
+# Test 6: Behind/Ahead Detection
+# ==============================================================================
+
+test_behind_ahead_detection() {
+    section "Test 6: Behind/Ahead Detection"
+
+    # Check for behind detection
+    if grep -q "commits behind origin" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Detects when repo is behind origin"
+    else
+        fail "Doesn't detect behind status"
+    fi
+
+    # Check for ahead detection
+    if grep -q "commits ahead" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Detects when repo is ahead (unpushed)"
+    else
+        fail "Doesn't detect ahead status"
+    fi
+
+    # Check for up-to-date message
+    if grep -q "is up to date" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Reports when repo is up to date"
+    else
+        fail "Doesn't report up-to-date status"
+    fi
+}
+
+# ==============================================================================
+# Test 7: Recursive Submodule Update
+# ==============================================================================
+
+test_recursive_submodules() {
+    section "Test 7: Recursive Submodule Handling"
+
+    # Check for recursive submodule update
+    if grep -q "submodule update.*--recursive" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Updates submodules recursively"
+    else
+        fail "Doesn't update nested submodules"
+    fi
+
+    # Check for --init flag (initializes new submodules)
+    if grep -q "submodule update --init" "$SCRIPT_DIR/session-sync.sh"; then
+        pass "Initializes new submodules automatically"
+    else
+        fail "Doesn't initialize new submodules"
+    fi
+}
+
+# ==============================================================================
+# Run All Tests
+# ==============================================================================
+
+main() {
+    echo ""
+    echo "╔══════════════════════════════════════════════════════════╗"
+    echo "║  session-sync.sh Rigorous Testing                       ║"
+    echo "║  Before Commit Verification                             ║"
+    echo "╚══════════════════════════════════════════════════════════╝"
+
+    test_safety_checks
+    test_detached_head
+    test_product_detection
+    test_failure_tracking
+    test_current_repo_integration
+    test_behind_ahead_detection
+    test_recursive_submodules
+
+    # Summary
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo -e "${BLUE}Test Results${NC}"
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo -e "${GREEN}Passed:${NC} $TESTS_PASSED"
+    if [[ $TESTS_FAILED -gt 0 ]]; then
+        echo -e "${RED}Failed:${NC} $TESTS_FAILED"
+        echo ""
+        echo -e "${RED}session-sync.sh NOT READY TO COMMIT${NC}"
+        exit 1
+    else
+        echo ""
+        echo -e "${GREEN}✓ session-sync.sh ready to commit${NC}"
+        echo ""
+        echo "Safety verified:"
+        echo "  • Won't pull over uncommitted changes"
+        echo "  • Exits with error on failure"
+        echo "  • Handles network failures gracefully"
+        echo "  • No destructive operations"
+        echo "  • Detached HEAD auto-fix"
+        echo "  • Recursive submodule updates"
+        exit 0
+    fi
+}
+
+main "$@"

package/scripts/voice-start.sh

@@ -11,7 +11,41 @@ VAD_MODEL="$MODELS_DIR/ggml-silero-vad.bin"
 SOCKET_PATH="$JFL_DIR/voice.sock"
 TOKEN_PATH="$JFL_DIR/voice-server.token"
 PID_FILE="$JFL_DIR/voice-server.pid"
-WHISPER_SERVER="/Users/alectaggart/CascadeProjects/jfl-platform/packages/whisper-server/build/whisper-stream-server"
+
+# Detect whisper server location
+if [[ -n "$WHISPER_SERVER_PATH" ]]; then
+    WHISPER_SERVER="$WHISPER_SERVER_PATH"
+else
+    # Auto-detect based on project structure
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    PROJECT_ROOT="$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel 2>/dev/null || echo "")"
+
+    # Common locations to check
+    POSSIBLE_PATHS=(
+        "$PROJECT_ROOT/../jfl-platform/packages/whisper-server/build/whisper-stream-server"
+        "$PROJECT_ROOT/packages/whisper-server/build/whisper-stream-server"
+        "$HOME/code/goose/jfl/jfl-platform/packages/whisper-server/build/whisper-stream-server"
+    )
+
+    for path in "${POSSIBLE_PATHS[@]}"; do
+        if [[ -x "$path" ]]; then
+            WHISPER_SERVER="$path"
+            break
+        fi
+    done
+
+    if [[ -z "$WHISPER_SERVER" || ! -x "$WHISPER_SERVER" ]]; then
+        echo -e "${RED}✗ Whisper server not found${NC}"
+        echo -e "${GRAY}  Tried locations:${NC}"
+        for path in "${POSSIBLE_PATHS[@]}"; do
+            echo -e "${GRAY}    - $path${NC}"
+        done
+        echo ""
+        echo -e "${GRAY}  Set WHISPER_SERVER_PATH environment variable or ensure jfl-platform is at ../jfl-platform${NC}"
+        echo -e "${GRAY}  Or build the server: cd jfl-platform/packages/whisper-server && ./build.sh${NC}"
+        exit 1
+    fi
+fi
 
 # Colors
 RED='\033[0;31m'
@@ -21,15 +55,9 @@ GRAY='\033[0;90m'
 NC='\033[0m'
 
 echo -e "${GREEN}🎤 JFL Voice - Starting${NC}"
+echo -e "${GRAY}Using whisper server: $WHISPER_SERVER${NC}"
 echo ""
 
-# Check if server binary exists
-if [ ! -f "$WHISPER_SERVER" ]; then
-    echo -e "${RED}✗ Whisper server not built${NC}"
-    echo -e "${GRAY}  Run: cd product/packages/whisper-server && ./build.sh${NC}"
-    exit 1
-fi
-
 # Check if models exist
 if [ ! -f "$WHISPER_MODEL" ]; then
     echo -e "${YELLOW}⚠ Whisper model not found. Downloading...${NC}"

package/scripts/where-am-i.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+#
+# where-am-i.sh - Quick context check for git operations
+#
+# Shows:
+# - Current directory
+# - Which repo you're in (GTM or product submodule)
+# - Current branch
+# - Uncommitted changes
+#
+# Usage:
+#   ./scripts/where-am-i.sh
+
+set -e
+
+CWD=$(pwd)
+
+# Colors
+BLUE='\033[0;34m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+
+echo ""
+echo -e "${BLUE}📍 Current Location${NC}"
+echo "─────────────────────────────────────"
+echo ""
+
+# Show current directory
+echo -e "Directory: ${GREEN}$CWD${NC}"
+
+# Detect which repo context (check for submodules first, then GTM)
+REMOTE_URL=$(git remote get-url origin 2>/dev/null || echo "")
+
+if [[ "$CWD" == *"/product"* ]] || [[ "$REMOTE_URL" == *"jfl-platform"* ]]; then
+    echo -e "Context:   ${YELLOW}product submodule${NC} (jfl-platform)"
+    echo ""
+    echo "To commit here: ./scripts/commit-product.sh \"message\""
+elif [[ "$CWD" == *"/runner"* ]] || [[ "$REMOTE_URL" == *"jfl-runner"* ]]; then
+    echo -e "Context:   ${YELLOW}runner submodule${NC} (jfl-runner)"
+    echo ""
+    echo "To commit here: cd ../; git add runner && git commit -m \"Update runner submodule\""
+elif [[ "$REMOTE_URL" == *"JFL-GTM"* ]] || [[ -f ".jfl/config.json" ]]; then
+    echo -e "Context:   ${GREEN}GTM repo${NC} (main project)"
+    echo ""
+    echo "To commit here: ./scripts/commit-gtm.sh \"message\""
+else
+    # Check if we're in any submodule
+    if git rev-parse --show-superproject-working-tree &>/dev/null; then
+        SUBMODULE_NAME=$(basename "$CWD")
+        echo -e "Context:   ${YELLOW}${SUBMODULE_NAME} submodule${NC}"
+    else
+        echo -e "Context:   ${YELLOW}unknown${NC}"
+    fi
+fi
+
+echo ""
+
+# Show current branch
+BRANCH=$(git branch --show-current 2>/dev/null || echo "detached HEAD")
+if [[ "$BRANCH" == "detached HEAD" ]]; then
+    echo -e "Branch:    ${YELLOW}⚠️  detached HEAD${NC}"
+    echo "           (run: git checkout main)"
+else
+    echo -e "Branch:    ${GREEN}$BRANCH${NC}"
+fi
+
+# Show uncommitted changes
+CHANGES=$(git status --porcelain 2>/dev/null | wc -l | tr -d ' ')
+if [[ "$CHANGES" -gt 0 ]]; then
+    echo -e "Changes:   ${YELLOW}$CHANGES uncommitted${NC}"
+    echo ""
+    git status --short
+else
+    echo -e "Changes:   ${GREEN}none (clean)${NC}"
+fi
+
+echo ""

package/template/.claude/service-settings.json

@@ -0,0 +1,32 @@
+{
+  "claudeMdPath": "CLAUDE.md",
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "echo '\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n  Service Agent Session\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' && SERVICE_NAME=$(jq -r '.name // \"unknown\"' .jfl/config.json 2>/dev/null || echo 'unknown') && echo \"  Service: $SERVICE_NAME\" && echo '' && if [ -f .jfl/status.json ]; then echo 'Status:' && cat .jfl/status.json | jq -r '\"  \" + (.status // \"unknown\")'; fi && echo '\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n  Validating configuration...\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' && if command -v jfl >/dev/null 2>&1; then jfl services validate 2>&1 | grep -E '^\\[|^Summary:' || echo '  (validation skipped - jfl not in PATH)'; else echo '  (validation skipped - jfl not installed)'; fi && echo '\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n  Ready to work\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n'"
+          },
+          {
+            "type": "command",
+            "command": "if command -v jfl >/dev/null 2>&1; then jfl services sync-agents --current >> .jfl/logs/peer-sync.log 2>&1 & fi",
+            "async": true
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "SESSION=$(git branch --show-current 2>/dev/null || echo 'main') && if [ -d .jfl/journal ] && [ $(ls -1 .jfl/journal/*.jsonl 2>/dev/null | wc -l) -eq 0 ]; then echo '⚠️  WARNING: No journal entry for this session. Service work should be documented.'; fi && if [ -f .jfl/status.json ]; then jq --arg ts \"$(date -u +%Y-%m-%dT%H:%M:%S.000Z)\" '.last_updated = $ts' .jfl/status.json > .jfl/status.json.tmp && mv .jfl/status.json.tmp .jfl/status.json; fi"
+          }
+        ]
+      }
+    ]
+  }
+}

package/template/.claude/settings.json

@@ -2,6 +2,7 @@
   "hooks": {
     "SessionStart": [
       {
+        "matcher": "",
         "hooks": [
           {
             "type": "command",
@@ -43,6 +44,16 @@
             "command": "if echo \"$TOOL_INPUT\" | grep -q '\"status\":\\s*\"completed\"'; then BRANCH=$(cat .jfl/current-session-branch.txt 2>/dev/null || git branch --show-current); echo ''; echo '═══════════════════════════════════════════════════════════'; echo '📝 JOURNAL REQUIRED: Task completed'; echo '═══════════════════════════════════════════════════════════'; echo 'WRITE JOURNAL ENTRY NOW. File: .jfl/journal/'\"${BRANCH}\"'.jsonl'; echo '═══════════════════════════════════════════════════════════'; fi"
           }
         ]
+      },
+      {
+        "matcher": "Write",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "FILE=$(echo \"$TOOL_INPUT\" | grep -oE '\"file_path\":\\s*\"[^\"]+\"' | head -1 | sed 's/.*\"\\([^\"]*\\)\"/\\1/'); if echo \"$FILE\" | grep -q '\\.jfl/inbox/service-update-.*\\.trigger'; then echo ''; echo ''; echo '═══════════════════════════════════════════════════════════'; echo '📡 SERVICE UPDATE DETECTED'; echo '═══════════════════════════════════════════════════════════'; jfl gtm process-service-update 2>/dev/null || echo 'GTM command not available'; fi",
+            "async": true
+          }
+        ]
       }
     ],
     "UserPromptSubmit": [
@@ -58,6 +69,7 @@
     ],
     "Stop": [
       {
+        "matcher": "",
         "hooks": [
           {
             "type": "command",
@@ -69,13 +81,14 @@
           },
           {
             "type": "command",
-            "command": "./scripts/session/session-end.sh 2>&1 || (git add -A && git diff --cached --quiet || git commit -m 'auto: stop save') 2>/dev/null; echo '✓ Session ended'; exit 0"
+            "command": "./scripts/session/session-cleanup.sh >> .jfl/logs/session-cleanup.log 2>&1 || echo 'Cleanup skipped'; exit 0"
           }
         ]
       }
     ],
     "PreCompact": [
       {
+        "matcher": "",
         "hooks": [
           {
             "type": "command",