claude-code-conductor 2.8.0__tar.gz → 2.10.0__tar.gz

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/permission_handler.py

@@ -369,6 +369,11 @@ def main() -> None:
     rules = load_rules()
     description = describe_tool(tool_name, tool_input)
 
+    # AskUserQuestion は通知のみ。自動承認対象外として扱う。
+    if tool_name == 'AskUserQuestion':
+        notify(f'-> 質問: {description}')
+        return
+
     for pattern in rules.get('auto_allow', []):
         if matches_pattern(tool_name, tool_input, pattern):
             if rules.get('notify_on_auto', True):

claude_code_conductor-2.10.0/.claude/hooks/recall_inject.py

@@ -0,0 +1,292 @@
+#!/usr/bin/env python3
+"""UserPromptSubmit hook: inject semantically-similar past context (α design).
+
+The hook runs ``c3 recall search`` against the local HNSW index and
+returns the top hits as ``additionalContext`` for the parent Claude to
+consider. The preface explicitly asks Claude to evaluate the relevance
+of each hit and ignore unrelated ones — i.e. *AI judges, hook does not
+filter aggressively*.
+
+Skip conditions (all silent no-ops, exit 0):
+- ``C3_RECALL_HOOK_DISABLE=1`` env var set
+- Prompt shorter than :data:`_MIN_PROMPT_CHARS` (default 15)
+- Prompt starts with ``/`` (slash command) or ``@`` (file mention)
+- No ``.claude/state/recall_meta.json`` / ``recall.hnsw`` (index not built)
+- ``c3.cli`` subprocess fails or times out
+- Zero hits above ``--min-score``
+
+Output protocol:
+    ``{"hookSpecificOutput": {"hookEventName": "UserPromptSubmit",
+        "additionalContext": "..."}}``
+
+Performance: each invocation runs a fresh Python subprocess that loads
+fastembed + onnxruntime + the MiniLM model. Cold-start is ~2-3 seconds,
+warm cache ~1-2 seconds. Users can disable this hook entirely by setting
+``C3_RECALL_HOOK_DISABLE=1`` in the shell or in ``.env``.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import re
+import subprocess
+import sys
+from pathlib import Path
+from typing import Iterable
+
+try:
+    sys.stdin.reconfigure(encoding="utf-8")
+    sys.stdout.reconfigure(encoding="utf-8")
+    sys.stderr.reconfigure(encoding="utf-8")
+except AttributeError:
+    pass
+
+
+# Minimum prompt length (chars) to bother running recall. Short messages
+# like "yes" / "ok" / "go" rarely benefit from semantic recall and the
+# subprocess overhead is wasteful.
+_MIN_PROMPT_CHARS = 15
+
+# SR-L-1: cap the prompt passed to the subprocess to avoid passing huge
+# context windows through command-line arguments (OS arg-length limits and
+# unnecessary embedding overhead).
+_MAX_PROMPT_CHARS = 2000
+
+_TOP_K = 3
+
+# Slightly stricter than the CLI default (0.3) because the parent Claude
+# pays a context cost for every injected line; surfacing weak matches
+# isn't worth the noise.
+_MIN_SCORE = 0.4
+
+# Generous timeout to accommodate the fastembed cold-start the first
+# time a Claude session warms up the cache.
+_TIMEOUT_SEC = 8
+
+_DISABLE_ENV_VAR = "C3_RECALL_HOOK_DISABLE"
+
+
+# SR-M-1: strip control characters (except \t) and newlines from fields
+# that are embedded inline into the additionalContext string.  Unescaped
+# newlines in path / chunk_label would allow a malicious file path or
+# heading to inject extra lines (including header-like strings) into the
+# context block seen by the parent LLM.
+_CONTROL_RE = re.compile(r"[\x00-\x08\x0b-\x1f\x7f]")
+
+
+def _sanitize_field(s: str) -> str:
+    """Remove newlines and non-printable control chars from inline fields.
+
+    Any text following the first newline is stripped entirely (not just the
+    newline character) so that a malicious path like
+    ``normal/path\\nX-Injected: evil-header`` cannot smuggle arbitrary text
+    into the output after the newline is collapsed.
+    """
+    if not s:
+        return ""
+    # Take only text before the first newline.
+    first_line = s.split("\n")[0].split("\r")[0]
+    # Strip remaining control chars (but preserve tab for readability).
+    return _CONTROL_RE.sub("", first_line)
+
+
+def should_skip_prompt(prompt: str) -> bool:
+    """Pure-logic check used by main() and the unit tests."""
+    if not prompt:
+        return True
+    stripped = prompt.strip()
+    if len(stripped) < _MIN_PROMPT_CHARS:
+        return True
+    if stripped.startswith("/"):
+        return True
+    if stripped.startswith("@"):
+        return True
+    return False
+
+
+def format_additional_context(hits: Iterable[dict], *, stale: bool = False) -> str:
+    """Render hits into the ``additionalContext`` block.
+
+    The preface is the key design lever for α: it tells the parent Claude
+    that these are *candidates*, not *facts*, and asks it to discard
+    unrelated entries.
+
+    When ``stale`` is True, a directive is prepended that asks the parent
+    Claude to surface ``AskUserQuestion`` so the user can choose whether
+    to ``c3 recall rebuild``. The hook itself cannot invoke
+    ``AskUserQuestion`` — only the parent LLM can — so we route the
+    decision through context injection.
+    """
+    lines: list[str] = []
+    if stale:
+        lines.extend(
+            [
+                "[recall] ⚠️ インデックスが古い可能性があります（最新ソースの mtime > index mtime）。",
+                "次に進む前に、AskUserQuestion で以下の 3 択をユーザーに提示してください:",
+                "  - 今すぐ rebuild する → Bash で `c3 recall rebuild` を実行（約 1〜2 分）",
+                "  - 後で / 今は不要 → 検索結果は古いままという前提で続行",
+                "  - 無視 → このまま現タスクを進める",
+                "ユーザーが同一セッション中にすでに「後で」「無視」と答えた場合は再度尋ねないでください。",
+                "",
+            ]
+        )
+    lines.append(
+        "[recall] 過去の類似情報の検索結果（参考のみ。**現タスクと無関係なら無視**してください）:"
+    )
+    for i, hit in enumerate(hits, start=1):
+        score = hit.get("score")
+        # SR-M-1: sanitize inline fields to prevent newline / control-char
+        # injection from malicious file paths or headings.
+        path = _sanitize_field(hit.get("path") or "")
+        label = _sanitize_field(hit.get("chunk_label") or "")
+        snippet = (hit.get("snippet") or "").strip().replace("\n", " ")
+        if len(snippet) > 220:
+            snippet = snippet[:220] + "..."
+        score_str = f"{score:.2f}" if isinstance(score, (int, float)) else str(score)
+        lines.append(f"  [{i}] score={score_str}  {path}  :: {label}")
+        if snippet:
+            lines.append(f"      {snippet}")
+    return "\n".join(lines)
+
+
+def find_repo_root() -> Path | None:
+    """Return the nearest ancestor containing ``.claude/`` (or None)."""
+    here = Path(os.getenv("CLAUDE_PROJECT_DIR") or Path.cwd()).resolve()
+    for candidate in [here, *here.parents]:
+        if (candidate / ".claude").is_dir():
+            return candidate
+    return None
+
+
+def index_exists(repo_root: Path) -> bool:
+    meta = repo_root / ".claude" / "state" / "recall_meta.json"
+    index = repo_root / ".claude" / "state" / "recall.hnsw"
+    return meta.exists() and index.exists()
+
+
+# Source directories scanned to decide if the recall index is older than
+# at least one of its inputs. Mirrors :mod:`c3.recall_index.collect_sources`
+# but kept local to the hook so it can run without importing the c3
+# package (the hook may execute in environments where ``c3`` is not yet
+# importable, e.g. immediately after ``c3 init``).
+# CR-L-02: Keep in sync with c3.recall_index.collect_sources when adding
+# or removing source kinds.
+_STALE_SOURCE_GLOBS = (
+    (Path(".claude") / "memory" / "sessions", "*.tmp"),
+    (Path(".claude") / "agent-memory", "*.md"),
+    (Path(".claude") / "reports" / "archive", "*.md"),
+)
+_STALE_PATTERNS_JSON = Path(".claude") / "memory" / "patterns.json"
+
+
+def index_is_stale(repo_root: Path) -> bool:
+    """Return True if any recall source is newer than the index file."""
+    index_path = repo_root / ".claude" / "state" / "recall.hnsw"
+    if not index_path.exists():
+        return False
+    index_mtime = index_path.stat().st_mtime
+    for rel_dir, pattern in _STALE_SOURCE_GLOBS:
+        absolute = repo_root / rel_dir
+        if not absolute.is_dir():
+            continue
+        for path in absolute.rglob(pattern):
+            # Cycle2-L-1 [SR-V-002]: skip symlinks to avoid reading mtime of
+            # files outside the C3 source tree (matches the analogous guard in
+            # c3.recall_index._collect_markdown_glob).
+            if not path.is_file() or path.name == ".gitkeep" or path.is_symlink():
+                continue
+            try:
+                if path.stat().st_mtime > index_mtime:
+                    return True
+            except OSError:
+                continue
+    patterns_path = repo_root / _STALE_PATTERNS_JSON
+    if patterns_path.is_file():
+        try:
+            if patterns_path.stat().st_mtime > index_mtime:
+                return True
+        except OSError:
+            pass
+    return False
+
+
+def run_recall(prompt: str, repo_root: Path) -> list[dict]:
+    """Invoke ``python -m c3.cli recall search`` and return ``hits`` list.
+
+    Any error path (subprocess failure, timeout, malformed JSON) returns
+    an empty list so the hook stays silent rather than surfacing errors
+    to the user mid-prompt.
+    """
+    # SR-L-1: truncate prompt to avoid OS arg-length limits and pass only
+    # the most relevant context to the embedding model.
+    prompt = prompt[:_MAX_PROMPT_CHARS]
+    try:
+        result = subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "c3.cli",
+                "recall",
+                "search",
+                prompt,
+                "--top",
+                str(_TOP_K),
+                "--min-score",
+                str(_MIN_SCORE),
+                "--json",
+                "--target",
+                str(repo_root),
+            ],
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            timeout=_TIMEOUT_SEC,
+        )
+    except (subprocess.TimeoutExpired, OSError):
+        return []
+    if result.returncode != 0:
+        return []
+    try:
+        data = json.loads(result.stdout)
+    except (json.JSONDecodeError, ValueError):
+        return []
+    hits = data.get("hits") or []
+    return hits if isinstance(hits, list) else []
+
+
+def main() -> int:
+    if os.environ.get(_DISABLE_ENV_VAR) == "1":
+        return 0
+
+    try:
+        payload = json.load(sys.stdin)
+    except (json.JSONDecodeError, ValueError):
+        return 0
+
+    prompt = payload.get("prompt", "")
+    if not isinstance(prompt, str) or should_skip_prompt(prompt):
+        return 0
+
+    repo_root = find_repo_root()
+    if repo_root is None or not index_exists(repo_root):
+        return 0
+
+    hits = run_recall(prompt, repo_root)
+    if not hits:
+        return 0
+
+    stale = index_is_stale(repo_root)
+
+    output = {
+        "hookSpecificOutput": {
+            "hookEventName": "UserPromptSubmit",
+            "additionalContext": format_additional_context(hits, stale=stale),
+        }
+    }
+    print(json.dumps(output, ensure_ascii=False))
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/record_tier_outcome.py

@@ -87,6 +87,40 @@ def _delete_tier_selection() -> None:
         )
 
 
+# prompt-history.jsonl の上限サイズ（バイト）。超過時は末尾 _PROMPT_HISTORY_TRUNCATE_LINES 行
+# だけを残してローテーションする。読み込み側 (select_tier._PROMPT_HISTORY_SCAN_LINES=1000) と
+# 同じオーダーで保持し、ディスク消費を抑える [SR-V-001]。
+_PROMPT_HISTORY_MAX_BYTES = 10 * 1024 * 1024  # 10 MB
+_PROMPT_HISTORY_TRUNCATE_LINES = 2000
+
+
+def _rotate_prompt_history_if_needed() -> None:
+    """prompt-history.jsonl が上限超過なら末尾 N 行を残して切り詰める。
+
+    書き込み側のサイズ無制限成長を防ぐシンプルなローテーション。失敗時は警告のみ。
+    """
+    try:
+        size = os.path.getsize(PROMPT_HISTORY_PATH)
+    except OSError:
+        return
+    if size <= _PROMPT_HISTORY_MAX_BYTES:
+        return
+    try:
+        # 末尾 N 行のみ deque で保持して上書きする（ファイル全体は走査するが I/O のみ）
+        import collections as _c
+        with open(PROMPT_HISTORY_PATH, "r", encoding="utf-8") as f:
+            tail = list(_c.deque(f, maxlen=_PROMPT_HISTORY_TRUNCATE_LINES))
+        tmp_path = PROMPT_HISTORY_PATH + ".tmp"
+        with open(tmp_path, "w", encoding="utf-8") as f:
+            f.writelines(tail)
+        os.replace(tmp_path, PROMPT_HISTORY_PATH)
+    except OSError as exc:
+        print(
+            f"[record_tier_outcome] prompt-history rotate skipped: {exc}",
+            file=sys.stderr,
+        )
+
+
 def _append_prompt_history(selection: dict, success: bool) -> None:
     """Phase 2-C: prompt-history.jsonl に 1 行追記する。
 
