okstra 0.114.0 → 0.115.0

package/runtime/python/okstra_token_usage/claude.py

@@ -83,6 +83,28 @@ def _session_meta_from_record(rec: dict) -> tuple[str | None, str | None]:
     return agent, model
 
 
+_SUBAGENT_FILENAME_RE = re.compile(r"^agent-a(?P<agent>.+)-[0-9a-f]{8,}$")
+
+
+def _agent_name_from_subagent_path(jsonl_path: Path) -> str | None:
+    if jsonl_path.parent.name != "subagents":
+        return None
+    match = _SUBAGENT_FILENAME_RE.match(jsonl_path.stem)
+    return match.group("agent") if match else None
+
+
+def _iter_claude_session_jsonls(
+    proj_dir: Path,
+    subagent_parent_sids: list[str] | None = None,
+):
+    yield from sorted(proj_dir.glob("*.jsonl"))
+    if subagent_parent_sids is None:
+        yield from sorted(proj_dir.glob("*/subagents/*.jsonl"))
+        return
+    for sid in sorted({sid for sid in subagent_parent_sids if sid}):
+        yield from sorted((proj_dir / sid / "subagents").glob("*.jsonl"))
+
+
 def _advance_usage_scan(jsonl_path: Path, usage_state: dict) -> dict:
     """`usage_state['offset']` 이후의 완결 라인을 읽어 이벤트를 커밋하고,
     개행 없는 마지막 라인은 transient 로만 반영한 view 를 돌려준다.
@@ -230,7 +252,8 @@ def claude_session_totals(
         save_cache(jsonl_path, cache)
     else:
         view = _advance_usage_scan(jsonl_path, fresh_cache()["usage"])
-    return _totals_from_events(view["events"], view["agentName"],
+    agent_name = view["agentName"] or _agent_name_from_subagent_path(jsonl_path)
+    return _totals_from_events(view["events"], agent_name,
                                view["model"], since, until)
 
 
@@ -312,7 +335,7 @@ def find_claude_team_sessions(
     if not proj_dir.is_dir():
         return out
     needles_lower = [f'"teamname":"{n.lower()}"' for n in team_needles if n]
-    for p in proj_dir.glob("*.jsonl"):
+    for p in _iter_claude_session_jsonls(proj_dir):
         for needle_lower in needles_lower:
             if incremental:
                 cache = load_cache(p)
@@ -333,26 +356,33 @@ def find_claude_team_sessions(
 _TEAM_TAG_NEEDLE = '"teamname":"'
 
 
+def _agent_name_matches(agent_name: str | None, prefixes: list[str]) -> bool:
+    if not agent_name:
+        return False
+    for prefix in prefixes:
+        if agent_name == prefix or agent_name.startswith(f"{prefix}-"):
+            return True
+    return False
+
+
 def find_claude_agent_sessions(
     cwd: Path,
     agent_prefixes: list[str],
     projects_root: Path | None = None,
     *,
     incremental: bool = False,
+    subagent_parent_sids: list[str] | None = None,
 ) -> dict[str, Path]:
-    """Map sessionId -> jsonl path for non-team sessions whose recorded
-    `agentName` matches one of ``agent_prefixes``.
-
-    no-team run(teamCreate `skipped`(concurrent-run) / `error` fallback)의
-    worker 세션은 team 태그가 없어 teamName needle 로는 발견되지 않는다. 대신
-    하네스가 dispatch `name` 인자로 기록하는 `agentName` 을 needle 로 찾되,
-    team 태그가 있는 세션은 제외한다 — 그것은 동시 team-mode run 의 worker 다.
-
-    같은 agentName 을 쓰는 다른 run 의 세션도 걸릴 수 있으므로, 호출자는 반드시
-    run 윈도우로 totals 를 스코핑하고 in-window 이벤트가 없는 세션을 버려야
-    한다. 윈도우가 겹치는 두 no-team run 이 같은 role 을 dispatch 한 경우의
-    교차 귀속은 구조적으로 분리 불가 — usage 블록의 sessionId 목록으로만
-    추적 가능하다.
+    """Map worker-like Claude jsonls by agent name or nested subagent filename.
+
+    Legacy top-level worker jsonls record `agentName` in the JSONL body. Newer
+    in-process subagents can instead live under
+    `<lead-session>/subagents/agent-a<name>-<hash>.jsonl` with no body
+    `agentName`, so this finder also matches that filename form.
+
+    Callers can pass `subagent_parent_sids` to limit nested subagents to the
+    current lead session directory. Top-level fallback discovery remains broad
+    and must still be filtered by the run window after totals are read.
     """
     proj_dir = claude_project_dir(cwd, projects_root)
     out: dict[str, Path] = {}
