feat: truncation banner + total_discovered; robust cross-OS Setup (pipx/venv)

LeonardLeroy · LeonardLeroy · commit 01745d7e52e2 · 2026-06-04T13:31:10.000+02:00
diff --git a/documentation.md b/documentation.md
@@ -448,6 +448,8 @@ Command:
 ecocode profile-repo --root . --ext .py --runs 3 --json
 ```
 
+Ignored directories (`node_modules`, `.git`, `.venv`, `dist`, `build`, `target`, …) are pruned during discovery, so scans stay fast even in large repositories. Discovery is capped by `--max-files` (default 50 on the CLI, 200 in the VS Code extension). When more matching files exist than the cap, the JSON reports `total_discovered` (all matching files) alongside `total_files` (the scanned subset), and the human output prints a "scanned X of Y files" note — totals then cover the scanned subset only. Raise `--max-files` (or `ecocode.maxFiles`) to scan more.
+
 Example JSON excerpt:
 
 ```json
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ecocode-cli"
-version = "0.2.1"
+version = "0.2.2"
 description = "EcoCode — energy and performance profiler for source code (CLI core for the EcoCode VS Code extension)"
 readme = "README.md"
 requires-python = ">=3.10"
diff --git a/src/ecocode/commands/profile_repo.py b/src/ecocode/commands/profile_repo.py
@@ -173,6 +173,7 @@ def handle(args: argparse.Namespace) -> int:
         "collector": args.collector,
         "runs": args.runs,
         "total_files": result.total_files,
+        "total_discovered": result.total_discovered,
         "total_cpu_seconds": result.total_cpu_seconds,
         "total_memory_mb": result.total_memory_mb,
         "total_energy_wh": result.total_energy_wh,
@@ -230,6 +231,11 @@ def handle(args: argparse.Namespace) -> int:
     print("EcoCode repository profile")
     print(f"Root:                     {result.root}")
     print(f"Files profiled:           {result.total_files}")
+    if result.total_discovered > result.total_files:
+        print(
+            f"Note: scanned {result.total_files} of {result.total_discovered} files "
+            f"(--max-files limit). Totals cover the scanned subset only."
+        )
     print(f"Total CPU time (s):       {result.total_cpu_seconds}")
     print(f"Total memory peak (MB):   {result.total_memory_mb}")
     print(f"Total estimated Wh:       {result.total_energy_wh}")
diff --git a/src/ecocode/core/repository_profiler.py b/src/ecocode/core/repository_profiler.py
@@ -60,12 +60,12 @@ class RepoProfileResult:
     total_energy_wh: float
     average_sustainability_score: float
     results: list[ProfileResult]
