@grifhinz/logics-manager 2.5.0 → 2.5.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/AlexAgo83/logics-manager/actions/workflows/ci.yml/badge.svg)](https://github.com/AlexAgo83/logics-manager/actions/workflows/ci.yml)
 [![License](https://img.shields.io/github/license/AlexAgo83/logics-manager)](LICENSE)
-![Version](https://img.shields.io/badge/version-v2.5.0-4C8BF5)
+![Version](https://img.shields.io/badge/version-v2.5.2-4C8BF5)
 ![VS Code](https://img.shields.io/badge/VS%20Code-1.86.0-007ACC?logo=visualstudiocode&logoColor=white)
 ![TypeScript](https://img.shields.io/badge/TypeScript-5.3.3-3178C6?logo=typescript&logoColor=white)
 ![Vitest](https://img.shields.io/badge/Vitest-2.1.8-6E9F18?logo=vitest&logoColor=white)
@@ -230,13 +230,15 @@ npm install -g @grifhinz/logics-manager@latest
 If npm reports a successful update but `logics-manager --version` still shows an older version, another installation is earlier on `PATH`. Diagnose it with:
 
 ```bash
-command -v -a logics-manager
+type -a logics-manager
+whence -a logics-manager  # zsh
+pipx list
 npm prefix -g
 npm list -g @grifhinz/logics-manager --depth=0
 "$(npm prefix -g)/bin/logics-manager" --version
 ```
 
-If the direct npm binary shows the expected version, remove the older Python install or move the npm global `bin` directory earlier on `PATH`.
+If the direct npm binary shows the expected version, remove the older Python install or move the npm global `bin` directory earlier on `PATH`. In zsh, run `rehash` or open a new terminal after changing installs so the shell forgets any cached command location.
 
 ## VS Code Extension
 

package/VERSION

@@ -1 +1 @@
-2.5.0
+2.5.2

package/clients/shared-web/media/css/layout.css

@@ -107,6 +107,7 @@
 }
 
 .layout--stacked .details {
+  width: 100%;
   min-height: 220px;
   border-top: none;
   position: absolute;

package/clients/viewer/browser-host.js

@@ -1751,6 +1751,14 @@
         <span class="viewer-git__domain-label">${escapeHtml(label)}${key === "changes" ? gitBadgeHtml("changes") : ""}${key === "history" ? gitBadgeHtml("history") : ""}</span><strong>${escapeHtml(count)}</strong>
       </button>
     `).join("");
+    const renderChangeStats = (entry) => {
+      const additions = Number(entry?.additions);
+      const deletions = Number(entry?.deletions);
+      if (!Number.isFinite(additions) || !Number.isFinite(deletions)) {
+        return "";
+      }
+      return `<span class="viewer-git__file-changes" title="Line changes"><span class="viewer-git__file-additions">+${escapeHtml(additions)}</span><span class="viewer-git__file-deletions">-${escapeHtml(deletions)}</span></span>`;
+    };
     const renderFileSections = (allowedKeys) => groupDefs.filter(([key]) => allowedKeys.includes(key)).map(([key, label]) => {
       const entries = Array.isArray(payload.groups?.[key]) ? payload.groups[key] : [];
       if (!entries.length) {
@@ -1763,6 +1771,7 @@
             <li>
               <button class="viewer-git__file" type="button" data-viewer-git-file="${escapeHtml(entry.path)}" data-viewer-git-cached="${key === "staged" ? "1" : "0"}">
                 <span class="viewer-git__file-path">${escapeHtml(entry.from ? `${entry.from} -> ${entry.path}` : entry.path)}</span>
+                ${renderChangeStats(entry)}
                 ${entry.logicsType ? `<span class="viewer-git__file-kind">${escapeHtml(entry.logicsType)}</span>` : ""}
               </button>
             </li>
@@ -1852,6 +1861,29 @@
     });
   }
 
+  function gitDiffLineKind(line) {
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      return "add";
+    }
+    if (line.startsWith("-") && !line.startsWith("---")) {
+      return "delete";
+    }
+    if (line.startsWith("@@")) {
+      return "hunk";
+    }
+    if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("+++") || line.startsWith("---")) {
+      return "meta";
+    }
+    return "context";
+  }
+
+  function renderGitDiffPreview(content) {
+    return String(content)
+      .split("\n")
+      .map((line) => `<span class="viewer-git__diff-line viewer-git__diff-line--${gitDiffLineKind(line)}">${escapeHtml(line || " ")}</span>`)
+      .join("");
+  }
+
   async function loadGitDiff(path, cached, button = null) {
     const diffPanel = document.querySelector("[data-viewer-git-diff]");
     if (!(diffPanel instanceof HTMLElement) || !path) {
@@ -1873,7 +1905,7 @@
       return;
     }
     const content = payload.diff || payload.message || "No diff is available for this file.";
-    diffPanel.innerHTML = `<div class="viewer-git__diff-meta">${escapeHtml(payload.path || path)} · ${escapeHtml(payload.mode || "worktree")}${payload.truncated ? " · truncated" : ""}</div><pre><code>${escapeHtml(content)}</code></pre>`;
+    diffPanel.innerHTML = `<div class="viewer-git__diff-meta">${escapeHtml(payload.path || path)} · ${escapeHtml(payload.mode || "worktree")}${payload.truncated ? " · truncated" : ""}</div><pre><code>${renderGitDiffPreview(content)}</code></pre>`;
   }
 
   function applyGitDomain(domain) {

package/clients/viewer/viewer.css

@@ -829,6 +829,23 @@
   overflow-wrap: anywhere;
 }
 
+.viewer-git__file-changes {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  flex: 0 0 auto;
+  font-family: var(--vscode-editor-font-family, ui-monospace, SFMono-Regular, Menlo, monospace);
+  font-size: 11px;
+}
+
+.viewer-git__file-additions {
+  color: #7ee787;
+}
+
+.viewer-git__file-deletions {
+  color: #ffaaa5;
+}
+
 .viewer-git__file-kind {
   flex: 0 0 auto;
   padding: 2px 6px;
@@ -871,6 +888,35 @@
   white-space: pre;
 }
 
+.viewer-git__diff-line {
+  display: block;
+  min-height: 1.35em;
+  padding: 0 8px;
+  border-left: 3px solid transparent;
+}
+
+.viewer-git__diff-line--add {
+  border-left-color: #2ea043;
+  background: rgba(46, 160, 67, 0.16);
+  color: #7ee787;
+}
+
+.viewer-git__diff-line--delete {
+  border-left-color: #f85149;
+  background: rgba(248, 81, 73, 0.16);
+  color: #ffaaa5;
+}
+
+.viewer-git__diff-line--hunk {
+  border-left-color: var(--vscode-textLink-foreground, #4ea1ff);
+  background: color-mix(in srgb, var(--vscode-textLink-foreground, #4ea1ff) 14%, transparent);
+  color: var(--vscode-textLink-foreground, #4ea1ff);
+}
+
+.viewer-git__diff-line--meta {
+  color: var(--vscode-descriptionForeground, #aaaaaa);
+}
+
 .viewer-git__commit,
 .viewer-git__state {
   margin: 0;

package/logics_manager/cli.py

@@ -195,15 +195,21 @@ def _find_executable_paths(command: str) -> list[str]:
 def _print_path_conflict_guidance(paths: list[str]) -> None:
     if len(paths) <= 1:
         return
+    path_lines = [f"  - {path}" for path in paths]
     print(
         "\n".join(
             [
                 "",
                 "Multiple logics-manager executables are on PATH. If --version still shows an older release, an earlier install is taking precedence.",
+                "Detected executables:",
+                *path_lines,
                 "Diagnose with:",
-                "  command -v -a logics-manager",
+                "  type -a logics-manager",
+                "  whence -a logics-manager  # zsh",
                 "  pipx list",
                 "  npm list -g @grifhinz/logics-manager --depth=0",
+                "",
+                "If you recently changed installs in zsh, run `rehash` or open a new terminal before retrying.",
             ]
         )
     )

package/logics_manager/mcp.py

@@ -427,7 +427,7 @@ def _markdown_file_path(repo_root: Path, raw_path: str, allowed_dirs: tuple[str,
 
 def _run_command(repo_root: Path, args: list[str]) -> subprocess.CompletedProcess[str]:
     command = [sys.executable, "-m", "logics_manager", *args]
-    result = subprocess.run(command, cwd=repo_root, check=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+    result = subprocess.run(command, cwd=repo_root, check=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, env=_subprocess_env())
     if result.returncode != 0:
         raise McpToolError(
             "command_failed",
@@ -439,7 +439,7 @@ def _run_command(repo_root: Path, args: list[str]) -> subprocess.CompletedProces
 
 def _run_json_command(repo_root: Path, args: list[str]) -> dict[str, Any]:
     command = [sys.executable, "-m", "logics_manager", *args]
-    result = subprocess.run(command, cwd=repo_root, check=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+    result = subprocess.run(command, cwd=repo_root, check=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, env=_subprocess_env())
     payload = _json_from_stdout_or_none(result.stdout)
     if payload is None:
         raise McpToolError(
@@ -450,6 +450,14 @@ def _run_json_command(repo_root: Path, args: list[str]) -> dict[str, Any]:
     return payload
 
 
+def _subprocess_env() -> dict[str, str]:
+    env = os.environ.copy()
+    source_root = str(Path(__file__).resolve().parents[1])
+    existing = env.get("PYTHONPATH")
+    env["PYTHONPATH"] = source_root if not existing else os.pathsep.join([source_root, existing])
+    return env
+
+
 def _json_from_stdout(stdout: str) -> dict[str, Any]:
     start = stdout.find("{")
     end = stdout.rfind("}")

package/logics_manager/viewer.py

@@ -14,6 +14,7 @@ from dataclasses import dataclass
 from datetime import datetime
 from http import HTTPStatus
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
+from importlib import metadata
 from pathlib import Path
 from typing import Any
 from urllib.parse import parse_qs, quote, unquote, urlencode, urlparse
@@ -56,8 +57,14 @@ NODE_MERMAID_ROOT = REPO_ROOT / "node_modules" / "mermaid" / "dist"
 
 def _current_version() -> str:
     try:
-        return (REPO_ROOT / "VERSION").read_text(encoding="utf-8").strip() or "0.0.0"
+        version = (REPO_ROOT / "VERSION").read_text(encoding="utf-8").strip()
     except OSError:
+        version = ""
+    if version:
+        return version
+    try:
+        return metadata.version("logics-manager")
+    except metadata.PackageNotFoundError:
         return "0.0.0"
 
 
@@ -489,7 +496,38 @@ def _parse_recent_git_commits(output: str) -> list[dict[str, str]]:
     return commits
 
 
-def _count_unique_git_status_paths(groups: dict[str, list[dict[str, str]]]) -> int:
+def _parse_git_numstat(output: str) -> dict[str, dict[str, int]]:
+    stats: dict[str, dict[str, int]] = {}
+    for line in output.splitlines():
+        parts = line.split("\t")
+        if len(parts) < 3:
+            continue
+        raw_additions, raw_deletions, raw_path = parts[:3]
+        try:
+            additions = int(raw_additions)
+            deletions = int(raw_deletions)
+        except ValueError:
+            continue
+        path = raw_path.strip()
+        if " => " in path:
+            path = path.split(" => ", 1)[1].strip("{}")
+        if path:
+            stats[path] = {"additions": additions, "deletions": deletions}
+    return stats
+
+
+def _attach_git_change_stats(groups: dict[str, list[dict[str, Any]]], staged_stats: dict[str, dict[str, int]], worktree_stats: dict[str, dict[str, int]]) -> None:
+    for key, entries in groups.items():
+        stats_source = staged_stats if key == "staged" else worktree_stats
+        for entry in entries:
+            path = str(entry.get("path", ""))
+            stats = stats_source.get(path) or staged_stats.get(path) or worktree_stats.get(path)
+            if stats:
+                entry["additions"] = stats["additions"]
+                entry["deletions"] = stats["deletions"]
+
+
+def _count_unique_git_status_paths(groups: dict[str, list[dict[str, Any]]]) -> int:
     paths: set[str] = set()
     for entries in groups.values():
         for entry in entries:
@@ -536,6 +574,8 @@ def git_status_payload(repo_root: Path, *, runner: Any | None = None, which: Any
 
     try:
         status = _run_read_only_git(repo_root, ["status", "--porcelain=v1", "-b"], runner=runner)
+        staged_numstat = _run_read_only_git(repo_root, ["diff", "--no-ext-diff", "--numstat", "--cached"], runner=runner)
+        worktree_numstat = _run_read_only_git(repo_root, ["diff", "--no-ext-diff", "--numstat"], runner=runner)
         commit = _run_read_only_git(repo_root, ["log", "-1", "--pretty=format:%h %s"], runner=runner)
         recent_commits = _run_read_only_git(
             repo_root,
@@ -551,12 +591,18 @@ def git_status_payload(repo_root: Path, *, runner: Any | None = None, which: Any
 
     lines = status.stdout.splitlines()
     branch_info = _parse_git_branch_line(lines[0]) if lines else {"branch": "HEAD", "tracking": "", "ahead": 0, "behind": 0}
-    groups: dict[str, list[dict[str, str]]] = {key: [] for key in ("staged", "modified", "deleted", "renamed", "untracked")}
+    groups: dict[str, list[dict[str, Any]]] = {key: [] for key in ("staged", "modified", "deleted", "renamed", "untracked")}
     for line in lines[1:]:
         classified = _classify_porcelain_entry(line)
         if classified:
             group, entry = classified
             groups[group].append(entry)
+    if staged_numstat.returncode == 0 or worktree_numstat.returncode == 0:
+        _attach_git_change_stats(
+            groups,
+            _parse_git_numstat(staged_numstat.stdout if staged_numstat.returncode == 0 else ""),
+            _parse_git_numstat(worktree_numstat.stdout if worktree_numstat.returncode == 0 else ""),
+        )
     counts = {key: len(value) for key, value in groups.items()}
     uncommitted_files = _count_unique_git_status_paths(groups)
     dirty = any(counts.values())

package/package.json

@@ -2,7 +2,7 @@
   "name": "@grifhinz/logics-manager",
   "displayName": "Logics Orchestrator",
   "description": "Visual orchestration for Logics workflows inside VS Code.",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "publisher": "cdx-logics",
   "icon": "clients/shared-web/media/icon.png",
   "repository": {

package/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "logics-manager"
-version = "2.5.0"
+version = "2.5.2"
 description = "Canonical Logics CLI"
 requires-python = ">=3.10"