diff --git a/.github/agents/speckit.constitution.agent.md b/.github/agents/speckit.constitution.agent.md
index 885ac1b1..32ec35ed 100644
--- a/.github/agents/speckit.constitution.agent.md
+++ b/.github/agents/speckit.constitution.agent.md
@@ -18,9 +18,11 @@ You **MUST** consider the user input before proceeding (if not empty).
 
 You are updating the project constitution at `.specify/memory/constitution.md`. This file is a TEMPLATE containing placeholder tokens in square brackets (e.g. `[PROJECT_NAME]`, `[PRINCIPLE_1_NAME]`). Your job is to (a) collect/derive concrete values, (b) fill the template precisely, and (c) propagate any amendments across dependent artifacts.
 
+**Note**: If `.specify/memory/constitution.md` does not exist yet, it should have been initialized from `.specify/templates/constitution-template.md` during project setup. If it's missing, copy the template first.
+
 Follow this execution flow:
 
-1. Load the existing constitution template at `.specify/memory/constitution.md`.
+1. Load the existing constitution at `.specify/memory/constitution.md`.
    - Identify every placeholder token of the form `[ALL_CAPS_IDENTIFIER]`.
    **IMPORTANT**: The user might require less or more principles than the ones used in the template. If a number is specified, respect that - follow the general template. You will update the doc accordingly.
 
diff --git a/.github/agents/speckit.plan.agent.md b/.github/agents/speckit.plan.agent.md
index 0040e8cd..5d83991b 100644
--- a/.github/agents/speckit.plan.agent.md
+++ b/.github/agents/speckit.plan.agent.md
@@ -69,10 +69,11 @@ You **MUST** consider the user input before proceeding (if not empty).
    - Validation rules from requirements
    - State transitions if applicable
 
-2. **Generate API contracts** from functional requirements:
-   - For each user action → endpoint
-   - Use standard REST/GraphQL patterns
-   - Output OpenAPI/GraphQL schema to `/contracts/`
+2. **Define interface contracts** (if project has external interfaces) → `/contracts/`:
+   - Identify what interfaces the project exposes to users or other systems
+   - Document the contract format appropriate for the project type
+   - Examples: public APIs for libraries, command schemas for CLI tools, endpoints for web services, grammars for parsers, UI contracts for applications
+   - Skip if project is purely internal (build scripts, one-off tools, etc.)
 
 3. **Agent context update**:
    - Run `.specify/scripts/bash/update-agent-context.sh copilot` (Linux or macOS) or `.specify/scripts/powershell/update-agent-context.ps1 -AgentType copilot` (Windows)
diff --git a/.github/agents/speckit.specify.agent.md b/.github/agents/speckit.specify.agent.md
index 960a0313..09e3e427 100644
--- a/.github/agents/speckit.specify.agent.md
+++ b/.github/agents/speckit.specify.agent.md
@@ -56,8 +56,8 @@ Given that feature description, do this:
 
    d. Run the script `.specify/scripts/bash/create-new-feature.sh --json "$ARGUMENTS"` (Linux or macOS) or `.specify/scripts/powershell/create-new-feature.ps1 -Json "$ARGUMENTS"` (Windows) with the calculated number and short-name:
       - Pass `--number N+1` and `--short-name "your-short-name"` along with the feature description
-      - Bash example: `.specify/scripts/bash/create-new-feature.sh --json "$ARGUMENTS" --number 5 --short-name "user-auth" "Add user authentication"`
-      - PowerShell example: `.specify/scripts/powershell/create-new-feature.ps1 -Json "$ARGUMENTS" -Json -Number 5 -ShortName "user-auth" "Add user authentication"`
+      - Bash example: `.specify/scripts/bash/create-new-feature.sh --json "$ARGUMENTS" --json --number 5 --short-name "user-auth" "Add user authentication"`
+      - PowerShell example: `.specify/scripts/bash/create-new-feature.sh --json "$ARGUMENTS" -Json -Number 5 -ShortName "user-auth" "Add user authentication"`
 
    **IMPORTANT**:
    - Check all three sources (remote branches, local branches, specs directories) to find the highest number
@@ -104,20 +104,20 @@ Given that feature description, do this:
 
       ```markdown
       # Specification Quality Checklist: [FEATURE NAME]
-
+      
       **Purpose**: Validate specification completeness and quality before proceeding to planning
       **Created**: [DATE]
       **Feature**: [Link to spec.md]
-
+      
       ## Content Quality
-
+      
       - [ ] No implementation details (languages, frameworks, APIs)
       - [ ] Focused on user value and business needs
       - [ ] Written for non-technical stakeholders
       - [ ] All mandatory sections completed
-
+      
       ## Requirement Completeness
-
+      
       - [ ] No [NEEDS CLARIFICATION] markers remain
       - [ ] Requirements are testable and unambiguous
       - [ ] Success criteria are measurable
@@ -126,16 +126,16 @@ Given that feature description, do this:
       - [ ] Edge cases are identified
       - [ ] Scope is clearly bounded
       - [ ] Dependencies and assumptions identified
-
+      
       ## Feature Readiness
-
+      
       - [ ] All functional requirements have clear acceptance criteria
       - [ ] User scenarios cover primary flows
       - [ ] Feature meets measurable outcomes defined in Success Criteria
       - [ ] No implementation details leak into specification
-
+      
       ## Notes
-
+      
       - Items marked incomplete require spec updates before `/speckit.clarify` or `/speckit.plan`
       ```
 
@@ -160,20 +160,20 @@ Given that feature description, do this:
 
            ```markdown
            ## Question [N]: [Topic]
-
+           
            **Context**: [Quote relevant spec section]
-
+           
            **What we need to know**: [Specific question from NEEDS CLARIFICATION marker]
-
+           
            **Suggested Answers**:
-
+           
            | Option | Answer | Implications |
            |--------|--------|--------------|
            | A      | [First suggested answer] | [What this means for the feature] |
            | B      | [Second suggested answer] | [What this means for the feature] |
            | C      | [Third suggested answer] | [What this means for the feature] |
            | Custom | Provide your own answer | [Explain how to provide custom input] |
-
+           
            **Your choice**: _[Wait for user response]_
            ```
 
@@ -232,7 +232,7 @@ When creating this spec from a user prompt:
 - Performance targets: Standard web/mobile app expectations unless specified
 - Error handling: User-friendly messages with appropriate fallbacks
 - Authentication method: Standard session-based or OAuth2 for web apps
-- Integration patterns: RESTful APIs unless specified otherwise
+- Integration patterns: Use project-appropriate patterns (REST/GraphQL for web services, function calls for libraries, CLI args for tools, etc.)
 
 ### Success Criteria Guidelines
 
diff --git a/.github/agents/speckit.tasks.agent.md b/.github/agents/speckit.tasks.agent.md
index 6bc1c486..fa9bd0c4 100644
--- a/.github/agents/speckit.tasks.agent.md
+++ b/.github/agents/speckit.tasks.agent.md
@@ -25,14 +25,14 @@ You **MUST** consider the user input before proceeding (if not empty).
 
 2. **Load design documents**: Read from FEATURE_DIR:
    - **Required**: plan.md (tech stack, libraries, structure), spec.md (user stories with priorities)
-   - **Optional**: data-model.md (entities), contracts/ (API endpoints), research.md (decisions), quickstart.md (test scenarios)
+   - **Optional**: data-model.md (entities), contracts/ (interface contracts), research.md (decisions), quickstart.md (test scenarios)
    - Note: Not all projects have all documents. Generate tasks based on what's available.
 
 3. **Execute task generation workflow**:
    - Load plan.md and extract tech stack, libraries, project structure
    - Load spec.md and extract user stories with their priorities (P1, P2, P3, etc.)
    - If data-model.md exists: Extract entities and map to user stories
-   - If contracts/ exists: Map endpoints to user stories
+   - If contracts/ exists: Map interface contracts to user stories
    - If research.md exists: Extract decisions for setup tasks
    - Generate tasks organized by user story (see Task Generation Rules below)
    - Generate dependency graph showing user story completion order
@@ -109,13 +109,13 @@ Every task MUST strictly follow this format:
    - Map all related components to their story:
      - Models needed for that story
      - Services needed for that story
-     - Endpoints/UI needed for that story
+     - Interfaces/UI needed for that story
      - If tests requested: Tests specific to that story
    - Mark story dependencies (most stories should be independent)
 
 2. **From Contracts**:
-   - Map each contract/endpoint → to the user story it serves
-   - If tests requested: Each contract → contract test task [P] before implementation in that story's phase
+   - Map each interface contract → to the user story it serves
+   - If tests requested: Each interface contract → contract test task [P] before implementation in that story's phase
 
 3. **From Data Model**:
    - Map each entity to the user story(ies) that need it
diff --git a/.specify/scripts/bash/check-prerequisites.sh b/.specify/scripts/bash/check-prerequisites.sh
index 5895bbbb..98e387c2 100755
--- a/.specify/scripts/bash/check-prerequisites.sh
+++ b/.specify/scripts/bash/check-prerequisites.sh
@@ -28,21 +28,21 @@ INCLUDE_TASKS=false
 PATHS_ONLY=false
 
 for arg in "$@"; do
-  case "$arg" in
-    --json)
-      JSON_MODE=true
-      ;;
-    --require-tasks)
-      REQUIRE_TASKS=true
-      ;;
-    --include-tasks)
-      INCLUDE_TASKS=true
-      ;;
-    --paths-only)
-      PATHS_ONLY=true
-      ;;
-    --help | -h)
-      cat <<'EOF'
+    case "$arg" in
+        --json)
+            JSON_MODE=true
+            ;;
+        --require-tasks)
+            REQUIRE_TASKS=true
+            ;;
+        --include-tasks)
+            INCLUDE_TASKS=true
+            ;;
+        --paths-only)
+            PATHS_ONLY=true
+            ;;
+        --help|-h)
+            cat << 'EOF'
 Usage: check-prerequisites.sh [OPTIONS]
 
 Consolidated prerequisite checking for Spec-Driven Development workflow.
@@ -65,13 +65,13 @@ EXAMPLES:
   ./check-prerequisites.sh --paths-only
   
 EOF
-      exit 0
-      ;;
-    *)
-      echo "ERROR: Unknown option '$arg'. Use --help for usage information." >&2
-      exit 1
-      ;;
-  esac
+            exit 0
+            ;;
+        *)
+            echo "ERROR: Unknown option '$arg'. Use --help for usage information." >&2
+            exit 1
+            ;;
+    esac
 done
 
 # Source common functions
@@ -84,39 +84,39 @@ check_feature_branch "$CURRENT_BRANCH" "$HAS_GIT" || exit 1
 
 # If paths-only mode, output paths and exit (support JSON + paths-only combined)
 if $PATHS_ONLY; then
-  if $JSON_MODE; then
-    # Minimal JSON paths payload (no validation performed)
-    printf '{"REPO_ROOT":"%s","BRANCH":"%s","FEATURE_DIR":"%s","FEATURE_SPEC":"%s","IMPL_PLAN":"%s","TASKS":"%s"}\n' \
-      "$REPO_ROOT" "$CURRENT_BRANCH" "$FEATURE_DIR" "$FEATURE_SPEC" "$IMPL_PLAN" "$TASKS"
-  else
-    echo "REPO_ROOT: $REPO_ROOT"
-    echo "BRANCH: $CURRENT_BRANCH"
-    echo "FEATURE_DIR: $FEATURE_DIR"
-    echo "FEATURE_SPEC: $FEATURE_SPEC"
-    echo "IMPL_PLAN: $IMPL_PLAN"
-    echo "TASKS: $TASKS"
-  fi
-  exit 0
+    if $JSON_MODE; then
+        # Minimal JSON paths payload (no validation performed)
+        printf '{"REPO_ROOT":"%s","BRANCH":"%s","FEATURE_DIR":"%s","FEATURE_SPEC":"%s","IMPL_PLAN":"%s","TASKS":"%s"}\n' \
+            "$REPO_ROOT" "$CURRENT_BRANCH" "$FEATURE_DIR" "$FEATURE_SPEC" "$IMPL_PLAN" "$TASKS"
+    else
+        echo "REPO_ROOT: $REPO_ROOT"
+        echo "BRANCH: $CURRENT_BRANCH"
+        echo "FEATURE_DIR: $FEATURE_DIR"
+        echo "FEATURE_SPEC: $FEATURE_SPEC"
+        echo "IMPL_PLAN: $IMPL_PLAN"
+        echo "TASKS: $TASKS"
+    fi
+    exit 0
 fi
 
 # Validate required directories and files
 if [[ ! -d "$FEATURE_DIR" ]]; then
-  echo "ERROR: Feature directory not found: $FEATURE_DIR" >&2
-  echo "Run /speckit.specify first to create the feature structure." >&2
-  exit 1
+    echo "ERROR: Feature directory not found: $FEATURE_DIR" >&2
+    echo "Run /speckit.specify first to create the feature structure." >&2
+    exit 1
 fi
 
 if [[ ! -f "$IMPL_PLAN" ]]; then
-  echo "ERROR: plan.md not found in $FEATURE_DIR" >&2
-  echo "Run /speckit.plan first to create the implementation plan." >&2
-  exit 1
+    echo "ERROR: plan.md not found in $FEATURE_DIR" >&2
+    echo "Run /speckit.plan first to create the implementation plan." >&2
+    exit 1
 fi
 
 # Check for tasks.md if required
 if $REQUIRE_TASKS && [[ ! -f "$TASKS" ]]; then
-  echo "ERROR: tasks.md not found in $FEATURE_DIR" >&2
-  echo "Run /speckit.tasks first to create the task list." >&2
-  exit 1
+    echo "ERROR: tasks.md not found in $FEATURE_DIR" >&2
+    echo "Run /speckit.tasks first to create the task list." >&2
+    exit 1
 fi
 
 # Build list of available documents
@@ -128,39 +128,39 @@ docs=()
 
 # Check contracts directory (only if it exists and has files)
 if [[ -d "$CONTRACTS_DIR" ]] && [[ -n "$(ls -A "$CONTRACTS_DIR" 2>/dev/null)" ]]; then
-  docs+=("contracts/")
+    docs+=("contracts/")
 fi
 
 [[ -f "$QUICKSTART" ]] && docs+=("quickstart.md")
 
 # Include tasks.md if requested and it exists
 if $INCLUDE_TASKS && [[ -f "$TASKS" ]]; then
-  docs+=("tasks.md")
+    docs+=("tasks.md")
 fi
 
 # Output results
 if $JSON_MODE; then
