@dtt_siye/atool 1.3.0 → 1.4.0

package/lib/common.sh

@@ -140,11 +140,9 @@ ensure_dir() {
 # ── IDE Config Directory Helpers (cross-platform) ─────────────────────────────
 
 get_claude_config_dir() {
-    if is_windows && [[ -n "${APPDATA:-}" ]]; then
-        cygpath -u "$APPDATA/claude" 2>/dev/null || echo "$HOME/.claude"
-    else
-        echo "$HOME/.claude"
-    fi
+    # Claude Code CLI always uses ~/.claude/ on all platforms
+    # (APPDATA/claude is the Claude Desktop app, not the CLI)
+    echo "$HOME/.claude"
 }
 
 get_cursor_config_dir() {
@@ -861,15 +859,20 @@ scan_skills_catalog() {
                 ;;
             pdf|docx|pptx|xlsx)
                 office="${office}- ${skill_name}: ${desc}
+"
+                ;;
+            # Core initialization
+            atool-init)
+                planning="${planning}- ${skill_name}: ${desc}
 "
                 ;;
             # Architecture & Design
-            software-architecture|ai-project-architecture|ui-ux-pro)
+            software-architecture|ai-project-architecture|ui-ux-pro|architecture-guard)
                 arch_design="${arch_design}- ${skill_name}: ${desc}
 "
                 ;;
             # Quality & Review
-            code-review|project-analyze|project-query|verification-before-completion)
+            code-review|project-analyze|project-query|verification-before-completion|agent-audit)
                 quality_review="${quality_review}- ${skill_name}: ${desc}
 "
                 ;;
@@ -879,8 +882,13 @@ scan_skills_catalog() {
 "
                 ;;
             # Planning & Dispatch
-            writing-plans|smart-dispatch|brainstorming|clarify-before-build)
+            writing-plans|smart-dispatch|brainstorming|clarify-before-build|using-git-worktrees|find-skills)
                 planning="${planning}- ${skill_name}: ${desc}
+"
+                ;;
+            # Testing & Automation
+            webapp-testing|ci-feedback)
+                quality_review="${quality_review}- ${skill_name}: ${desc}
 "
                 ;;
             *)