@@ -361,20 +391,29 @@ def find_claude_agent_sessions(
     agent_needles = [f'"agentname":"{p.lower()}' for p in agent_prefixes if p]
     if not agent_needles:
         return out
-    for p in proj_dir.glob("*.jsonl"):
+    for p in _iter_claude_session_jsonls(proj_dir, subagent_parent_sids):
+        path_agent = _agent_name_from_subagent_path(p)
+        filename_matched = _agent_name_matches(path_agent, agent_prefixes)
+        scoped_subagent = (
+            filename_matched
+            and path_agent is not None
+            and subagent_parent_sids is not None
+        )
         if incremental:
             cache = load_cache(p)
-            matched = any(_cached_needle_scan(p, cache, n) for n in agent_needles)
+            matched = filename_matched or any(
+                _cached_needle_scan(p, cache, n) for n in agent_needles
+            )
             team_tagged = matched and _cached_needle_scan(p, cache, _TEAM_TAG_NEEDLE)
             save_cache(p, cache)
         else:
-            matched = any(
+            matched = filename_matched or any(
                 _needle_scan(p, {"offset": 0, "found": False}, n)
                 for n in agent_needles
             )
             team_tagged = matched and _needle_scan(
                 p, {"offset": 0, "found": False}, _TEAM_TAG_NEEDLE
             )
-        if matched and not team_tagged:
+        if matched and (scoped_subagent or not team_tagged):
             out[p.stem] = p
     return out

package/runtime/python/okstra_token_usage/collect.py

@@ -653,8 +653,10 @@ def collect(team_state_path: Path, project_root: Path | None = None, *,
             for w in state.get("workers", [])
             for prefix in match_prefixes(w.get("workerId") or "")
         ]
+        subagent_parent_sids = [lead_sid] if lead_sid else []
         agent_sessions = find_claude_agent_sessions(
-            cwd, worker_prefix_pool, incremental=incremental
+            cwd, worker_prefix_pool, incremental=incremental,
+            subagent_parent_sids=subagent_parent_sids,
         )
         for sid, path in agent_sessions.items():
             if sid == lead_sid or sid in claude_sessions:

package/runtime/python/okstra_vendor/__init__.py

@@ -12,6 +12,9 @@ Currently vendored:
     (`_speedups.c` / `_speedups.pyi`) is stripped; the pure-python
     `_native` fallback is used at import time.
   - networkx (BSD-3-Clause) — graph model + community detection for okstra-graphify.
+    Per-package `tests/` suites and the top-level `conftest.py` are stripped;
+    okstra never runs networkx's own test suite. On re-vendor, drop every
+    `**/tests/` directory and `conftest.py` again.
   - graphify 0.4.23 (MIT) — knowledge-graph pipeline for okstra-graphify. tree-sitter
     native bindings are NOT vendored; okstra-graphify only indexes .okstra/ docs.
 

package/runtime/schemas/final-report-v1.0.schema.json

@@ -154,6 +154,26 @@
       }
     },
 