@@ -108,6 +142,7 @@ def _append_prompt_history(selection: dict, success: bool) -> None:
     }
     try:
         os.makedirs(os.path.dirname(PROMPT_HISTORY_PATH), exist_ok=True)
+        _rotate_prompt_history_if_needed()
         with open(PROMPT_HISTORY_PATH, "a", encoding="utf-8") as f:
             f.write(json.dumps(record, ensure_ascii=False) + "\n")
     except OSError as exc:

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/restore_session.py

@@ -41,6 +41,15 @@ def find_latest_session() -> str | None:
     return os.path.join(SESSIONS_DIR, max(files))
 
 
+def extract_section(content: str, heading: str) -> str:
+    """``session_utils.extract_section`` への薄いラッパー（後方互換用）。
+
+    過去にこのモジュール直下にあった ``extract_section`` を呼び出すテスト・スクリプトとの
+    互換維持のため、モジュールレベルで公開する。実体は :mod:`session_utils` 側にある。
+    """
+    return _load_session_utils().extract_section(content, heading)
+
+
 def main():
     path = find_latest_session()
     if not path or not os.path.exists(path):

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/select_tier.py

@@ -94,11 +94,15 @@ def _mask_secrets(text: str) -> str:
 
     キー名やプレフィックスは残し、値のみを置換することで
     「何が含まれていたか」は伝わらないようにする。
