agentpack-cli 0.1.16__tar.gz → 0.1.20__tar.gz

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentpack-cli
-Version: 0.1.16
+Version: 0.1.20
 Summary: Token-aware context packing for AI coding agents — Claude, Cursor, Windsurf, and Codex
 License: MIT
 License-File: LICENSE
@@ -44,7 +44,7 @@ Description-Content-Type: text/markdown
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![CI](https://github.com/vishal2612200/agentpack/actions/workflows/ci.yml/badge.svg)](https://github.com/vishal2612200/agentpack/actions/workflows/ci.yml)
 
-> **Status: alpha (v0.1.17).** Works, tested, used in real sessions. Python and JavaScript/TypeScript are the best-supported languages. Not yet validated across a wide range of repos. API may change before 1.0.
+> **Status: alpha (v0.1.20).** Works, tested, used in real sessions. Python and JavaScript/TypeScript are the best-supported languages. Not yet validated across a wide range of repos. API may change before 1.0.
 >
 > **Platform note:** macOS and Linux are fully supported. Windows support is not yet implemented (git hooks use POSIX shell; the Claude Code session hooks use `python3`/`rm -f`). Contributions welcome.
 
@@ -297,7 +297,7 @@ Configures:
 - `CLAUDE.md` — tells Claude to read the context pack before each task
 - `.claude/settings.json` — two hooks:
   - `SessionStart`: clears injection sentinel so first prompt gets context
-  - `UserPromptSubmit`: detects repo changes via content hash (not file mtime), triggers background repack using your prompt as the task description so keyword scoring matches the current conversation
+  - `UserPromptSubmit`: runs `agentpack hook` — detects repo changes via `root_hash`, triggers background repack using your prompt as task. With MCP: emits Option-B hint (~100 tokens, task + top files). Without MCP: emits capped fallback (top 8 files, ≤3k chars)
 
 After this, context is injected automatically into every Claude Code session. No `/agentpack` command needed — it just happens.
 
@@ -1298,7 +1298,23 @@ Skip writing a task description — agentpack infers it from your branch name, c
 agentpack pack --task auto
 ```
 
-Priority order: branch name → changed file paths → recent commit message. The more descriptive your branch names (`feat/add-rate-limiting` beats `dev`), the better the inferred task.
+Priority order (strongest → weakest):
+
+| Source | Example output |
+|--------|---------------|
+| `task.md` (explicit) | `"migrate DB schema to multi-tenant"` |
+| branch + staged files | `"feat add-rate-limiting: payments, throttle"` |
+| staged files only | `"payments, throttle"` |
+| branch + unstaged | `"feat add-rate-limiting: session, token"` |
+| branch + latest commit | `"feat add-rate-limiting: fix token expiry check"` |
+| branch name alone | `"feat add-rate-limiting"` |
+| unstaged files | `"session, token"` |
+| recent commit messages | `"fix token expiry check; add pagination"` |
+| recently modified files | `"session, payments"` (noisy — last resort) |
+
+The heuristic that fired is logged: `Auto task (branch+staged): feat add-rate-limiting: payments`.
+
+The more descriptive your branch names (`feat/add-rate-limiting` beats `dev`) and the more you stage before running, the more accurate the inference.
 
 ### Concept synonym expansion
 

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/README.md

@@ -5,7 +5,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![CI](https://github.com/vishal2612200/agentpack/actions/workflows/ci.yml/badge.svg)](https://github.com/vishal2612200/agentpack/actions/workflows/ci.yml)
 
-> **Status: alpha (v0.1.17).** Works, tested, used in real sessions. Python and JavaScript/TypeScript are the best-supported languages. Not yet validated across a wide range of repos. API may change before 1.0.
+> **Status: alpha (v0.1.20).** Works, tested, used in real sessions. Python and JavaScript/TypeScript are the best-supported languages. Not yet validated across a wide range of repos. API may change before 1.0.
 >
 > **Platform note:** macOS and Linux are fully supported. Windows support is not yet implemented (git hooks use POSIX shell; the Claude Code session hooks use `python3`/`rm -f`). Contributions welcome.
 
@@ -258,7 +258,7 @@ Configures:
 - `CLAUDE.md` — tells Claude to read the context pack before each task
 - `.claude/settings.json` — two hooks:
   - `SessionStart`: clears injection sentinel so first prompt gets context
-  - `UserPromptSubmit`: detects repo changes via content hash (not file mtime), triggers background repack using your prompt as the task description so keyword scoring matches the current conversation
+  - `UserPromptSubmit`: runs `agentpack hook` — detects repo changes via `root_hash`, triggers background repack using your prompt as task. With MCP: emits Option-B hint (~100 tokens, task + top files). Without MCP: emits capped fallback (top 8 files, ≤3k chars)
 
 After this, context is injected automatically into every Claude Code session. No `/agentpack` command needed — it just happens.
 
@@ -1259,7 +1259,23 @@ Skip writing a task description — agentpack infers it from your branch name, c
 agentpack pack --task auto
 ```
 
-Priority order: branch name → changed file paths → recent commit message. The more descriptive your branch names (`feat/add-rate-limiting` beats `dev`), the better the inferred task.
+Priority order (strongest → weakest):
+
+| Source | Example output |
+|--------|---------------|
+| `task.md` (explicit) | `"migrate DB schema to multi-tenant"` |
+| branch + staged files | `"feat add-rate-limiting: payments, throttle"` |
+| staged files only | `"payments, throttle"` |
+| branch + unstaged | `"feat add-rate-limiting: session, token"` |
+| branch + latest commit | `"feat add-rate-limiting: fix token expiry check"` |
+| branch name alone | `"feat add-rate-limiting"` |
+| unstaged files | `"session, token"` |
+| recent commit messages | `"fix token expiry check; add pagination"` |
+| recently modified files | `"session, payments"` (noisy — last resort) |
+
+The heuristic that fired is logged: `Auto task (branch+staged): feat add-rate-limiting: payments`.
+
+The more descriptive your branch names (`feat/add-rate-limiting` beats `dev`) and the more you stage before running, the more accurate the inference.
 
 ### Concept synonym expansion
 

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentpack-cli"
-version = "0.1.16"
+version = "0.1.20"
 description = "Token-aware context packing for AI coding agents — Claude, Cursor, Windsurf, and Codex"
 readme = "README.md"
 requires-python = ">=3.10"

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/__init__.py

@@ -1,3 +1,3 @@
 """AgentPack — token-aware context packing for AI coding agents."""
 
-__version__ = "0.1.17"
+__version__ = "0.1.20"

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/application/pack_service.py

@@ -304,6 +304,8 @@ class PackService:
             token_estimate=packed_tokens,
         )
         excluded_receipts = [r for r in plan.receipts if r.action == "excluded"]