+    "readerSummary": {
+      "type": "object",
+      "description": "Optional reader-first summary rendered near the top of the Markdown report and reused by the HTML reader dashboard. Existing v1.0 data.json files may omit it; new report-writer output should populate it to keep the first-read path short.",
+      "required": [
+        "decision",
+        "humanActionRequired",
+        "blockingItems",
+        "safeToSkip",
+        "recommendedCommand"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "decision": { "type": "string", "minLength": 1 },
+        "humanActionRequired": { "type": "string", "minLength": 1 },
+        "blockingItems": { "type": "string", "minLength": 1 },
+        "safeToSkip": { "type": "string", "minLength": 1 },
+        "recommendedCommand": { "type": "string", "minLength": 1 }
+      }
+    },
+
     "rationale": {
       "type": "object",
       "description": "## 작업 배경과 근거 — reviewer-facing narrative answering the four questions in order. Each field is prose (not a table) and MUST carry at least one evidence reference (path:line, a report ID such as C-001/F-013/§5.4, or another cited source) OR an explicit insufficiency marker (e.g. '근거 불충분'). validate-run.py fails a field with neither. Required for every task-type.",

package/runtime/templates/reports/final-report.template.md

@@ -67,6 +67,20 @@ implementation-option: {{ frontmatter.implementationOption | yaml_scalar }}
 | Approval Required? | `{% if verdictCard.approvalRequired %}yes — {{ t("verdictCard.approvalRequiredSuffix") }}{% else %}no{% endif %}` |
 | Next Step | {{ verdictCard.nextStep | mdcell }} |
 
+{% if readerSummary %}
+## {{ t("readerSummary.heading") }}
+
+{{ t("sectionIntro.readerSummary") }}
+
+| {{ t("readerSummary.tableHeaderItem") }} | {{ t("readerSummary.tableHeaderValue") }} |
+|------|----|
+| {{ t("readerSummary.decisionLabel") }} | {{ readerSummary.decision | mdcell }} |
+| {{ t("readerSummary.humanActionRequiredLabel") }} | {{ readerSummary.humanActionRequired | mdcell }} |
+| {{ t("readerSummary.blockingItemsLabel") }} | {{ readerSummary.blockingItems | mdcell }} |
+| {{ t("readerSummary.safeToSkipLabel") }} | {{ readerSummary.safeToSkip | mdcell }} |
+| {{ t("readerSummary.recommendedCommandLabel") }} | `{{ readerSummary.recommendedCommand | mdcell }}` |
+
+{% endif %}
 ## {{ t("rationale.heading") }}
 
 {{ t("rationale.intro") }}

package/runtime/templates/reports/i18n/en.json

@@ -44,13 +44,14 @@
   },
   "sectionIntro": {
     "verdictCard": "At-a-glance verdict card — a summary that mirrors the values in `## 7. Final Verdict` and `## 3. Recommended Next Steps`.",
-    "clarificationCarryIn": "Unresolved `Clarification Items` from the prior report, re-examined against new evidence and carried in with updated status.",
-    "ticketCoverage": "Summary of the core problems, requirements, and verification targets this run covered.",
-    "executionStatus": "At-a-glance table of each worker's status, assigned model, and key findings.",
-    "sourceItemsRule": "The `Source items` column shows which worker items each consensus row was synthesised from, as `<worker>:<item-id>` pairs.",
-    "planBodyVerification": "Per-item cross-verification of each plan-body item (option, stage, step, dependency, validation, rollback, requirement coverage) for whether it is executable as written and internally consistent. Whether each option actually *solves* the problem (requirement satisfaction) is judged separately under Requirement Coverage, not here.",
-    "clarificationItems": "Items that need your answer or supporting material before the next step."
-  },
+      "clarificationCarryIn": "Unresolved `Clarification Items` from the prior report, re-examined against new evidence and carried in with updated status.",
+      "ticketCoverage": "Summary of the core problems, requirements, and verification targets this run covered.",
+      "executionStatus": "At-a-glance table of each worker's status, assigned model, and key findings.",
+      "sourceItemsRule": "The `Source items` column shows which worker items each consensus row was synthesised from, as `<worker>:<item-id>` pairs.",
+      "planBodyVerification": "Per-item cross-verification of each plan-body item (option, stage, step, dependency, validation, rollback, requirement coverage) for whether it is executable as written and internally consistent. Whether each option actually *solves* the problem (requirement satisfaction) is judged separately under Requirement Coverage, not here.",
+      "clarificationItems": "Items that need your answer or supporting material before the next step.",
+      "readerSummary": "The shortest reader path: what was decided, what a human must do next, and which audit details can wait until a deeper review."
+    },
   "tokenSummary": {
     "heading": "Token Usage Summary",
     "tableHeaderItem": "Item",
@@ -62,11 +63,21 @@
   "verdictCard": {
     "tableHeaderLabel": "Item",
     "tableHeaderValue": "Value",
-    "approvalRequiredSuffix": "frontmatter `approved` must be `true` to enter `implementation`",
-    "rationaleLabel": "Rationale summary",
-    "nextStepLabel": "Next step"
-  },
-  "rationale": {
+      "approvalRequiredSuffix": "frontmatter `approved` must be `true` to enter `implementation`",
+      "rationaleLabel": "Rationale summary",
+      "nextStepLabel": "Next step"
+    },
+    "readerSummary": {
+      "heading": "Reader Summary",
+      "tableHeaderItem": "Item",
+      "tableHeaderValue": "Value",
+      "decisionLabel": "Decision",
+      "humanActionRequiredLabel": "Human action required",
+      "blockingItemsLabel": "Blocking items",
+      "safeToSkipLabel": "Safe to skip on first read",
+      "recommendedCommandLabel": "Recommended command"
+    },
+    "rationale": {
     "heading": "Background and Rationale",
     "intro": "Why this work, what it changes, and why the chosen approach is sound — written so a reviewer can follow it. Each item cites its evidence (path:line, report ID, etc.).",
     "motivationLabel": "Why this work",

package/runtime/templates/reports/i18n/ko.json

@@ -44,13 +44,14 @@
   },
   "sectionIntro": {
     "verdictCard": "한눈에 보는 결과 카드 — `## 7. Final Verdict` 와 `## 3. Recommended Next Steps` 의 값을 그대로 옮긴 요약입니다.",
-    "clarificationCarryIn": "이전 보고서의 미해결 `Clarification Items` 를 새 증거로 재검토해 해소·갱신한 뒤 이어받은 항목입니다.",
-    "ticketCoverage": "이 run 이 다룬 핵심 문제·요구사항·검증 대상 요약입니다.",
-    "executionStatus": "각 worker 의 상태·배정 모델·핵심 finding 을 한눈에 보는 표입니다.",
-    "sourceItemsRule": "`Source items` 열은 이 합의 항목이 어느 워커의 어느 항목에서 합성됐는지를 `<worker>:<item-id>` 형식으로 표기합니다.",
-    "planBodyVerification": "계획 본문의 각 항목(옵션·스테이지·스텝·의존성·검증·롤백·요구사항 커버리지)이 적힌 대로 실행 가능하고 서로 모순이 없는지 워커들이 항목별로 교차 검증한 결과입니다. 각 옵션이 '문제를 실제로 푸는지'(요구사항 충족)는 여기가 아니라 Requirement Coverage 에서 별도로 판정합니다.",
-    "clarificationItems": "다음 진행 전에 사용자의 답변이나 자료 첨부가 필요한 항목입니다."
-  },
+      "clarificationCarryIn": "이전 보고서의 미해결 `Clarification Items` 를 새 증거로 재검토해 해소·갱신한 뒤 이어받은 항목입니다.",
+      "ticketCoverage": "이 run 이 다룬 핵심 문제·요구사항·검증 대상 요약입니다.",
+      "executionStatus": "각 worker 의 상태·배정 모델·핵심 finding 을 한눈에 보는 표입니다.",
+      "sourceItemsRule": "`Source items` 열은 이 합의 항목이 어느 워커의 어느 항목에서 합성됐는지를 `<worker>:<item-id>` 형식으로 표기합니다.",
+      "planBodyVerification": "계획 본문의 각 항목(옵션·스테이지·스텝·의존성·검증·롤백·요구사항 커버리지)이 적힌 대로 실행 가능하고 서로 모순이 없는지 워커들이 항목별로 교차 검증한 결과입니다. 각 옵션이 '문제를 실제로 푸는지'(요구사항 충족)는 여기가 아니라 Requirement Coverage 에서 별도로 판정합니다.",
+      "clarificationItems": "다음 진행 전에 사용자의 답변이나 자료 첨부가 필요한 항목입니다.",
+      "readerSummary": "가장 짧은 읽기 경로입니다. 무엇이 결정됐는지, 사람이 다음에 무엇을 해야 하는지, 어떤 감사 세부사항은 나중에 봐도 되는지 먼저 보여줍니다."
+    },
   "tokenSummary": {
     "heading": "토큰 사용량 요약",
     "tableHeaderItem": "항목",
@@ -62,11 +63,21 @@
   "verdictCard": {
     "tableHeaderLabel": "항목",
     "tableHeaderValue": "값",
-    "approvalRequiredSuffix": "frontmatter `approved` 가 `true` 여야 `implementation` 진입 가능",
-    "rationaleLabel": "근거 요약",
-    "nextStepLabel": "다음 단계"
-  },
-  "rationale": {
+      "approvalRequiredSuffix": "frontmatter `approved` 가 `true` 여야 `implementation` 진입 가능",
+      "rationaleLabel": "근거 요약",
+      "nextStepLabel": "다음 단계"
+    },
+    "readerSummary": {
+      "heading": "Reader Summary",
+      "tableHeaderItem": "항목",
+      "tableHeaderValue": "값",
+      "decisionLabel": "Decision",
+      "humanActionRequiredLabel": "Human action required",
+      "blockingItemsLabel": "Blocking items",
+      "safeToSkipLabel": "Safe to skip on first read",
+      "recommendedCommandLabel": "Recommended command"
+    },
+    "rationale": {
     "heading": "작업 배경과 근거",
     "intro": "이 작업을 왜·무엇을·왜 그렇게 하는지 검토자가 따라갈 수 있도록 정리한다. 각 항목은 근거(파일:줄, 보고서 ID 등)를 인용한다.",
     "motivationLabel": "왜 이 작업을 하는가",

package/runtime/templates/reports/report.css

@@ -73,6 +73,61 @@ nav.toc li.toc-h3 { padding-left: 1.2em; font-size: 0.92em; }
 nav.toc a { color: inherit; text-decoration: none; }
 nav.toc a:hover { text-decoration: underline; }
 
+.reader-dashboard {
+  margin: 0 0 1.5rem;
+  padding: 0.9rem 1rem;
+  border: 1px solid color-mix(in srgb, Highlight 45%, transparent);
+  border-radius: 6px;
+  background: color-mix(in srgb, Highlight 8%, Canvas);
+}
+.reader-dashboard-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 1rem;
+  margin-bottom: 0.8rem;
+}
+.reader-dashboard h2 {
+  margin: 0;
+  border-bottom: none;
+  padding-bottom: 0;
+}
+.reader-mode-controls {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.35rem;
+}
+.reader-mode-controls button[aria-pressed="true"] {
+  background: Highlight;
+  color: HighlightText;
+  border-color: Highlight;
+}
+.reader-summary-grid {
+  display: grid;
+  grid-template-columns: minmax(12ch, 0.28fr) 1fr;
+  gap: 0.45rem 0.9rem;
+  margin: 0;
+}
+.reader-summary-grid dt {
+  font-weight: 600;
+  color: color-mix(in srgb, CanvasText 72%, transparent);
+}
+.reader-summary-grid dd { margin: 0; }
+
+html[data-reader-mode="action"] main > [data-reader-section="audit"],
+html[data-reader-mode="action"] main > [data-reader-section="detail"] {
+  display: none;
+}
+html[data-reader-mode="audit"] main > [data-reader-section="detail"] {
+  display: none;
+}
+
+@media (max-width: 70ch) {
+  .reader-dashboard-head { align-items: flex-start; flex-direction: column; }
+  .reader-summary-grid { grid-template-columns: 1fr; }
+  .reader-summary-grid dt { margin-top: 0.45rem; }
+}
+
 h1, h2, h3, h4, h5, h6 { line-height: 1.25; margin-top: 1.6em; margin-bottom: 0.4em; }
 h1 { font-size: 1.7rem; }
 h2 { font-size: 1.35rem; border-bottom: 1px solid GrayText; padding-bottom: 0.2em; }

package/runtime/templates/reports/report.js

@@ -230,6 +230,50 @@
     showDismiss(false);
   }
 