-  # Build JSON array of documents
-  if [[ ${#docs[@]} -eq 0 ]]; then
-    json_docs="[]"
-  else
-    json_docs=$(printf '"%s",' "${docs[@]}")
-    json_docs="[${json_docs%,}]"
-  fi
-
-  printf '{"FEATURE_DIR":"%s","AVAILABLE_DOCS":%s}\n' "$FEATURE_DIR" "$json_docs"
+    # Build JSON array of documents
+    if [[ ${#docs[@]} -eq 0 ]]; then
+        json_docs="[]"
+    else
+        json_docs=$(printf '"%s",' "${docs[@]}")
+        json_docs="[${json_docs%,}]"
+    fi
+    
+    printf '{"FEATURE_DIR":"%s","AVAILABLE_DOCS":%s}\n' "$FEATURE_DIR" "$json_docs"
 else
-  # Text output
-  echo "FEATURE_DIR:$FEATURE_DIR"
-  echo "AVAILABLE_DOCS:"
-
-  # Show status of each potential document
-  check_file "$RESEARCH" "research.md"
-  check_file "$DATA_MODEL" "data-model.md"
-  check_dir "$CONTRACTS_DIR" "contracts/"
-  check_file "$QUICKSTART" "quickstart.md"
-
-  if $INCLUDE_TASKS; then
-    check_file "$TASKS" "tasks.md"
-  fi
+    # Text output
+    echo "FEATURE_DIR:$FEATURE_DIR"
+    echo "AVAILABLE_DOCS:"
+    
+    # Show status of each potential document
+    check_file "$RESEARCH" "research.md"
+    check_file "$DATA_MODEL" "data-model.md"
+    check_dir "$CONTRACTS_DIR" "contracts/"
+    check_file "$QUICKSTART" "quickstart.md"
+    
+    if $INCLUDE_TASKS; then
+        check_file "$TASKS" "tasks.md"
+    fi
 fi
diff --git a/.specify/scripts/bash/common.sh b/.specify/scripts/bash/common.sh
index d6bf3429..7b6fcbad 100755
--- a/.specify/scripts/bash/common.sh
+++ b/.specify/scripts/bash/common.sh
@@ -3,82 +3,82 @@
 
 # Get repository root, with fallback for non-git repositories
 get_repo_root() {
-  if git rev-parse --show-toplevel >/dev/null 2>&1; then
-    git rev-parse --show-toplevel
-  else
-    # Fall back to script location for non-git repos
-    local script_dir="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-    (cd "$script_dir/../../.." && pwd)
-  fi
+    if git rev-parse --show-toplevel >/dev/null 2>&1; then
+        git rev-parse --show-toplevel
+    else
+        # Fall back to script location for non-git repos
+        local script_dir="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+        (cd "$script_dir/../../.." && pwd)
+    fi
 }
 
 # Get current branch, with fallback for non-git repositories
 get_current_branch() {
-  # First check if SPECIFY_FEATURE environment variable is set
-  if [[ -n "${SPECIFY_FEATURE:-}" ]]; then
-    echo "$SPECIFY_FEATURE"
-    return
-  fi
-
-  # Then check git if available
-  if git rev-parse --abbrev-ref HEAD >/dev/null 2>&1; then
-    git rev-parse --abbrev-ref HEAD
-    return
-  fi
-
-  # For non-git repos, try to find the latest feature directory
-  local repo_root=$(get_repo_root)
-  local specs_dir="$repo_root/specs"
-
-  if [[ -d "$specs_dir" ]]; then
-    local latest_feature=""
-    local highest=0
-
-    for dir in "$specs_dir"/*; do
-      if [[ -d "$dir" ]]; then
-        local dirname=$(basename "$dir")
-        if [[ "$dirname" =~ ^([0-9]{3})- ]]; then
-          local number=${BASH_REMATCH[1]}
-          number=$((10#$number))
-          if [[ "$number" -gt "$highest" ]]; then
-            highest=$number
-            latest_feature=$dirname
-          fi
-        fi
-      fi
-    done
+    # First check if SPECIFY_FEATURE environment variable is set
+    if [[ -n "${SPECIFY_FEATURE:-}" ]]; then
+        echo "$SPECIFY_FEATURE"
+        return
+    fi
 
-    if [[ -n "$latest_feature" ]]; then
-      echo "$latest_feature"
-      return
+    # Then check git if available
+    if git rev-parse --abbrev-ref HEAD >/dev/null 2>&1; then
+        git rev-parse --abbrev-ref HEAD
+        return
     fi
-  fi
 
-  echo "main" # Final fallback
+    # For non-git repos, try to find the latest feature directory
+    local repo_root=$(get_repo_root)
+    local specs_dir="$repo_root/specs"
+
+    if [[ -d "$specs_dir" ]]; then
+        local latest_feature=""
+        local highest=0
+
+        for dir in "$specs_dir"/*; do
+            if [[ -d "$dir" ]]; then
+                local dirname=$(basename "$dir")
+                if [[ "$dirname" =~ ^([0-9]{3})- ]]; then
+                    local number=${BASH_REMATCH[1]}
+                    number=$((10#$number))
+                    if [[ "$number" -gt "$highest" ]]; then
+                        highest=$number
+                        latest_feature=$dirname
+                    fi
+                fi
+            fi
+        done
+
+        if [[ -n "$latest_feature" ]]; then
+            echo "$latest_feature"
+            return
+        fi
+    fi
+
+    echo "main"  # Final fallback
 }
 
 # Check if we have git available
 has_git() {
-  git rev-parse --show-toplevel >/dev/null 2>&1
+    git rev-parse --show-toplevel >/dev/null 2>&1
 }
 
 check_feature_branch() {
-  local branch="$1"
-  local has_git_repo="$2"
+    local branch="$1"
+    local has_git_repo="$2"
 
-  # For non-git repos, we can't enforce branch naming but still provide output
-  if [[ "$has_git_repo" != "true" ]]; then
-    echo "[specify] Warning: Git repository not detected; skipped branch validation" >&2
-    return 0
-  fi
+    # For non-git repos, we can't enforce branch naming but still provide output
+    if [[ "$has_git_repo" != "true" ]]; then
+        echo "[specify] Warning: Git repository not detected; skipped branch validation" >&2
+        return 0
+    fi
 
-  if [[ ! "$branch" =~ ^[0-9]{3}- ]]; then
-    echo "ERROR: Not on a feature branch. Current branch: $branch" >&2
-    echo "Feature branches should be named like: 001-feature-name" >&2
-    return 1
-  fi
+    if [[ ! "$branch" =~ ^[0-9]{3}- ]]; then
+        echo "ERROR: Not on a feature branch. Current branch: $branch" >&2
+        echo "Feature branches should be named like: 001-feature-name" >&2
+        return 1
+    fi
 
-  return 0
+    return 0
 }
 
 get_feature_dir() { echo "$1/specs/$2"; }
@@ -86,57 +86,57 @@ get_feature_dir() { echo "$1/specs/$2"; }
 # Find feature directory by numeric prefix instead of exact branch match
 # This allows multiple branches to work on the same spec (e.g., 004-fix-bug, 004-add-feature)
 find_feature_dir_by_prefix() {
-  local repo_root="$1"
-  local branch_name="$2"
-  local specs_dir="$repo_root/specs"
-
-  # Extract numeric prefix from branch (e.g., "004" from "004-whatever")
-  if [[ ! "$branch_name" =~ ^([0-9]{3})- ]]; then
-    # If branch doesn't have numeric prefix, fall back to exact match
-    echo "$specs_dir/$branch_name"
-    return
-  fi
-
-  local prefix="${BASH_REMATCH[1]}"
-
-  # Search for directories in specs/ that start with this prefix
-  local matches=()
-  if [[ -d "$specs_dir" ]]; then
-    for dir in "$specs_dir"/"$prefix"-*; do
-      if [[ -d "$dir" ]]; then
-        matches+=("$(basename "$dir")")
-      fi
-    done
-  fi
-
-  # Handle results
-  if [[ ${#matches[@]} -eq 0 ]]; then
-    # No match found - return the branch name path (will fail later with clear error)
-    echo "$specs_dir/$branch_name"
-  elif [[ ${#matches[@]} -eq 1 ]]; then
-    # Exactly one match - perfect!
-    echo "$specs_dir/${matches[0]}"
-  else
-    # Multiple matches - this shouldn't happen with proper naming convention
-    echo "ERROR: Multiple spec directories found with prefix '$prefix': ${matches[*]}" >&2
-    echo "Please ensure only one spec directory exists per numeric prefix." >&2
-    echo "$specs_dir/$branch_name" # Return something to avoid breaking the script
-  fi
+    local repo_root="$1"
+    local branch_name="$2"
+    local specs_dir="$repo_root/specs"
+
+    # Extract numeric prefix from branch (e.g., "004" from "004-whatever")
+    if [[ ! "$branch_name" =~ ^([0-9]{3})- ]]; then
+        # If branch doesn't have numeric prefix, fall back to exact match
+        echo "$specs_dir/$branch_name"
+        return
+    fi
+
+    local prefix="${BASH_REMATCH[1]}"
+
+    # Search for directories in specs/ that start with this prefix
+    local matches=()
+    if [[ -d "$specs_dir" ]]; then
+        for dir in "$specs_dir"/"$prefix"-*; do
+            if [[ -d "$dir" ]]; then
+                matches+=("$(basename "$dir")")
+            fi
+        done
+    fi
+
+    # Handle results
+    if [[ ${#matches[@]} -eq 0 ]]; then
+        # No match found - return the branch name path (will fail later with clear error)
+        echo "$specs_dir/$branch_name"
+    elif [[ ${#matches[@]} -eq 1 ]]; then
+        # Exactly one match - perfect!
+        echo "$specs_dir/${matches[0]}"
+    else
+        # Multiple matches - this shouldn't happen with proper naming convention
+        echo "ERROR: Multiple spec directories found with prefix '$prefix': ${matches[*]}" >&2
+        echo "Please ensure only one spec directory exists per numeric prefix." >&2
+        echo "$specs_dir/$branch_name"  # Return something to avoid breaking the script
+    fi
 }
 
 get_feature_paths() {
-  local repo_root=$(get_repo_root)
-  local current_branch=$(get_current_branch)
-  local has_git_repo="false"
+    local repo_root=$(get_repo_root)
+    local current_branch=$(get_current_branch)
+    local has_git_repo="false"
 
-  if has_git; then
-    has_git_repo="true"
-  fi
+    if has_git; then
+        has_git_repo="true"
+    fi
 
-  # Use prefix-based lookup to support multiple branches per spec
-  local feature_dir=$(find_feature_dir_by_prefix "$repo_root" "$current_branch")
+    # Use prefix-based lookup to support multiple branches per spec
+    local feature_dir=$(find_feature_dir_by_prefix "$repo_root" "$current_branch")
 
-  cat <<EOF
+    cat <<EOF
 REPO_ROOT='$repo_root'
 CURRENT_BRANCH='$current_branch'
 HAS_GIT='$has_git_repo'
diff --git a/.specify/scripts/bash/create-new-feature.sh b/.specify/scripts/bash/create-new-feature.sh
index cc95e858..c40cfd77 100755
--- a/.specify/scripts/bash/create-new-feature.sh
+++ b/.specify/scripts/bash/create-new-feature.sh
@@ -8,151 +8,151 @@ BRANCH_NUMBER=""
 ARGS=()
 i=1
 while [ $i -le $# ]; do
-  arg="${!i}"
-  case "$arg" in
-    --json)
-      JSON_MODE=true
-      ;;
-    --short-name)
-      if [ $((i + 1)) -gt $# ]; then
-        echo 'Error: --short-name requires a value' >&2
-        exit 1
-      fi
-      i=$((i + 1))
-      next_arg="${!i}"
-      # Check if the next argument is another option (starts with --)
-      if [[ "$next_arg" == --* ]]; then
-        echo 'Error: --short-name requires a value' >&2
-        exit 1
-      fi
-      SHORT_NAME="$next_arg"
-      ;;
-    --number)
-      if [ $((i + 1)) -gt $# ]; then
-        echo 'Error: --number requires a value' >&2
-        exit 1
-      fi
-      i=$((i + 1))
-      next_arg="${!i}"
-      if [[ "$next_arg" == --* ]]; then
-        echo 'Error: --number requires a value' >&2
-        exit 1
-      fi
-      BRANCH_NUMBER="$next_arg"
-      ;;
-    --help | -h)
-      echo "Usage: $0 [--json] [--short-name <name>] [--number N] <feature_description>"
-      echo ""
-      echo "Options:"
-      echo "  --json              Output in JSON format"
-      echo "  --short-name <name> Provide a custom short name (2-4 words) for the branch"
-      echo "  --number N          Specify branch number manually (overrides auto-detection)"
-      echo "  --help, -h          Show this help message"
-      echo ""
-      echo "Examples:"
-      echo "  $0 'Add user authentication system' --short-name 'user-auth'"
-      echo "  $0 'Implement OAuth2 integration for API' --number 5"
-      exit 0
-      ;;
-    *)
-      ARGS+=("$arg")
-      ;;
-  esac
-  i=$((i + 1))
+    arg="${!i}"
+    case "$arg" in
+        --json) 
+            JSON_MODE=true 
+            ;;
+        --short-name)
+            if [ $((i + 1)) -gt $# ]; then
+                echo 'Error: --short-name requires a value' >&2
+                exit 1
+            fi
+            i=$((i + 1))
+            next_arg="${!i}"
+            # Check if the next argument is another option (starts with --)
+            if [[ "$next_arg" == --* ]]; then
+                echo 'Error: --short-name requires a value' >&2
+                exit 1
+            fi
+            SHORT_NAME="$next_arg"
+            ;;
+        --number)
+            if [ $((i + 1)) -gt $# ]; then
+                echo 'Error: --number requires a value' >&2
+                exit 1
+            fi
+            i=$((i + 1))
+            next_arg="${!i}"
+            if [[ "$next_arg" == --* ]]; then
+                echo 'Error: --number requires a value' >&2
+                exit 1
+            fi
+            BRANCH_NUMBER="$next_arg"
+            ;;
+        --help|-h) 
+            echo "Usage: $0 [--json] [--short-name <name>] [--number N] <feature_description>"
+            echo ""
+            echo "Options:"
+            echo "  --json              Output in JSON format"
+            echo "  --short-name <name> Provide a custom short name (2-4 words) for the branch"
+            echo "  --number N          Specify branch number manually (overrides auto-detection)"
+            echo "  --help, -h          Show this help message"
+            echo ""
+            echo "Examples:"
+            echo "  $0 'Add user authentication system' --short-name 'user-auth'"
+            echo "  $0 'Implement OAuth2 integration for API' --number 5"
+            exit 0
+            ;;
+        *) 
+            ARGS+=("$arg") 
+            ;;
+    esac
+    i=$((i + 1))
 done
 
 FEATURE_DESCRIPTION="${ARGS[*]}"
 if [ -z "$FEATURE_DESCRIPTION" ]; then
-  echo "Usage: $0 [--json] [--short-name <name>] [--number N] <feature_description>" >&2
-  exit 1
+    echo "Usage: $0 [--json] [--short-name <name>] [--number N] <feature_description>" >&2
+    exit 1
 fi
 
 # Function to find the repository root by searching for existing project markers
 find_repo_root() {
-  local dir="$1"
-  while [ "$dir" != "/" ]; do
-    if [ -d "$dir/.git" ] || [ -d "$dir/.specify" ]; then
-      echo "$dir"
-      return 0
-    fi
-    dir="$(dirname "$dir")"
-  done
-  return 1
+    local dir="$1"
+    while [ "$dir" != "/" ]; do
+        if [ -d "$dir/.git" ] || [ -d "$dir/.specify" ]; then
+            echo "$dir"
+            return 0
+        fi
+        dir="$(dirname "$dir")"
+    done
+    return 1
 }
 
 # Function to get highest number from specs directory
 get_highest_from_specs() {
-  local specs_dir="$1"
-  local highest=0
-
-  if [ -d "$specs_dir" ]; then
-    for dir in "$specs_dir"/*; do
-      [ -d "$dir" ] || continue
-      dirname=$(basename "$dir")
-      number=$(echo "$dirname" | grep -o '^[0-9]\+' || echo "0")
-      number=$((10#$number))
-      if [ "$number" -gt "$highest" ]; then
-        highest=$number
-      fi
-    done
-  fi
-
-  echo "$highest"
+    local specs_dir="$1"
+    local highest=0
+    
+    if [ -d "$specs_dir" ]; then
+        for dir in "$specs_dir"/*; do
+            [ -d "$dir" ] || continue
+            dirname=$(basename "$dir")
+            number=$(echo "$dirname" | grep -o '^[0-9]\+' || echo "0")
+            number=$((10#$number))
+            if [ "$number" -gt "$highest" ]; then
+                highest=$number
+            fi
+        done
+    fi
+    
+    echo "$highest"
 }
 
 # Function to get highest number from git branches
 get_highest_from_branches() {
-  local highest=0
-
-  # Get all branches (local and remote)
-  branches=$(git branch -a 2>/dev/null || echo "")
-
-  if [ -n "$branches" ]; then
-    while IFS= read -r branch; do
-      # Clean branch name: remove leading markers and remote prefixes
-      clean_branch=$(echo "$branch" | sed 's/^[* ]*//; s|^remotes/[^/]*/||')
-
-      # Extract feature number if branch matches pattern ###-*
-      if echo "$clean_branch" | grep -q '^[0-9]\{3\}-'; then
-        number=$(echo "$clean_branch" | grep -o '^[0-9]\{3\}' || echo "0")
-        number=$((10#$number))
-        if [ "$number" -gt "$highest" ]; then
-          highest=$number
-        fi
-      fi
-    done <<<"$branches"
-  fi
-
-  echo "$highest"
+    local highest=0
+    
+    # Get all branches (local and remote)
+    branches=$(git branch -a 2>/dev/null || echo "")
+    
+    if [ -n "$branches" ]; then
+        while IFS= read -r branch; do
+            # Clean branch name: remove leading markers and remote prefixes
+            clean_branch=$(echo "$branch" | sed 's/^[* ]*//; s|^remotes/[^/]*/||')
+            
+            # Extract feature number if branch matches pattern ###-*
+            if echo "$clean_branch" | grep -q '^[0-9]\{3\}-'; then
+                number=$(echo "$clean_branch" | grep -o '^[0-9]\{3\}' || echo "0")
+                number=$((10#$number))
+                if [ "$number" -gt "$highest" ]; then
+                    highest=$number
+                fi
+            fi
+        done <<< "$branches"
+    fi
+    
+    echo "$highest"
 }
 
 # Function to check existing branches (local and remote) and return next available number
 check_existing_branches() {
-  local specs_dir="$1"
+    local specs_dir="$1"
 
-  # Fetch all remotes to get latest branch info (suppress errors if no remotes)
-  git fetch --all --prune 2>/dev/null || true
+    # Fetch all remotes to get latest branch info (suppress errors if no remotes)
+    git fetch --all --prune 2>/dev/null || true
 
-  # Get highest number from ALL branches (not just matching short name)
-  local highest_branch=$(get_highest_from_branches)
+    # Get highest number from ALL branches (not just matching short name)
+    local highest_branch=$(get_highest_from_branches)
 
-  # Get highest number from ALL specs (not just matching short name)
-  local highest_spec=$(get_highest_from_specs "$specs_dir")
+    # Get highest number from ALL specs (not just matching short name)
+    local highest_spec=$(get_highest_from_specs "$specs_dir")
 
-  # Take the maximum of both
-  local max_num=$highest_branch
-  if [ "$highest_spec" -gt "$max_num" ]; then
-    max_num=$highest_spec
-  fi
+    # Take the maximum of both
+    local max_num=$highest_branch
+    if [ "$highest_spec" -gt "$max_num" ]; then
+        max_num=$highest_spec
+    fi
 
-  # Return next number
-  echo $((max_num + 1))
+    # Return next number
+    echo $((max_num + 1))
 }
 
 # Function to clean and format a branch name
 clean_branch_name() {
-  local name="$1"
-  echo "$name" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/-\+/-/g' | sed 's/^-//' | sed 's/-$//'
+    local name="$1"
+    echo "$name" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/-\+/-/g' | sed 's/^-//' | sed 's/-$//'
 }
 
 # Resolve repository root. Prefer git information when available, but fall back
@@ -161,15 +161,15 @@ clean_branch_name() {
 SCRIPT_DIR="$(CDPATH="" cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 if git rev-parse --show-toplevel >/dev/null 2>&1; then
-  REPO_ROOT=$(git rev-parse --show-toplevel)
-  HAS_GIT=true
+    REPO_ROOT=$(git rev-parse --show-toplevel)
+    HAS_GIT=true
 else
-  REPO_ROOT="$(find_repo_root "$SCRIPT_DIR")"
-  if [ -z "$REPO_ROOT" ]; then
-    echo "Error: Could not determine repository root. Please run this script from within the repository." >&2
-    exit 1
-  fi
-  HAS_GIT=false
+    REPO_ROOT="$(find_repo_root "$SCRIPT_DIR")"
+    if [ -z "$REPO_ROOT" ]; then
+        echo "Error: Could not determine repository root. Please run this script from within the repository." >&2
+        exit 1
+    fi
+    HAS_GIT=false
 fi
 
 cd "$REPO_ROOT"
@@ -179,71 +179,71 @@ mkdir -p "$SPECS_DIR"
 
 # Function to generate branch name with stop word filtering and length filtering
 generate_branch_name() {
-  local description="$1"
-
-  # Common stop words to filter out
-  local stop_words="^(i|a|an|the|to|for|of|in|on|at|by|with|from|is|are|was|were|be|been|being|have|has|had|do|does|did|will|would|should|could|can|may|might|must|shall|this|that|these|those|my|your|our|their|want|need|add|get|set)$"
-
-  # Convert to lowercase and split into words
-  local clean_name=$(echo "$description" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/ /g')
-
-  # Filter words: remove stop words and words shorter than 3 chars (unless they're uppercase acronyms in original)
-  local meaningful_words=()
-  for word in $clean_name; do
-    # Skip empty words
-    [ -z "$word" ] && continue
-
-    # Keep words that are NOT stop words AND (length >= 3 OR are potential acronyms)
-    if ! echo "$word" | grep -qiE "$stop_words"; then
-      if [ ${#word} -ge 3 ]; then
-        meaningful_words+=("$word")
-      elif echo "$description" | grep -q "\b${word^^}\b"; then
-        # Keep short words if they appear as uppercase in original (likely acronyms)
-        meaningful_words+=("$word")
-      fi
-    fi
-  done
-
-  # If we have meaningful words, use first 3-4 of them
-  if [ ${#meaningful_words[@]} -gt 0 ]; then
-    local max_words=3
-    if [ ${#meaningful_words[@]} -eq 4 ]; then max_words=4; fi
-
-    local result=""
-    local count=0
-    for word in "${meaningful_words[@]}"; do
-      if [ $count -ge $max_words ]; then break; fi
-      if [ -n "$result" ]; then result="$result-"; fi
-      result="$result$word"
-      count=$((count + 1))
+    local description="$1"
+    
+    # Common stop words to filter out
+    local stop_words="^(i|a|an|the|to|for|of|in|on|at|by|with|from|is|are|was|were|be|been|being|have|has|had|do|does|did|will|would|should|could|can|may|might|must|shall|this|that|these|those|my|your|our|their|want|need|add|get|set)$"
+    
+    # Convert to lowercase and split into words
+    local clean_name=$(echo "$description" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/ /g')
+    
+    # Filter words: remove stop words and words shorter than 3 chars (unless they're uppercase acronyms in original)
+    local meaningful_words=()
+    for word in $clean_name; do
+        # Skip empty words
+        [ -z "$word" ] && continue
+        
+        # Keep words that are NOT stop words AND (length >= 3 OR are potential acronyms)
+        if ! echo "$word" | grep -qiE "$stop_words"; then
+            if [ ${#word} -ge 3 ]; then
+                meaningful_words+=("$word")
+            elif echo "$description" | grep -q "\b${word^^}\b"; then
+                # Keep short words if they appear as uppercase in original (likely acronyms)
+                meaningful_words+=("$word")
+            fi
+        fi
     done
-    echo "$result"
-  else
-    # Fallback to original logic if no meaningful words found
-    local cleaned=$(clean_branch_name "$description")
-    echo "$cleaned" | tr '-' '\n' | grep -v '^$' | head -3 | tr '\n' '-' | sed 's/-$//'
-  fi
+    
+    # If we have meaningful words, use first 3-4 of them
+    if [ ${#meaningful_words[@]} -gt 0 ]; then
+        local max_words=3
+        if [ ${#meaningful_words[@]} -eq 4 ]; then max_words=4; fi
+        
+        local result=""
+        local count=0
+        for word in "${meaningful_words[@]}"; do
+            if [ $count -ge $max_words ]; then break; fi
+            if [ -n "$result" ]; then result="$result-"; fi
+            result="$result$word"
+            count=$((count + 1))
+        done
+        echo "$result"
+    else
+        # Fallback to original logic if no meaningful words found
+        local cleaned=$(clean_branch_name "$description")
+        echo "$cleaned" | tr '-' '\n' | grep -v '^$' | head -3 | tr '\n' '-' | sed 's/-$//'
+    fi
 }
 
 # Generate branch name
 if [ -n "$SHORT_NAME" ]; then
-  # Use provided short name, just clean it up
-  BRANCH_SUFFIX=$(clean_branch_name "$SHORT_NAME")
+    # Use provided short name, just clean it up
+    BRANCH_SUFFIX=$(clean_branch_name "$SHORT_NAME")
 else
-  # Generate from description with smart filtering
-  BRANCH_SUFFIX=$(generate_branch_name "$FEATURE_DESCRIPTION")
+    # Generate from description with smart filtering
+    BRANCH_SUFFIX=$(generate_branch_name "$FEATURE_DESCRIPTION")
 fi
 
 # Determine branch number
 if [ -z "$BRANCH_NUMBER" ]; then
-  if [ "$HAS_GIT" = true ]; then
-    # Check existing branches on remotes
-    BRANCH_NUMBER=$(check_existing_branches "$SPECS_DIR")
-  else
-    # Fall back to local directory check
-    HIGHEST=$(get_highest_from_specs "$SPECS_DIR")
-    BRANCH_NUMBER=$((HIGHEST + 1))
-  fi
+    if [ "$HAS_GIT" = true ]; then
+        # Check existing branches on remotes
+        BRANCH_NUMBER=$(check_existing_branches "$SPECS_DIR")
+    else
+        # Fall back to local directory check
+        HIGHEST=$(get_highest_from_specs "$SPECS_DIR")
+        BRANCH_NUMBER=$((HIGHEST + 1))
+    fi
 fi
 
 # Force base-10 interpretation to prevent octal conversion (e.g., 010 → 8 in octal, but should be 10 in decimal)
@@ -254,27 +254,27 @@ BRANCH_NAME="${FEATURE_NUM}-${BRANCH_SUFFIX}"
 # Validate and truncate if necessary
 MAX_BRANCH_LENGTH=244
 if [ ${#BRANCH_NAME} -gt $MAX_BRANCH_LENGTH ]; then
-  # Calculate how much we need to trim from suffix
-  # Account for: feature number (3) + hyphen (1) = 4 chars
-  MAX_SUFFIX_LENGTH=$((MAX_BRANCH_LENGTH - 4))
-
-  # Truncate suffix at word boundary if possible
-  TRUNCATED_SUFFIX=$(echo "$BRANCH_SUFFIX" | cut -c1-$MAX_SUFFIX_LENGTH)
-  # Remove trailing hyphen if truncation created one
-  TRUNCATED_SUFFIX=$(echo "$TRUNCATED_SUFFIX" | sed 's/-$//')
-
-  ORIGINAL_BRANCH_NAME="$BRANCH_NAME"
-  BRANCH_NAME="${FEATURE_NUM}-${TRUNCATED_SUFFIX}"
-
-  >&2 echo "[specify] Warning: Branch name exceeded GitHub's 244-byte limit"
-  >&2 echo "[specify] Original: $ORIGINAL_BRANCH_NAME (${#ORIGINAL_BRANCH_NAME} bytes)"
-  >&2 echo "[specify] Truncated to: $BRANCH_NAME (${#BRANCH_NAME} bytes)"
+    # Calculate how much we need to trim from suffix
+    # Account for: feature number (3) + hyphen (1) = 4 chars
+    MAX_SUFFIX_LENGTH=$((MAX_BRANCH_LENGTH - 4))
+    
+    # Truncate suffix at word boundary if possible
+    TRUNCATED_SUFFIX=$(echo "$BRANCH_SUFFIX" | cut -c1-$MAX_SUFFIX_LENGTH)
+    # Remove trailing hyphen if truncation created one
+    TRUNCATED_SUFFIX=$(echo "$TRUNCATED_SUFFIX" | sed 's/-$//')
+    
+    ORIGINAL_BRANCH_NAME="$BRANCH_NAME"
+    BRANCH_NAME="${FEATURE_NUM}-${TRUNCATED_SUFFIX}"
+    
+    >&2 echo "[specify] Warning: Branch name exceeded GitHub's 244-byte limit"
+    >&2 echo "[specify] Original: $ORIGINAL_BRANCH_NAME (${#ORIGINAL_BRANCH_NAME} bytes)"
+    >&2 echo "[specify] Truncated to: $BRANCH_NAME (${#BRANCH_NAME} bytes)"
 fi
 
 if [ "$HAS_GIT" = true ]; then
-  git checkout -b "$BRANCH_NAME"
+    git checkout -b "$BRANCH_NAME"
 else
-  >&2 echo "[specify] Warning: Git repository not detected; skipped branch creation for $BRANCH_NAME"
+    >&2 echo "[specify] Warning: Git repository not detected; skipped branch creation for $BRANCH_NAME"
 fi
 
 FEATURE_DIR="$SPECS_DIR/$BRANCH_NAME"
@@ -288,10 +288,10 @@ if [ -f "$TEMPLATE" ]; then cp "$TEMPLATE" "$SPEC_FILE"; else touch "$SPEC_FILE"
 export SPECIFY_FEATURE="$BRANCH_NAME"
 
 if $JSON_MODE; then
-  printf '{"BRANCH_NAME":"%s","SPEC_FILE":"%s","FEATURE_NUM":"%s"}\n' "$BRANCH_NAME" "$SPEC_FILE" "$FEATURE_NUM"
+    printf '{"BRANCH_NAME":"%s","SPEC_FILE":"%s","FEATURE_NUM":"%s"}\n' "$BRANCH_NAME" "$SPEC_FILE" "$FEATURE_NUM"
 else
-  echo "BRANCH_NAME: $BRANCH_NAME"
-  echo "SPEC_FILE: $SPEC_FILE"
-  echo "FEATURE_NUM: $FEATURE_NUM"
-  echo "SPECIFY_FEATURE environment variable set to: $BRANCH_NAME"
+    echo "BRANCH_NAME: $BRANCH_NAME"
+    echo "SPEC_FILE: $SPEC_FILE"
+    echo "FEATURE_NUM: $FEATURE_NUM"
+    echo "SPECIFY_FEATURE environment variable set to: $BRANCH_NAME"
 fi
diff --git a/.specify/scripts/bash/setup-plan.sh b/.specify/scripts/bash/setup-plan.sh
index 4518bdf3..d01c6d6c 100755
--- a/.specify/scripts/bash/setup-plan.sh
+++ b/.specify/scripts/bash/setup-plan.sh
@@ -7,20 +7,20 @@ JSON_MODE=false
 ARGS=()
 
 for arg in "$@"; do
-  case "$arg" in
-    --json)
-      JSON_MODE=true
-      ;;
-    --help | -h)
-      echo "Usage: $0 [--json]"
-      echo "  --json    Output results in JSON format"
-      echo "  --help    Show this help message"
-      exit 0
-      ;;
-    *)
-      ARGS+=("$arg")
-      ;;
-  esac
+    case "$arg" in
+        --json) 
+            JSON_MODE=true 
+            ;;
+        --help|-h) 
+            echo "Usage: $0 [--json]"
+            echo "  --json    Output results in JSON format"
+            echo "  --help    Show this help message"
+            exit 0 
+            ;;
+        *) 
+            ARGS+=("$arg") 
+            ;;
+    esac
 done
 
 # Get script directory and load common functions
@@ -39,22 +39,23 @@ mkdir -p "$FEATURE_DIR"
 # Copy plan template if it exists
 TEMPLATE="$REPO_ROOT/.specify/templates/plan-template.md"
 if [[ -f "$TEMPLATE" ]]; then
-  cp "$TEMPLATE" "$IMPL_PLAN"
-  echo "Copied plan template to $IMPL_PLAN"
+    cp "$TEMPLATE" "$IMPL_PLAN"
+    echo "Copied plan template to $IMPL_PLAN"
 else
-  echo "Warning: Plan template not found at $TEMPLATE"
-  # Create a basic plan file if template doesn't exist
-  touch "$IMPL_PLAN"
+    echo "Warning: Plan template not found at $TEMPLATE"
+    # Create a basic plan file if template doesn't exist
+    touch "$IMPL_PLAN"
 fi
 
 # Output results
 if $JSON_MODE; then
-  printf '{"FEATURE_SPEC":"%s","IMPL_PLAN":"%s","SPECS_DIR":"%s","BRANCH":"%s","HAS_GIT":"%s"}\n' \
-    "$FEATURE_SPEC" "$IMPL_PLAN" "$FEATURE_DIR" "$CURRENT_BRANCH" "$HAS_GIT"
+    printf '{"FEATURE_SPEC":"%s","IMPL_PLAN":"%s","SPECS_DIR":"%s","BRANCH":"%s","HAS_GIT":"%s"}\n' \
+        "$FEATURE_SPEC" "$IMPL_PLAN" "$FEATURE_DIR" "$CURRENT_BRANCH" "$HAS_GIT"
 else
-  echo "FEATURE_SPEC: $FEATURE_SPEC"
-  echo "IMPL_PLAN: $IMPL_PLAN"
-  echo "SPECS_DIR: $FEATURE_DIR"
-  echo "BRANCH: $CURRENT_BRANCH"
-  echo "HAS_GIT: $HAS_GIT"
+    echo "FEATURE_SPEC: $FEATURE_SPEC"
+    echo "IMPL_PLAN: $IMPL_PLAN" 
+    echo "SPECS_DIR: $FEATURE_DIR"
+    echo "BRANCH: $CURRENT_BRANCH"
+    echo "HAS_GIT: $HAS_GIT"
 fi
+
diff --git a/.specify/scripts/bash/update-agent-context.sh b/.specify/scripts/bash/update-agent-context.sh
index ef22db52..a33ea5cd 100755
--- a/.specify/scripts/bash/update-agent-context.sh
+++ b/.specify/scripts/bash/update-agent-context.sh
@@ -2,7 +2,7 @@
 
 # Update agent context files with information from plan.md
 #
-# This script maintains AI agent context files by parsing feature specifications
+# This script maintains AI agent context files by parsing feature specifications 
 # and updating agent-specific configuration files with project information.
 #
 # MAIN FUNCTIONS:
@@ -30,12 +30,12 @@
 #
 # 5. Multi-Agent Support
 #    - Handles agent-specific file paths and naming conventions
-#    - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy CLI, Qoder CLI, Amp, SHAI, or Amazon Q Developer CLI
+#    - Supports: Claude, Gemini, Copilot, Cursor, Qwen, opencode, Codex, Windsurf, Kilo Code, Auggie CLI, Roo Code, CodeBuddy CLI, Qoder CLI, Amp, SHAI, Amazon Q Developer CLI, or Antigravity
 #    - Can update single agents or all existing agent files
 #    - Creates default Claude file if no agent files exist
 #
 # Usage: ./update-agent-context.sh [agent_type]
-# Agent types: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|shai|q|bob|qoder
+# Agent types: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli
 # Leave empty to update all existing agent files
 
 set -e
@@ -55,10 +55,10 @@ source "$SCRIPT_DIR/common.sh"
 # Get all paths and variables from common functions
 eval $(get_feature_paths)
 
-NEW_PLAN="$IMPL_PLAN" # Alias for compatibility with existing code
+NEW_PLAN="$IMPL_PLAN"  # Alias for compatibility with existing code
 AGENT_TYPE="${1:-}"
 
-# Agent-specific file paths
+# Agent-specific file paths  
 CLAUDE_FILE="$REPO_ROOT/CLAUDE.md"
 GEMINI_FILE="$REPO_ROOT/GEMINI.md"
 COPILOT_FILE="$REPO_ROOT/.github/agents/copilot-instructions.md"
@@ -74,6 +74,7 @@ QODER_FILE="$REPO_ROOT/QODER.md"
 AMP_FILE="$REPO_ROOT/AGENTS.md"
 SHAI_FILE="$REPO_ROOT/SHAI.md"
 Q_FILE="$REPO_ROOT/AGENTS.md"
+AGY_FILE="$REPO_ROOT/.agent/rules/specify-rules.md"
 BOB_FILE="$REPO_ROOT/AGENTS.md"
 
 # Template file
@@ -90,27 +91,27 @@ NEW_PROJECT_TYPE=""
 #==============================================================================
 
 log_info() {
-  echo "INFO: $1"
+    echo "INFO: $1"
 }
 
 log_success() {
-  echo "✓ $1"
+    echo "✓ $1"
 }
 
 log_error() {
-  echo "ERROR: $1" >&2
+    echo "ERROR: $1" >&2
 }
 
 log_warning() {
-  echo "WARNING: $1" >&2
+    echo "WARNING: $1" >&2
 }
 
 # Cleanup function for temporary files
 cleanup() {
-  local exit_code=$?
-  rm -f /tmp/agent_update_*_$$
-  rm -f /tmp/manual_additions_$$
-  exit $exit_code
+    local exit_code=$?
+    rm -f /tmp/agent_update_*_$$
+    rm -f /tmp/manual_additions_$$
+    exit $exit_code
 }
 
 # Set up cleanup trap
@@ -121,32 +122,32 @@ trap cleanup EXIT INT TERM
 #==============================================================================
 
 validate_environment() {
-  # Check if we have a current branch/feature (git or non-git)
-  if [[ -z "$CURRENT_BRANCH" ]]; then
-    log_error "Unable to determine current feature"
-    if [[ "$HAS_GIT" == "true" ]]; then
-      log_info "Make sure you're on a feature branch"
-    else
-      log_info "Set SPECIFY_FEATURE environment variable or create a feature first"
-    fi
-    exit 1
-  fi
-
-  # Check if plan.md exists
-  if [[ ! -f "$NEW_PLAN" ]]; then
-    log_error "No plan.md found at $NEW_PLAN"
-    log_info "Make sure you're working on a feature with a corresponding spec directory"
-    if [[ "$HAS_GIT" != "true" ]]; then
-      log_info "Use: export SPECIFY_FEATURE=your-feature-name or create a new feature first"
-    fi
-    exit 1
-  fi
-
-  # Check if template exists (needed for new files)
-  if [[ ! -f "$TEMPLATE_FILE" ]]; then
-    log_warning "Template file not found at $TEMPLATE_FILE"
-    log_warning "Creating new agent files will fail"
-  fi
+    # Check if we have a current branch/feature (git or non-git)
+    if [[ -z "$CURRENT_BRANCH" ]]; then
+        log_error "Unable to determine current feature"
+        if [[ "$HAS_GIT" == "true" ]]; then
+            log_info "Make sure you're on a feature branch"
+        else
+            log_info "Set SPECIFY_FEATURE environment variable or create a feature first"
+        fi
+        exit 1
+    fi
+    
+    # Check if plan.md exists
+    if [[ ! -f "$NEW_PLAN" ]]; then
+        log_error "No plan.md found at $NEW_PLAN"
+        log_info "Make sure you're working on a feature with a corresponding spec directory"
+        if [[ "$HAS_GIT" != "true" ]]; then
+            log_info "Use: export SPECIFY_FEATURE=your-feature-name or create a new feature first"
+        fi
+        exit 1
+    fi
+    
+    # Check if template exists (needed for new files)
+    if [[ ! -f "$TEMPLATE_FILE" ]]; then
+        log_warning "Template file not found at $TEMPLATE_FILE"
+        log_warning "Creating new agent files will fail"
+    fi
 }
 
 #==============================================================================
@@ -154,79 +155,79 @@ validate_environment() {
 #==============================================================================
 
 extract_plan_field() {
-  local field_pattern="$1"
-  local plan_file="$2"
-
-  grep "^\*\*${field_pattern}\*\*: " "$plan_file" 2>/dev/null \
-    | head -1 \
-    | sed "s|^\*\*${field_pattern}\*\*: ||" \
-    | sed 's/^[ \t]*//;s/[ \t]*$//' \
-    | grep -v "NEEDS CLARIFICATION" \
-    | grep -v "^N/A$" || echo ""
+    local field_pattern="$1"
+    local plan_file="$2"
+    
+    grep "^\*\*${field_pattern}\*\*: " "$plan_file" 2>/dev/null | \
+        head -1 | \
+        sed "s|^\*\*${field_pattern}\*\*: ||" | \
+        sed 's/^[ \t]*//;s/[ \t]*$//' | \
+        grep -v "NEEDS CLARIFICATION" | \
+        grep -v "^N/A$" || echo ""
 }
 
 parse_plan_data() {
-  local plan_file="$1"
-
-  if [[ ! -f "$plan_file" ]]; then
-    log_error "Plan file not found: $plan_file"
-    return 1
-  fi
-
-  if [[ ! -r "$plan_file" ]]; then
-    log_error "Plan file is not readable: $plan_file"
-    return 1
-  fi
-
-  log_info "Parsing plan data from $plan_file"
-
-  NEW_LANG=$(extract_plan_field "Language/Version" "$plan_file")
-  NEW_FRAMEWORK=$(extract_plan_field "Primary Dependencies" "$plan_file")
-  NEW_DB=$(extract_plan_field "Storage" "$plan_file")
-  NEW_PROJECT_TYPE=$(extract_plan_field "Project Type" "$plan_file")
-
-  # Log what we found
-  if [[ -n "$NEW_LANG" ]]; then
-    log_info "Found language: $NEW_LANG"
-  else
-    log_warning "No language information found in plan"
-  fi
-
-  if [[ -n "$NEW_FRAMEWORK" ]]; then
-    log_info "Found framework: $NEW_FRAMEWORK"
-  fi
-
-  if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]]; then
-    log_info "Found database: $NEW_DB"
-  fi
-
-  if [[ -n "$NEW_PROJECT_TYPE" ]]; then
-    log_info "Found project type: $NEW_PROJECT_TYPE"
-  fi
+    local plan_file="$1"
+    
+    if [[ ! -f "$plan_file" ]]; then
+        log_error "Plan file not found: $plan_file"
+        return 1
+    fi
+    
+    if [[ ! -r "$plan_file" ]]; then
+        log_error "Plan file is not readable: $plan_file"
+        return 1
+    fi
+    
+    log_info "Parsing plan data from $plan_file"
+    
+    NEW_LANG=$(extract_plan_field "Language/Version" "$plan_file")
+    NEW_FRAMEWORK=$(extract_plan_field "Primary Dependencies" "$plan_file")
+    NEW_DB=$(extract_plan_field "Storage" "$plan_file")
+    NEW_PROJECT_TYPE=$(extract_plan_field "Project Type" "$plan_file")
+    
+    # Log what we found
+    if [[ -n "$NEW_LANG" ]]; then
+        log_info "Found language: $NEW_LANG"
+    else
+        log_warning "No language information found in plan"
+    fi
+    
+    if [[ -n "$NEW_FRAMEWORK" ]]; then
+        log_info "Found framework: $NEW_FRAMEWORK"
+    fi
+    
+    if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]]; then
+        log_info "Found database: $NEW_DB"
+    fi
+    
+    if [[ -n "$NEW_PROJECT_TYPE" ]]; then
+        log_info "Found project type: $NEW_PROJECT_TYPE"
+    fi
 }
 
 format_technology_stack() {
-  local lang="$1"
-  local framework="$2"
-  local parts=()
-
-  # Add non-empty parts
-  [[ -n "$lang" && "$lang" != "NEEDS CLARIFICATION" ]] && parts+=("$lang")
-  [[ -n "$framework" && "$framework" != "NEEDS CLARIFICATION" && "$framework" != "N/A" ]] && parts+=("$framework")
-
-  # Join with proper formatting
-  if [[ ${#parts[@]} -eq 0 ]]; then
-    echo ""
-  elif [[ ${#parts[@]} -eq 1 ]]; then
-    echo "${parts[0]}"
-  else
-    # Join multiple parts with " + "
-    local result="${parts[0]}"
-    for ((i = 1; i < ${#parts[@]}; i++)); do
-      result="$result + ${parts[i]}"
-    done
-    echo "$result"
-  fi
+    local lang="$1"
+    local framework="$2"
+    local parts=()
+    
+    # Add non-empty parts
+    [[ -n "$lang" && "$lang" != "NEEDS CLARIFICATION" ]] && parts+=("$lang")
+    [[ -n "$framework" && "$framework" != "NEEDS CLARIFICATION" && "$framework" != "N/A" ]] && parts+=("$framework")
+    
+    # Join with proper formatting
+    if [[ ${#parts[@]} -eq 0 ]]; then
+        echo ""
+    elif [[ ${#parts[@]} -eq 1 ]]; then
+        echo "${parts[0]}"
+    else
+        # Join multiple parts with " + "
+        local result="${parts[0]}"
+        for ((i=1; i<${#parts[@]}; i++)); do
+            result="$result + ${parts[i]}"
+        done
+        echo "$result"
+    fi
 }
 
 #==============================================================================
@@ -234,341 +235,344 @@ format_technology_stack() {
 #==============================================================================
 
 get_project_structure() {
-  local project_type="$1"
-
-  if [[ "$project_type" == *"web"* ]]; then
-    echo "backend/\\nfrontend/\\ntests/"
-  else
-    echo "src/\\ntests/"
-  fi
+    local project_type="$1"
+    
+    if [[ "$project_type" == *"web"* ]]; then
+        echo "backend/\\nfrontend/\\ntests/"
+    else
+        echo "src/\\ntests/"
+    fi
 }
 
 get_commands_for_language() {
-  local lang="$1"
-
-  case "$lang" in
-    *"Python"*)
-      echo "cd src && pytest && ruff check ."
-      ;;
-    *"Rust"*)
-      echo "cargo test && cargo clippy"
-      ;;
-    *"JavaScript"* | *"TypeScript"*)
-      echo "npm test \\&\\& npm run lint"
-      ;;
-    *)
-      echo "# Add commands for $lang"
-      ;;
-  esac
+    local lang="$1"
+    
+    case "$lang" in
+        *"Python"*)
+            echo "cd src && pytest && ruff check ."
+            ;;
+        *"Rust"*)
+            echo "cargo test && cargo clippy"
+            ;;
+        *"JavaScript"*|*"TypeScript"*)
+            echo "npm test \\&\\& npm run lint"
+            ;;
+        *)
+            echo "# Add commands for $lang"
+            ;;
+    esac
 }
 
 get_language_conventions() {
-  local lang="$1"
-  echo "$lang: Follow standard conventions"
+    local lang="$1"
+    echo "$lang: Follow standard conventions"
 }
 
 create_new_agent_file() {
-  local target_file="$1"
-  local temp_file="$2"
-  local project_name="$3"
-  local current_date="$4"
-
-  if [[ ! -f "$TEMPLATE_FILE" ]]; then
-    log_error "Template not found at $TEMPLATE_FILE"
-    return 1
-  fi
-
-  if [[ ! -r "$TEMPLATE_FILE" ]]; then
-    log_error "Template file is not readable: $TEMPLATE_FILE"
-    return 1
-  fi
-
-  log_info "Creating new agent context file from template..."
-
-  if ! cp "$TEMPLATE_FILE" "$temp_file"; then
-    log_error "Failed to copy template file"
-    return 1
-  fi
-
-  # Replace template placeholders
-  local project_structure
-  project_structure=$(get_project_structure "$NEW_PROJECT_TYPE")
-
-  local commands
-  commands=$(get_commands_for_language "$NEW_LANG")
-
-  local language_conventions
-  language_conventions=$(get_language_conventions "$NEW_LANG")
-
-  # Perform substitutions with error checking using safer approach
-  # Escape special characters for sed by using a different delimiter or escaping
-  local escaped_lang=$(printf '%s\n' "$NEW_LANG" | sed 's/[\[\.*^$()+{}|]/\\&/g')
-  local escaped_framework=$(printf '%s\n' "$NEW_FRAMEWORK" | sed 's/[\[\.*^$()+{}|]/\\&/g')
-  local escaped_branch=$(printf '%s\n' "$CURRENT_BRANCH" | sed 's/[\[\.*^$()+{}|]/\\&/g')
-
-  # Build technology stack and recent change strings conditionally
-  local tech_stack
-  if [[ -n "$escaped_lang" && -n "$escaped_framework" ]]; then
-    tech_stack="- $escaped_lang + $escaped_framework ($escaped_branch)"
-  elif [[ -n "$escaped_lang" ]]; then
-    tech_stack="- $escaped_lang ($escaped_branch)"
-  elif [[ -n "$escaped_framework" ]]; then
-    tech_stack="- $escaped_framework ($escaped_branch)"
-  else
-    tech_stack="- ($escaped_branch)"
-  fi
-
-  local recent_change
-  if [[ -n "$escaped_lang" && -n "$escaped_framework" ]]; then
-    recent_change="- $escaped_branch: Added $escaped_lang + $escaped_framework"
-  elif [[ -n "$escaped_lang" ]]; then
-    recent_change="- $escaped_branch: Added $escaped_lang"
-  elif [[ -n "$escaped_framework" ]]; then
-    recent_change="- $escaped_branch: Added $escaped_framework"
-  else
-    recent_change="- $escaped_branch: Added"
-  fi
-
-  local substitutions=(
-    "s|\[PROJECT NAME\]|$project_name|"
-    "s|\[DATE\]|$current_date|"
-    "s|\[EXTRACTED FROM ALL PLAN.MD FILES\]|$tech_stack|"
-    "s|\[ACTUAL STRUCTURE FROM PLANS\]|$project_structure|g"
-    "s|\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\]|$commands|"
-    "s|\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\]|$language_conventions|"
-    "s|\[LAST 3 FEATURES AND WHAT THEY ADDED\]|$recent_change|"
-  )
-
-  for substitution in "${substitutions[@]}"; do
-    if ! sed -i.bak -e "$substitution" "$temp_file"; then
-      log_error "Failed to perform substitution: $substitution"
-      rm -f "$temp_file" "$temp_file.bak"
-      return 1
-    fi
-  done
-
-  # Convert \n sequences to actual newlines
-  newline=$(printf '\n')
-  sed -i.bak2 "s/\\\\n/${newline}/g" "$temp_file"
-
-  # Clean up backup files
-  rm -f "$temp_file.bak" "$temp_file.bak2"
-
-  return 0
-}
-
-update_existing_agent_file() {
-  local target_file="$1"
-  local current_date="$2"
-
-  log_info "Updating existing agent context file..."
-
-  # Use a single temporary file for atomic update
-  local temp_file
-  temp_file=$(mktemp) || {
-    log_error "Failed to create temporary file"
-    return 1
-  }
-
-  # Process the file in one pass
-  local tech_stack=$(format_technology_stack "$NEW_LANG" "$NEW_FRAMEWORK")
-  local new_tech_entries=()
-  local new_change_entry=""
-
-  # Prepare new technology entries
-  if [[ -n "$tech_stack" ]] && ! grep -q "$tech_stack" "$target_file"; then
-    new_tech_entries+=("- $tech_stack ($CURRENT_BRANCH)")
-  fi
-
-  if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]] && [[ "$NEW_DB" != "NEEDS CLARIFICATION" ]] && ! grep -q "$NEW_DB" "$target_file"; then
-    new_tech_entries+=("- $NEW_DB ($CURRENT_BRANCH)")
-  fi
-
-  # Prepare new change entry
-  if [[ -n "$tech_stack" ]]; then
-    new_change_entry="- $CURRENT_BRANCH: Added $tech_stack"
-  elif [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]] && [[ "$NEW_DB" != "NEEDS CLARIFICATION" ]]; then
-    new_change_entry="- $CURRENT_BRANCH: Added $NEW_DB"
-  fi
-
-  # Check if sections exist in the file
-  local has_active_technologies=0
-  local has_recent_changes=0
-
-  if grep -q "^## Active Technologies" "$target_file" 2>/dev/null; then
-    has_active_technologies=1
-  fi
-
-  if grep -q "^## Recent Changes" "$target_file" 2>/dev/null; then
-    has_recent_changes=1
-  fi
-
-  # Process file line by line
-  local in_tech_section=false
-  local in_changes_section=false
-  local tech_entries_added=false
-  local changes_entries_added=false
-  local existing_changes_count=0
-  local file_ended=false
-
-  while IFS= read -r line || [[ -n "$line" ]]; do
-    # Handle Active Technologies section
-    if [[ "$line" == "## Active Technologies" ]]; then
-      echo "$line" >>"$temp_file"
-      in_tech_section=true
-      continue
-    elif [[ $in_tech_section == true ]] && [[ "$line" =~ ^##[[:space:]] ]]; then
-      # Add new tech entries before closing the section
-      if [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
-        printf '%s\n' "${new_tech_entries[@]}" >>"$temp_file"
-        tech_entries_added=true
-      fi
-      echo "$line" >>"$temp_file"
-      in_tech_section=false
-      continue
-    elif [[ $in_tech_section == true ]] && [[ -z "$line" ]]; then
-      # Add new tech entries before empty line in tech section
-      if [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
-        printf '%s\n' "${new_tech_entries[@]}" >>"$temp_file"
-        tech_entries_added=true
-      fi
-      echo "$line" >>"$temp_file"
-      continue
-    fi
-
-    # Handle Recent Changes section
-    if [[ "$line" == "## Recent Changes" ]]; then
-      echo "$line" >>"$temp_file"
-      # Add new change entry right after the heading
-      if [[ -n "$new_change_entry" ]]; then
-        echo "$new_change_entry" >>"$temp_file"
-      fi
-      in_changes_section=true
-      changes_entries_added=true
-      continue
-    elif [[ $in_changes_section == true ]] && [[ "$line" =~ ^##[[:space:]] ]]; then
-      echo "$line" >>"$temp_file"
-      in_changes_section=false
-      continue
-    elif [[ $in_changes_section == true ]] && [[ "$line" == "- "* ]]; then
-      # Keep only first 2 existing changes
-      if [[ $existing_changes_count -lt 2 ]]; then
-        echo "$line" >>"$temp_file"
-        ((existing_changes_count++))
-      fi
-      continue
-    fi
-
-    # Update timestamp
-    if [[ "$line" =~ \*\*Last\ updated\*\*:.*[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] ]]; then
-      echo "$line" | sed "s/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/$current_date/" >>"$temp_file"
+    local target_file="$1"
+    local temp_file="$2"
+    local project_name="$3"
+    local current_date="$4"
+    
+    if [[ ! -f "$TEMPLATE_FILE" ]]; then
+        log_error "Template not found at $TEMPLATE_FILE"
+        return 1
+    fi
+    
+    if [[ ! -r "$TEMPLATE_FILE" ]]; then
+        log_error "Template file is not readable: $TEMPLATE_FILE"
+        return 1
+    fi
+    
+    log_info "Creating new agent context file from template..."
+    
+    if ! cp "$TEMPLATE_FILE" "$temp_file"; then
+        log_error "Failed to copy template file"
+        return 1
+    fi
+    
+    # Replace template placeholders
+    local project_structure
+    project_structure=$(get_project_structure "$NEW_PROJECT_TYPE")
+    
+    local commands
+    commands=$(get_commands_for_language "$NEW_LANG")
+    
+    local language_conventions
+    language_conventions=$(get_language_conventions "$NEW_LANG")
+    
+    # Perform substitutions with error checking using safer approach
+    # Escape special characters for sed by using a different delimiter or escaping
+    local escaped_lang=$(printf '%s\n' "$NEW_LANG" | sed 's/[\[\.*^$()+{}|]/\\&/g')
+    local escaped_framework=$(printf '%s\n' "$NEW_FRAMEWORK" | sed 's/[\[\.*^$()+{}|]/\\&/g')
+    local escaped_branch=$(printf '%s\n' "$CURRENT_BRANCH" | sed 's/[\[\.*^$()+{}|]/\\&/g')
+    
+    # Build technology stack and recent change strings conditionally
+    local tech_stack
+    if [[ -n "$escaped_lang" && -n "$escaped_framework" ]]; then
+        tech_stack="- $escaped_lang + $escaped_framework ($escaped_branch)"
+    elif [[ -n "$escaped_lang" ]]; then
+        tech_stack="- $escaped_lang ($escaped_branch)"
+    elif [[ -n "$escaped_framework" ]]; then
+        tech_stack="- $escaped_framework ($escaped_branch)"
     else
-      echo "$line" >>"$temp_file"
-    fi
-  done <"$target_file"
-
-  # Post-loop check: if we're still in the Active Technologies section and haven't added new entries
-  if [[ $in_tech_section == true ]] && [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
-    printf '%s\n' "${new_tech_entries[@]}" >>"$temp_file"
-    tech_entries_added=true
-  fi
-
-  # If sections don't exist, add them at the end of the file
-  if [[ $has_active_technologies -eq 0 ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
-    echo "" >>"$temp_file"
-    echo "## Active Technologies" >>"$temp_file"
-    printf '%s\n' "${new_tech_entries[@]}" >>"$temp_file"
-    tech_entries_added=true
-  fi
-
-  if [[ $has_recent_changes -eq 0 ]] && [[ -n "$new_change_entry" ]]; then
-    echo "" >>"$temp_file"
-    echo "## Recent Changes" >>"$temp_file"
-    echo "$new_change_entry" >>"$temp_file"
-    changes_entries_added=true
-  fi
-
-  # Move temp file to target atomically
-  if ! mv "$temp_file" "$target_file"; then
-    log_error "Failed to update target file"
-    rm -f "$temp_file"
-    return 1
-  fi
-
-  return 0
-}
-#==============================================================================
-# Main Agent File Update Function
-#==============================================================================
+        tech_stack="- ($escaped_branch)"
+    fi
 
-update_agent_file() {
-  local target_file="$1"
-  local agent_name="$2"
+    local recent_change
+    if [[ -n "$escaped_lang" && -n "$escaped_framework" ]]; then
+        recent_change="- $escaped_branch: Added $escaped_lang + $escaped_framework"
+    elif [[ -n "$escaped_lang" ]]; then
+        recent_change="- $escaped_branch: Added $escaped_lang"
+    elif [[ -n "$escaped_framework" ]]; then
+        recent_change="- $escaped_branch: Added $escaped_framework"
+    else
+        recent_change="- $escaped_branch: Added"
+    fi
 
-  if [[ -z "$target_file" ]] || [[ -z "$agent_name" ]]; then
-    log_error "update_agent_file requires target_file and agent_name parameters"
-    return 1
-  fi
+    local substitutions=(
+        "s|\[PROJECT NAME\]|$project_name|"
+        "s|\[DATE\]|$current_date|"
+        "s|\[EXTRACTED FROM ALL PLAN.MD FILES\]|$tech_stack|"
+        "s|\[ACTUAL STRUCTURE FROM PLANS\]|$project_structure|g"
+        "s|\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\]|$commands|"
+        "s|\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\]|$language_conventions|"
+        "s|\[LAST 3 FEATURES AND WHAT THEY ADDED\]|$recent_change|"
+    )
+    
+    for substitution in "${substitutions[@]}"; do
+        if ! sed -i.bak -e "$substitution" "$temp_file"; then
+            log_error "Failed to perform substitution: $substitution"
+            rm -f "$temp_file" "$temp_file.bak"
+            return 1
+        fi
+    done
+    
+    # Convert \n sequences to actual newlines
+    newline=$(printf '\n')
+    sed -i.bak2 "s/\\\\n/${newline}/g" "$temp_file"
+    
+    # Clean up backup files
+    rm -f "$temp_file.bak" "$temp_file.bak2"
+    
+    return 0
+}
 
-  log_info "Updating $agent_name context file: $target_file"
 
-  local project_name
-  project_name=$(basename "$REPO_ROOT")
-  local current_date
-  current_date=$(date +%Y-%m-%d)
 
-  # Create directory if it doesn't exist
-  local target_dir
-  target_dir=$(dirname "$target_file")
-  if [[ ! -d "$target_dir" ]]; then
-    if ! mkdir -p "$target_dir"; then
-      log_error "Failed to create directory: $target_dir"
-      return 1
-    fi
-  fi
 
-  if [[ ! -f "$target_file" ]]; then
-    # Create new file from template
+update_existing_agent_file() {
+    local target_file="$1"
+    local current_date="$2"
+    
+    log_info "Updating existing agent context file..."
+    
+    # Use a single temporary file for atomic update
     local temp_file
     temp_file=$(mktemp) || {
-      log_error "Failed to create temporary file"
-      return 1
+        log_error "Failed to create temporary file"
+        return 1
     }
-
-    if create_new_agent_file "$target_file" "$temp_file" "$project_name" "$current_date"; then
-      if mv "$temp_file" "$target_file"; then
-        log_success "Created new $agent_name context file"
-      else
-        log_error "Failed to move temporary file to $target_file"
+    
+    # Process the file in one pass
+    local tech_stack=$(format_technology_stack "$NEW_LANG" "$NEW_FRAMEWORK")
+    local new_tech_entries=()
+    local new_change_entry=""
+    
+    # Prepare new technology entries
+    if [[ -n "$tech_stack" ]] && ! grep -q "$tech_stack" "$target_file"; then
+        new_tech_entries+=("- $tech_stack ($CURRENT_BRANCH)")
+    fi
+    
+    if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]] && [[ "$NEW_DB" != "NEEDS CLARIFICATION" ]] && ! grep -q "$NEW_DB" "$target_file"; then
+        new_tech_entries+=("- $NEW_DB ($CURRENT_BRANCH)")
+    fi
+    
+    # Prepare new change entry
+    if [[ -n "$tech_stack" ]]; then
+        new_change_entry="- $CURRENT_BRANCH: Added $tech_stack"
+    elif [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]] && [[ "$NEW_DB" != "NEEDS CLARIFICATION" ]]; then
+        new_change_entry="- $CURRENT_BRANCH: Added $NEW_DB"
+    fi
+    
+    # Check if sections exist in the file
+    local has_active_technologies=0
+    local has_recent_changes=0
+    
+    if grep -q "^## Active Technologies" "$target_file" 2>/dev/null; then
+        has_active_technologies=1
+    fi
+    
+    if grep -q "^## Recent Changes" "$target_file" 2>/dev/null; then
+        has_recent_changes=1
+    fi
+    
+    # Process file line by line
+    local in_tech_section=false
+    local in_changes_section=false
+    local tech_entries_added=false
+    local changes_entries_added=false
+    local existing_changes_count=0
+    local file_ended=false
+    
+    while IFS= read -r line || [[ -n "$line" ]]; do
+        # Handle Active Technologies section
+        if [[ "$line" == "## Active Technologies" ]]; then
+            echo "$line" >> "$temp_file"
+            in_tech_section=true
+            continue
+        elif [[ $in_tech_section == true ]] && [[ "$line" =~ ^##[[:space:]] ]]; then
+            # Add new tech entries before closing the section
+            if [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
+                printf '%s\n' "${new_tech_entries[@]}" >> "$temp_file"
+                tech_entries_added=true
+            fi
+            echo "$line" >> "$temp_file"
+            in_tech_section=false
+            continue
+        elif [[ $in_tech_section == true ]] && [[ -z "$line" ]]; then
+            # Add new tech entries before empty line in tech section
+            if [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
+                printf '%s\n' "${new_tech_entries[@]}" >> "$temp_file"
+                tech_entries_added=true
+            fi
+            echo "$line" >> "$temp_file"
+            continue
+        fi
+        
+        # Handle Recent Changes section
+        if [[ "$line" == "## Recent Changes" ]]; then
+            echo "$line" >> "$temp_file"
+            # Add new change entry right after the heading
+            if [[ -n "$new_change_entry" ]]; then
+                echo "$new_change_entry" >> "$temp_file"
+            fi
+            in_changes_section=true
+            changes_entries_added=true
+            continue
+        elif [[ $in_changes_section == true ]] && [[ "$line" =~ ^##[[:space:]] ]]; then
+            echo "$line" >> "$temp_file"
+            in_changes_section=false
+            continue
+        elif [[ $in_changes_section == true ]] && [[ "$line" == "- "* ]]; then
+            # Keep only first 2 existing changes
+            if [[ $existing_changes_count -lt 2 ]]; then
+                echo "$line" >> "$temp_file"
+                ((existing_changes_count++))
+            fi
+            continue
+        fi
+        
+        # Update timestamp
+        if [[ "$line" =~ \*\*Last\ updated\*\*:.*[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] ]]; then
+            echo "$line" | sed "s/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/$current_date/" >> "$temp_file"
+        else
+            echo "$line" >> "$temp_file"
+        fi
+    done < "$target_file"
+    
+    # Post-loop check: if we're still in the Active Technologies section and haven't added new entries
+    if [[ $in_tech_section == true ]] && [[ $tech_entries_added == false ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
+        printf '%s\n' "${new_tech_entries[@]}" >> "$temp_file"
+        tech_entries_added=true
+    fi
+    
+    # If sections don't exist, add them at the end of the file
+    if [[ $has_active_technologies -eq 0 ]] && [[ ${#new_tech_entries[@]} -gt 0 ]]; then
+        echo "" >> "$temp_file"
+        echo "## Active Technologies" >> "$temp_file"
+        printf '%s\n' "${new_tech_entries[@]}" >> "$temp_file"
+        tech_entries_added=true
+    fi
+    
+    if [[ $has_recent_changes -eq 0 ]] && [[ -n "$new_change_entry" ]]; then
+        echo "" >> "$temp_file"
+        echo "## Recent Changes" >> "$temp_file"
+        echo "$new_change_entry" >> "$temp_file"
+        changes_entries_added=true
+    fi
+    
+    # Move temp file to target atomically
+    if ! mv "$temp_file" "$target_file"; then
+        log_error "Failed to update target file"
         rm -f "$temp_file"
         return 1
-      fi
-    else
-      log_error "Failed to create new agent file"
-      rm -f "$temp_file"
-      return 1
-    fi
-  else
-    # Update existing file
-    if [[ ! -r "$target_file" ]]; then
-      log_error "Cannot read existing file: $target_file"
-      return 1
     fi
+    
+    return 0
+}
+#==============================================================================
+# Main Agent File Update Function
+#==============================================================================
 
-    if [[ ! -w "$target_file" ]]; then
-      log_error "Cannot write to existing file: $target_file"
-      return 1
+update_agent_file() {
+    local target_file="$1"
+    local agent_name="$2"
+    
+    if [[ -z "$target_file" ]] || [[ -z "$agent_name" ]]; then
+        log_error "update_agent_file requires target_file and agent_name parameters"
+        return 1
     fi
-
-    if update_existing_agent_file "$target_file" "$current_date"; then
-      log_success "Updated existing $agent_name context file"
+    
+    log_info "Updating $agent_name context file: $target_file"
+    
+    local project_name
+    project_name=$(basename "$REPO_ROOT")
+    local current_date
+    current_date=$(date +%Y-%m-%d)
+    
+    # Create directory if it doesn't exist
+    local target_dir
+    target_dir=$(dirname "$target_file")
+    if [[ ! -d "$target_dir" ]]; then
+        if ! mkdir -p "$target_dir"; then
+            log_error "Failed to create directory: $target_dir"
+            return 1
+        fi
+    fi
+    
+    if [[ ! -f "$target_file" ]]; then
+        # Create new file from template
+        local temp_file
+        temp_file=$(mktemp) || {
+            log_error "Failed to create temporary file"
+            return 1
+        }
+        
+        if create_new_agent_file "$target_file" "$temp_file" "$project_name" "$current_date"; then
+            if mv "$temp_file" "$target_file"; then
+                log_success "Created new $agent_name context file"
+            else
+                log_error "Failed to move temporary file to $target_file"
+                rm -f "$temp_file"
+                return 1
+            fi
+        else
+            log_error "Failed to create new agent file"
+            rm -f "$temp_file"
+            return 1
+        fi
     else
-      log_error "Failed to update existing agent file"
-      return 1
+        # Update existing file
+        if [[ ! -r "$target_file" ]]; then
+            log_error "Cannot read existing file: $target_file"
+            return 1
+        fi
+        
+        if [[ ! -w "$target_file" ]]; then
+            log_error "Cannot write to existing file: $target_file"
+            return 1
+        fi
+        
+        if update_existing_agent_file "$target_file" "$current_date"; then
+            log_success "Updated existing $agent_name context file"
+        else
+            log_error "Failed to update existing agent file"
+            return 1
+        fi
     fi
-  fi
-
-  return 0
+    
+    return 0
 }
 
 #==============================================================================
@@ -576,172 +580,182 @@ update_agent_file() {
 #==============================================================================
 
 update_specific_agent() {
-  local agent_type="$1"
-
-  case "$agent_type" in
-    claude)
-      update_agent_file "$CLAUDE_FILE" "Claude Code"
-      ;;
-    gemini)
-      update_agent_file "$GEMINI_FILE" "Gemini CLI"
-      ;;
-    copilot)
-      update_agent_file "$COPILOT_FILE" "GitHub Copilot"
-      ;;
-    cursor-agent)
-      update_agent_file "$CURSOR_FILE" "Cursor IDE"
-      ;;
-    qwen)
-      update_agent_file "$QWEN_FILE" "Qwen Code"
-      ;;
-    opencode)
-      update_agent_file "$AGENTS_FILE" "opencode"
-      ;;
-    codex)
-      update_agent_file "$AGENTS_FILE" "Codex CLI"
-      ;;
-    windsurf)
-      update_agent_file "$WINDSURF_FILE" "Windsurf"
-      ;;
-    kilocode)
-      update_agent_file "$KILOCODE_FILE" "Kilo Code"
-      ;;
-    auggie)
-      update_agent_file "$AUGGIE_FILE" "Auggie CLI"
-      ;;
-    roo)
-      update_agent_file "$ROO_FILE" "Roo Code"
-      ;;
-    codebuddy)
-      update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
-      ;;
-    qoder)
-      update_agent_file "$QODER_FILE" "Qoder CLI"
-      ;;
-    amp)
-      update_agent_file "$AMP_FILE" "Amp"
-      ;;
-    shai)
-      update_agent_file "$SHAI_FILE" "SHAI"
-      ;;
-    q)
-      update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
-      ;;
-    bob)
-      update_agent_file "$BOB_FILE" "IBM Bob"
-      ;;
-    *)
-      log_error "Unknown agent type '$agent_type'"
-      log_error "Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|amp|shai|q|bob|qoder"
-      exit 1
-      ;;
-  esac
+    local agent_type="$1"
+    
+    case "$agent_type" in
+        claude)
+            update_agent_file "$CLAUDE_FILE" "Claude Code"
+            ;;
+        gemini)
+            update_agent_file "$GEMINI_FILE" "Gemini CLI"
+            ;;
+        copilot)
+            update_agent_file "$COPILOT_FILE" "GitHub Copilot"
+            ;;
+        cursor-agent)
+            update_agent_file "$CURSOR_FILE" "Cursor IDE"
+            ;;
+        qwen)
+            update_agent_file "$QWEN_FILE" "Qwen Code"
+            ;;
+        opencode)
+            update_agent_file "$AGENTS_FILE" "opencode"
+            ;;
+        codex)
+            update_agent_file "$AGENTS_FILE" "Codex CLI"
+            ;;
+        windsurf)
+            update_agent_file "$WINDSURF_FILE" "Windsurf"
+            ;;
+        kilocode)
+            update_agent_file "$KILOCODE_FILE" "Kilo Code"
+            ;;
+        auggie)
+            update_agent_file "$AUGGIE_FILE" "Auggie CLI"
+            ;;
+        roo)
+            update_agent_file "$ROO_FILE" "Roo Code"
+            ;;
+        codebuddy)
+            update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
+            ;;
+        qodercli)
+            update_agent_file "$QODER_FILE" "Qoder CLI"
+            ;;
+        amp)
+            update_agent_file "$AMP_FILE" "Amp"
+            ;;
+        shai)
+            update_agent_file "$SHAI_FILE" "SHAI"
+            ;;
+        q)
+            update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
+            ;;
+        agy)
+            update_agent_file "$AGY_FILE" "Antigravity"
+            ;;
+        bob)
+            update_agent_file "$BOB_FILE" "IBM Bob"
+            ;;
+        generic)
+            log_info "Generic agent: no predefined context file. Use the agent-specific update script for your agent."
+            ;;
+        *)
+            log_error "Unknown agent type '$agent_type'"
+            log_error "Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic"
+            exit 1
+            ;;
+    esac
 }
 
 update_all_existing_agents() {
-  local found_agent=false
-
-  # Check each possible agent file and update if it exists
-  if [[ -f "$CLAUDE_FILE" ]]; then
-    update_agent_file "$CLAUDE_FILE" "Claude Code"
-    found_agent=true
-  fi
-
-  if [[ -f "$GEMINI_FILE" ]]; then
-    update_agent_file "$GEMINI_FILE" "Gemini CLI"
-    found_agent=true
-  fi
-
-  if [[ -f "$COPILOT_FILE" ]]; then
-    update_agent_file "$COPILOT_FILE" "GitHub Copilot"
-    found_agent=true
-  fi
-
-  if [[ -f "$CURSOR_FILE" ]]; then
-    update_agent_file "$CURSOR_FILE" "Cursor IDE"
-    found_agent=true
-  fi
-
-  if [[ -f "$QWEN_FILE" ]]; then
-    update_agent_file "$QWEN_FILE" "Qwen Code"
-    found_agent=true
-  fi
-
-  if [[ -f "$AGENTS_FILE" ]]; then
-    update_agent_file "$AGENTS_FILE" "Codex/opencode"
-    found_agent=true
-  fi
-
-  if [[ -f "$WINDSURF_FILE" ]]; then
-    update_agent_file "$WINDSURF_FILE" "Windsurf"
-    found_agent=true
-  fi
-
-  if [[ -f "$KILOCODE_FILE" ]]; then
-    update_agent_file "$KILOCODE_FILE" "Kilo Code"
-    found_agent=true
-  fi
-
-  if [[ -f "$AUGGIE_FILE" ]]; then
-    update_agent_file "$AUGGIE_FILE" "Auggie CLI"
-    found_agent=true
-  fi
-
-  if [[ -f "$ROO_FILE" ]]; then
-    update_agent_file "$ROO_FILE" "Roo Code"
-    found_agent=true
-  fi
-
-  if [[ -f "$CODEBUDDY_FILE" ]]; then
-    update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
-    found_agent=true
-  fi
-
-  if [[ -f "$SHAI_FILE" ]]; then
-    update_agent_file "$SHAI_FILE" "SHAI"
-    found_agent=true
-  fi
-
-  if [[ -f "$QODER_FILE" ]]; then
-    update_agent_file "$QODER_FILE" "Qoder CLI"
-    found_agent=true
-  fi
-
-  if [[ -f "$Q_FILE" ]]; then
-    update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
-    found_agent=true
-  fi
-
-  if [[ -f "$BOB_FILE" ]]; then
-    update_agent_file "$BOB_FILE" "IBM Bob"
-    found_agent=true
-  fi
-
-  # If no agent files exist, create a default Claude file
-  if [[ "$found_agent" == false ]]; then
-    log_info "No existing agent files found, creating default Claude file..."
-    update_agent_file "$CLAUDE_FILE" "Claude Code"
-  fi
-}
-print_summary() {
-  echo
-  log_info "Summary of changes:"
+    local found_agent=false
+    
+    # Check each possible agent file and update if it exists
+    if [[ -f "$CLAUDE_FILE" ]]; then
+        update_agent_file "$CLAUDE_FILE" "Claude Code"
+        found_agent=true
+    fi
+    
+    if [[ -f "$GEMINI_FILE" ]]; then
+        update_agent_file "$GEMINI_FILE" "Gemini CLI"
+        found_agent=true
+    fi
+    
+    if [[ -f "$COPILOT_FILE" ]]; then
+        update_agent_file "$COPILOT_FILE" "GitHub Copilot"
+        found_agent=true
+    fi
+    
+    if [[ -f "$CURSOR_FILE" ]]; then
+        update_agent_file "$CURSOR_FILE" "Cursor IDE"
+        found_agent=true
+    fi
+    
+    if [[ -f "$QWEN_FILE" ]]; then
+        update_agent_file "$QWEN_FILE" "Qwen Code"
+        found_agent=true
+    fi
+    
+    if [[ -f "$AGENTS_FILE" ]]; then
+        update_agent_file "$AGENTS_FILE" "Codex/opencode"
+        found_agent=true
+    fi
+    
+    if [[ -f "$WINDSURF_FILE" ]]; then
+        update_agent_file "$WINDSURF_FILE" "Windsurf"
+        found_agent=true
+    fi
+    
+    if [[ -f "$KILOCODE_FILE" ]]; then
+        update_agent_file "$KILOCODE_FILE" "Kilo Code"
+        found_agent=true
+    fi
+
+    if [[ -f "$AUGGIE_FILE" ]]; then
+        update_agent_file "$AUGGIE_FILE" "Auggie CLI"
+        found_agent=true
+    fi
+    
+    if [[ -f "$ROO_FILE" ]]; then
+        update_agent_file "$ROO_FILE" "Roo Code"
+        found_agent=true
+    fi
+
+    if [[ -f "$CODEBUDDY_FILE" ]]; then
+        update_agent_file "$CODEBUDDY_FILE" "CodeBuddy CLI"
+        found_agent=true
+    fi
 
-  if [[ -n "$NEW_LANG" ]]; then
-    echo "  - Added language: $NEW_LANG"
-  fi
+    if [[ -f "$SHAI_FILE" ]]; then
+        update_agent_file "$SHAI_FILE" "SHAI"
+        found_agent=true
+    fi
 
-  if [[ -n "$NEW_FRAMEWORK" ]]; then
-    echo "  - Added framework: $NEW_FRAMEWORK"
-  fi
+    if [[ -f "$QODER_FILE" ]]; then
+        update_agent_file "$QODER_FILE" "Qoder CLI"
+        found_agent=true
+    fi
 
-  if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]]; then
-    echo "  - Added database: $NEW_DB"
-  fi
+    if [[ -f "$Q_FILE" ]]; then
+        update_agent_file "$Q_FILE" "Amazon Q Developer CLI"
+        found_agent=true
+    fi
 
-  echo
+    if [[ -f "$AGY_FILE" ]]; then
+        update_agent_file "$AGY_FILE" "Antigravity"
+        found_agent=true
+    fi
+    if [[ -f "$BOB_FILE" ]]; then
+        update_agent_file "$BOB_FILE" "IBM Bob"
+        found_agent=true
+    fi
+    
+    # If no agent files exist, create a default Claude file
+    if [[ "$found_agent" == false ]]; then
+        log_info "No existing agent files found, creating default Claude file..."
+        update_agent_file "$CLAUDE_FILE" "Claude Code"
+    fi
+}
+print_summary() {
+    echo
+    log_info "Summary of changes:"
+    
+    if [[ -n "$NEW_LANG" ]]; then
+        echo "  - Added language: $NEW_LANG"
+    fi
+    
+    if [[ -n "$NEW_FRAMEWORK" ]]; then
+        echo "  - Added framework: $NEW_FRAMEWORK"
+    fi
+    
+    if [[ -n "$NEW_DB" ]] && [[ "$NEW_DB" != "N/A" ]]; then
+        echo "  - Added database: $NEW_DB"
+    fi
+    
+    echo
 
-  log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|codebuddy|shai|q|bob|qoder]"
+    log_info "Usage: $0 [claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli]"
 }
 
 #==============================================================================
@@ -749,47 +763,48 @@ print_summary() {
 #==============================================================================
 
 main() {
-  # Validate environment before proceeding
-  validate_environment
-
-  log_info "=== Updating agent context files for feature $CURRENT_BRANCH ==="
-
-  # Parse the plan file to extract project information
-  if ! parse_plan_data "$NEW_PLAN"; then
-    log_error "Failed to parse plan data"
-    exit 1
-  fi
-
-  # Process based on agent type argument
-  local success=true
-
-  if [[ -z "$AGENT_TYPE" ]]; then
-    # No specific agent provided - update all existing agent files
-    log_info "No agent specified, updating all existing agent files..."
-    if ! update_all_existing_agents; then
-      success=false
-    fi
-  else
-    # Specific agent provided - update only that agent
-    log_info "Updating specific agent: $AGENT_TYPE"
-    if ! update_specific_agent "$AGENT_TYPE"; then
-      success=false
-    fi
-  fi
-
-  # Print summary
-  print_summary
-
-  if [[ "$success" == true ]]; then
-    log_success "Agent context update completed successfully"
-    exit 0
-  else
-    log_error "Agent context update completed with errors"
-    exit 1
-  fi
+    # Validate environment before proceeding
+    validate_environment
+    
+    log_info "=== Updating agent context files for feature $CURRENT_BRANCH ==="
+    
+    # Parse the plan file to extract project information
+    if ! parse_plan_data "$NEW_PLAN"; then
+        log_error "Failed to parse plan data"
+        exit 1
+    fi
+    
+    # Process based on agent type argument
+    local success=true
+    
+    if [[ -z "$AGENT_TYPE" ]]; then
+        # No specific agent provided - update all existing agent files
+        log_info "No agent specified, updating all existing agent files..."
+        if ! update_all_existing_agents; then
+            success=false
+        fi
+    else
+        # Specific agent provided - update only that agent
+        log_info "Updating specific agent: $AGENT_TYPE"
+        if ! update_specific_agent "$AGENT_TYPE"; then
+            success=false
+        fi
+    fi
+    
+    # Print summary
+    print_summary
+    
+    if [[ "$success" == true ]]; then
+        log_success "Agent context update completed successfully"
+        exit 0
+    else
+        log_error "Agent context update completed with errors"
+        exit 1
+    fi
 }
 
 # Execute main function if script is run directly
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-  main "$@"
+    main "$@"
 fi
+
diff --git a/.specify/scripts/powershell/check-prerequisites.ps1 b/.specify/scripts/powershell/check-prerequisites.ps1
index 5d793d04..91667e9e 100644
--- a/.specify/scripts/powershell/check-prerequisites.ps1
+++ b/.specify/scripts/powershell/check-prerequisites.ps1
@@ -42,10 +42,10 @@ OPTIONS:
 EXAMPLES:
   # Check task prerequisites (plan.md required)
   .\check-prerequisites.ps1 -Json
-
+  
   # Check implementation prerequisites (plan.md + tasks.md required)
   .\check-prerequisites.ps1 -Json -RequireTasks -IncludeTasks
-
+  
   # Get feature paths only (no validation)
   .\check-prerequisites.ps1 -PathsOnly
 
@@ -59,8 +59,8 @@ EXAMPLES:
 # Get feature paths and validate branch
 $paths = Get-FeaturePathsEnv
 
-if (-not (Test-FeatureBranch -Branch $paths.CURRENT_BRANCH -HasGit:$paths.HAS_GIT)) {
-    exit 1
+if (-not (Test-FeatureBranch -Branch $paths.CURRENT_BRANCH -HasGit:$paths.HAS_GIT)) { 
+    exit 1 
 }
 
 # If paths-only mode, output paths and exit (support combined -Json -PathsOnly)
@@ -74,8 +74,7 @@ if ($PathsOnly) {
             IMPL_PLAN    = $paths.IMPL_PLAN
             TASKS        = $paths.TASKS
         } | ConvertTo-Json -Compress
-    }
-    else {
+    } else {
         Write-Output "REPO_ROOT: $($paths.REPO_ROOT)"
         Write-Output "BRANCH: $($paths.CURRENT_BRANCH)"
         Write-Output "FEATURE_DIR: $($paths.FEATURE_DIR)"
@@ -114,36 +113,35 @@ if (Test-Path $paths.RESEARCH) { $docs += 'research.md' }
 if (Test-Path $paths.DATA_MODEL) { $docs += 'data-model.md' }
 
 # Check contracts directory (only if it exists and has files)
-if ((Test-Path $paths.CONTRACTS_DIR) -and (Get-ChildItem -Path $paths.CONTRACTS_DIR -ErrorAction SilentlyContinue | Select-Object -First 1)) {
-    $docs += 'contracts/'
+if ((Test-Path $paths.CONTRACTS_DIR) -and (Get-ChildItem -Path $paths.CONTRACTS_DIR -ErrorAction SilentlyContinue | Select-Object -First 1)) { 
+    $docs += 'contracts/' 
 }
 
 if (Test-Path $paths.QUICKSTART) { $docs += 'quickstart.md' }
 
 # Include tasks.md if requested and it exists
-if ($IncludeTasks -and (Test-Path $paths.TASKS)) {
-    $docs += 'tasks.md'
+if ($IncludeTasks -and (Test-Path $paths.TASKS)) { 
+    $docs += 'tasks.md' 
 }
 
 # Output results
 if ($Json) {
     # JSON output
-    [PSCustomObject]@{
-        FEATURE_DIR    = $paths.FEATURE_DIR
-        AVAILABLE_DOCS = $docs
+    [PSCustomObject]@{ 
+        FEATURE_DIR = $paths.FEATURE_DIR
+        AVAILABLE_DOCS = $docs 
     } | ConvertTo-Json -Compress
-}
-else {
+} else {
     # Text output
     Write-Output "FEATURE_DIR:$($paths.FEATURE_DIR)"
     Write-Output "AVAILABLE_DOCS:"
-
+    
     # Show status of each potential document
     Test-FileExists -Path $paths.RESEARCH -Description 'research.md' | Out-Null
     Test-FileExists -Path $paths.DATA_MODEL -Description 'data-model.md' | Out-Null
     Test-DirHasFiles -Path $paths.CONTRACTS_DIR -Description 'contracts/' | Out-Null
     Test-FileExists -Path $paths.QUICKSTART -Description 'quickstart.md' | Out-Null
-
+    
     if ($IncludeTasks) {
         Test-FileExists -Path $paths.TASKS -Description 'tasks.md' | Out-Null
     }
diff --git a/.specify/scripts/powershell/common.ps1 b/.specify/scripts/powershell/common.ps1
index 470212a4..b0be2735 100644
--- a/.specify/scripts/powershell/common.ps1
+++ b/.specify/scripts/powershell/common.ps1
@@ -7,11 +7,10 @@ function Get-RepoRoot {
         if ($LASTEXITCODE -eq 0) {
             return $result
         }
-    }
-    catch {
+    } catch {
         # Git command failed
     }
-
+    
     # Fall back to script location for non-git repos
     return (Resolve-Path (Join-Path $PSScriptRoot "../../..")).Path
 }
@@ -21,26 +20,25 @@ function Get-CurrentBranch {
     if ($env:SPECIFY_FEATURE) {
         return $env:SPECIFY_FEATURE
     }
-
+    
     # Then check git if available
     try {
         $result = git rev-parse --abbrev-ref HEAD 2>$null
         if ($LASTEXITCODE -eq 0) {
             return $result
         }
-    }
-    catch {
+    } catch {
         # Git command failed
     }
-
+    
     # For non-git repos, try to find the latest feature directory
     $repoRoot = Get-RepoRoot
     $specsDir = Join-Path $repoRoot "specs"
-
+    
     if (Test-Path $specsDir) {
         $latestFeature = ""
         $highest = 0
-
+        
         Get-ChildItem -Path $specsDir -Directory | ForEach-Object {
             if ($_.Name -match '^(\d{3})-') {
                 $num = [int]$matches[1]
@@ -50,12 +48,12 @@ function Get-CurrentBranch {
                 }
             }
         }
-
+        
         if ($latestFeature) {
             return $latestFeature
         }
     }
-
+    
     # Final fallback
     return "main"
 }
@@ -64,8 +62,7 @@ function Test-HasGit {
     try {
         git rev-parse --show-toplevel 2>$null | Out-Null
         return ($LASTEXITCODE -eq 0)
-    }
-    catch {
+    } catch {
         return $false
     }
 }
@@ -75,13 +72,13 @@ function Test-FeatureBranch {
         [string]$Branch,
         [bool]$HasGit = $true
     )
-
+    
     # For non-git repos, we can't enforce branch naming but still provide output
     if (-not $HasGit) {
         Write-Warning "[specify] Warning: Git repository not detected; skipped branch validation"
         return $true
     }
-
+    
     if ($Branch -notmatch '^[0-9]{3}-') {
         Write-Output "ERROR: Not on a feature branch. Current branch: $Branch"
         Write-Output "Feature branches should be named like: 001-feature-name"
@@ -100,19 +97,19 @@ function Get-FeaturePathsEnv {
     $currentBranch = Get-CurrentBranch
     $hasGit = Test-HasGit
     $featureDir = Get-FeatureDir -RepoRoot $repoRoot -Branch $currentBranch
-
+    
     [PSCustomObject]@{
-        REPO_ROOT      = $repoRoot
+        REPO_ROOT     = $repoRoot
         CURRENT_BRANCH = $currentBranch
-        HAS_GIT        = $hasGit
-        FEATURE_DIR    = $featureDir
-        FEATURE_SPEC   = Join-Path $featureDir 'spec.md'
-        IMPL_PLAN      = Join-Path $featureDir 'plan.md'
-        TASKS          = Join-Path $featureDir 'tasks.md'
-        RESEARCH       = Join-Path $featureDir 'research.md'
-        DATA_MODEL     = Join-Path $featureDir 'data-model.md'
-        QUICKSTART     = Join-Path $featureDir 'quickstart.md'
-        CONTRACTS_DIR  = Join-Path $featureDir 'contracts'
+        HAS_GIT       = $hasGit
+        FEATURE_DIR   = $featureDir
+        FEATURE_SPEC  = Join-Path $featureDir 'spec.md'
+        IMPL_PLAN     = Join-Path $featureDir 'plan.md'
+        TASKS         = Join-Path $featureDir 'tasks.md'
+        RESEARCH      = Join-Path $featureDir 'research.md'
+        DATA_MODEL    = Join-Path $featureDir 'data-model.md'
+        QUICKSTART    = Join-Path $featureDir 'quickstart.md'
+        CONTRACTS_DIR = Join-Path $featureDir 'contracts'
     }
 }
 
@@ -121,8 +118,7 @@ function Test-FileExists {
     if (Test-Path -Path $Path -PathType Leaf) {
         Write-Output "  ✓ $Description"
         return $true
-    }
-    else {
+    } else {
         Write-Output "  ✗ $Description"
         return $false
     }
@@ -133,8 +129,7 @@ function Test-DirHasFiles {
     if ((Test-Path -Path $Path -PathType Container) -and (Get-ChildItem -Path $Path -ErrorAction SilentlyContinue | Where-Object { -not $_.PSIsContainer } | Select-Object -First 1)) {
         Write-Output "  ✓ $Description"
         return $true
-    }
-    else {
+    } else {
         Write-Output "  ✗ $Description"
         return $false
     }
diff --git a/.specify/scripts/powershell/create-new-feature.ps1 b/.specify/scripts/powershell/create-new-feature.ps1
index ffdace9d..2f0172e3 100644
--- a/.specify/scripts/powershell/create-new-feature.ps1
+++ b/.specify/scripts/powershell/create-new-feature.ps1
@@ -61,7 +61,7 @@ function Find-RepositoryRoot {
 
 function Get-HighestNumberFromSpecs {
     param([string]$SpecsDir)
-
+    
     $highest = 0
     if (Test-Path $SpecsDir) {
         Get-ChildItem -Path $SpecsDir -Directory | ForEach-Object {
@@ -76,7 +76,7 @@ function Get-HighestNumberFromSpecs {
 
 function Get-HighestNumberFromBranches {
     param()
-
+    
     $highest = 0
     try {
         $branches = git branch -a 2>$null
@@ -84,7 +84,7 @@ function Get-HighestNumberFromBranches {
             foreach ($branch in $branches) {
                 # Clean branch name: remove leading markers and remote prefixes
                 $cleanBranch = $branch.Trim() -replace '^\*?\s+', '' -replace '^remotes/[^/]+/', ''
-
+                
                 # Extract feature number if branch matches pattern ###-*
                 if ($cleanBranch -match '^(\d+)-') {
                     $num = [int]$matches[1]
@@ -92,8 +92,7 @@ function Get-HighestNumberFromBranches {
                 }
             }
         }
-    }
-    catch {
+    } catch {
         # If git command fails, return 0
         Write-Verbose "Could not check Git branches: $_"
     }
@@ -108,8 +107,7 @@ function Get-NextBranchNumber {
     # Fetch all remotes to get latest branch info (suppress errors if no remotes)
     try {
         git fetch --all --prune 2>$null | Out-Null
-    }
-    catch {
+    } catch {
         # Ignore fetch errors
     }
 
@@ -128,7 +126,7 @@ function Get-NextBranchNumber {
 
 function ConvertTo-CleanBranchName {
     param([string]$Name)
-
+    
     return $Name.ToLower() -replace '[^a-z0-9]', '-' -replace '-{2,}', '-' -replace '^-', '' -replace '-$', ''
 }
 $fallbackRoot = (Find-RepositoryRoot -StartDir $PSScriptRoot)
@@ -141,12 +139,10 @@ try {
     $repoRoot = git rev-parse --show-toplevel 2>$null
     if ($LASTEXITCODE -eq 0) {
         $hasGit = $true
-    }
-    else {
+    } else {
         throw "Git not available"
     }
-}
-catch {
+} catch {
     $repoRoot = $fallbackRoot
     $hasGit = $false
 }
@@ -159,7 +155,7 @@ New-Item -ItemType Directory -Path $specsDir -Force | Out-Null
 # Function to generate branch name with stop word filtering and length filtering
 function Get-BranchName {
     param([string]$Description)
-
+    
     # Common stop words to filter out
     $stopWords = @(
         'i', 'a', 'an', 'the', 'to', 'for', 'of', 'in', 'on', 'at', 'by', 'with', 'from',
@@ -168,34 +164,32 @@ function Get-BranchName {
         'this', 'that', 'these', 'those', 'my', 'your', 'our', 'their',
         'want', 'need', 'add', 'get', 'set'
     )
-
+    
     # Convert to lowercase and extract words (alphanumeric only)
     $cleanName = $Description.ToLower() -replace '[^a-z0-9\s]', ' '
     $words = $cleanName -split '\s+' | Where-Object { $_ }
-
+    
     # Filter words: remove stop words and words shorter than 3 chars (unless they're uppercase acronyms in original)
     $meaningfulWords = @()
     foreach ($word in $words) {
         # Skip stop words
         if ($stopWords -contains $word) { continue }
-
+        
         # Keep words that are length >= 3 OR appear as uppercase in original (likely acronyms)
         if ($word.Length -ge 3) {
             $meaningfulWords += $word
-        }
-        elseif ($Description -match "\b$($word.ToUpper())\b") {
+        } elseif ($Description -match "\b$($word.ToUpper())\b") {
             # Keep short words if they appear as uppercase in original (likely acronyms)
             $meaningfulWords += $word
         }
     }
-
+    
     # If we have meaningful words, use first 3-4 of them
     if ($meaningfulWords.Count -gt 0) {
         $maxWords = if ($meaningfulWords.Count -eq 4) { 4 } else { 3 }
         $result = ($meaningfulWords | Select-Object -First $maxWords) -join '-'
         return $result
-    }
-    else {
+    } else {
         # Fallback to original logic if no meaningful words found
         $result = ConvertTo-CleanBranchName -Name $Description
         $fallbackWords = ($result -split '-') | Where-Object { $_ } | Select-Object -First 3
@@ -207,8 +201,7 @@ function Get-BranchName {
 if ($ShortName) {
     # Use provided short name, just clean it up
     $branchSuffix = ConvertTo-CleanBranchName -Name $ShortName
-}
-else {
+} else {
     # Generate from description with smart filtering
     $branchSuffix = Get-BranchName -Description $featureDesc
 }
@@ -218,8 +211,7 @@ if ($Number -eq 0) {
     if ($hasGit) {
         # Check existing branches on remotes
         $Number = Get-NextBranchNumber -SpecsDir $specsDir
-    }
-    else {
+    } else {
         # Fall back to local directory check
         $Number = (Get-HighestNumberFromSpecs -SpecsDir $specsDir) + 1
     }
@@ -235,15 +227,15 @@ if ($branchName.Length -gt $maxBranchLength) {
     # Calculate how much we need to trim from suffix
     # Account for: feature number (3) + hyphen (1) = 4 chars
     $maxSuffixLength = $maxBranchLength - 4
-
+    
     # Truncate suffix
     $truncatedSuffix = $branchSuffix.Substring(0, [Math]::Min($branchSuffix.Length, $maxSuffixLength))
     # Remove trailing hyphen if truncation created one
     $truncatedSuffix = $truncatedSuffix -replace '-$', ''
-
+    
     $originalBranchName = $branchName
     $branchName = "$featureNum-$truncatedSuffix"
-
+    
     Write-Warning "[specify] Branch name exceeded GitHub's 244-byte limit"
     Write-Warning "[specify] Original: $originalBranchName ($($originalBranchName.Length) bytes)"
     Write-Warning "[specify] Truncated to: $branchName ($($branchName.Length) bytes)"
@@ -252,12 +244,10 @@ if ($branchName.Length -gt $maxBranchLength) {
 if ($hasGit) {
     try {
         git checkout -b $branchName | Out-Null
-    }
-    catch {
+    } catch {
         Write-Warning "Failed to create git branch: $branchName"
     }
-}
-else {
+} else {
     Write-Warning "[specify] Warning: Git repository not detected; skipped branch creation for $branchName"
 }
 
@@ -266,26 +256,24 @@ New-Item -ItemType Directory -Path $featureDir -Force | Out-Null
 
 $template = Join-Path $repoRoot '.specify/templates/spec-template.md'
 $specFile = Join-Path $featureDir 'spec.md'
-if (Test-Path $template) {
-    Copy-Item $template $specFile -Force
-}
-else {
-    New-Item -ItemType File -Path $specFile | Out-Null
+if (Test-Path $template) { 
+    Copy-Item $template $specFile -Force 
+} else { 
+    New-Item -ItemType File -Path $specFile | Out-Null 
 }
 
 # Set the SPECIFY_FEATURE environment variable for the current session
 $env:SPECIFY_FEATURE = $branchName
 
 if ($Json) {
-    $obj = [PSCustomObject]@{
+    $obj = [PSCustomObject]@{ 
         BRANCH_NAME = $branchName
-        SPEC_FILE   = $specFile
+        SPEC_FILE = $specFile
         FEATURE_NUM = $featureNum
-        HAS_GIT     = $hasGit
+        HAS_GIT = $hasGit
     }
     $obj | ConvertTo-Json -Compress
-}
-else {
+} else {
     Write-Output "BRANCH_NAME: $branchName"
     Write-Output "SPEC_FILE: $specFile"
     Write-Output "FEATURE_NUM: $featureNum"
diff --git a/.specify/scripts/powershell/setup-plan.ps1 b/.specify/scripts/powershell/setup-plan.ps1
index 81482312..d0ed582f 100644
--- a/.specify/scripts/powershell/setup-plan.ps1
+++ b/.specify/scripts/powershell/setup-plan.ps1
@@ -24,8 +24,8 @@ if ($Help) {
 $paths = Get-FeaturePathsEnv
 
 # Check if we're on a proper feature branch (only for git repos)
-if (-not (Test-FeatureBranch -Branch $paths.CURRENT_BRANCH -HasGit $paths.HAS_GIT)) {
-    exit 1
+if (-not (Test-FeatureBranch -Branch $paths.CURRENT_BRANCH -HasGit $paths.HAS_GIT)) { 
+    exit 1 
 }
 
 # Ensure the feature directory exists
@@ -33,11 +33,10 @@ New-Item -ItemType Directory -Path $paths.FEATURE_DIR -Force | Out-Null
 
 # Copy plan template if it exists, otherwise note it or create empty file
 $template = Join-Path $paths.REPO_ROOT '.specify/templates/plan-template.md'
-if (Test-Path $template) {
+if (Test-Path $template) { 
     Copy-Item $template $paths.IMPL_PLAN -Force
     Write-Output "Copied plan template to $($paths.IMPL_PLAN)"
-}
-else {
+} else {
     Write-Warning "Plan template not found at $template"
     # Create a basic plan file if template doesn't exist
     New-Item -ItemType File -Path $paths.IMPL_PLAN -Force | Out-Null
@@ -45,16 +44,15 @@ else {
 
 # Output results
 if ($Json) {
-    $result = [PSCustomObject]@{
+    $result = [PSCustomObject]@{ 
         FEATURE_SPEC = $paths.FEATURE_SPEC
-        IMPL_PLAN    = $paths.IMPL_PLAN
-        SPECS_DIR    = $paths.FEATURE_DIR
-        BRANCH       = $paths.CURRENT_BRANCH
-        HAS_GIT      = $paths.HAS_GIT
+        IMPL_PLAN = $paths.IMPL_PLAN
+        SPECS_DIR = $paths.FEATURE_DIR
+        BRANCH = $paths.CURRENT_BRANCH
+        HAS_GIT = $paths.HAS_GIT
     }
     $result | ConvertTo-Json -Compress
-}
-else {
+} else {
     Write-Output "FEATURE_SPEC: $($paths.FEATURE_SPEC)"
     Write-Output "IMPL_PLAN: $($paths.IMPL_PLAN)"
     Write-Output "SPECS_DIR: $($paths.FEATURE_DIR)"
diff --git a/.specify/scripts/powershell/update-agent-context.ps1 b/.specify/scripts/powershell/update-agent-context.ps1
index 83688439..61718e96 100644
--- a/.specify/scripts/powershell/update-agent-context.ps1
+++ b/.specify/scripts/powershell/update-agent-context.ps1
@@ -9,7 +9,7 @@ Mirrors the behavior of scripts/bash/update-agent-context.sh:
  2. Plan Data Extraction
  3. Agent File Management (create from template or update existing)
  4. Content Generation (technology stack, recent changes, timestamp)
- 5. Multi-Agent Support (claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, roo, codebuddy, amp, shai, q, bob, qoder)
+ 5. Multi-Agent Support (claude, gemini, copilot, cursor-agent, qwen, opencode, codex, windsurf, kilocode, auggie, roo, codebuddy, amp, shai, q, agy, bob, qodercli)
 
 .PARAMETER AgentType
 Optional agent key to update a single agent. If omitted, updates all existing agent files (creating a default Claude file if none exist).
@@ -24,8 +24,8 @@ Optional agent key to update a single agent. If omitted, updates all existing ag
 Relies on common helper functions in common.ps1
 #>
 param(
-    [Parameter(Position = 0)]
-    [ValidateSet('claude', 'gemini', 'copilot', 'cursor-agent', 'qwen', 'opencode', 'codex', 'windsurf', 'kilocode', 'auggie', 'roo', 'codebuddy', 'amp', 'shai', 'q', 'bob', 'qoder')]
+    [Parameter(Position=0)]
+    [ValidateSet('claude','gemini','copilot','cursor-agent','qwen','opencode','codex','windsurf','kilocode','auggie','roo','codebuddy','amp','shai','q','agy','bob','qodercli','generic')]
     [string]$AgentType
 )
 
@@ -37,29 +37,30 @@ $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 # Acquire environment paths
 $envData = Get-FeaturePathsEnv
-$REPO_ROOT = $envData.REPO_ROOT
+$REPO_ROOT     = $envData.REPO_ROOT
 $CURRENT_BRANCH = $envData.CURRENT_BRANCH
-$HAS_GIT = $envData.HAS_GIT
-$IMPL_PLAN = $envData.IMPL_PLAN
+$HAS_GIT       = $envData.HAS_GIT
+$IMPL_PLAN     = $envData.IMPL_PLAN
 $NEW_PLAN = $IMPL_PLAN
 
 # Agent file paths
-$CLAUDE_FILE = Join-Path $REPO_ROOT 'CLAUDE.md'
-$GEMINI_FILE = Join-Path $REPO_ROOT 'GEMINI.md'
-$COPILOT_FILE = Join-Path $REPO_ROOT '.github/agents/copilot-instructions.md'
-$CURSOR_FILE = Join-Path $REPO_ROOT '.cursor/rules/specify-rules.mdc'
-$QWEN_FILE = Join-Path $REPO_ROOT 'QWEN.md'
-$AGENTS_FILE = Join-Path $REPO_ROOT 'AGENTS.md'
+$CLAUDE_FILE   = Join-Path $REPO_ROOT 'CLAUDE.md'
+$GEMINI_FILE   = Join-Path $REPO_ROOT 'GEMINI.md'
+$COPILOT_FILE  = Join-Path $REPO_ROOT '.github/agents/copilot-instructions.md'
+$CURSOR_FILE   = Join-Path $REPO_ROOT '.cursor/rules/specify-rules.mdc'
+$QWEN_FILE     = Join-Path $REPO_ROOT 'QWEN.md'
+$AGENTS_FILE   = Join-Path $REPO_ROOT 'AGENTS.md'
 $WINDSURF_FILE = Join-Path $REPO_ROOT '.windsurf/rules/specify-rules.md'
 $KILOCODE_FILE = Join-Path $REPO_ROOT '.kilocode/rules/specify-rules.md'
-$AUGGIE_FILE = Join-Path $REPO_ROOT '.augment/rules/specify-rules.md'
-$ROO_FILE = Join-Path $REPO_ROOT '.roo/rules/specify-rules.md'
+$AUGGIE_FILE   = Join-Path $REPO_ROOT '.augment/rules/specify-rules.md'
+$ROO_FILE      = Join-Path $REPO_ROOT '.roo/rules/specify-rules.md'
 $CODEBUDDY_FILE = Join-Path $REPO_ROOT 'CODEBUDDY.md'
-$QODER_FILE = Join-Path $REPO_ROOT 'QODER.md'
-$AMP_FILE = Join-Path $REPO_ROOT 'AGENTS.md'
-$SHAI_FILE = Join-Path $REPO_ROOT 'SHAI.md'
-$Q_FILE = Join-Path $REPO_ROOT 'AGENTS.md'
-$BOB_FILE = Join-Path $REPO_ROOT 'AGENTS.md'
+$QODER_FILE    = Join-Path $REPO_ROOT 'QODER.md'
+$AMP_FILE      = Join-Path $REPO_ROOT 'AGENTS.md'
+$SHAI_FILE     = Join-Path $REPO_ROOT 'SHAI.md'
+$Q_FILE        = Join-Path $REPO_ROOT 'AGENTS.md'
+$AGY_FILE      = Join-Path $REPO_ROOT '.agent/rules/specify-rules.md'
+$BOB_FILE      = Join-Path $REPO_ROOT 'AGENTS.md'
 
 $TEMPLATE_FILE = Join-Path $REPO_ROOT '.specify/templates/agent-file-template.md'
 
@@ -69,36 +70,36 @@ $script:NEW_FRAMEWORK = ''
 $script:NEW_DB = ''
 $script:NEW_PROJECT_TYPE = ''
 
-function Write-Info {
+function Write-Info { 
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$Message
     )
-    Write-Host "INFO: $Message"
+    Write-Host "INFO: $Message" 
 }
 
-function Write-Success {
+function Write-Success { 
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$Message
     )
-    Write-Host "$([char]0x2713) $Message"
+    Write-Host "$([char]0x2713) $Message" 
 }
 
-function Write-WarningMsg {
+function Write-WarningMsg { 
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$Message
     )
-    Write-Warning $Message
+    Write-Warning $Message 
 }
 
-function Write-Err {
+function Write-Err { 
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$Message
     )
-    Write-Host "ERROR: $Message" -ForegroundColor Red
+    Write-Host "ERROR: $Message" -ForegroundColor Red 
 }
 
 function Validate-Environment {
@@ -122,32 +123,32 @@ function Validate-Environment {
 
 function Extract-PlanField {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$FieldPattern,
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$PlanFile
     )
     if (-not (Test-Path $PlanFile)) { return '' }
     # Lines like **Language/Version**: Python 3.12
     $regex = "^\*\*$([Regex]::Escape($FieldPattern))\*\*: (.+)$"
     Get-Content -LiteralPath $PlanFile -Encoding utf8 | ForEach-Object {
-        if ($_ -match $regex) {
+        if ($_ -match $regex) { 
             $val = $Matches[1].Trim()
-            if ($val -notin @('NEEDS CLARIFICATION', 'N/A')) { return $val }
+            if ($val -notin @('NEEDS CLARIFICATION','N/A')) { return $val }
         }
     } | Select-Object -First 1
 }
 
 function Parse-PlanData {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$PlanFile
     )
     if (-not (Test-Path $PlanFile)) { Write-Err "Plan file not found: $PlanFile"; return $false }
     Write-Info "Parsing plan data from $PlanFile"
-    $script:NEW_LANG = Extract-PlanField -FieldPattern 'Language/Version' -PlanFile $PlanFile
-    $script:NEW_FRAMEWORK = Extract-PlanField -FieldPattern 'Primary Dependencies' -PlanFile $PlanFile
-    $script:NEW_DB = Extract-PlanField -FieldPattern 'Storage' -PlanFile $PlanFile
+    $script:NEW_LANG        = Extract-PlanField -FieldPattern 'Language/Version' -PlanFile $PlanFile
+    $script:NEW_FRAMEWORK   = Extract-PlanField -FieldPattern 'Primary Dependencies' -PlanFile $PlanFile
+    $script:NEW_DB          = Extract-PlanField -FieldPattern 'Storage' -PlanFile $PlanFile
     $script:NEW_PROJECT_TYPE = Extract-PlanField -FieldPattern 'Project Type' -PlanFile $PlanFile
 
     if ($NEW_LANG) { Write-Info "Found language: $NEW_LANG" } else { Write-WarningMsg 'No language information found in plan' }
@@ -159,29 +160,29 @@ function Parse-PlanData {
 
 function Format-TechnologyStack {
     param(
-        [Parameter(Mandatory = $false)]
+        [Parameter(Mandatory=$false)]
         [string]$Lang,
-        [Parameter(Mandatory = $false)]
+        [Parameter(Mandatory=$false)]
         [string]$Framework
     )
     $parts = @()
     if ($Lang -and $Lang -ne 'NEEDS CLARIFICATION') { $parts += $Lang }
-    if ($Framework -and $Framework -notin @('NEEDS CLARIFICATION', 'N/A')) { $parts += $Framework }
+    if ($Framework -and $Framework -notin @('NEEDS CLARIFICATION','N/A')) { $parts += $Framework }
     if (-not $parts) { return '' }
     return ($parts -join ' + ')
 }
 
-function Get-ProjectStructure {
+function Get-ProjectStructure { 
     param(
-        [Parameter(Mandatory = $false)]
+        [Parameter(Mandatory=$false)]
         [string]$ProjectType
     )
-    if ($ProjectType -match 'web') { return "backend/`nfrontend/`ntests/" } else { return "src/`ntests/" }
+    if ($ProjectType -match 'web') { return "backend/`nfrontend/`ntests/" } else { return "src/`ntests/" } 
 }
 
-function Get-CommandsForLanguage {
+function Get-CommandsForLanguage { 
     param(
-        [Parameter(Mandatory = $false)]
+        [Parameter(Mandatory=$false)]
         [string]$Lang
     )
     switch -Regex ($Lang) {
@@ -192,21 +193,21 @@ function Get-CommandsForLanguage {
     }
 }
 
-function Get-LanguageConventions {
+function Get-LanguageConventions { 
     param(
-        [Parameter(Mandatory = $false)]
+        [Parameter(Mandatory=$false)]
         [string]$Lang
     )
-    if ($Lang) { "${Lang}: Follow standard conventions" } else { 'General: Follow standard conventions' }
+    if ($Lang) { "${Lang}: Follow standard conventions" } else { 'General: Follow standard conventions' } 
 }
 
 function New-AgentFile {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$TargetFile,
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$ProjectName,
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [datetime]$Date
     )
     if (-not (Test-Path $TEMPLATE_FILE)) { Write-Err "Template not found at $TEMPLATE_FILE"; return $false }
@@ -222,44 +223,40 @@ function New-AgentFile {
     $escaped_branch = $CURRENT_BRANCH
 
     $content = Get-Content -LiteralPath $temp -Raw -Encoding utf8
-    $content = $content -replace '\[PROJECT NAME\]', $ProjectName
-    $content = $content -replace '\[DATE\]', $Date.ToString('yyyy-MM-dd')
-
+    $content = $content -replace '\[PROJECT NAME\]',$ProjectName
+    $content = $content -replace '\[DATE\]',$Date.ToString('yyyy-MM-dd')
+    
     # Build the technology stack string safely
     $techStackForTemplate = ""
     if ($escaped_lang -and $escaped_framework) {
         $techStackForTemplate = "- $escaped_lang + $escaped_framework ($escaped_branch)"
-    }
-    elseif ($escaped_lang) {
+    } elseif ($escaped_lang) {
         $techStackForTemplate = "- $escaped_lang ($escaped_branch)"
-    }
-    elseif ($escaped_framework) {
+    } elseif ($escaped_framework) {
         $techStackForTemplate = "- $escaped_framework ($escaped_branch)"
     }
-
-    $content = $content -replace '\[EXTRACTED FROM ALL PLAN.MD FILES\]', $techStackForTemplate
+    
+    $content = $content -replace '\[EXTRACTED FROM ALL PLAN.MD FILES\]',$techStackForTemplate
     # For project structure we manually embed (keep newlines)
     $escapedStructure = [Regex]::Escape($projectStructure)
-    $content = $content -replace '\[ACTUAL STRUCTURE FROM PLANS\]', $escapedStructure
+    $content = $content -replace '\[ACTUAL STRUCTURE FROM PLANS\]',$escapedStructure
     # Replace escaped newlines placeholder after all replacements
-    $content = $content -replace '\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\]', $commands
-    $content = $content -replace '\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\]', $languageConventions
-
+    $content = $content -replace '\[ONLY COMMANDS FOR ACTIVE TECHNOLOGIES\]',$commands
+    $content = $content -replace '\[LANGUAGE-SPECIFIC, ONLY FOR LANGUAGES IN USE\]',$languageConventions
+    
     # Build the recent changes string safely
     $recentChangesForTemplate = ""
     if ($escaped_lang -and $escaped_framework) {
         $recentChangesForTemplate = "- ${escaped_branch}: Added ${escaped_lang} + ${escaped_framework}"
-    }
-    elseif ($escaped_lang) {
+    } elseif ($escaped_lang) {
         $recentChangesForTemplate = "- ${escaped_branch}: Added ${escaped_lang}"
-    }
-    elseif ($escaped_framework) {
+    } elseif ($escaped_framework) {
         $recentChangesForTemplate = "- ${escaped_branch}: Added ${escaped_framework}"
     }
-
-    $content = $content -replace '\[LAST 3 FEATURES AND WHAT THEY ADDED\]', $recentChangesForTemplate
+    
+    $content = $content -replace '\[LAST 3 FEATURES AND WHAT THEY ADDED\]',$recentChangesForTemplate
     # Convert literal \n sequences introduced by Escape to real newlines
-    $content = $content -replace '\\n', [Environment]::NewLine
+    $content = $content -replace '\\n',[Environment]::NewLine
 
     $parent = Split-Path -Parent $TargetFile
     if (-not (Test-Path $parent)) { New-Item -ItemType Directory -Path $parent | Out-Null }
@@ -270,9 +267,9 @@ function New-AgentFile {
 
 function Update-ExistingAgentFile {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$TargetFile,
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [datetime]$Date
     )
     if (-not (Test-Path $TargetFile)) { return (New-AgentFile -TargetFile $TargetFile -ProjectName (Split-Path $REPO_ROOT -Leaf) -Date $Date) }
@@ -281,25 +278,25 @@ function Update-ExistingAgentFile {
     $newTechEntries = @()
     if ($techStack) {
         $escapedTechStack = [Regex]::Escape($techStack)
-        if (-not (Select-String -Pattern $escapedTechStack -Path $TargetFile -Quiet)) {
-            $newTechEntries += "- $techStack ($CURRENT_BRANCH)"
+        if (-not (Select-String -Pattern $escapedTechStack -Path $TargetFile -Quiet)) { 
+            $newTechEntries += "- $techStack ($CURRENT_BRANCH)" 
         }
     }
-    if ($NEW_DB -and $NEW_DB -notin @('N/A', 'NEEDS CLARIFICATION')) {
+    if ($NEW_DB -and $NEW_DB -notin @('N/A','NEEDS CLARIFICATION')) {
         $escapedDB = [Regex]::Escape($NEW_DB)
-        if (-not (Select-String -Pattern $escapedDB -Path $TargetFile -Quiet)) {
-            $newTechEntries += "- $NEW_DB ($CURRENT_BRANCH)"
+        if (-not (Select-String -Pattern $escapedDB -Path $TargetFile -Quiet)) { 
+            $newTechEntries += "- $NEW_DB ($CURRENT_BRANCH)" 
         }
     }
     $newChangeEntry = ''
     if ($techStack) { $newChangeEntry = "- ${CURRENT_BRANCH}: Added ${techStack}" }
-    elseif ($NEW_DB -and $NEW_DB -notin @('N/A', 'NEEDS CLARIFICATION')) { $newChangeEntry = "- ${CURRENT_BRANCH}: Added ${NEW_DB}" }
+    elseif ($NEW_DB -and $NEW_DB -notin @('N/A','NEEDS CLARIFICATION')) { $newChangeEntry = "- ${CURRENT_BRANCH}: Added ${NEW_DB}" }
 
     $lines = Get-Content -LiteralPath $TargetFile -Encoding utf8
     $output = New-Object System.Collections.Generic.List[string]
     $inTech = $false; $inChanges = $false; $techAdded = $false; $changeAdded = $false; $existingChanges = 0
 
-    for ($i = 0; $i -lt $lines.Count; $i++) {
+    for ($i=0; $i -lt $lines.Count; $i++) {
         $line = $lines[$i]
         if ($line -eq '## Active Technologies') {
             $output.Add($line)
@@ -326,7 +323,7 @@ function Update-ExistingAgentFile {
             continue
         }
         if ($line -match '\*\*Last updated\*\*: .*\d{4}-\d{2}-\d{2}') {
-            $output.Add(($line -replace '\d{4}-\d{2}-\d{2}', $Date.ToString('yyyy-MM-dd')))
+            $output.Add(($line -replace '\d{4}-\d{2}-\d{2}',$Date.ToString('yyyy-MM-dd')))
             continue
         }
         $output.Add($line)
@@ -343,9 +340,9 @@ function Update-ExistingAgentFile {
 
 function Update-AgentFile {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$TargetFile,
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$AgentName
     )
     if (-not $TargetFile -or -not $AgentName) { Write-Err 'Update-AgentFile requires TargetFile and AgentName'; return $false }
@@ -358,12 +355,10 @@ function Update-AgentFile {
 
     if (-not (Test-Path $TargetFile)) {
         if (New-AgentFile -TargetFile $TargetFile -ProjectName $projectName -Date $date) { Write-Success "Created new $AgentName context file" } else { Write-Err 'Failed to create new agent file'; return $false }
-    }
-    else {
+    } else {
         try {
             if (Update-ExistingAgentFile -TargetFile $TargetFile -Date $date) { Write-Success "Updated existing $AgentName context file" } else { Write-Err 'Failed to update agent file'; return $false }
-        }
-        catch {
+        } catch {
             Write-Err "Cannot access or update existing file: $TargetFile. $_"
             return $false
         }
@@ -373,49 +368,52 @@ function Update-AgentFile {
 
 function Update-SpecificAgent {
     param(
-        [Parameter(Mandatory = $true)]
+        [Parameter(Mandatory=$true)]
         [string]$Type
     )
     switch ($Type) {
-        'claude' { Update-AgentFile -TargetFile $CLAUDE_FILE   -AgentName 'Claude Code' }
-        'gemini' { Update-AgentFile -TargetFile $GEMINI_FILE   -AgentName 'Gemini CLI' }
-        'copilot' { Update-AgentFile -TargetFile $COPILOT_FILE  -AgentName 'GitHub Copilot' }
+        'claude'   { Update-AgentFile -TargetFile $CLAUDE_FILE   -AgentName 'Claude Code' }
+        'gemini'   { Update-AgentFile -TargetFile $GEMINI_FILE   -AgentName 'Gemini CLI' }
+        'copilot'  { Update-AgentFile -TargetFile $COPILOT_FILE  -AgentName 'GitHub Copilot' }
         'cursor-agent' { Update-AgentFile -TargetFile $CURSOR_FILE   -AgentName 'Cursor IDE' }
-        'qwen' { Update-AgentFile -TargetFile $QWEN_FILE     -AgentName 'Qwen Code' }
+        'qwen'     { Update-AgentFile -TargetFile $QWEN_FILE     -AgentName 'Qwen Code' }
         'opencode' { Update-AgentFile -TargetFile $AGENTS_FILE   -AgentName 'opencode' }
-        'codex' { Update-AgentFile -TargetFile $AGENTS_FILE   -AgentName 'Codex CLI' }
+        'codex'    { Update-AgentFile -TargetFile $AGENTS_FILE   -AgentName 'Codex CLI' }
         'windsurf' { Update-AgentFile -TargetFile $WINDSURF_FILE -AgentName 'Windsurf' }
         'kilocode' { Update-AgentFile -TargetFile $KILOCODE_FILE -AgentName 'Kilo Code' }
-        'auggie' { Update-AgentFile -TargetFile $AUGGIE_FILE   -AgentName 'Auggie CLI' }
-        'roo' { Update-AgentFile -TargetFile $ROO_FILE      -AgentName 'Roo Code' }
+        'auggie'   { Update-AgentFile -TargetFile $AUGGIE_FILE   -AgentName 'Auggie CLI' }
+        'roo'      { Update-AgentFile -TargetFile $ROO_FILE      -AgentName 'Roo Code' }
         'codebuddy' { Update-AgentFile -TargetFile $CODEBUDDY_FILE -AgentName 'CodeBuddy CLI' }
-        'qoder' { Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI' }
-        'amp' { Update-AgentFile -TargetFile $AMP_FILE      -AgentName 'Amp' }
-        'shai' { Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI' }
-        'q' { Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI' }
-        'bob' { Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob' }
-        default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|bob|qoder'; return $false }
+        'qodercli' { Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI' }
+        'amp'      { Update-AgentFile -TargetFile $AMP_FILE      -AgentName 'Amp' }
+        'shai'     { Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI' }
+        'q'        { Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI' }
+        'agy'      { Update-AgentFile -TargetFile $AGY_FILE      -AgentName 'Antigravity' }
+        'bob'      { Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob' }
+        'generic'  { Write-Info 'Generic agent: no predefined context file. Use the agent-specific update script for your agent.' }
+        default { Write-Err "Unknown agent type '$Type'"; Write-Err 'Expected: claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic'; return $false }
     }
 }
 
 function Update-AllExistingAgents {
     $found = $false
     $ok = $true
-    if (Test-Path $CLAUDE_FILE) { if (-not (Update-AgentFile -TargetFile $CLAUDE_FILE   -AgentName 'Claude Code')) { $ok = $false }; $found = $true }
-    if (Test-Path $GEMINI_FILE) { if (-not (Update-AgentFile -TargetFile $GEMINI_FILE   -AgentName 'Gemini CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $COPILOT_FILE) { if (-not (Update-AgentFile -TargetFile $COPILOT_FILE  -AgentName 'GitHub Copilot')) { $ok = $false }; $found = $true }
-    if (Test-Path $CURSOR_FILE) { if (-not (Update-AgentFile -TargetFile $CURSOR_FILE   -AgentName 'Cursor IDE')) { $ok = $false }; $found = $true }
-    if (Test-Path $QWEN_FILE) { if (-not (Update-AgentFile -TargetFile $QWEN_FILE     -AgentName 'Qwen Code')) { $ok = $false }; $found = $true }
-    if (Test-Path $AGENTS_FILE) { if (-not (Update-AgentFile -TargetFile $AGENTS_FILE   -AgentName 'Codex/opencode')) { $ok = $false }; $found = $true }
+    if (Test-Path $CLAUDE_FILE)   { if (-not (Update-AgentFile -TargetFile $CLAUDE_FILE   -AgentName 'Claude Code')) { $ok = $false }; $found = $true }
+    if (Test-Path $GEMINI_FILE)   { if (-not (Update-AgentFile -TargetFile $GEMINI_FILE   -AgentName 'Gemini CLI')) { $ok = $false }; $found = $true }
+    if (Test-Path $COPILOT_FILE)  { if (-not (Update-AgentFile -TargetFile $COPILOT_FILE  -AgentName 'GitHub Copilot')) { $ok = $false }; $found = $true }
+    if (Test-Path $CURSOR_FILE)   { if (-not (Update-AgentFile -TargetFile $CURSOR_FILE   -AgentName 'Cursor IDE')) { $ok = $false }; $found = $true }
+    if (Test-Path $QWEN_FILE)     { if (-not (Update-AgentFile -TargetFile $QWEN_FILE     -AgentName 'Qwen Code')) { $ok = $false }; $found = $true }
+    if (Test-Path $AGENTS_FILE)   { if (-not (Update-AgentFile -TargetFile $AGENTS_FILE   -AgentName 'Codex/opencode')) { $ok = $false }; $found = $true }
     if (Test-Path $WINDSURF_FILE) { if (-not (Update-AgentFile -TargetFile $WINDSURF_FILE -AgentName 'Windsurf')) { $ok = $false }; $found = $true }
     if (Test-Path $KILOCODE_FILE) { if (-not (Update-AgentFile -TargetFile $KILOCODE_FILE -AgentName 'Kilo Code')) { $ok = $false }; $found = $true }
-    if (Test-Path $AUGGIE_FILE) { if (-not (Update-AgentFile -TargetFile $AUGGIE_FILE   -AgentName 'Auggie CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $ROO_FILE) { if (-not (Update-AgentFile -TargetFile $ROO_FILE      -AgentName 'Roo Code')) { $ok = $false }; $found = $true }
+    if (Test-Path $AUGGIE_FILE)   { if (-not (Update-AgentFile -TargetFile $AUGGIE_FILE   -AgentName 'Auggie CLI')) { $ok = $false }; $found = $true }
+    if (Test-Path $ROO_FILE)      { if (-not (Update-AgentFile -TargetFile $ROO_FILE      -AgentName 'Roo Code')) { $ok = $false }; $found = $true }
     if (Test-Path $CODEBUDDY_FILE) { if (-not (Update-AgentFile -TargetFile $CODEBUDDY_FILE -AgentName 'CodeBuddy CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $QODER_FILE) { if (-not (Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $SHAI_FILE) { if (-not (Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI')) { $ok = $false }; $found = $true }
-    if (Test-Path $Q_FILE) { if (-not (Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI')) { $ok = $false }; $found = $true }
-    if (Test-Path $BOB_FILE) { if (-not (Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob')) { $ok = $false }; $found = $true }
+    if (Test-Path $QODER_FILE)    { if (-not (Update-AgentFile -TargetFile $QODER_FILE    -AgentName 'Qoder CLI')) { $ok = $false }; $found = $true }
+    if (Test-Path $SHAI_FILE)     { if (-not (Update-AgentFile -TargetFile $SHAI_FILE     -AgentName 'SHAI')) { $ok = $false }; $found = $true }
+    if (Test-Path $Q_FILE)        { if (-not (Update-AgentFile -TargetFile $Q_FILE        -AgentName 'Amazon Q Developer CLI')) { $ok = $false }; $found = $true }
+    if (Test-Path $AGY_FILE)      { if (-not (Update-AgentFile -TargetFile $AGY_FILE      -AgentName 'Antigravity')) { $ok = $false }; $found = $true }
+    if (Test-Path $BOB_FILE)      { if (-not (Update-AgentFile -TargetFile $BOB_FILE      -AgentName 'IBM Bob')) { $ok = $false }; $found = $true }
     if (-not $found) {
         Write-Info 'No existing agent files found, creating default Claude file...'
         if (-not (Update-AgentFile -TargetFile $CLAUDE_FILE -AgentName 'Claude Code')) { $ok = $false }
@@ -430,7 +428,7 @@ function Print-Summary {
     if ($NEW_FRAMEWORK) { Write-Host "  - Added framework: $NEW_FRAMEWORK" }
     if ($NEW_DB -and $NEW_DB -ne 'N/A') { Write-Host "  - Added database: $NEW_DB" }
     Write-Host ''
-    Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|bob|qoder]'
+    Write-Info 'Usage: ./update-agent-context.ps1 [-AgentType claude|gemini|copilot|cursor-agent|qwen|opencode|codex|windsurf|kilocode|auggie|roo|codebuddy|amp|shai|q|agy|bob|qodercli|generic]'
 }
 
 function Main {
diff --git a/.specify/templates/checklist-template.md b/.specify/templates/checklist-template.md
index 0caeacf8..806657da 100644
--- a/.specify/templates/checklist-template.md
+++ b/.specify/templates/checklist-template.md
@@ -6,16 +6,16 @@
 
 **Note**: This checklist is generated by the `/speckit.checklist` command based on feature context and requirements.
 
-<!--
+<!-- 
   ============================================================================
   IMPORTANT: The checklist items below are SAMPLE ITEMS for illustration only.
-
+  
   The /speckit.checklist command MUST replace these with actual items based on:
   - User's specific checklist request
   - Feature requirements from spec.md
   - Technical context from plan.md
   - Implementation details from tasks.md
-
+  
   DO NOT keep these sample items in the generated checklist file.
   ============================================================================
 -->
diff --git a/.specify/templates/constitution-template.md b/.specify/templates/constitution-template.md
new file mode 100644
index 00000000..a4670ff4
--- /dev/null
+++ b/.specify/templates/constitution-template.md
@@ -0,0 +1,50 @@
+# [PROJECT_NAME] Constitution
+<!-- Example: Spec Constitution, TaskFlow Constitution, etc. -->
+
+## Core Principles
+
+### [PRINCIPLE_1_NAME]
+<!-- Example: I. Library-First -->
+[PRINCIPLE_1_DESCRIPTION]
+<!-- Example: Every feature starts as a standalone library; Libraries must be self-contained, independently testable, documented; Clear purpose required - no organizational-only libraries -->
+
+### [PRINCIPLE_2_NAME]
+<!-- Example: II. CLI Interface -->
+[PRINCIPLE_2_DESCRIPTION]
+<!-- Example: Every library exposes functionality via CLI; Text in/out protocol: stdin/args → stdout, errors → stderr; Support JSON + human-readable formats -->
+
+### [PRINCIPLE_3_NAME]
+<!-- Example: III. Test-First (NON-NEGOTIABLE) -->
+[PRINCIPLE_3_DESCRIPTION]
+<!-- Example: TDD mandatory: Tests written → User approved → Tests fail → Then implement; Red-Green-Refactor cycle strictly enforced -->
+
+### [PRINCIPLE_4_NAME]
+<!-- Example: IV. Integration Testing -->
+[PRINCIPLE_4_DESCRIPTION]
+<!-- Example: Focus areas requiring integration tests: New library contract tests, Contract changes, Inter-service communication, Shared schemas -->
+
+### [PRINCIPLE_5_NAME]
+<!-- Example: V. Observability, VI. Versioning & Breaking Changes, VII. Simplicity -->
+[PRINCIPLE_5_DESCRIPTION]
+<!-- Example: Text I/O ensures debuggability; Structured logging required; Or: MAJOR.MINOR.BUILD format; Or: Start simple, YAGNI principles -->
+
+## [SECTION_2_NAME]
+<!-- Example: Additional Constraints, Security Requirements, Performance Standards, etc. -->
+
+[SECTION_2_CONTENT]
+<!-- Example: Technology stack requirements, compliance standards, deployment policies, etc. -->
+
+## [SECTION_3_NAME]
+<!-- Example: Development Workflow, Review Process, Quality Gates, etc. -->
+
+[SECTION_3_CONTENT]
+<!-- Example: Code review requirements, testing gates, deployment approval process, etc. -->
+
+## Governance
+<!-- Example: Constitution supersedes all other practices; Amendments require documentation, approval, migration plan -->
+
+[GOVERNANCE_RULES]
+<!-- Example: All PRs/reviews must verify compliance; Complexity must be justified; Use [GUIDANCE_FILE] for runtime development guidance -->
+
+**Version**: [CONSTITUTION_VERSION] | **Ratified**: [RATIFICATION_DATE] | **Last Amended**: [LAST_AMENDED_DATE]
+<!-- Example: Version: 2.1.1 | Ratified: 2025-06-13 | Last Amended: 2025-07-16 -->
diff --git a/.specify/templates/plan-template.md b/.specify/templates/plan-template.md
index 5ac33c05..5a2fafeb 100644
--- a/.specify/templates/plan-template.md
+++ b/.specify/templates/plan-template.md
@@ -3,7 +3,7 @@
 **Branch**: `[###-feature-name]` | **Date**: [DATE] | **Spec**: [link]
 **Input**: Feature specification from `/specs/[###-feature-name]/spec.md`
 
-**Note**: This template is filled in by the `/speckit.plan` command. See `.specify/templates/commands/plan.md` for the execution workflow.
+**Note**: This template is filled in by the `/speckit.plan` command. See `.specify/templates/plan-template.md` for the execution workflow.
 
 ## Summary
 
@@ -17,14 +17,14 @@
   the iteration process.
 -->
 
-**Language/Version**: [e.g., Python 3.11, Swift 5.9, Rust 1.75 or NEEDS CLARIFICATION]
-**Primary Dependencies**: [e.g., FastAPI, UIKit, LLVM or NEEDS CLARIFICATION]
-**Storage**: [if applicable, e.g., PostgreSQL, CoreData, files or N/A]
-**Testing**: [e.g., pytest, XCTest, cargo test or NEEDS CLARIFICATION]
+**Language/Version**: [e.g., Python 3.11, Swift 5.9, Rust 1.75 or NEEDS CLARIFICATION]  
+**Primary Dependencies**: [e.g., FastAPI, UIKit, LLVM or NEEDS CLARIFICATION]  
+**Storage**: [if applicable, e.g., PostgreSQL, CoreData, files or N/A]  
+**Testing**: [e.g., pytest, XCTest, cargo test or NEEDS CLARIFICATION]  
 **Target Platform**: [e.g., Linux server, iOS 15+, WASM or NEEDS CLARIFICATION]
-**Project Type**: [single/web/mobile - determines source structure]
-**Performance Goals**: [domain-specific, e.g., 1000 req/s, 10k lines/sec, 60 fps or NEEDS CLARIFICATION]
-**Constraints**: [domain-specific, e.g., <200ms p95, <100MB memory, offline-capable or NEEDS CLARIFICATION]
+**Project Type**: [e.g., library/cli/web-service/mobile-app/compiler/desktop-app or NEEDS CLARIFICATION]  
+**Performance Goals**: [domain-specific, e.g., 1000 req/s, 10k lines/sec, 60 fps or NEEDS CLARIFICATION]  
+**Constraints**: [domain-specific, e.g., <200ms p95, <100MB memory, offline-capable or NEEDS CLARIFICATION]  
 **Scale/Scope**: [domain-specific, e.g., 10k users, 1M LOC, 50 screens or NEEDS CLARIFICATION]
 
 ## Constitution Check
diff --git a/.specify/templates/spec-template.md b/.specify/templates/spec-template.md
index db6bdb2d..c67d9149 100644
--- a/.specify/templates/spec-template.md
+++ b/.specify/templates/spec-template.md
@@ -1,8 +1,8 @@
 # Feature Specification: [FEATURE NAME]
 
-**Feature Branch**: `[###-feature-name]`
-**Created**: [DATE]
-**Status**: Draft
+**Feature Branch**: `[###-feature-name]`  
+**Created**: [DATE]  
+**Status**: Draft  
 **Input**: User description: "$ARGUMENTS"
 
 ## User Scenarios & Testing *(mandatory)*
@@ -11,7 +11,7 @@
   IMPORTANT: User stories should be PRIORITIZED as user journeys ordered by importance.
   Each user story/journey must be INDEPENDENTLY TESTABLE - meaning if you implement just ONE of them,
   you should still have a viable MVP (Minimum Viable Product) that delivers value.
-
+  
   Assign priorities (P1, P2, P3, etc.) to each story, where P1 is the most critical.
   Think of each story as a standalone slice of functionality that can be:
   - Developed independently
@@ -85,7 +85,7 @@
 ### Functional Requirements
 
 - **FR-001**: System MUST [specific capability, e.g., "allow users to create accounts"]
-- **FR-002**: System MUST [specific capability, e.g., "validate email addresses"]
+- **FR-002**: System MUST [specific capability, e.g., "validate email addresses"]  
 - **FR-003**: Users MUST be able to [key interaction, e.g., "reset their password"]
 - **FR-004**: System MUST [data requirement, e.g., "persist user preferences"]
 - **FR-005**: System MUST [behavior, e.g., "log all security events"]
diff --git a/.specify/templates/tasks-template.md b/.specify/templates/tasks-template.md
index 8accc1d7..60f9be45 100644
--- a/.specify/templates/tasks-template.md
+++ b/.specify/templates/tasks-template.md
@@ -25,21 +25,21 @@ description: "Task list template for feature implementation"
 - **Mobile**: `api/src/`, `ios/src/` or `android/src/`
 - Paths shown below assume single project - adjust based on plan.md structure
 
-<!--
+<!-- 
   ============================================================================
   IMPORTANT: The tasks below are SAMPLE TASKS for illustration purposes only.
-
+  
   The /speckit.tasks command MUST replace these with actual tasks based on:
   - User stories from spec.md (with their priorities P1, P2, P3...)
   - Feature requirements from plan.md
   - Entities from data-model.md
   - Endpoints from contracts/
-
+  
   Tasks MUST be organized by user story so each story can be:
   - Implemented independently
   - Tested independently
   - Delivered as an MVP increment
-
+  
   DO NOT keep these sample tasks in the generated tasks.md file.
   ============================================================================
 -->
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2418f391..388adcec 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,13 +1,13 @@
 {
-  "chat.promptFilesRecommendations": {
-    "speckit.constitution": true,
-    "speckit.specify": true,
-    "speckit.plan": true,
-    "speckit.tasks": true,
-    "speckit.implement": true
-  },
-  "chat.tools.terminal.autoApprove": {
-    ".specify/scripts/bash/": true,
-    ".specify/scripts/powershell/": true
-  }
+    "chat.promptFilesRecommendations": {
+        "speckit.constitution": true,
+        "speckit.specify": true,
+        "speckit.plan": true,
+        "speckit.tasks": true,
+        "speckit.implement": true
+    },
+    "chat.tools.terminal.autoApprove": {
+        ".specify/scripts/bash/": true,
+        ".specify/scripts/powershell/": true
+    }
 }