-    PEM ブロックは開始タグ〜終了タグ全体を ***  に置換する。
+    PEM ブロックは開始タグ + *** + 終了タグ に置換する。
     """
     result = text
     for pattern in _MASK_PATTERNS:
-        result = pattern.sub(lambda m: m.group(1) + "***", result)
+        # group(2) があれば PEM ブロック (BEGIN...END)、なければプレフィックス系
+        result = pattern.sub(
+            lambda m: m.group(1) + "***" + (m.group(2) if m.lastindex and m.lastindex >= 2 else ""),
+            result,
+        )
     return result
 
 # prompt-history.jsonl の末尾から読む最大行数（パフォーマンス対策）
@@ -325,11 +329,11 @@ def write_tier_selection(
     record_tier_outcome.py がこの json を読んで α/β を更新する。
     既存ファイルは上書きされる（最新 1 件のみ保持）。
 
-    tier-routing Phase 2-A: ``suggested_model`` も併せて書く。runner.py がこれを読んで
-    PO 経由のサブエージェント起動時に ``claude --agents`` で動的に上書きする。
-    tier 名と model の短縮名は同一とする。
+    ``suggested_model`` を併せて書く。tier 名と model の短縮名は同一とする。
+    （PO 廃止前は runner.py が読んで ``claude --agents`` 用に使っていたが、v2.0.0 以降は
+    記録目的のみ。将来再利用する余地のために維持する。）
 
-    tier-routing Phase 2-B: ``escalated`` / ``escalation_reason`` を任意で含める。
+    ``escalated`` / ``escalation_reason`` を任意で含める。
     failure rate に基づく昇格が起きた場合のみ True / 文字列が入る。
     """
     os.makedirs(os.path.dirname(TIER_SELECTION_PATH), exist_ok=True)