@@ -890,26 +898,31 @@ scan_skills_catalog() {
         esac
     done
 
-    # Check for Superpowers skills
+    # Check for Superpowers skills (only if Superpowers directory exists and is separate from skills_dir)
     local sp_dir="$skills_dir"
     if [[ -d "$skills_dir/_superpowers/skills" ]]; then
         sp_dir="$skills_dir/_superpowers/skills"
     fi
-    for skill_dir in "$sp_dir"/*/; do
-        [[ ! -d "$skill_dir" ]] && continue
-        local skill_name
-        skill_name=$(basename "$skill_dir")
-        [[ -L "$skill_dir" ]] && continue
-        local sp_md="$skill_dir/SKILL.md"
-        [[ ! -f "$sp_md" ]] && continue
-        local desc=""
-        desc=$(head -10 "$sp_md" | sed -n '/^---$/,/^---$/p' | grep '^description:' | head -1 | sed 's/^description:[[:space:]]*//')
-        if [[ -z "$desc" ]]; then
-            desc=$(head -10 "$sp_md" | grep -i '^#' | head -1 | sed 's/^#*\s*//' || echo "$skill_name")
-        fi
-        superpowers_list="${superpowers_list}- ${skill_name}: ${desc}
+
+    # Only scan Superpowers directory if it exists and is NOT the same as skills_dir
+    # (prevents double-scanning skills already categorized in first loop)
+    if [[ "$sp_dir" != "$skills_dir" ]] && [[ -d "$sp_dir" ]]; then
+        for skill_dir in "$sp_dir"/*/; do
+            [[ ! -d "$skill_dir" ]] && continue
+            local skill_name
+            skill_name=$(basename "$skill_dir")
+            [[ -L "$skill_dir" ]] && continue
+            local sp_md="$skill_dir/SKILL.md"
+            [[ ! -f "$sp_md" ]] && continue
+            local desc=""
+            desc=$(head -10 "$sp_md" | sed -n '/^---$/,/^---$/p' | grep '^description:' | head -1 | sed 's/^description:[[:space:]]*//')
+            if [[ -z "$desc" ]]; then
+                desc=$(head -10 "$sp_md" | grep -i '^#' | head -1 | sed 's/^#*\s*//' || echo "$skill_name")
+            fi
+            superpowers_list="${superpowers_list}- ${skill_name}: ${desc}
 "
-    done
+        done
+    fi
 
     # Output catalog
     if [[ -n "$conventions" ]]; then

package/lib/compute-importance.sh

@@ -591,6 +591,79 @@ compute_importance() {
     rm -rf "$tmpdir"
 }
 
+# === Batch Processing (for pre-scan manifest.json) ===
+
+# Update manifest.json modules array with importance scores
+# Args: MANIFEST_PATH - path to manifest.json
+#       PROJECT_ROOT - project root directory (parent of .atool-docs)
+# Updates: manifest.json modules[].importance field in-place
+compute_importance_batch() {
+    local manifest_path="${1:-.atool-docs/pre-scan/manifest.json}"
+    local project_root="${2:-.}"
+
+    if [[ ! -f "$manifest_path" ]]; then
+        log_error "Manifest not found: $manifest_path"
+        return 1
+    fi
+
+    log_info "Computing importance scores for modules in manifest..."
+
+    # Get inventory directory from project_root
+    local inventory_dir="${project_root}/.atool-docs/inventory"
+
+    # Read modules from manifest
+    local modules_json
+    modules_json=$(jq -r '.modules[] | .slug' "$manifest_path" 2>/dev/null)
+
+    if [[ -z "$modules_json" ]]; then
+        log_warn "No modules found in manifest"
+        return 0
+    fi
+
+    # Build module path map: slug -> importance_score
+    local tmpdir
+    tmpdir=$(mktemp -d)
+
+    # Discover all modules in project and compute importance
+    local all_modules
+    all_modules=$(discover_modules "$project_root")
+
+    if [[ -z "$all_modules" ]]; then
+        log_warn "No source modules found in project"
+        echo "{}" > "$tmpdir/importance_map"
+    else
+        # Compute importance for all discovered modules
+        log_info "Computing importance factors for discovered modules..."
+        local importance_output
+        importance_output=$(compute_importance "$project_root" --inventory-dir "$inventory_dir" 2>/dev/null || true)
+
+        # Build slug-to-importance map from output (module_path<tab>score<tab>tier)
+        # Convert module path to slug: extract last path component
+        {
+            while IFS=$'\t' read -r module_path score tier; do
+                [[ -z "$module_path" ]] && continue
+                local slug
+                slug=$(basename "$module_path")
+                printf '%s\t%s\n' "$slug" "$score"
+            done <<< "$importance_output"
+        } > "$tmpdir/importance_map"
+    fi
+
+    # Update manifest.json with importance scores
+    log_info "Updating manifest with importance scores..."
+    jq --slurpfile importance_data <(cat "$tmpdir/importance_map" | jq -R 'split("\t") | {key: .[0], value: (.[1] | tonumber)}' | jq -s 'from_entries') \
+        '.modules |= map(.importance = ($importance_data[0][.slug] // 0))' \
+        "$manifest_path" > "$tmpdir/manifest_updated.json"
+
+    # Atomically replace manifest
+    mv "$tmpdir/manifest_updated.json" "$manifest_path"
+
+    # Cleanup
+    rm -rf "$tmpdir"
+
+    log_success "Importance scores computed and manifest updated"
+}
+
 # === Standalone Execution ===
 # When run directly (not sourced), execute compute_importance with CLI args
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then

package/lib/install-cursor.sh

@@ -79,8 +79,8 @@ should_always_apply() {
         project-analyze)           return 0 ;;
         # Workflow skill with no good glob match - must be always-on
         using-git-worktrees)       return 0 ;;
-        # Conventions skills - always relevant for their file types (via globs too)
-        *-conventions)              return 0 ;;
+        # Conventions skills - globs handle triggering by file type (no need for alwaysApply)
+        *-conventions)              return 1 ;;
         # All other skills: use globs or on-demand (reduces context token consumption)
         *)                          return 1 ;;
     esac

package/lib/install-hooks.sh

