fix: monorepo path support, unstaged change detection, dead code cleanup

- Strip git-root-to-repo_path prefix from diff paths for monorepo subdirs
- Add index.diff(None) alongside index.diff('HEAD') to capture unstaged edits
- Return None from _detect_via_git when prev_commit is null, enabling mtime fallback
- Remove dead code and unused imports in prompt_server.py (4 raw prompt
  constants, logging, Optional, session resolution stub)
- Remove unused 'time' import in analysis.py

Author: mambo-wang

codewiki/mcp/tools/analysis.py

@@ -12,7 +12,6 @@
 import json
 import logging
 import os
-import time
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -92,10 +91,11 @@ def _detect_via_git(
     repo_path: Path,
     metadata: Dict[str, Any],
 ) -> Optional[Dict[str, Any]]:
-    """Detect changes via git. Returns None if not in a git repo.
+    """Detect changes via git. Returns None if not in a git repo or if no
+    previous commit is recorded (so the caller can fall through to mtime).
 
-    Checks both committed changes (diff against stored commit_id) and
-    uncommitted changes (``git status``).
+    Checks committed changes (diff against stored commit_id), staged changes
+    (``index.diff('HEAD')``), and unstaged/untracked changes.
     """
     try:
         import git
@@ -104,37 +104,67 @@ def _detect_via_git(
         return None
 
     prev_commit = metadata.get("generation_info", {}).get("commit_id")
+    if not prev_commit:
+        return None  # No baseline to compare; let mtime fallback handle it
+
     try:
         current_commit = repo.head.commit.hexsha
     except Exception:
         return None
 
+    # Compute subpath prefix for monorepo support.
+    # Git diff returns paths relative to the git root, but component IDs
+    # use paths relative to repo_path.  Strip the prefix so they align.
+    git_root = Path(repo.working_dir).resolve()
+    repo_root = repo_path.resolve()
+    try:
+        subpath = repo_root.relative_to(git_root).as_posix()
+    except ValueError:
+        subpath = ""
+    if subpath == ".":
+        subpath = ""
+
     changed: list[str] = []
     method = "git"
 
     # 1) Committed changes since last generation
-    if prev_commit and prev_commit != current_commit:
+    if prev_commit != current_commit:
         try:
             diff_index = repo.commit(prev_commit).diff(current_commit)
             seen: set[str] = set()
             for diff in diff_index:
-                if diff.a_path and diff.a_path not in seen:
-                    changed.append(diff.a_path)
-                    seen.add(diff.a_path)
-                if diff.b_path and diff.b_path not in seen:
-                    changed.append(diff.b_path)
-                    seen.add(diff.b_path)
+                for p in (diff.a_path, diff.b_path):
+                    if p and p not in seen:
+                        if subpath:
+                            if p.startswith(subpath + "/"):
+                                p = p[len(subpath) + 1:]
+                            else:
+                                continue  # outside target subdirectory
+                        changed.append(p)
+                        seen.add(p)
         except Exception:
             pass
 
-    # 2) Uncommitted changes (user may have edited but not committed)
+    # 2) Uncommitted changes: staged (index vs HEAD) + unstaged (working tree vs index) + untracked
     try:
+        for d in list(repo.index.diff("HEAD")) + list(repo.index.diff(None)):
+            p = d.a_path
+            if p and p not in changed:
+                if subpath:
+                    if p.startswith(subpath + "/"):
+                        p = p[len(subpath) + 1:]
+                    else:
+                        continue
+                changed.append(p)
         for item in repo.untracked_files:
-            if item not in changed:
-                changed.append(item)
-        for file_path in [d.a_path for d in repo.index.diff("HEAD")]:
-            if file_path and file_path not in changed:
-                changed.append(file_path)
+            p = item
+            if subpath:
+                if p.startswith(subpath + "/"):
+                    p = p[len(subpath) + 1:]
+                else:
+                    continue
+            if p not in changed:
+                changed.append(p)
     except Exception:
         pass
 

codewiki/mcp/tools/prompt_server.py

@@ -9,15 +9,10 @@
 from __future__ import annotations
 
 import json
-import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from codewiki.mcp.session import SessionStore
 from codewiki.src.be.prompt_template import (
-    CLUSTER_REPO_PROMPT,
-    CLUSTER_MODULE_PROMPT,
-    SYSTEM_PROMPT,
-    LEAF_SYSTEM_PROMPT,
     USER_PROMPT,
     REPO_OVERVIEW_PROMPT,
     MODULE_OVERVIEW_PROMPT,
@@ -27,8 +22,6 @@
     format_user_prompt,
 )
 
-logger = logging.getLogger(__name__)
-
 
 # Prompt catalog: maps prompt_type to (raw_template, usage_hint, variables_doc)
 _PROMPT_CATALOG: Dict[str, Dict[str, str]] = {
@@ -135,18 +128,9 @@ def _resolve_prompt(prompt_type: str, variables: Dict[str, Any]) -> str:
         return format_leaf_system_prompt(module_name, custom_instructions)
 
     elif prompt_type == "user":
-        # If full variables are provided, use the full formatter
-        session_id = variables.get("session_id")
         module_name = variables.get("module_name", "MODULE_NAME")
-        core_component_ids = variables.get("core_component_ids", [])
         module_tree = variables.get("module_tree", {})
 
-        if session_id and core_component_ids:
-            # Try to resolve from session
-            from codewiki.mcp.session import SessionStore
-            # We can't easily access the store here, so fall back to template
-            pass
-
         # Return the template with placeholders filled as possible
         return USER_PROMPT.format(
             module_name=module_name,