@@ -337,7 +341,7 @@ def write_tier_selection(
         "complexity": complexity,
         "tier": tier,
         "mode": mode,
-        # Phase 2-A: tier はそのまま claude --agents の model 短縮名として使える
+        # tier はそのまま claude --agents の model 短縮名として使える
         "suggested_model": tier,
     }
     if escalated:
@@ -383,10 +387,8 @@ def build_additional_context(
 
     return (
         f"[tier-routing 推奨] 複雑度: {complexity} / 推奨 Tier: {tier}（{confidence}）。"
-        f"PO 経由のサブエージェント起動時はこの推奨が claude --agents JSON で"
-        f" 自動適用されます（Phase 2-A）。親 Claude の Agent ツール経由は依然"
-        f" frontmatter 指定が優先されるため、コスト最適化したい場合は手動切替"
-        f" してください。{suffix}"
+        f" 親 Claude の Agent ツール経由ではエージェント定義の frontmatter 指定が"
+        f" 優先されるため、コスト最適化したい場合は手動切替してください。{suffix}"
     )
 
 

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/session_utils.py

@@ -20,7 +20,6 @@ def is_worktree(cwd: str) -> bool:
 def create_session_template(date_str: str) -> str:
     return (
         f"SESSION: {date_str}\n"
-        f"TASK_TYPE: \n"
         f"AGENT: \n"
         f"DURATION: \n"
         f"\n"

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/statusline.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
-"""Context gauge statusline script.
-Displays context usage + optional rate limit gauges (when plan provides rate_limits data).
+"""Statusline script for Claude Code.
+
+Displays: [model display name] effort | ctx used X% | 5h lim X% | 7d lim X%
+
+context_window_size (200K / 1M) は ctx used X% と情報重複のため表示しない。
+gauge バー描画も省スペース優先で表示しない。
 """
 
 import json
@@ -35,14 +39,6 @@ def pct_color(pct: int) -> str:
         return GREEN
 
 
-def format_context_size(size: int) -> str:
-    if size >= 900_000:
-        return '1M'
-    elif size >= 100_000:
-        return '200K'
-    return str(size)
-
-
 def format_reset_time(resets_at) -> str:
     if not resets_at:
         return ''
@@ -82,18 +78,13 @@ def render_output(raw: str) -> None:
     header: list[str] = []
     metrics: list[str] = []
 
-    # [model display name]  context_size  effort  — スペース区切り
+    # [model display name]  effort  — スペース区切り
+    # （context_window_size は ctx used X% と情報重複のため表示しない）
     model = data.get('model') or {}
     display_name = model.get('display_name', '')
     if display_name:
         header.append(f'[{display_name}]')
 
-    # context window size: 200K / 1M
-    ctx_window = data.get('context_window') or {}
-    ctx_size = ctx_window.get('context_window_size')
-    if ctx_size:
-        header.append(format_context_size(int(ctx_size)))
-
     # effort level
     effort = data.get('effort') or {}
     effort_level = effort.get('level', '')
@@ -101,6 +92,7 @@ def render_output(raw: str) -> None:
         header.append(effort_level)
 
     # ctx usg %
+    ctx_window = data.get('context_window') or {}
     ctx_pct = round(ctx_window.get('used_percentage') or 0)
     metrics.append('ctx used ' + pct_color(ctx_pct) + str(ctx_pct) + '%' + RESET)
 

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/stop.py

@@ -251,6 +251,10 @@ def update_patterns(date_str: str) -> None:
             continue
 
         registered = _parse_session_date(pattern['registered_date'])
+        if registered is None:
+            # registered_date が parse 不能ならパターンを保持して継続（クラッシュ回避）
+            active.append(pattern)
+            continue
         days_elapsed = (today - registered).days
 
         if days_elapsed >= EXPIRY_DAYS:

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/subagent_log.py

@@ -78,8 +78,8 @@ _SAFE_PAYLOAD_FIELDS = frozenset({
 # U+2028 (LINE SEPARATOR) / U+2029 (PARAGRAPH SEPARATOR) の定数 (sec-H-1)
 # ensure_ascii=False の json.dumps はこれらをエスケープしないため、
 # _append_log で明示的に \\u2028 / \\u2029 へ置換する。
-_U2028 = '
'
-_U2029 = '
'
+_U2028 = '
'  # LINE SEPARATOR
+_U2029 = '
'  # PARAGRAPH SEPARATOR
 
 
 def _now_iso() -> str:

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/hooks/worktree_guard.py

@@ -5,6 +5,10 @@ PO_WORKTREE_GUARD=1 が設定されている場合のみ動作する。
 worktree 内で実装タスクを実行するワークフロー（parallel-agents skill が
 isolation:"worktree" 付きで起動する agent など）が事前にこの env を設定して有効化する。
 Write / Edit ツールの対象パスが CWD（worktree ルート）外であればブロックする。
+
+NOTE [SR-V-002]: env 未設定時にガードが無効化されるリスクは parallel-agents/SKILL.md
+で `PO_WORKTREE_GUARD=1` 設定を必須化することで運用上対処する。CWD parts チェック
+単独で自動有効化する設計変更は次回 major bump で検討予定。
 """
 
 import json

{claude_code_conductor-2.8.0 → claude_code_conductor-2.10.0}/.claude/settings.json

@@ -63,7 +63,7 @@
   },
   "statusLine": {
     "type": "command",
-    "command": "python \"$CLAUDE_PROJECT_DIR/.claude/hooks/statusline.py\""
+    "command": "python \"${CLAUDE_PROJECT_DIR}/.claude/hooks/statusline.py\""
   },
   "hooks": {
     "PreToolUse": [
@@ -140,6 +140,11 @@
             "type": "command",
             "command": "python",
             "args": ["${CLAUDE_PROJECT_DIR}/.claude/hooks/select_tier.py"]
+          },
+          {
+            "type": "command",
+            "command": "python",
+            "args": ["${CLAUDE_PROJECT_DIR}/.claude/hooks/recall_inject.py"]
           }
         ]
       }