+    total_discovered: int = 0
 
 
-def discover_profile_targets(
+def _discover_all_targets(
     root: Path,
     extensions: set[str],
-    max_files: int,
     include_globs: list[str] | None = None,
     exclude_globs: list[str] | None = None,
 ) -> list[Path]:
@@ -95,7 +95,17 @@ def discover_profile_targets(
             candidates.append(path)
 
     candidates.sort()
-    return candidates[:max_files]
+    return candidates
+
+
+def discover_profile_targets(
+    root: Path,
+    extensions: set[str],
+    max_files: int,
+    include_globs: list[str] | None = None,
+    exclude_globs: list[str] | None = None,
+) -> list[Path]:
+    return _discover_all_targets(root, extensions, include_globs, exclude_globs)[:max_files]
 
 
 def _profile_target_resilient(
@@ -146,13 +156,14 @@ def profile_repository(
         raise FileNotFoundError(f"Repository root not found: {root}")
 
     profile_extensions = extensions or DEFAULT_SCRIPT_EXTENSIONS
-    targets = discover_profile_targets(
+    all_targets = _discover_all_targets(
         root,
         profile_extensions,
-        max_files,
         include_globs=include_globs,
         exclude_globs=exclude_globs,
     )
+    total_discovered = len(all_targets)
+    targets = all_targets[:max_files]
 
     results = [
         _profile_target_resilient(
@@ -186,4 +197,5 @@ def profile_repository(
         total_energy_wh=total_energy_wh,
         average_sustainability_score=average_sustainability_score,
         results=results,
+        total_discovered=total_discovered,
     )
diff --git a/src/ecocode/core/schemas.py b/src/ecocode/core/schemas.py
@@ -250,6 +250,7 @@ class SchemaValidationError(ValueError):
         "collector": {"type": "string", "enum": ["placeholder", "runtime", "static"]},
         "runs": {"type": "integer", "minimum": 1},
         "total_files": {"type": "integer", "minimum": 0},
+        "total_discovered": {"type": "integer", "minimum": 0},
         "total_cpu_seconds": {"type": "number"},
         "total_memory_mb": {"type": "number"},
         "total_energy_wh": {"type": "number"},
diff --git a/tests/test_output_contracts.py b/tests/test_output_contracts.py
@@ -38,6 +38,7 @@
     "collector",
     "runs",
     "total_files",
+    "total_discovered",
     "total_cpu_seconds",
     "total_memory_mb",
     "total_energy_wh",
diff --git a/tests/test_static_and_multilang.py b/tests/test_static_and_multilang.py
@@ -100,3 +100,13 @@ def test_discovery_prunes_ignored_directories(tmp_path: Path) -> None:
     names = {path.name for path in targets}
 
     assert names == {"app.py"}
+
+
+def test_repo_reports_total_discovered_when_truncated(tmp_path: Path) -> None:
+    for index in range(5):
+        (tmp_path / f"f{index}.py").write_text("print('x')\n", encoding="utf-8")
+
+    result = profile_repository(tmp_path, extensions={".py"}, max_files=2)
+
+    assert result.total_files == 2
+    assert result.total_discovered == 5
diff --git a/vscode-extension/README.md b/vscode-extension/README.md
@@ -38,7 +38,7 @@ Repeated runs expose variability (coefficient of variation) so you can trust the
 
 The extension is a UI on top of the **EcoCode CLI** (a Python package). Install the CLI once — either:
 
-- **One click:** run **EcoCode: Setup CLI In Workspace** (or click *Setup CLI* when prompted). It installs the CLI into a dedicated virtual environment for you (no PEP 668 issues).
+- **One click:** run **EcoCode: Setup CLI In Workspace** (or click *Setup CLI* when prompted). It uses **pipx** when available, otherwise a dedicated virtual environment — PEP 668-safe on Linux/macOS/Windows, and the extension auto-detects either install.
 - **Manually with pipx:**
 
   ```bash
@@ -93,7 +93,7 @@ Workspace scans use the `static` collector by default: a source-based estimate t
 - `ecocode.diagnosticsEnabled`: show inline optimization suggestions while editing (default `true`).
 - `ecocode.timeoutSeconds`: max seconds per CLI invocation (default `120`).
 - `ecocode.installSource`: pip install source used by *Setup CLI* (PyPI name, git URL, or local path).
-- `ecocode.maxFiles`: max number of scanned files.
+- `ecocode.maxFiles`: max number of files scanned per workspace scan (default 200). Large repos are capped at this number; when the limit is reached the dashboard shows a "showing X of Y files" banner with a one-click **Increase limit** button. Raise it to scan more.
 - `ecocode.runs`: repeated runs for stability.
 - `ecocode.extensions`: optional extension filters.
 - `ecocode.includeGlobs`: optional include globs.
diff --git a/vscode-extension/media/dashboard.css b/vscode-extension/media/dashboard.css
@@ -257,3 +257,14 @@ th {
   opacity: 0.85;
   margin-top: 2px;
 }
+
+#truncationBanner {
+  border-left: 3px solid #bb8009;
+  background: rgba(187, 128, 9, 0.12);
+  font-size: 0.85rem;
+}
+
+#truncationBanner button {
+  margin-left: 8px;
+  cursor: pointer;
+}
diff --git a/vscode-extension/media/dashboard.js b/vscode-extension/media/dashboard.js
@@ -11,6 +11,7 @@ const el = {
   showCurrentFile: byId("showCurrentFile"),
   showSuggestions: byId("showSuggestions"),
   errorBox: byId("errorBox"),
+  truncationBanner: byId("truncationBanner"),
   summarySection: byId("summarySection"),
   stabilitySection: byId("stabilitySection"),
   filesSection: byId("filesSection"),
@@ -62,6 +63,24 @@ function renderMetrics(report) {
   `;
 }
 
+function renderTruncation(report) {
+  const discovered = report && report.total_discovered;
+  if (!report || typeof discovered !== "number" || discovered <= report.total_files) {
+    el.truncationBanner.classList.add("hidden");
+    el.truncationBanner.innerHTML = "";
+    return;
+  }
+  el.truncationBanner.classList.remove("hidden");
+  el.truncationBanner.innerHTML =
+    `<strong>Partial scan:</strong> showing <strong>${report.total_files}</strong> of <strong>${discovered}</strong> matching files (file limit reached). ` +
+    `Totals below cover the scanned subset only. ` +
+    `<button id="increaseLimitBtn">Increase limit</button>`;
+  const button = byId("increaseLimitBtn");
+  if (button) {
+    button.addEventListener("click", () => vscode.postMessage({ type: "increaseMaxFiles" }));
+  }
+}
+
 function renderStability(report) {
   if (!report || !report.stability) {
     el.stabilitySection.innerHTML = "<h2>Stability</h2><p>No repeated-run stability data yet.</p>";
@@ -205,6 +224,7 @@ function render(state) {
   el.errorBox.classList.toggle("error", !!state.lastError);
   el.errorBox.textContent = state.lastError || "";
 
+  renderTruncation(state.workspaceReport);
   renderMetrics(state.workspaceReport);
   renderStability(state.workspaceReport);
   const topLimit = Number.isFinite(state.showTopFiles) ? state.showTopFiles : 15;
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -2,7 +2,7 @@
   "name": "ecocode-vscode",
   "displayName": "EcoCode Insights",
   "description": "Live-ish repository energy/performance insights powered by EcoCode CLI",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "publisher": "ecocode",
   "icon": "media/Ecocode.png",
   "repository": {
diff --git a/vscode-extension/src/dashboard.ts b/vscode-extension/src/dashboard.ts
@@ -36,6 +36,8 @@ export function getDashboardHtml(webview: vscode.Webview, extensionUri: vscode.U
 
   <section id="errorBox" class="card hidden"></section>
 
+  <section id="truncationBanner" class="card hidden"></section>
+
   <section id="summarySection" class="grid"></section>
 
   <section id="stabilitySection" class="card"></section>
diff --git a/vscode-extension/src/ecocodeRunner.ts b/vscode-extension/src/ecocodeRunner.ts
@@ -106,6 +106,14 @@ export function getGlobalPythonPath(): string {
   return path.join(root, "venv", "bin", "python");
 }
 
+export function getPipxCliPath(): string {
+  const binDir = process.env.PIPX_BIN_DIR?.trim() || path.join(os.homedir(), ".local", "bin");
+  if (process.platform === "win32") {
+    return path.join(binDir, "ecocode.exe");
+  }
+  return path.join(binDir, "ecocode");
+}
+
 interface EcoCodeExecutionTarget {
   command: string;
   baseArgs: string[];
@@ -132,6 +140,11 @@ async function resolveExecutionTarget(cliPath: string, cwd: string): Promise<Eco
     return { command: globalCliPath, baseArgs: [] };
   }
 
+  const pipxCli = getPipxCliPath();
+  if (await exists(pipxCli)) {
+    return { command: pipxCli, baseArgs: [] };
+  }
+
   const unixCli = path.join(cwd, ".venv", "bin", "ecocode");
   if (await exists(unixCli)) {
     return { command: unixCli, baseArgs: [] };
diff --git a/vscode-extension/src/extension.ts b/vscode-extension/src/extension.ts
@@ -144,6 +144,10 @@ class EcoCodeController implements vscode.WebviewViewProvider {
         await this.scanWorkspace();
         return;
       }
+      if (message?.type === "increaseMaxFiles") {
+        await vscode.commands.executeCommand("workbench.action.openSettings", "ecocode.maxFiles");
+        return;
+      }
       if (message?.type === "scanCurrentFile") {
         await this.scanCurrentFile();
       }
@@ -375,10 +379,9 @@ class EcoCodeController implements vscode.WebviewViewProvider {
     const terminal = vscode.window.createTerminal({
       name: "EcoCode Setup",
       cwd: vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ?? os.homedir(),
-      // Force PowerShell on Windows: the setup syntax below is PowerShell-specific
-      // and cmd.exe would fail on it.
-      shellPath: isWindows ? "powershell.exe" : undefined,
-      // HISTFILE only makes sense on POSIX shells.
+      // Force a predictable shell so the conditional setup syntax is reliable
+      // across user shells (zsh/fish on Unix, cmd.exe on Windows).
+      shellPath: isWindows ? "powershell.exe" : "/bin/bash",
       env: isWindows ? undefined : { HISTFILE: "/tmp/ecocode_setup_history" },
     });
 
@@ -387,29 +390,34 @@ class EcoCodeController implements vscode.WebviewViewProvider {
     const venvPath = path.join(globalInstallRoot, "venv");
     const installSource = loadSettings().installSource;
 
+    // Strategy (both OSes): use pipx when available (isolated, on PATH, PEP 668-safe);
+    // otherwise create a dedicated venv. `-U` / `--force` make re-running upgrade the CLI.
     const setupCommand = isWindows
       ? [
-        `New-Item -ItemType Directory -Force -Path "${globalInstallRoot}" | Out-Null`,
-        // py launcher is preferred, but some installs only expose 'python'.
-        `if (Get-Command py -ErrorAction SilentlyContinue) { py -3 -m venv "${venvPath}" } else { python -m venv "${venvPath}" }`,
-        `& "${globalPythonPath}" -m pip install --upgrade pip`,
-        `& "${globalPythonPath}" -m pip install "${installSource}"`,
-      ].join("; ")
+        `if (Get-Command pipx -ErrorAction SilentlyContinue) {`,
+        `  pipx install --force "${installSource}"`,
+        `} else {`,
+        `  New-Item -ItemType Directory -Force -Path "${globalInstallRoot}" | Out-Null;`,
+        `  if (Get-Command py -ErrorAction SilentlyContinue) { py -3 -m venv "${venvPath}" } else { python -m venv "${venvPath}" };`,
+        `  & "${globalPythonPath}" -m pip install --upgrade pip;`,
+        `  & "${globalPythonPath}" -m pip install -U "${installSource}"`,
+        `}`,
+      ].join(" ")
       : [
-        `mkdir -p "${globalInstallRoot}"`,
-        `python3 -m venv "${venvPath}"`,
-        `"${globalPythonPath}" -m pip install --upgrade pip`,
-        `"${globalPythonPath}" -m pip install "${installSource}"`,
-      ].join(" && ");
+        `if command -v pipx >/dev/null 2>&1; then`,
+        `  pipx install --force "${installSource}";`,
+        `else`,
+        `  mkdir -p "${globalInstallRoot}";`,
+        `  python3 -m venv "${venvPath}" || python -m venv "${venvPath}";`,
+        `  "${globalPythonPath}" -m pip install --upgrade pip;`,
+        `  "${globalPythonPath}" -m pip install -U "${installSource}";`,
+        `fi`,
+      ].join(" ");
 
     terminal.show(true);
     terminal.sendText(setupCommand, true);
     vscode.window.showInformationMessage(
-      `EcoCode setup started in terminal. Global CLI will be installed at ${
-        isWindows
-          ? path.join(globalInstallRoot, "venv", "Scripts", "ecocode.exe")
-          : path.join(globalInstallRoot, "venv", "bin", "ecocode")
-      }.`,
+      "EcoCode setup started in the terminal. Once it finishes, run a scan — the extension auto-detects the CLI (pipx or the dedicated venv).",
     );
   }
 
diff --git a/vscode-extension/src/types.ts b/vscode-extension/src/types.ts
@@ -46,6 +46,7 @@ export interface EcoCodeRepoReport {
   collector: CollectorType;
   runs: number;
   total_files: number;
+  total_discovered?: number;
   total_cpu_seconds: number;
   total_memory_mb: number;
   total_energy_wh: number;
