clearfront 2.6.0__tar.gz → 2.7.0__tar.gz

{clearfront-2.6.0 → clearfront-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clearfront
-Version: 2.6.0
+Version: 2.7.0
 Summary: AI-powered OSINT agent, MCP server, and CLI. Interactive REPL + 30 tools. Anthropic Claude or local Ollama. For authorized security research use only.
 Author: Scott Martin Anderson
 License-Expression: MIT
@@ -81,7 +81,7 @@ Dynamic: license-file
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square)](https://www.python.org/)
 [![License MIT](https://img.shields.io/badge/license-MIT-green?style=flat-square)](LICENSE)
 [![MCP](https://img.shields.io/badge/protocol-MCP-blueviolet?style=flat-square)](https://modelcontextprotocol.io/)
-[![Version](https://img.shields.io/badge/version-2.6.0-informational?style=flat-square)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.7.0-informational?style=flat-square)](CHANGELOG.md)
 
 **[clearfront.sh](https://clearfront.sh)** · [Disclaimer](./DISCLAIMER.md)
 

{clearfront-2.6.0 → clearfront-2.7.0}/README.md

@@ -10,7 +10,7 @@
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square)](https://www.python.org/)
 [![License MIT](https://img.shields.io/badge/license-MIT-green?style=flat-square)](LICENSE)
 [![MCP](https://img.shields.io/badge/protocol-MCP-blueviolet?style=flat-square)](https://modelcontextprotocol.io/)
-[![Version](https://img.shields.io/badge/version-2.6.0-informational?style=flat-square)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.7.0-informational?style=flat-square)](CHANGELOG.md)
 
 **[clearfront.sh](https://clearfront.sh)** · [Disclaimer](./DISCLAIMER.md)
 

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/agent.py

@@ -57,7 +57,8 @@ from clearfront.tools.search_wayback import run_wayback_osint
 from clearfront.tools.search_greynoise import run_greynoise_osint
 from clearfront.tools.search_hudsonrock import run_hudsonrock_osint
 from clearfront.pivot import investigate_graph_for_agent
-from clearfront.prompts import SYSTEM_PROMPT
+from clearfront.prompts import system_prompt_for_effort
+from clearfront import effort as _effort
 
 logger = logging.getLogger(__name__)
 
@@ -787,17 +788,23 @@ class OISAgent:
         self,
         api_key: str | None = None,
         model: str = "claude-sonnet-4-20250514",
+        effort: str = _effort.DEFAULT,
     ) -> None:
         self.client = anthropic.AsyncAnthropic(
             api_key=api_key or os.environ.get("ANTHROPIC_API_KEY", "")
         )
         self.model = model
+        self.effort = _effort.normalize(effort)
         self.history: list[dict[str, Any]] = []
 
     def clear_history(self) -> None:
         """Reset conversation memory."""
         self.history = []
 
+    def set_effort(self, effort: str) -> None:
+        """Set the sweep effort for subsequent investigations."""
+        self.effort = _effort.normalize(effort)
+
     async def run(
         self,
         prompt: str,
@@ -825,8 +832,17 @@ class OISAgent:
             tool_calls=[],
             on_tool_call=on_tool_call,
         )
+        # Sweep effort shapes the system prompt (enrichment instruction) and caps
+        # the number of tool rounds. When the cap is reached we do not abort; we
+        # take one more turn with tools disabled so the model writes its report
+        # from the evidence gathered so far.
+        system_text = system_prompt_for_effort(self.effort)
+        max_rounds = _effort.rounds(self.effort)
+        tool_rounds = 0
         try:
             while True:
+                tool_rounds += 1
+                force_final = tool_rounds > max_rounds
                 # Prompt caching: a breakpoint on the (single) system block caches the
                 # system prompt + all tool definitions together (tools render before
                 # system), so that large stable prefix is re-billed at ~0.1x on every
@@ -840,11 +856,12 @@ class OISAgent:
                     system=[
                         {
                             "type": "text",
-                            "text": SYSTEM_PROMPT,
+                            "text": system_text,
                             "cache_control": {"type": "ephemeral"},
                         }
                     ],
                     tools=TOOL_DEFINITIONS,  # type: ignore[arg-type]
+                    tool_choice={"type": "none"} if force_final else {"type": "auto"},
                     messages=ctx.messages,  # type: ignore[arg-type]
                     cache_control={"type": "ephemeral"},
                 )
@@ -911,15 +928,21 @@ class OllamaAgent:
         self,
         model: str = "llama3.2",
         host: str = "http://localhost:11434",
+        effort: str = _effort.DEFAULT,
     ) -> None:
         self.model = model
         self.host = host
+        self.effort = _effort.normalize(effort)
         self.history: list[dict[str, Any]] = []
 
     def clear_history(self) -> None:
         """Reset conversation memory."""
         self.history = []
 
+    def set_effort(self, effort: str) -> None:
+        """Set the sweep effort for subsequent investigations."""
+        self.effort = _effort.normalize(effort)
+
     async def run(
         self,
         prompt: str,
@@ -962,21 +985,27 @@ class OllamaAgent:
 
         self.history.append({"role": "user", "content": prompt})
         messages: list[Any] = [
-            {"role": "system", "content": SYSTEM_PROMPT},
+            {"role": "system", "content": system_prompt_for_effort(self.effort)},
             *self.history,
         ]
         ctx = _AgentRunContext(messages=messages, tool_calls=[], on_tool_call=on_tool_call)
 
+        # Sweep effort caps the tool rounds. Ollama has no reliable tool_choice
+        # switch, so on the final turn we call without tools, which forces a
+        # text answer from the evidence gathered so far.
+        max_rounds = _effort.rounds(self.effort)
+        tool_rounds = 0
         try:
             client = ollama.AsyncClient(host=self.host)
             while True:
-                response = await client.chat(
-                    model=self.model,
-                    messages=ctx.messages,
-                    tools=_OLLAMA_TOOLS,
-                )
+                tool_rounds += 1
+                force_final = tool_rounds > max_rounds
+                chat_kwargs: dict[str, Any] = {"model": self.model, "messages": ctx.messages}
+                if not force_final:
+                    chat_kwargs["tools"] = _OLLAMA_TOOLS
+                response = await client.chat(**chat_kwargs)
                 msg = response.message
-                if not msg.tool_calls:
+                if force_final or not msg.tool_calls:
                     text = msg.content or ""
                     self.history.append({"role": "assistant", "content": text})
                     return AgentResponse(content=text, tool_calls=ctx.tool_calls)
@@ -1079,17 +1108,23 @@ class OpenAICompatibleAgent:
         model: str = "gpt-4o-mini",
         base_url: str = "http://localhost:8080/v1",
         api_key: str | None = None,
+        effort: str = _effort.DEFAULT,
     ) -> None:
         self.model = model
         self.base_url = base_url
         # Many local servers ignore the key, but the SDK requires a non-empty string.
         self.api_key = api_key or os.environ.get("OPENAI_API_KEY", "") or "sk-no-key-required"
+        self.effort = _effort.normalize(effort)
         self.history: list[dict[str, Any]] = []
 
     def clear_history(self) -> None:
         """Reset conversation memory."""
         self.history = []
 
+    def set_effort(self, effort: str) -> None:
+        """Set the sweep effort for subsequent investigations."""
+        self.effort = _effort.normalize(effort)
+
     async def run(
         self,
         prompt: str,
@@ -1124,19 +1159,26 @@ class OpenAICompatibleAgent:
 
         self.history.append({"role": "user", "content": prompt})
         messages: list[Any] = [
-            {"role": "system", "content": SYSTEM_PROMPT},
+            {"role": "system", "content": system_prompt_for_effort(self.effort)},
             *self.history,
         ]
         ctx = _AgentRunContext(messages=messages, tool_calls=[], on_tool_call=on_tool_call)
 
+        # Sweep effort caps the tool rounds. On the final turn we set
+        # tool_choice="none" so the model writes its report instead of calling
+        # another tool.
+        max_rounds = _effort.rounds(self.effort)
+        tool_rounds = 0
         try:
             client = openai.AsyncOpenAI(base_url=self.base_url, api_key=self.api_key)
             while True:
+                tool_rounds += 1
+                force_final = tool_rounds > max_rounds
                 response = await client.chat.completions.create(
                     model=self.model,
                     messages=ctx.messages,
                     tools=_OPENAI_TOOLS,
-                    tool_choice="auto",
+                    tool_choice="none" if force_final else "auto",
                     max_tokens=_MAX_TOKENS,
                 )
                 if not response.choices:
@@ -1148,7 +1190,7 @@ class OpenAICompatibleAgent:
                         ),
                     )
                 msg = response.choices[0].message
-                if not msg.tool_calls:
+                if force_final or not msg.tool_calls:
                     text = msg.content or ""
                     self.history.append({"role": "assistant", "content": text})
                     return AgentResponse(content=text, tool_calls=ctx.tool_calls)

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/cli.py

@@ -213,6 +213,17 @@ def _build_parser() -> argparse.ArgumentParser:
         dest="is_pdf_disabled",
         help="Disable automatic PDF generation alongside Markdown reports.",
     )
+    parser.add_argument(
+        "--effort",
+        type=str,
+        default="deeper",
+        choices=["faster", "balanced", "deeper"],
+        help=(
+            "Sweep effort for the interactive analyst (default: deeper).  "
+            "faster: fewer sources, quick pass.  balanced: main sources.  "
+            "deeper: follows every lead.  Change it live with the 'effort' command."
+        ),
+    )
 
     subparsers = parser.add_subparsers(dest="command", metavar="command")
 
@@ -1389,6 +1400,7 @@ async def _async_main() -> None:
             openai_model=getattr(args, "openai_model", "gpt-4o-mini"),
             openai_api_key=getattr(args, "openai_api_key", None),
             is_pdf_disabled=getattr(args, "is_pdf_disabled", False),
+            effort=getattr(args, "effort", "deeper"),
         )
         await repl.run()
         return

clearfront-2.7.0/clearfront/effort.py

@@ -0,0 +1,65 @@
+# clearfront/effort.py
+"""Sweep effort: shared level metadata and the tool-round ceiling per level.
+
+Faster, Balanced, and Deeper trade collection breadth (the number of tool
+rounds the analyst runs) and the matching enrichment instruction, never the
+analyst's reasoning or output quality. Deeper is the full default fan-out; its
+ceiling stays env-tunable via ``OIS_MAX_TOOL_ROUNDS``. The lighter levels are
+capped below it and never exceed it.
+
+This module holds the pieces that are identical across surfaces: the level list
+(used by the web console chip and the REPL ``effort`` command) and the per-level
+round ceiling (used by both agent loops). The prompt wording itself is
+surface-specific and lives with each surface: the web console keeps its own
+graph-flavoured enrichment text in ``web_server``; the terminal agent's version
+lives in ``prompts`` (see ``system_prompt_for_effort``).
+"""
+
+from __future__ import annotations
+
+import os
+
+DEFAULT = "deeper"
+
+# User-facing labels and descriptions. The descriptions are kept identical to
+# the web console's sweep-effort menu (clearfront/web/index.html effortLevels) so
+# every surface describes the feature the same way.
+LEVELS: list[dict[str, str]] = [
+    {
+        "v": "faster",
+        "name": "Faster",
+        "desc": "Checks fewer sources for a quick sweep. Finishes fast and uses less of your API budget.",
+    },
+    {
+        "v": "balanced",
+        "name": "Balanced",
+        "desc": "Covers the main sources. A middle ground on time and cost.",
+    },
+    {
+        "v": "deeper",
+        "name": "Deeper",
+        "desc": "Follows every lead for the most complete map, but takes longer and uses more of your API budget.",
+    },
+]
+
+_VALUES = {level["v"] for level in LEVELS}
+
+
+def normalize(effort: str | None) -> str:
+    """Return a valid effort value, falling back to the default for anything unknown."""
+    return effort if effort in _VALUES else DEFAULT
+
+
+def rounds(effort: str) -> int:
+    """Tool-round ceiling for a effort level. Deeper stays env-tunable (default 12);
+    the lighter levels are capped below it and never exceed it."""
+    ceiling = int(os.environ.get("OIS_MAX_TOOL_ROUNDS", "12"))
+    return {"faster": min(4, ceiling), "balanced": min(8, ceiling)}.get(effort, ceiling)
+
+
+def describe(effort: str) -> str:
+    """One-line description for a effort value (for the REPL 'effort' command)."""
+    for level in LEVELS:
+        if level["v"] == effort:
+            return level["desc"]
+    return ""

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/mcp_server.py

@@ -1,6 +1,6 @@
 # clearfront/mcp_server.py
 """
-Clearfront MCP Server, v2.6.0
+Clearfront MCP Server, v2.7.0
 
 Exposes all 30 OSINT tool capabilities plus multi-target investigation
 to MCP-compliant AI clients over standard I/O. Tools include:

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/prompts.py

@@ -83,6 +83,76 @@ CRITICAL RULES:
 SYSTEM_PROMPT = INVESTIGATION_STRATEGY + "\n\n" + ANALYST_CORE
 
 
+# ---------------------------------------------------------------------------
+# Sweep effort (terminal agent): swap the enrichment instruction and, for the
+# lighter levels, prepend a forceful collection-mode line. Deeper is the full
+# default fan-out and returns SYSTEM_PROMPT byte-identical. The round ceiling
+# that pairs with each level lives in clearfront/effort.py.
+# ---------------------------------------------------------------------------
+
+# The exact aggressive-enrichment sentence embedded in ANALYST_CORE above. Kept
+# as a constant so the lighter levels can swap it out reliably; a test asserts
+# it still occurs verbatim in SYSTEM_PROMPT so an edit to ANALYST_CORE cannot
+# silently break the swap.
+_ENRICH_DEEPER = (
+    "- Enrich aggressively before finalising. Every time a pivot surfaces (an email, domain, "
+    "company, real name, phone, or an additional handle), expand it with the applicable tools, "
+    "then expand the new entities those reveal, chaining outward until the tool budget is reached. "
+    "The more real, connected entities you surface, the stronger the report."
+)
+
+AGENT_ENRICH = {
+    "deeper": _ENRICH_DEEPER,
+    "balanced": (
+        "- Enrich only the strongest pivots before finalising. When a high-value pivot surfaces "
+        "(a confirmed email, domain, real name, or primary handle), expand it once with the "
+        "applicable tools. Do not chain outward exhaustively across every lead, even if the user's "
+        "own message asks you to map everything or run until the tool budget is reached. Deliver a "
+        "solid report on the main footprint."
+    ),
+    "faster": (
+        "- Do not enrich outward. This is a single focused pass: run only the highest-signal tools "
+        "for the target, and do not scrape URLs or chase company, domain, breach, or secondary "
+        "pivots, even if the user's own message asks you to map everything or run until the tool "
+        "budget is reached. Deliver a tight, accurate report from what the priority tools return, "
+        "and note that a deeper sweep is available for the full map."
+    ),
+}
+
+# Prepended only for the lighter levels, so the instruction to run light wins
+# over any "map everything" language in the base prompt or the user's message.
+AGENT_MODE_LINE = {
+    "balanced": (
+        "COLLECTION MODE: BALANCED. This overrides any other instruction, including in the user's "
+        "own message, to map every reachable data point or run until the tool budget is reached. "
+        "Sweep the main sources and expand only the strongest one or two pivots. Do not chain "
+        "outward exhaustively."
+    ),
+    "faster": (
+        "COLLECTION MODE: FASTER. This overrides any other instruction, including in the user's own "
+        "message, to map every reachable data point, enrich every pivot, or run until the tool "
+        "budget is reached. Run a single quick pass of only the highest-signal tools for the target "
+        "type. Do not scrape URLs and do not chase company, domain, or secondary pivots."
+    ),
+}
+
+
+def system_prompt_for_effort(effort: str) -> str:
+    """Return the terminal agent's system prompt shaped for a sweep effort.
+
+    Deeper returns SYSTEM_PROMPT unchanged. Balanced and Faster swap the
+    enrichment sentence for the lighter instruction and prepend the matching
+    collection-mode line.
+    """
+    if effort not in AGENT_ENRICH:
+        effort = "deeper"
+    core = SYSTEM_PROMPT
+    if effort != "deeper":
+        core = core.replace(_ENRICH_DEEPER, AGENT_ENRICH[effort])
+    preamble = AGENT_MODE_LINE.get(effort)
+    return f"{preamble}\n\n{core}" if preamble else core
+
+
 # ---------------------------------------------------------------------------
 # Compact variant for small local models (Ollama)
 # ---------------------------------------------------------------------------

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/repl.py

@@ -31,6 +31,7 @@ from rich.panel import Panel
 
 from clearfront import __version__
 from clearfront.agent import OllamaAgent, OpenAICompatibleAgent, OISAgent
+from clearfront import effort as _effort
 
 logger = logging.getLogger(__name__)
 
@@ -134,6 +135,7 @@ def _print_help() -> None:
                     "[bold]Commands:[/]",
                     "",
                     "  [#00ff88]<target>[/]          Investigate any target (email, username, domain, IP, name)",
+                    "  [#00ff88]effort[/]             Set sweep effort (faster, balanced, deeper)",
                     "  [#00ff88]clear[/]             Clear conversation memory",
                     "  [#00ff88]save[/]              Save last report to reports/",
                     "  [#00ff88]tools[/]             List available OSINT tools",
@@ -216,6 +218,7 @@ def _print_config(
     ollama_host: str,
     is_pdf_disabled: bool,
     openai_base_url: str = "",
+    effort: str = _effort.DEFAULT,
 ) -> None:
     masked = ("*" * 20 + api_key[-6:]) if api_key and len(api_key) > 6 else "not set"
     rows = [
@@ -229,6 +232,7 @@ def _print_config(
     else:
         rows.append(f"[bold]Ollama:[/]   {ollama_host}")
     rows += [
+        f"[bold]Effort:[/]    {effort}",
         "[bold]Reports:[/]  ./reports/",
         f"[bold]PDF:[/]      {'disabled' if is_pdf_disabled else 'enabled'}",
     ]
@@ -276,6 +280,7 @@ class OISRepl:
         openai_model: str = "gpt-4o-mini",
         openai_api_key: str | None = None,
         is_pdf_disabled: bool = False,
+        effort: str = _effort.DEFAULT,
     ) -> None:
         self._api_key = api_key or os.environ.get("ANTHROPIC_API_KEY", "")
         self._provider = provider
@@ -285,12 +290,14 @@ class OISRepl:
         self._openai_model = openai_model
         self._openai_api_key = openai_api_key
         self._is_pdf_disabled = is_pdf_disabled
+        self._effort = _effort.normalize(effort)
 
         self._agent: OISAgent | OllamaAgent | OpenAICompatibleAgent
         if provider == "ollama":
             self._agent = OllamaAgent(
                 model=ollama_model,
                 host=ollama_host,
+                effort=self._effort,
             )
             self._display_model = ollama_model
         elif provider == "openai":
@@ -298,10 +305,11 @@ class OISRepl:
                 model=openai_model,
                 base_url=openai_base_url,
                 api_key=openai_api_key,
+                effort=self._effort,
             )
             self._display_model = openai_model
         else:
-            self._agent = OISAgent(api_key=self._api_key)
+            self._agent = OISAgent(api_key=self._api_key, effort=self._effort)
             self._display_model = "claude-sonnet-4-20250514"
 
         self._last_response: str = ""
@@ -449,7 +457,7 @@ class OISRepl:
             return False
         os.environ["ANTHROPIC_API_KEY"] = key
         self._api_key = key
-        self._agent = OISAgent(api_key=key)
+        self._agent = OISAgent(api_key=key, effort=self._effort)
         saved = self._persist_key_to_env(key)
         if saved:
             console.print(f"\n  [dim]Key saved to {saved} and active for this session.[/]\n")
@@ -512,9 +520,38 @@ class OISRepl:
                         self._ollama_host,
                         self._is_pdf_disabled,
                         self._openai_base_url,
+                        self._effort,
                     )
                     continue
 
+                # 'effort' shows the current level; 'effort <level>' sets it. Only
+                # treat 'effort <arg>' as a command when <arg> is a real level, so
+                # a genuine query that happens to start with 'effort' still runs.
+                effort_parts = user_input.split(maxsplit=1)
+                if effort_parts[0].lower() == "effort" and (
+                    len(effort_parts) == 1
+                    or effort_parts[1].strip().lower() in {lvl["v"] for lvl in _effort.LEVELS}
+                ):
+                    if len(effort_parts) == 2:
+                        chosen = effort_parts[1].strip().lower()
+                        self._effort = chosen
+                        self._agent.set_effort(chosen)
+                        console.print(
+                            f"  [dim]Sweep effort set to[/] [#00ff88]{chosen}[/][dim]. "
+                            f"{_effort.describe(chosen)}[/]\n"
+                        )
+                    else:
+                        console.print(f"\n  [bold]Sweep effort:[/] [#00ff88]{self._effort}[/]")
+                        for lvl in _effort.LEVELS:
+                            marker = "[#00ff88]›[/]" if lvl["v"] == self._effort else " "
+                            console.print(
+                                f"  {marker} [#00ff88]{lvl['v']:<9}[/][dim]{lvl['desc']}[/]"
+                            )
+                        console.print(
+                            "  [dim]Set with: effort faster | balanced | deeper[/]\n"
+                        )
+                    continue
+
                 if user_input.lower() == "save":
                     if self._last_response:
                         path = _save_report(self._last_response)

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/web/index.html

@@ -514,13 +514,13 @@
 
   <!-- right: backend status readout + controls -->
   <div class="flex items-center gap-1.5 flex-none">
-    <!-- sweep-depth selector: no-noun chip, opens a level menu whose footer explains the cost -->
+    <!-- effort selector: no-noun chip, opens a level menu whose footer explains the cost -->
     <div class="relative hidden sm:block" @keydown.escape.window="depthOpen = false">
       <button @click="depthOpen = !depthOpen"
               :aria-expanded="depthOpen"
               aria-haspopup="true"
-              aria-label="Sweep depth"
-              title="Sweep depth: how far each investigation reaches. Trades time and API budget, never analyst quality."
+              aria-label="Effort"
+              title="Effort: how far each investigation reaches. Trades time and API budget, never analyst quality."
               class="flex items-center gap-1.5 font-mono text-xs px-2.5 py-1 rounded border border-app text-primary bg-transparent hover:border-strong transition-colors cursor-pointer whitespace-nowrap">
         <span x-text="depthCurrent().name"></span>
         <svg width="9" height="9" viewBox="0 0 10 10" fill="none" stroke="currentColor"
@@ -531,7 +531,7 @@
       <div x-show="depthOpen" x-cloak
            x-transition:enter="transition ease-out duration-100" x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
            @click.outside="depthOpen = false" @mouseleave="depthHover = null"
-           role="radiogroup" aria-label="Sweep depth"
+           role="radiogroup" aria-label="Effort"
            class="absolute right-0 mt-2 w-60 p-1.5 rounded-lg border border-app bg-surface z-50"
            style="box-shadow:0 8px 24px rgba(0,0,0,0.28);">
         <template x-for="l in depthLevels" :key="l.v">
@@ -920,7 +920,7 @@ OPEN-SOURCE INTELLIGENCE                                     AUTHORIZED USE · v
 <script>
 document.addEventListener('alpine:init', () => {
   Alpine.data('clearfront', () => ({
-    version: '2.6.0',
+    version: '2.7.0',
     booting: false,
     bootLines: [],
     bootAnim: false,
@@ -955,8 +955,9 @@ document.addEventListener('alpine:init', () => {
     setupData: {},
     isLight: false,
 
-    // Sweep depth: header control for how far each investigation fans out. Trades
+    // Effort: header control for how far each investigation fans out. Trades
     // collection breadth (tool rounds), never analyst quality. Persisted in settings.
+    // Kept as "depth" in the Alpine state + /api/chat payload (internal wire name).
     depthOpen: false,
     depthHover: null,
     depthLevels: [
@@ -987,13 +988,13 @@ document.addEventListener('alpine:init', () => {
         svgIcon: '<path stroke-linecap="round" stroke-linejoin="round" d="M7.864 4.243A7.5 7.5 0 0 1 19.5 10.5c0 2.92-.556 5.709-1.568 8.268M5.742 6.364A7.465 7.465 0 0 0 4.5 10.5a7.464 7.464 0 0 1-1.15 3.993m1.989 3.559A11.209 11.209 0 0 0 8.25 10.5a3.75 3.75 0 1 1 7.5 0c0 .527-.021 1.049-.064 1.565M12 10.5a14.94 14.94 0 0 1-3.6 9.75m6.633-4.596a18.666 18.666 0 0 1-2.485 5.33"/>',
         title: 'Check my identity',
         desc: 'Map your digital footprint',
-        prompt: 'Check my own identity exposure. This is an authorized self-check of my own identifiers. First, open by asking me for the seed, and you MUST always include the linked-identity confirmation in that question. Use this exact phrasing or a close variation: "Provide the email address and/or username to check. If supplying both, confirm whether they are linked to the same identity." Once I give it, run a full entity investigation, not a prose summary: find my linked accounts (search_email, search_maigret, search_username), breaches and pastes (search_breach, search_paste), and wider footprint (search_footprint), then enrich every strong pivot you find (each real name, additional handle, email, personal domain, or company), chaining outward to the new entities those reveal until the tool budget is reached. Surface every account, breach, paste, email, domain, and name you find and how they connect through shared pivots, so the evidence graph (generated automatically after your report) is a complete, densely connected map of how my footprint links together. Do not emit a graph block yourself.',
+        prompt: 'Check my own identity exposure. This is an authorized self-check of my own identifiers. First, open by asking me for the seed, and you MUST always include the linked-identity confirmation in that question. Use this exact phrasing or a close variation: "Provide the email address and/or username to check. If supplying both, confirm whether they are linked to the same identity." Once I give it, run a full entity investigation, not a prose summary: find my linked accounts (search_email, search_maigret, search_username), breaches and pastes (search_breach, search_paste), and wider footprint (search_footprint), then follow the pivots that surface (real names, additional handles, emails, personal domains, companies) as far as the selected sweep depth allows. Surface the accounts, breaches, pastes, emails, domains, and names you find and how they connect through shared pivots, so the evidence graph (generated automatically after your report) maps how my footprint links together. Do not emit a graph block yourself.',
       },
       {
         svgIcon: '<path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72c.127.96.361 1.903.7 2.81a2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0 1 22 16.92z"/>',
         title: 'Check my number',
         desc: 'Where your number is exposed',
-        prompt: 'Check my own phone number exposure. This is an authorized self-check of my own number. First, ask me for the phone number to check in E.164 format (for example +447911123456). Once I give it, run a full entity investigation, not a prose summary: validate and profile the number with search_phone (carrier, country, and line type: mobile, VoIP, or landline), check data breaches with search_breach passing the number in HIBP format (country code and digits only, no plus sign or spaces), check paste sites with search_paste, and map where the number appears publicly with search_footprint (search the number in quotes). Specifically check whether the number is listed on public people-search and data-broker sites (for example Whitepages, Spokeo, BeenVerified, TruePeopleSearch, Radaris, and UK sites like 192.com) using search_dorks_live or site-scoped SERP queries, and report any broker pages that surface. Identify connected online accounts only from public evidence: the number shown on a public profile, or a breach record that ties the number to an account. Do not enumerate platform registration through password-reset or signup flows, which is active probing and out of scope. If the footprint surfaces a name, email, or accounts tied to the number, enrich every strong pivot you find (each name, email, domain, or account), chaining outward to the new entities those reveal within the tool budget, so the evidence graph becomes a complete, densely connected map of how my number links to my wider footprint. Assess the findings against the phone threat model: SIM-swap and port-out risk (higher for a SIM-backed mobile reused for 2FA), SMS or 2FA interception, spam and scam targeting, and doxxing linkage where the number connects to my identity. Note honestly that HIBP phone-breach coverage is limited to the few breaches that loaded phone numbers. Give me a ranked, fix-first report (for example: move 2FA off SMS to an authenticator app or passkey, set a carrier port-out or SIM-swap PIN, remove the number from data-broker listings) and surface the number, carrier, breaches, pastes, linked accounts, emails, and names you find and how they connect through shared pivots, so the evidence graph (generated automatically after your report) is complete. Do not emit a graph block yourself.',
+        prompt: 'Check my own phone number exposure. This is an authorized self-check of my own number. First, ask me for the phone number to check in E.164 format (for example +447911123456). Once I give it, run a full entity investigation, not a prose summary: validate and profile the number with search_phone (carrier, country, and line type: mobile, VoIP, or landline), check data breaches with search_breach passing the number in HIBP format (country code and digits only, no plus sign or spaces), check paste sites with search_paste, and map where the number appears publicly with search_footprint (search the number in quotes). Specifically check whether the number is listed on public people-search and data-broker sites (for example Whitepages, Spokeo, BeenVerified, TruePeopleSearch, Radaris, and UK sites like 192.com) using search_dorks_live or site-scoped SERP queries, and report any broker pages that surface. Identify connected online accounts only from public evidence: the number shown on a public profile, or a breach record that ties the number to an account. Do not enumerate platform registration through password-reset or signup flows, which is active probing and out of scope. If the footprint surfaces a name, email, or accounts tied to the number, follow those pivots as far as the selected sweep depth allows, so the evidence graph maps how my number links to my wider footprint. Assess the findings against the phone threat model: SIM-swap and port-out risk (higher for a SIM-backed mobile reused for 2FA), SMS or 2FA interception, spam and scam targeting, and doxxing linkage where the number connects to my identity. Note honestly that HIBP phone-breach coverage is limited to the few breaches that loaded phone numbers. Give me a ranked, fix-first report (for example: move 2FA off SMS to an authenticator app or passkey, set a carrier port-out or SIM-swap PIN, remove the number from data-broker listings) and surface the number, carrier, breaches, pastes, linked accounts, emails, and names you find and how they connect through shared pivots, so the evidence graph (generated automatically after your report) reflects them. Do not emit a graph block yourself.',
       },
       {
         svgIcon: '<circle cx="12" cy="12" r="3"/><path d="M12 2v3M12 19v3M2 12h3M19 12h3M5.6 5.6l2.1 2.1M16.3 16.3l2.1 2.1M18.4 5.6l-2.1 2.1M7.7 16.3l-2.1 2.1"/>',
@@ -1688,9 +1689,17 @@ document.addEventListener('alpine:init', () => {
       try { G.d3Force('charge').strength(-48); } catch (e) {}
       try { G.d3Force('link').distance(26).strength(0.3); } catch (e) {}
       try { G.d3Force('radial', this._sphereForce(R, 0.14)); } catch (e) {}
-      // Frame the sphere once it settles (the camera does not auto-follow the expanding layout).
-      let fitted = false;
-      G.onEngineStop(() => { if (!fitted) { fitted = true; try { G.zoomToFit(700, 55); } catch (e) {} } });
+      // Frame the sphere as the force layout settles. onEngineStop alone was unreliable: it can
+      // fire before the layout has expanded, so the one-shot fit framed a tiny half-settled blob
+      // that then grew off-screen. Re-fit on a short schedule (and on engine stop) until the user
+      // takes the camera; harmless repeats, and it guarantees the whole graph ends up in view.
+      let interacted = false;
+      const onGrab = () => { interacted = true; };
+      el.addEventListener('pointerdown', onGrab);
+      el.addEventListener('wheel', onGrab, { passive: true });
+      const fit = () => { if (interacted) return; try { G.zoomToFit(600, 55); } catch (e) {} };
+      G.onEngineStop(fit);
+      [500, 1400, 2800, 4200].forEach(ms => setTimeout(fit, ms));
       // Gentle auto-rotation (orbit) that stops the moment the user interacts. Frozen under
       // prefers-reduced-motion.
       if (!reduce) {

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront/web_server.py

@@ -41,6 +41,7 @@ from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from sse_starlette.sse import EventSourceResponse
 
+from clearfront import effort as _effort
 from clearfront.brightdata import BRIGHTDATA_LINK_WEB
 from clearfront.corroboration import CorroborationLedger
 from clearfront.utils import is_internal_url
@@ -824,38 +825,50 @@ _DEPTH_ENRICH = {
         "the stronger the report and the denser the evidence graph. "
     ),
     "balanced": (
-        "- Enrich the strongest pivots before finalising. When a high-value pivot surfaces (a "
-        "confirmed email, domain, real name, or primary handle), expand it with the applicable "
-        "tools, then expand the entities those reveal. Prioritise the connections most likely to "
-        "be real over exhaustively chasing every lead, and deliver a solid map of the main "
-        "footprint within the tool budget. "
+        "- Enrich only the strongest pivots before finalising. When a high-value pivot surfaces (a "
+        "confirmed email, domain, real name, or primary handle), expand it once with the applicable "
+        "tools. Do not chain outward exhaustively across every lead, even if the user's own message "
+        "asks you to map everything or run until the tool budget is reached. Deliver a solid map of "
+        "the main footprint. "
     ),
     "faster": (
-        "- This is a focused first-look sweep. Run the highest-signal tools for this target type, "
-        "expand only the single strongest pivot if one clearly surfaces, and do not chase secondary "
-        "leads. Deliver a tight, accurate report from what the priority sources return, and note "
-        "that a deeper sweep is available if the user wants the full map. "
+        "- Do not enrich outward. This is a single focused pass: run only the highest-signal tools "
+        "for the target, and do NOT scrape URLs or chase company, domain, breach, or secondary "
+        "pivots, even if the user's own message asks you to map everything or run until the tool "
+        "budget is reached. Deliver a tight, accurate report from what the priority tools return, "
+        "and note that a deeper sweep is available for the full map. "
     ),
 }
 # Mode preamble is added ONLY for the lighter levels so the opening tasking line scales
 # its scope and completion estimate. Deeper gets no preamble, keeping its prompt unchanged.
 _DEPTH_MODE_LINE = {
     "balanced": (
-        "COLLECTION MODE: Balanced. Run a moderate sweep of the main sources. Scale the opening "
-        "completion estimate down accordingly, not to the full deep-sweep timing."
+        "COLLECTION MODE: BALANCED. This overrides any other instruction, including in the user's "
+        "own message, to map every reachable data point or run until the tool budget is reached. "
+        "Sweep the main sources and expand only the strongest one or two pivots; do not chain "
+        "outward exhaustively. Your OPENING tasking line must promise a focused sweep of the main "
+        "sources with an estimate around two minutes, NOT a full map of every data point and NOT "
+        "the five-minute deep-sweep line. Ignore the broad-sweep opener example below."
     ),
     "faster": (
-        "COLLECTION MODE: Faster. Run a quick focused pass over priority sources. Keep the opening "
-        "completion estimate short and do not promise mapping every reachable data point."
+        "COLLECTION MODE: FASTER. This overrides any other instruction, including in the user's own "
+        "message, to map every reachable data point, surface everything, enrich every pivot, or run "
+        "until the tool budget is reached. Run a single quick pass of only the highest-signal tools "
+        "for the target type; do NOT scrape URLs and do NOT chase company, domain, or secondary "
+        "pivots. Your OPENING tasking line MUST be short and MUST NOT claim a broad sweep or mention "
+        "mapping every data point. Use exactly: \"Stand by. Priority-source pass on the target. "
+        "Estimated completion under ninety seconds. Per-asset timings report on each card.\" Ignore "
+        "the broad-sweep opener example below."
     ),
 }
 
 
-def _depth_rounds(depth: str) -> int:
-    """Tool-round ceiling for a depth level. Deeper stays env-tunable (default 12); the
-    lighter levels are capped below it and never exceed it."""
-    ceiling = int(os.environ.get("OIS_MAX_TOOL_ROUNDS", "12"))
-    return {"faster": min(4, ceiling), "balanced": min(8, ceiling)}.get(depth, ceiling)
+# The per-level round ceiling is shared with the terminal agent path; see
+# clearfront/effort.py. The enrichment and mode-line wording above stays here
+# because it is graph-flavoured and specific to the web console. The web keeps
+# "depth" as its internal collection-mode name (ChatRequest.depth, the Alpine
+# chip, the /api/chat field); the user-facing label in index.html is "Effort".
+_depth_rounds = _effort.rounds
 
 
 async def _stream_claude(messages: list[dict], depth: str = "deeper") -> AsyncIterator[dict]:

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clearfront
-Version: 2.6.0
+Version: 2.7.0
 Summary: AI-powered OSINT agent, MCP server, and CLI. Interactive REPL + 30 tools. Anthropic Claude or local Ollama. For authorized security research use only.
 Author: Scott Martin Anderson
 License-Expression: MIT
@@ -81,7 +81,7 @@ Dynamic: license-file
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square)](https://www.python.org/)
 [![License MIT](https://img.shields.io/badge/license-MIT-green?style=flat-square)](LICENSE)
 [![MCP](https://img.shields.io/badge/protocol-MCP-blueviolet?style=flat-square)](https://modelcontextprotocol.io/)
-[![Version](https://img.shields.io/badge/version-2.6.0-informational?style=flat-square)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/version-2.7.0-informational?style=flat-square)](CHANGELOG.md)
 
 **[clearfront.sh](https://clearfront.sh)** · [Disclaimer](./DISCLAIMER.md)
 

{clearfront-2.6.0 → clearfront-2.7.0}/clearfront.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ clearfront/brightdata.py
 clearfront/cli.py
 clearfront/correlation.py
 clearfront/corroboration.py
+clearfront/effort.py
 clearfront/exceptions.py
 clearfront/extractors.py
 clearfront/json_output.py
@@ -72,6 +73,7 @@ tests/test_cli_output.py
 tests/test_corroboration.py
 tests/test_crt.py
 tests/test_dns.py
+tests/test_effort.py
 tests/test_exif.py
 tests/test_footprint.py
 tests/test_github_code_search.py

{clearfront-2.6.0 → clearfront-2.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clearfront"
-version = "2.6.0"
+version = "2.7.0"
 description = "AI-powered OSINT agent, MCP server, and CLI. Interactive REPL + 30 tools. Anthropic Claude or local Ollama. For authorized security research use only."
 readme = "README.md"
 requires-python = ">=3.10"

clearfront-2.7.0/tests/test_effort.py

@@ -0,0 +1,77 @@
+"""Sweep-effort invariants shared by the web console and the terminal agent."""
+
+from clearfront import effort
+from clearfront.prompts import (
+    SYSTEM_PROMPT,
+    AGENT_ENRICH,
+    AGENT_MODE_LINE,
+    _ENRICH_DEEPER,
+    system_prompt_for_effort,
+)
+
+
+def test_rounds_ceiling_per_level():
+    assert effort.rounds("faster") == 4
+    assert effort.rounds("balanced") == 8
+    assert effort.rounds("deeper") == 12
+    # Unknown level falls back to the deeper ceiling.
+    assert effort.rounds("bogus") == 12
+
+
+def test_rounds_respects_env_ceiling(monkeypatch):
+    monkeypatch.setenv("OIS_MAX_TOOL_ROUNDS", "6")
+    # Lighter levels are capped below the ceiling and never exceed it.
+    assert effort.rounds("faster") == 4
+    assert effort.rounds("balanced") == 6  # min(8, 6)
+    assert effort.rounds("deeper") == 6
+
+
+def test_normalize():
+    assert effort.normalize("faster") == "faster"
+    assert effort.normalize("balanced") == "balanced"
+    assert effort.normalize("deeper") == "deeper"
+    assert effort.normalize("bogus") == "deeper"
+    assert effort.normalize(None) == "deeper"
+
+
+def test_levels_match_console_descriptions():
+    # The descriptions must stay identical to the web console's depthLevels
+    # (clearfront/web/index.html) so both surfaces read the same.
+    by_v = {level["v"]: level for level in effort.LEVELS}
+    assert by_v["faster"]["desc"] == (
+        "Checks fewer sources for a quick sweep. Finishes fast and uses less of your API budget."
+    )
+    assert by_v["balanced"]["desc"] == (
+        "Covers the main sources. A middle ground on time and cost."
+    )
+    assert by_v["deeper"]["desc"] == (
+        "Follows every lead for the most complete map, but takes longer and uses more of your API budget."
+    )
+
+
+def test_deeper_prompt_is_byte_identical():
+    # Deeper must not change the historical prompt at all.
+    assert system_prompt_for_effort("deeper") == SYSTEM_PROMPT
+    assert system_prompt_for_effort("bogus") == SYSTEM_PROMPT
+
+
+def test_deeper_enrich_sentence_present_verbatim():
+    # The swap depends on this exact sentence living in SYSTEM_PROMPT.
+    assert _ENRICH_DEEPER in SYSTEM_PROMPT
+
+
+def test_lighter_levels_swap_enrich_and_prepend_mode_line():
+    for level in ("faster", "balanced"):
+        shaped = system_prompt_for_effort(level)
+        assert shaped.startswith(AGENT_MODE_LINE[level])
+        assert AGENT_ENRICH[level] in shaped
+        # The aggressive deeper instruction must be gone, not merely appended to.
+        assert _ENRICH_DEEPER not in shaped
+
+
+def test_web_and_agent_share_the_round_ceiling():
+    from clearfront import web_server
+
+    # The web console keeps the internal name _depth_rounds; it aliases the
+    # shared effort.rounds so both surfaces use one ceiling.
+    assert web_server._depth_rounds is effort.rounds

{clearfront-2.6.0 → clearfront-2.7.0}/tests/test_repl_first_run.py

@@ -52,6 +52,7 @@ def test_first_run_accepts_key(monkeypatch, tmp_path):
     os.environ.pop("ANTHROPIC_API_KEY", None)
     r = OISRepl.__new__(OISRepl)  # avoid PromptSession/FileHistory side effects
     r._api_key = ""
+    r._effort = "deeper"  # __init__ (bypassed here) normally sets this
     monkeypatch.setattr("builtins.input", lambda *a, **k: "sk-ant-test")
     monkeypatch.setattr(
         OISRepl, "_persist_key_to_env", staticmethod(lambda key, env_path=None: tmp_path / ".env")