+  function readerSectionKind(text) {
+    if (/Reader Summary|Verdict Card|Clarification Items|Recommended Next Steps|Follow-up Tasks/.test(text)) {
+      return "action";
+    }
+    if (/Evidence|Cross Verification|Execution Status|Token Usage|Plan Body Verification|Round History/.test(text)) {
+      return "audit";
+    }
+    return "detail";
+  }
+
+  function markReaderSections() {
+    var main = document.querySelector("main");
+    if (!main) return;
+    var current = "action";
+    var nodes = main.children;
+    for (var i = 0; i < nodes.length; i++) {
+      var node = nodes[i];
+      if (node.classList && node.classList.contains("reader-dashboard")) {
+        node.setAttribute("data-reader-section", "action");
+        current = "action";
+        continue;
+      }
+      if (/^H[12]$/.test(node.tagName || "")) {
+        current = readerSectionKind(node.textContent || "");
+      }
+      node.setAttribute("data-reader-section", current);
+    }
+  }
+
+  function setReaderMode(mode) {
+    if (mode !== "action" && mode !== "audit" && mode !== "full") {
+      mode = "action";
+    }
+    document.documentElement.setAttribute("data-reader-mode", mode);
+    var buttons = document.querySelectorAll('button[data-action="set-reader-mode"]');
+    for (var i = 0; i < buttons.length; i++) {
+      var btn = buttons[i];
+      btn.setAttribute(
+        "aria-pressed",
+        btn.getAttribute("data-reader-mode") === mode ? "true" : "false"
+      );
+    }
+  }
+
   function bind() {
     var clickables = document.querySelectorAll("button[data-action]");
     for (var i = 0; i < clickables.length; i++) {
@@ -241,8 +285,15 @@
         btn.addEventListener("click", copyUserResponse);
       } else if (action === "dismiss-user-response") {
         btn.addEventListener("click", dismissUserResponse);
+      } else if (action === "set-reader-mode") {
+        btn.addEventListener("click", function (event) {
+          setReaderMode(event.currentTarget.getAttribute("data-reader-mode"));
+        });
       }
-
+    }
+    markReaderSections();
+    if (document.querySelector('button[data-action="set-reader-mode"]')) {
+      setReaderMode("action");
     }
     bindOtherInputToggle();
   }