@@ -132,6 +132,58 @@ install_hooks() {
         fi
     fi
 
+    # Install pre-commit hook (PreToolUse - checks before git commit)
+    local pre_commit_src="$atool_root/hooks/pre-commit"
+    if [[ -f "$pre_commit_src" ]]; then
+        local pre_commit_name="atool-pre-commit"
+        local dest_pre_commit="$hooks_dir/$pre_commit_name"
+
+        if [[ -f "$dest_pre_commit" ]] && [[ "${ATOOL_FORCE:-0}" != "1" ]]; then
+            local pc_existing pc_source
+            pc_existing=$(file_checksum "$dest_pre_commit")
+            pc_source=$(file_checksum "$pre_commit_src")
+            if [[ "$pc_existing" == "$pc_source" ]]; then
+                log_info "Hook '$pre_commit_name' already up to date, skipping"
+            else
+                log_info "Hook '$pre_commit_name' exists but differs - backing up"
+                backup_file "$dest_pre_commit"
+                run_cmd cp "$pre_commit_src" "$dest_pre_commit"
+                run_cmd chmod +x "$dest_pre_commit"
+                log_success "Hook installed: $dest_pre_commit"
+            fi
+        else
+            run_cmd cp "$pre_commit_src" "$dest_pre_commit"
+            run_cmd chmod +x "$dest_pre_commit"
+            log_success "Hook installed: $dest_pre_commit"
+        fi
+    fi
+
+    # Install task-state-tracker hook (PostToolUse - tracks session state)
+    local task_state_src="$atool_root/hooks/task-state-tracker"
+    if [[ -f "$task_state_src" ]]; then
+        local task_state_name="atool-task-state-tracker"
+        local dest_task_state="$hooks_dir/$task_state_name"
+
+        if [[ -f "$dest_task_state" ]] && [[ "${ATOOL_FORCE:-0}" != "1" ]]; then
+            local ts_existing ts_source
+            ts_existing=$(file_checksum "$dest_task_state")
+            ts_source=$(file_checksum "$task_state_src")
+            if [[ "$ts_existing" == "$ts_source" ]]; then
+                log_info "Hook '$task_state_name' already up to date, skipping"
+            else
+                log_info "Hook '$task_state_name' exists but differs - backing up"
+                backup_file "$dest_task_state"
+                run_cmd cp "$task_state_src" "$dest_task_state"
+                run_cmd chmod +x "$dest_task_state"
+                log_success "Hook installed: $dest_task_state"
+            fi
+        else
+            run_cmd cp "$task_state_src" "$dest_task_state"
+            run_cmd chmod +x "$dest_task_state"
+            log_success "Hook installed: $dest_task_state"
+        fi
+    fi
+
     # Install hooks config JSON
     local config_file
     case "$ide_type" in
@@ -224,6 +276,18 @@ install_hooks_global() {
                 run_cmd chmod +x "$claude_hooks_dir/atool-doc-sync-reminder"
             fi
 
+            # Copy pre-commit hook (PreToolUse)
+            if [[ -f "$atool_root/hooks/pre-commit" ]]; then
+                run_cmd cp "$atool_root/hooks/pre-commit" "$claude_hooks_dir/atool-pre-commit"
+                run_cmd chmod +x "$claude_hooks_dir/atool-pre-commit"
+            fi
+
+            # Copy task-state-tracker hook (PostToolUse)
+            if [[ -f "$atool_root/hooks/task-state-tracker" ]]; then
+                run_cmd cp "$atool_root/hooks/task-state-tracker" "$claude_hooks_dir/atool-task-state-tracker"
+                run_cmd chmod +x "$claude_hooks_dir/atool-task-state-tracker"
+            fi
+
             # 2. Register hooks config in settings.json
             #    Claude Code reads hooks from settings.json, NOT from files on disk
             local settings_file="$claude_config_dir/settings.json"

package/lib/install-skills.sh

@@ -118,6 +118,25 @@ install_skills() {
         run_cmd cp -r "$skill_dir" "$target_skill"
         write_skill_version_marker "$target_skill" "$source_ver"
 
+        # Copy referenced lib/ scripts into skill's lib/ subdirectory
+        # Skills reference scripts via "source lib/X.sh" relative to the skill dir
+        local skill_lib_dir="$target_skill/lib"
+        local referenced_libs
+        local _find_paths=()
+        [[ -d "$target_skill/phases" ]] && _find_paths+=("$target_skill/phases")
+        _find_paths+=("$target_skill")
+        referenced_libs=$(find "${_find_paths[@]}" -maxdepth 2 -name '*.md' -exec grep -roh 'source lib/[^ ]*\.sh' {} + 2>/dev/null \
+            | sed 's/source lib\///' | sort -u || true)
+        if [[ -n "$referenced_libs" ]]; then
+            run_cmd mkdir -p "$skill_lib_dir"
+            for lib_name in $referenced_libs; do
+                local lib_src="$atool_root/lib/$lib_name"
+                if [[ -f "$lib_src" ]]; then
+                    run_cmd cp "$lib_src" "$skill_lib_dir/$lib_name"
+                fi
+            done
+        fi
+
         if [[ "$installed_ver" != "none" ]] && [[ "$installed_ver" != "$source_ver" ]]; then
             log_info "Updated skill: $skill_name"
         else