+        # Budget-cut: files that scored OK but didn't fit — more useful signal than "score too low"
+        budget_cut = [r.path for r in plan.receipts if r.reason == "budget exhausted"][:10]
         _record_metrics(
             root,
             task=request.task,
@@ -315,9 +317,10 @@ class PackService:
             selected_count=len(plan.selected),
             changed_count=len(plan.all_changed),
             selected_paths=[sf.path for sf in plan.selected],
+            selected_hints=[{"path": sf.path, "why": sf.reasons[0] if sf.reasons else ""} for sf in plan.selected[:8]],
             current_changed=plan.all_changed,
             excluded_count=len(excluded_receipts),
-            excluded_paths=[r.path for r in excluded_receipts if r.reason == "score too low"][:10],
+            excluded_paths=budget_cut,
         )
 
         return PackResult(
@@ -407,6 +410,7 @@ def _record_metrics(
     changed_count: int,
     selected_paths: list[str],
     current_changed: set[str],
+    selected_hints: list[dict] | None = None,
     excluded_count: int = 0,
     excluded_paths: list[str] | None = None,
 ) -> None:
@@ -424,6 +428,7 @@ def _record_metrics(
         "excluded_files": excluded_count,
         "excluded_paths": excluded_paths or [],
         "selected_paths": selected_paths,
+        "selected_hints": selected_hints or [],
         "phases": {k: round(v, 3) for k, v in phase_times.items()},
         "total_s": round(sum(phase_times.values()), 3),
     }

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/cli.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import typer
-from agentpack.commands import init, scan, diff, status, stats, summarize, pack, install, monitor, explain, doctor, watch, claude_cmd, benchmark, mcp_cmd
+from agentpack.commands import init, scan, diff, status, stats, summarize, pack, install, monitor, explain, doctor, watch, claude_cmd, benchmark, mcp_cmd, hook_cmd
 from agentpack import __version__
 
 
@@ -21,7 +21,7 @@ def _main(
     pass
 
 
-for mod in [init, scan, diff, status, stats, summarize, pack, install, monitor, explain, doctor, watch, claude_cmd, benchmark, mcp_cmd]:
+for mod in [init, scan, diff, status, stats, summarize, pack, install, monitor, explain, doctor, watch, claude_cmd, benchmark, mcp_cmd, hook_cmd]:
     mod.register(app)
 
 

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/commands/doctor.py

@@ -119,12 +119,37 @@ def register(app: typer.Typer) -> None:
         import json as _json
         _local_has_hooks = False
         _global_has_hooks = False
+
+        def _has_stale_hooks(hooks: dict) -> bool:
+            """Detect old inline-Python or context-injection hooks that should be upgraded."""
+            all_cmds = [
+                h.get("command", "")
+                for event_hooks in hooks.values()
+                for entry in event_hooks
+                for h in entry.get("hooks", [])
+            ]
+            return any(
+                "context.claude.md" in cmd
+                or ".context_injected" in cmd
+                or (".mcp_reminded" in cmd and "python3" in cmd)
+                for cmd in all_cmds
+            )
+
+        def _has_current_hooks(hooks: dict) -> bool:
+            return "agentpack hook" in str(hooks)
+
         if claude_settings.exists():
             try:
                 data = _json.loads(claude_settings.read_text())
                 hooks = data.get("hooks", {})
                 if "UserPromptSubmit" in hooks or "SessionStart" in hooks:
-                    console.print(f"  [green]✓[/] Claude hooks present (local): {claude_settings}")
+                    if _has_stale_hooks(hooks):
+                        console.print("  [yellow]![/] Claude hooks stale (local) — old injection hook detected. Run: agentpack install --agent claude")
+                        ok = False
+                    elif _has_current_hooks(hooks):
+                        console.print(f"  [green]✓[/] Claude hooks present (local): {claude_settings}")
+                    else:
+                        console.print(f"  [green]✓[/] Claude hooks present (local): {claude_settings}")
                     _local_has_hooks = True
                 else:
                     console.print("  [yellow]![/] Claude hooks missing (local) — run: agentpack install --agent claude")
@@ -138,7 +163,10 @@ def register(app: typer.Typer) -> None:
                 data = _json.loads(global_claude_settings.read_text())
                 hooks = data.get("hooks", {})
                 if "UserPromptSubmit" in hooks or "SessionStart" in hooks:
-                    console.print(f"  [green]✓[/] Claude hooks present (global): {global_claude_settings}")
+                    if _has_stale_hooks(hooks):
+                        console.print("  [yellow]![/] Claude hooks stale (global) — old injection hook detected. Run: agentpack install --agent claude --global")
+                    else:
+                        console.print(f"  [green]✓[/] Claude hooks present (global): {global_claude_settings}")
                     _global_has_hooks = True
                 else:
                     console.print("  [yellow]![/] Claude hooks missing (global) — run: agentpack install --agent claude --global")

agentpack_cli-0.1.20/src/agentpack/commands/hook_cmd.py

@@ -0,0 +1,248 @@
+from __future__ import annotations
+
+import json
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+import typer
+
+from agentpack.commands._shared import _root
+from agentpack.core import git as _git
+
+_TASK_FILE = ".agentpack/task.md"
+_TASK_FILE_DEFAULT_MARKER = "Write or update the current coding task here."
+_CODING_PROMPT_RE = re.compile(
+    r"(?:fix|add|refactor|impl|implement|update|write|debug|test|build|migrate|remove|delete|rename|optimize)\b",
+    re.IGNORECASE,
+)
+
+
+def register(app: typer.Typer) -> None:
+    @app.command(name="hook")
+    def hook(
+        event: str = typer.Option("UserPromptSubmit", "--event", help="Hook event name."),
+    ) -> None:
+        """Run as a Claude Code hook. Reads stdin (JSON), emits additionalContext."""
+        root = _root()
+        if event == "UserPromptSubmit":
+            _run_user_prompt_submit(root)
+        elif event == "SessionStart":
+            _run_session_start(root)
+        else:
+            sys.exit(0)
+
+
+# ---------------------------------------------------------------------------
+# Public helpers (tested directly)
+# ---------------------------------------------------------------------------
+
+def _mcp_installed(root: Path) -> bool:
+    local_mcp = root / ".mcp.json"
+    if local_mcp.exists():
+        try:
+            cfg = json.loads(local_mcp.read_text())
+            if "agentpack" in cfg.get("mcpServers", {}):
+                return True
+        except Exception:
+            pass
+    global_settings = Path.home() / ".claude" / "settings.json"
+    if global_settings.exists():
+        try:
+            cfg = json.loads(global_settings.read_text())
+            if "agentpack" in cfg.get("mcpServers", {}):
+                return True
+        except Exception:
+            pass
+    return False
+
+
+def _load_task_md(root: Path) -> str:
+    """Return task.md content if user has written a real task (not the default placeholder)."""
+    task_path = root / _TASK_FILE
+    if not task_path.exists():
+        return ""
+    try:
+        content = task_path.read_text(encoding="utf-8").strip()
+        # Strip markdown heading
+        lines = [ln for ln in content.splitlines() if not ln.startswith("#")]
+        body = "\n".join(lines).strip()
+        if not body or _TASK_FILE_DEFAULT_MARKER in body:
+            return ""
+        return body[:200]
+    except Exception:
+        return ""
+
+
+def _looks_like_coding_prompt(prompt: str) -> bool:
+    """Return True if prompt looks like a coding task (not a slash command or chat)."""
+    stripped = prompt.strip()
+    if stripped.startswith("/"):
+        return False
+    return bool(_CODING_PROMPT_RE.search(stripped))
+
+
+def _resolve_task(root: Path, prompt: str) -> str:
+    """Merge task.md + prompt into best task description for repack."""
+    task_md = _load_task_md(root)
+    if task_md:
+        return task_md
+    if prompt and _looks_like_coding_prompt(prompt):
+        return prompt[:200].strip()
+    return "auto"
+
+
+def _load_hints(root: Path, n: int = 5) -> list[dict]:
+    """Return top-n selected_hints (path + why) from last metrics record."""
+    metrics_path = root / ".agentpack" / "metrics.jsonl"
+    if not metrics_path.exists():
+        return []
+    try:
+        lines = metrics_path.read_text(encoding="utf-8").splitlines()
+        for line in reversed(lines):
+            line = line.strip()
+            if not line:
+                continue
+            rec = json.loads(line)
+            hints = rec.get("selected_hints", [])
+            if hints:
+                return hints[:n]
+            # Fallback: old metrics without hints
+            paths = rec.get("selected_paths", [])
+            if paths:
+                return [{"path": p, "why": ""} for p in paths[:n]]
+    except Exception:
+        pass
+    return []
+
+
+def _load_top_files(root: Path, n: int = 5) -> list[dict]:
+    """Alias kept for backward compat with tests."""
+    return _load_hints(root, n)
+
+
+def _load_pack_task(root: Path) -> str:
+    meta_path = root / ".agentpack" / "pack_metadata.json"
+    if not meta_path.exists():
+        return ""
+    try:
+        return json.loads(meta_path.read_text()).get("task", "")
+    except Exception:
+        return ""
+
+
+def _infer_live_task(root: Path) -> str:
+    """Live task: git priority chain (no stale metadata). Falls back to 'unknown'."""
+    try:
+        task, _ = _git.infer_task_with_source(root)
+        return task
+    except Exception:
+        return "unknown"
+
+
+def _current_root_hash(root: Path) -> str | None:
+    snap = root / ".agentpack" / "snapshots" / "latest.json"
+    if not snap.exists():
+        return None
+    try:
+        return json.loads(snap.read_text()).get("root_hash")
+    except Exception:
+        return None
+
+
+# ---------------------------------------------------------------------------
+# Event handlers
+# ---------------------------------------------------------------------------
+
+def _run_session_start(root: Path) -> None:
+    """Clear sentinels so first prompt gets fresh context."""
+    for sentinel in [
+        root / ".agentpack" / ".mcp_reminded",
+        root / ".agentpack" / ".context_injected",
+    ]:
+        try:
+            sentinel.unlink(missing_ok=True)
+        except Exception:
+            pass
+    # No output needed — SessionStart hooks don't inject additionalContext
+
+
+def _run_user_prompt_submit(root: Path) -> None:
+    snap_sentinel = root / ".agentpack" / ".mcp_reminded"
+
+    try:
+        hook_data = json.loads(sys.stdin.read())
+        prompt = hook_data.get("prompt", "")
+    except Exception:
+        prompt = ""
+
+    task = _resolve_task(root, prompt)
+
+    current_hash = _current_root_hash(root)
+    reminded_hash = snap_sentinel.read_text().strip() if snap_sentinel.exists() else None
+    repo_changed = current_hash != reminded_hash
+
+    if repo_changed:
+        subprocess.Popen(
+            ["agentpack", "pack", "--task", task, "--mode", "balanced", "--since", "HEAD~1"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        )
+        try:
+            snap_sentinel.write_text(current_hash or "1")
+        except Exception:
+            pass
+
+    has_mcp = _mcp_installed(root)
+
+    if has_mcp:
+        hints = _load_hints(root, n=5)
+        if hints:
+            files_lines = "\n".join(
+                f"  - {h['path']}" + (f" — {h['why']}" if h.get("why") else "")
+                for h in hints
+            )
+            status_note = "(repacking — call pack_context for fresh results)" if repo_changed else "(index fresh)"
+            current_task = _load_task_md(root) or _infer_live_task(root)
+            msg = (
+                f"AgentPack {status_note}\n"
+                f"task: {current_task}\n"
+                f"top files:\n{files_lines}\n"
+                f"Call agentpack_pack_context(task=\"...\") for full ranked context."
+            )
+        else:
+            msg = (
+                "AgentPack active. No pack yet — call agentpack_pack_context(task=\"...\") "
+                "to build context for this task."
+            )
+    else:
+        hints = _load_hints(root, n=8)
+        current_task = _load_task_md(root) or _infer_live_task(root)
+        if hints:
+            files_lines = "\n".join(
+                f"  - {h['path']}" + (f" — {h['why']}" if h.get("why") else "")
+                for h in hints
+            )
+            changed_note = " (repacking in background)" if repo_changed else ""
+            msg = (
+                f"AgentPack context{changed_note}\n"
+                f"task: {current_task}\n"
+                f"top files:\n{files_lines}\n\n"
+                f"For richer context, install MCP: agentpack install --agent claude"
+            )
+        else:
+            msg = (
+                "AgentPack active. Run `agentpack pack --task \"<task>\"` to build context.\n"
+                "For auto context, install MCP: agentpack install --agent claude"
+            )
+
+        if len(msg) > 3000:
+            msg = msg[:2970] + "\n... [truncated]"
+
+    print(json.dumps({
+        "hookSpecificOutput": {
+            "hookEventName": "UserPromptSubmit",
+            "additionalContext": msg,
+        }
+    }))

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/commands/pack.py

@@ -64,8 +64,19 @@ def _resolve_agent(agent: str) -> str:
 def _resolve_task(task: str) -> str:
     if task != "auto":
         return task
-    inferred = git.infer_task_from_git(_root())
-    console.print(f"[dim]Auto task: {inferred}[/]")
+    root = _root()
+    # task.md takes priority over all git heuristics
+    task_md_path = root / ".agentpack" / "task.md"
+    if task_md_path.exists():
+        content = task_md_path.read_text(encoding="utf-8").strip()
+        lines = [ln for ln in content.splitlines() if ln.strip() and not ln.startswith("#")]
+        body = lines[0].strip() if lines else ""
+        _PLACEHOLDER = "Write or update the current coding task here."
+        if body and _PLACEHOLDER not in body:
+            console.print(f"[dim]Auto task (task.md): {body}[/]")
+            return body
+    inferred, source = git.infer_task_with_source(root)
+    console.print(f"[dim]Auto task ({source}): {inferred}[/]")
     return inferred
 
 

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/core/git.py

@@ -94,12 +94,44 @@ def file_churn_counts(root: Path, max_commits: int = 200) -> dict[str, int]:
     return counts
 
 
-def infer_task_from_git(root: Path) -> str:
-    """Infer a task description from branch name, changed files, and recent commits.
-
-    Priority: branch name + changed files → branch name → changed files →
-              recent commit messages (up to 3) → recently modified files → fallback.
+def staged_files(root: Path) -> set[str]:
+    """Files staged for commit (git index only)."""
+    out = _run(["git", "diff", "--cached", "--name-only"], root)
+    if not out:
+        return set()
+    return {line.strip() for line in out.splitlines() if line.strip()}
+
+
+def infer_task_with_source(root: Path) -> tuple[str, str]:
+    """Infer task description with the heuristic that fired.
+
+    Priority (strongest → weakest):
+      branch+staged    staged files present + branch name
+      staged           staged files, no branch
+      branch+unstaged  unstaged changes + branch name
+      branch+commit    branch + latest commit message
+      branch           branch name alone
+      unstaged         unstaged changes, no branch
+      commits          recent commit messages
+      recently_modified git log history (noisy — last resort)
+      fallback         "general development"
     """
+    if not is_git_repo(root):
+        return "general development", "fallback"
+
+    staged = staged_files(root)
+
+    unstaged_out = _run(["git", "diff", "--name-only"], root)
+    unstaged: set[str] = set()
+    if unstaged_out:
+        for line in unstaged_out.splitlines():
+            line = line.strip()
+            if line:
+                unstaged.add(line)
+
+    staged_topic = _topic_from_paths(staged) if staged else None
+    unstaged_topic = _topic_from_paths(unstaged) if unstaged else None
+
     branch: str | None = None
     branch_out = _run(["git", "rev-parse", "--abbrev-ref", "HEAD"], root)
     if branch_out:
@@ -108,11 +140,6 @@ def infer_task_from_git(root: Path) -> str:
             slug = b.split("/", 1)[-1]
             branch = slug.replace("-", " ").replace("_", " ")
 
-    # Changed files are the strongest signal for *current* work
-    changed = changed_files(root)
-    file_topic = _topic_from_paths(changed) if changed else None
-
-    # Collect recent non-merge commit messages (up to 3) for richer fallback
     commit_msgs: list[str] = []
     log_out = _run(["git", "log", "--oneline", "-10"], root)
     if log_out:
@@ -126,26 +153,36 @@ def infer_task_from_git(root: Path) -> str:
             if len(commit_msgs) == 3:
                 break
 
-    # When branch is clean (no changed files), fall back to recently touched files
-    # so keyword scoring has something to work with beyond the branch name alone.
-    if not file_topic and not branch:
-        recent = recently_modified_files(root, n=10)
-        file_topic = _topic_from_paths(set(recent)) if recent else None
-
-    if branch and file_topic:
-        return f"{branch}: {file_topic}"
+    if branch and staged_topic:
+        return f"{branch}: {staged_topic}", "branch+staged"
+    if staged_topic:
+        return staged_topic, "staged"
+    if branch and unstaged_topic:
+        return f"{branch}: {unstaged_topic}", "branch+unstaged"
     if branch and commit_msgs:
-        # Augment bare branch name with latest commit context
-        return f"{branch}: {commit_msgs[0]}"
+        return f"{branch}: {commit_msgs[0]}", "branch+commit"
     if branch:
-        return branch
-    if file_topic and commit_msgs:
-        return f"{file_topic}: {commit_msgs[0]}"
-    if file_topic:
-        return file_topic
+        return branch, "branch"
+    if unstaged_topic and commit_msgs:
+        return f"{unstaged_topic}: {commit_msgs[0]}", "unstaged+commit"
+    if unstaged_topic:
+        return unstaged_topic, "unstaged"
     if commit_msgs:
-        return "; ".join(commit_msgs[:2])
-    return "general development"
+        return "; ".join(commit_msgs[:2]), "commits"
+
+    # Last resort: historical git log — only fires when no live signal found
+    recent = recently_modified_files(root, n=10)
+    recent_topic = _topic_from_paths(set(recent)) if recent else None
+    if recent_topic:
+        return recent_topic, "recently_modified"
+
+    return "general development", "fallback"
+
+
+def infer_task_from_git(root: Path) -> str:
+    """Infer a task description from git state. See infer_task_with_source for priority chain."""
+    task, _ = infer_task_with_source(root)
+    return task
 
 
 def _topic_from_paths(paths: set[str]) -> str | None:

{agentpack_cli-0.1.16 → agentpack_cli-0.1.20}/src/agentpack/installers/claude.py

@@ -77,70 +77,41 @@ class ClaudeInstaller:
 
         hooks = existing.setdefault("hooks", {})
 
-        # SessionStart: delete sentinel + kick off background repack so first prompt
-        # gets fresh context without blocking the session.
-        # Use session refresh if session exists (respects task.md), else fall back to pack.
-        sentinel_cmd = (
-            "rm -f .agentpack/.context_injected .agentpack/.mcp_reminded"
-            " && ([ -f .agentpack/session.json ]"
-            " && agentpack session refresh >/dev/null 2>&1"
-            " || agentpack pack --task auto --mode balanced >/dev/null 2>&1) &"
-        )
+        # SessionStart: delegate to `agentpack hook` CLI subcommand.
+        # Clears sentinels so first UserPromptSubmit gets fresh context.
+        session_hook_cmd = "agentpack hook --event SessionStart"
         session_start = hooks.setdefault("SessionStart", [])
-        # Replace any stale agentpack session hooks (old cmd only deleted sentinel).
+        # Remove stale agentpack session hooks (old rm -f / session refresh shell commands).
+        def _is_stale_session_hook(cmd: str) -> bool:
+            return (
+                ".context_injected" in cmd and "rm -f" in cmd
+            ) or "agentpack session refresh" in cmd
         for entry in session_start:
             entry["hooks"] = [
                 h for h in entry.get("hooks", [])
-                if not (".context_injected" in h.get("command", "") and "rm -f" in h.get("command", ""))
+                if not _is_stale_session_hook(h.get("command", ""))
             ]
         session_start[:] = [e for e in session_start if e.get("hooks")]
         already_has_session_hook = any(
-            any(h.get("command", "") == sentinel_cmd for h in entry.get("hooks", []))
+            any(h.get("command", "") == session_hook_cmd for h in entry.get("hooks", []))
             for entry in session_start
         )
         if not already_has_session_hook:
-            session_start.append({"hooks": [{"type": "command", "command": sentinel_cmd}]})
-
-        # UserPromptSubmit: tiny MCP reminder — no context injection, no file reads.
-        # MCP server handles actual context retrieval on demand (pull-based).
-        # Background repack keeps the index fresh for MCP queries, using the
-        # user's prompt as the task so keyword scoring matches current work.
-        # root_hash (not md5 of whole file) avoids false "changed" on created_at churn.
-        mcp_reminder_cmd = (
-            "python3 -c \"\n"
-            "import json, pathlib, subprocess, sys\n"
-            "snap = pathlib.Path('.agentpack/snapshots/latest.json')\n"
-            "sentinel = pathlib.Path('.agentpack/.mcp_reminded')\n"
-            "try:\n"
-            "    current_hash = json.loads(snap.read_text()).get('root_hash') if snap.exists() else None\n"
-            "except Exception:\n"
-            "    current_hash = None\n"
-            "reminded_hash = sentinel.read_text().strip() if sentinel.exists() else None\n"
-            "try:\n"
-            "    hook_data = json.loads(sys.stdin.read())\n"
-            "    prompt = hook_data.get('prompt', '')\n"
-            "except Exception:\n"
-            "    prompt = ''\n"
-            "task = (prompt[:200].strip() or 'auto') if prompt else 'auto'\n"
-            # Background repack when repo changed since last pack.
-            "if current_hash != reminded_hash:\n"
-            "    subprocess.Popen(['agentpack', 'pack', '--task', task, '--mode', 'balanced'],\n"
-            "                     stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)\n"
-            "    sentinel.write_text(current_hash or '1')\n"
-            "    msg = 'AgentPack: repo changed — repacking index. Call agentpack_pack_context(task=\\\"...\\\") for fresh context.'\n"
-            "else:\n"
-            "    msg = 'AgentPack MCP ready. Call agentpack_pack_context(task=\\\"...\\\") before editing files.'\n"
-            "print(json.dumps({'hookSpecificOutput': {'hookEventName': 'UserPromptSubmit',\n"
-            "    'additionalContext': msg}}))\n"
-            "\""
-        )
+            session_start.append({"hooks": [{"type": "command", "command": session_hook_cmd}]})
+
+        # UserPromptSubmit: delegate to `agentpack hook` CLI subcommand.
+        # - Reads prompt from stdin, uses it as pack task keyword.
+        # - With MCP: emits Option-B hint (task + top files list, ~100 tokens).
+        # - Without MCP: emits capped fallback (top files, hard cap 3k chars).
+        # - Background repacks when root_hash changes (content-addressed, not mtime).
+        hook_cmd = "agentpack hook --event UserPromptSubmit"
         user_prompt = hooks.setdefault("UserPromptSubmit", [])
-        # Remove stale agentpack hooks (old injection hooks and old MCP reminder versions).
+        # Remove stale agentpack hooks (old injection hooks, old inline MCP reminder).
         def _is_stale_agentpack_hook(cmd: str) -> bool:
             return (
                 "context.claude.md" in cmd
                 or ".context_injected" in cmd
-                or (".mcp_reminded" in cmd and "hashlib" in cmd)  # old md5-based reminder
+                or (".mcp_reminded" in cmd and "python3" in cmd)  # old inline python hooks
             )
         for entry in user_prompt:
             entry["hooks"] = [
@@ -149,14 +120,14 @@ class ClaudeInstaller:
             ]
         user_prompt[:] = [e for e in user_prompt if e.get("hooks")]
         already_has_prompt_hook = any(
-            any(h.get("command", "") == mcp_reminder_cmd for h in entry.get("hooks", []))
+            any(h.get("command", "") == hook_cmd for h in entry.get("hooks", []))
             for entry in user_prompt
         )
         if not already_has_prompt_hook:
             user_prompt.append({
                 "hooks": [{
                     "type": "command",
-                    "command": mcp_reminder_cmd,
+                    "command": hook_cmd,
                     "timeout": 5,
                     "statusMessage": "Checking agentpack index...",
                 }]