@@ -259,6 +310,7 @@
       collectEntries: collectEntries,
       collectApproval: collectApproval,
       exportUserResponse: exportUserResponse,
+      setReaderMode: setReaderMode,
     };
   }
 

package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_approx_clust_coeff.py

@@ -1,41 +0,0 @@
-import networkx as nx
-from networkx.algorithms.approximation import average_clustering
-
-# This approximation has to be exact in regular graphs
-# with no triangles or with all possible triangles.
-
-
-def test_petersen():
-    # Actual coefficient is 0
-    G = nx.petersen_graph()
-    assert average_clustering(G, trials=len(G) // 2) == nx.average_clustering(G)
-
-
-def test_petersen_seed():
-    # Actual coefficient is 0
-    G = nx.petersen_graph()
-    assert average_clustering(G, trials=len(G) // 2, seed=1) == nx.average_clustering(G)
-
-
-def test_tetrahedral():
-    # Actual coefficient is 1
-    G = nx.tetrahedral_graph()
-    assert average_clustering(G, trials=len(G) // 2) == nx.average_clustering(G)
-
-
-def test_dodecahedral():
-    # Actual coefficient is 0
-    G = nx.dodecahedral_graph()
-    assert average_clustering(G, trials=len(G) // 2) == nx.average_clustering(G)
-
-
-def test_empty():
-    G = nx.empty_graph(5)
-    assert average_clustering(G, trials=len(G) // 2) == 0
-
-
-def test_complete():
-    G = nx.complete_graph(5)
-    assert average_clustering(G, trials=len(G) // 2) == 1
-    G = nx.complete_graph(7)
-    assert average_clustering(G, trials=len(G) // 2) == 1

package/runtime/python/okstra_vendor/networkx/algorithms/approximation/tests/test_clique.py

@@ -1,112 +0,0 @@
-"""Unit tests for the :mod:`networkx.algorithms.approximation.clique` module."""
-
-import networkx as nx
-from networkx.algorithms.approximation import (
-    clique_removal,
-    large_clique_size,
-    max_clique,
-    maximum_independent_set,
-)
-
-
-def is_independent_set(G, nodes):
-    """Returns True if and only if `nodes` is a clique in `G`.
-
-    `G` is a NetworkX graph. `nodes` is an iterable of nodes in
-    `G`.
-
-    """
-    return G.subgraph(nodes).number_of_edges() == 0
-
-
-def is_clique(G, nodes):
-    """Returns True if and only if `nodes` is an independent set
-    in `G`.
-
-    `G` is an undirected simple graph. `nodes` is an iterable of
-    nodes in `G`.
-
-    """
-    H = G.subgraph(nodes)
-    n = len(H)
-    return H.number_of_edges() == n * (n - 1) // 2
-
-
-class TestCliqueRemoval:
-    """Unit tests for the
-    :func:`~networkx.algorithms.approximation.clique_removal` function.
-
-    """
-
-    def test_trivial_graph(self):
-        G = nx.trivial_graph()
-        independent_set, cliques = clique_removal(G)
-        assert is_independent_set(G, independent_set)
-        assert all(is_clique(G, clique) for clique in cliques)
-        # In fact, we should only have 1-cliques, that is, singleton nodes.
-        assert all(len(clique) == 1 for clique in cliques)
-
-    def test_complete_graph(self):
-        G = nx.complete_graph(10)
-        independent_set, cliques = clique_removal(G)
-        assert is_independent_set(G, independent_set)
-        assert all(is_clique(G, clique) for clique in cliques)
-
-    def test_barbell_graph(self):
-        G = nx.barbell_graph(10, 5)
-        independent_set, cliques = clique_removal(G)
-        assert is_independent_set(G, independent_set)
-        assert all(is_clique(G, clique) for clique in cliques)
-
-
-class TestMaxClique:
-    """Unit tests for the :func:`networkx.algorithms.approximation.max_clique`
-    function.
-
-    """
-
-    def test_null_graph(self):
-        G = nx.null_graph()
-        assert len(max_clique(G)) == 0
-
-    def test_complete_graph(self):
-        graph = nx.complete_graph(30)
-        # this should return the entire graph
-        mc = max_clique(graph)
-        assert 30 == len(mc)
-
-    def test_maximal_by_cardinality(self):
-        """Tests that the maximal clique is computed according to maximum
-        cardinality of the sets.
-
-        For more information, see pull request #1531.
-
-        """
-        G = nx.complete_graph(5)
-        G.add_edge(4, 5)
-        clique = max_clique(G)
-        assert len(clique) > 1
-
-        G = nx.lollipop_graph(30, 2)
-        clique = max_clique(G)
-        assert len(clique) > 2
-
-
-def test_large_clique_size():
-    G = nx.complete_graph(9)
-    nx.add_cycle(G, [9, 10, 11])
-    G.add_edge(8, 9)
-    G.add_edge(1, 12)
-    G.add_node(13)
-
-    assert large_clique_size(G) == 9
-    G.remove_node(5)
-    assert large_clique_size(G) == 8
-    G.remove_edge(2, 3)
-    assert large_clique_size(G) == 7
-
-
-def test_independent_set():
-    # smoke test
-    G = nx.Graph()
-    assert len(maximum_independent_set(G)) == 0