macpm 2.0__tar.gz → 2.1__tar.gz

{macpm-2.0 → macpm-2.1}/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 2.1 — 2026-11-11
+
+### Changed
+
+- The power panel is titled `Power` instead of `CPU+GPU+ANE Power`, and every
+  panel title is clipped to its box so a long title never wraps the frame.
+- The Temps & Fans panel now uses its spare rows for CPU/GPU peak temperatures
+  and fan limits instead of leaving them blank.
+- Per-core gauges are labelled `E1…` / `P1…` instead of `Core-1` / `C-1`, so
+  narrow gauges keep the percentage readable.
+
+### Added
+
+- **Temps & Fans panel** in the default view — hottest CPU and GPU sensor in
+  °C and the current RPM of every fan, read from `AppleSMC` without root.
+- **Process view** on key `3` — a macmon-style two-box layout: a
+  CPU/GPU/RAM summary box (with wired/active/inactive/free memory) and a
+  process table with PID, NAME, USER, CPU%, MEM and GPU% columns, sorted with
+  `s`, scrolled with `↑`/`↓` and paused with `Space`.  The table refreshes
+  every 2 seconds to keep macpm's own CPU low.  There is no power column.
+
+### Removed
+
+- The separate `macpm-sensors` command.  The SMC reader is now part of the TUI
+  (`macpm.sensors.SensorReader`).
+
+### Fixed
+
+- Impossible power peaks (such as `peak: 6208.38W`) caused by coalesced or
+  reset Energy Model counters are now discarded instead of being recorded.
+- When the unprivileged Energy Model counters never report, the power panel
+  shows `n/a` instead of a misleading `0.00W`; the total is withheld only when
+  both CPU and GPU are unreadable.
+
 ## 2.0 — 2026-11-10
 
 ### Changed

{macpm-2.0/macpm.egg-info → macpm-2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: macpm
-Version: 2.0
+Version: 2.1
 Summary: Rootless performance monitoring CLI tool for Apple Silicon
 Home-page: https://github.com/visualcjy/macpm
 Author: Jinyu Chen
@@ -42,7 +42,7 @@ Dynamic: summary
 # macpm
 
 **Rootless performance monitoring CLI for Apple Silicon.**<br>
-macpm 2.0 reads the same hardware counters as `powermetrics`, but through
+macpm 2.1 reads the same hardware counters as `powermetrics`, but through
 IOReport/IOKit/SMC — no `sudo`, no password, no privileged helper.
 
 A Python-based `nvtop`-inspired terminal monitor for Apple Silicon Macs,
@@ -50,8 +50,8 @@ forked from [asitop](https://github.com/tlkh/asitop).
 
 ## Demo
 
-Default view — CPU/GPU/ANE utilisation and power, memory, disk I/O and
-network, updating once per second:
+Default view — CPU/GPU/ANE utilisation and power, memory, temperatures/fans,
+disk I/O and network, updating once per second:
 
 ![macpm default view](https://raw.githubusercontent.com/visualcjy/macpm/main/images/macpm_v.gif)
 
@@ -70,9 +70,10 @@ Per-core view (`--show_cores`, or press `2` while running):
 - GPU utilisation and frequency
 - CPU / GPU / ANE power, rolling average, peaks and throttle state
 - RAM and swap usage
+- CPU/GPU temperature and fan RPM panel (SMC, read-only, no root)
 - Disk IOPS/throughput and network throughput
-- Optional temperature/fan reader (`macpm-sensors`)
-- Same terminal layout, colours, charts and key bindings as macpm 0.x
+- Process view with per-process CPU, memory and GPU usage, sortable with `s`
+- Familiar terminal layout, colours, charts and key bindings from macpm 0.x
 
 ## Install
 
@@ -88,7 +89,7 @@ Then run:
 macpm
 ```
 
-There is **no `sudo macpm`** in 2.0. Running it with `sudo` still works, but it
+There is **no `sudo macpm`** since 2.0. Running it with `sudo` still works, but it
 is unnecessary and no longer recommended.
 
 Prefer a standalone binary with no Python installation? See
@@ -113,7 +114,10 @@ Keys:
 ```text
 q / ESC     quit
 ← / →       change colour
-1 / 2       default view / per-core view
+1 / 2 / 3   default / per-core / process view
+s           cycle the process sort column (process view)
+↑ / ↓       scroll the process list (process view)
+Space       pause / resume the process list (process view)
 Ctrl+R      reset peaks
 ```
 
@@ -143,6 +147,9 @@ requires root and Apple's private entitlements.
 | CPU / GPU / ANE power | IOReport `Energy Model` |
 | RAM / swap | `psutil` |
 | Disk / network | `psutil` counters |
+| Per-process CPU / memory | `psutil`, plus `/bin/ps` for other users |
+| Per-process GPU | `IOAccelerator` user clients in the IORegistry |
+| CPU/GPU temperature, fan RPM | `AppleSMC` via the IOKit user client |
 | Thermal throttle | `pmset -g therm` |
 | SoC name / core counts | `sysctl` |
 | GPU core count | `ioreg` `gpu-core-count` |
@@ -152,18 +159,41 @@ M1–M3 store Hz there, M4+ store kHz.
 
 ## Temperatures and fans
 
-The default TUI intentionally stays identical to macpm 0.x, which has no
-temperature/fan panel.  The standalone SMC reader is available as:
+The default view has a **Temps & Fans** box next to the memory gauge.  It shows
+the hottest CPU and GPU sensor in °C and the current RPM of every fan, for
+example:
 
-```sh
-macpm-sensors
-macpm-sensors --json
+```text
+┌ Temps & Fans ──────────────────────────┐
+│ CPU 52.4°C   GPU 43.1°C                │
+│ Fan 1 2318 rpm  Fan 2 2502 rpm         │
+└────────────────────────────────────────┘
 ```
 
-It reads `AppleSMC` through the IOKit user client (read-only, no root) and
-reports the raw sensor keys present on the chip, fan RPM/min/max, and
-`PSTR`/`PPBR` power rails.  Fan **control** requires root and is not
-implemented.
+The values come from `AppleSMC` through the IOKit user client (read-only, no
+root).  SMC key names differ between chip generations, so the CPU/GPU sensor
+groups are selected per chip family and a missing key is simply shown as `--`.
+Fan **control** requires root and is not implemented.
+
+## Process view
+
+Press `3` for a macmon-style two-box layout.  The top box is titled with the
+SoC and core counts (as in views 1/2) and keeps the top-style CPU (E/P
+percentages and frequencies), GPU (%, MHz), RAM/swap and
+wired/active/inactive/free memory summary.  The second box is the
+process table with `PID`, `NAME`, `USER`, `CPU%`, `MEM` and `GPU%`; there is no
+power column.  The list is sorted by CPU usage by default; press `s` to cycle
+through CPU → MEM → GPU → PID → NAME → USER, and `↑` / `↓` to scroll.  The
+header shows the current sort column and direction.  Press `Space` to pause the
+list while you scroll through it; the footer changes to `Space resume` and the
+summary keeps updating.  The process table refreshes every 2 seconds (or
+`--interval`, if larger) to keep macpm's own CPU usage low; the summary above
+it refreshes every interval.  macpm's own process is listed as `macpm`.
+
+Per-process CPU and memory come from `psutil`, with `/bin/ps` for processes
+owned by other users (so system processes such as WindowServer appear too).
+GPU usage is the GPU time of the process' `IOAccelerator` user clients;
+processes without a readable GPU client show `0.0`.
 
 ## Compatibility
 
@@ -181,15 +211,15 @@ generation than on the macOS version:
 
 ## Standalone binaries
 
-Standalone unsigned/ad-hoc arm64 binaries (`macpm`, `macpm-sensors`) can be
-built with `packaging/build.sh` and attached to a GitHub release.  They bundle
-Python and all dependencies, so the target Mac needs no Python installation.
+Standalone unsigned/ad-hoc arm64 binary (`macpm`) can be built with
+`packaging/build.sh` and attached to a GitHub release.  It bundles Python and
+all dependencies, so the target Mac needs no Python installation.
 
 On first launch from a browser download, macOS Gatekeeper may ask you to
 right-click → Open, or you can remove the quarantine flag:
 
 ```sh
-xattr -d com.apple.quarantine ./macpm ./macpm-sensors ./macpm.command
+xattr -d com.apple.quarantine ./macpm ./macpm.command
 ```
 
 See [packaging/README.txt](https://github.com/visualcjy/macpm/blob/main/packaging/README.txt) for details.
@@ -226,13 +256,16 @@ Release steps are documented in [RELEASE.md](https://github.com/visualcjy/macpm/
 
 - **`macpm: command not found`** — add your Python user-base `bin` directory to
   `PATH`, or run `python3 -m macpm`.
-- **Power readings freeze on macOS 27** — some builds restrict unprivileged
-  `Energy Model` refreshes.  CPU/GPU usage and frequency still work.  Run
-  `macpm-dump` to inspect the raw values.
+- **Power readings freeze or show `n/a` on macOS 27** — some builds restrict
+  unprivileged `Energy Model` refreshes.  CPU/GPU usage and frequency still
+  work; a counter that never reports is shown as `n/a` instead of `0.00W`.
+  Run `macpm-dump` to inspect the raw values.
 - **M5/Ultra values look wrong** — CPU tier/channel mapping is not complete;
   see the compatibility table.
-- **`macpm-sensors` shows nothing** — not every SMC key exists on every chip;
-  the reader only reports the keys that are present.
+- **The Temps & Fans box says `SMC unavailable`** — the AppleSMC user client
+  could not be opened on this macOS build; the rest of macpm still works.
+- **A temperature shows `--`** — not every SMC key exists on every chip; the
+  reader only reports the keys that are present.
 
 ## Changelog
 

{macpm-2.0 → macpm-2.1}/README.md

@@ -1,7 +1,7 @@
 # macpm
 
 **Rootless performance monitoring CLI for Apple Silicon.**<br>
-macpm 2.0 reads the same hardware counters as `powermetrics`, but through
+macpm 2.1 reads the same hardware counters as `powermetrics`, but through
 IOReport/IOKit/SMC — no `sudo`, no password, no privileged helper.
 
 A Python-based `nvtop`-inspired terminal monitor for Apple Silicon Macs,
@@ -9,8 +9,8 @@ forked from [asitop](https://github.com/tlkh/asitop).
 
 ## Demo
 
-Default view — CPU/GPU/ANE utilisation and power, memory, disk I/O and
-network, updating once per second:
+Default view — CPU/GPU/ANE utilisation and power, memory, temperatures/fans,
+disk I/O and network, updating once per second:
 
 ![macpm default view](https://raw.githubusercontent.com/visualcjy/macpm/main/images/macpm_v.gif)
 
@@ -29,9 +29,10 @@ Per-core view (`--show_cores`, or press `2` while running):
 - GPU utilisation and frequency
 - CPU / GPU / ANE power, rolling average, peaks and throttle state
 - RAM and swap usage
+- CPU/GPU temperature and fan RPM panel (SMC, read-only, no root)
 - Disk IOPS/throughput and network throughput
-- Optional temperature/fan reader (`macpm-sensors`)
-- Same terminal layout, colours, charts and key bindings as macpm 0.x
+- Process view with per-process CPU, memory and GPU usage, sortable with `s`
+- Familiar terminal layout, colours, charts and key bindings from macpm 0.x
 
 ## Install
 
@@ -47,7 +48,7 @@ Then run:
 macpm
 ```
 
-There is **no `sudo macpm`** in 2.0. Running it with `sudo` still works, but it
+There is **no `sudo macpm`** since 2.0. Running it with `sudo` still works, but it
 is unnecessary and no longer recommended.
 
 Prefer a standalone binary with no Python installation? See
@@ -72,7 +73,10 @@ Keys:
 ```text
 q / ESC     quit
 ← / →       change colour
-1 / 2       default view / per-core view
+1 / 2 / 3   default / per-core / process view
+s           cycle the process sort column (process view)
+↑ / ↓       scroll the process list (process view)
+Space       pause / resume the process list (process view)
 Ctrl+R      reset peaks
 ```
 
@@ -102,6 +106,9 @@ requires root and Apple's private entitlements.
 | CPU / GPU / ANE power | IOReport `Energy Model` |
 | RAM / swap | `psutil` |
 | Disk / network | `psutil` counters |
+| Per-process CPU / memory | `psutil`, plus `/bin/ps` for other users |
+| Per-process GPU | `IOAccelerator` user clients in the IORegistry |
+| CPU/GPU temperature, fan RPM | `AppleSMC` via the IOKit user client |
 | Thermal throttle | `pmset -g therm` |
 | SoC name / core counts | `sysctl` |
 | GPU core count | `ioreg` `gpu-core-count` |
@@ -111,18 +118,41 @@ M1–M3 store Hz there, M4+ store kHz.
 
 ## Temperatures and fans
 
-The default TUI intentionally stays identical to macpm 0.x, which has no
-temperature/fan panel.  The standalone SMC reader is available as:
+The default view has a **Temps & Fans** box next to the memory gauge.  It shows
+the hottest CPU and GPU sensor in °C and the current RPM of every fan, for
+example:
 
-```sh
-macpm-sensors
-macpm-sensors --json
+```text
+┌ Temps & Fans ──────────────────────────┐
+│ CPU 52.4°C   GPU 43.1°C                │
+│ Fan 1 2318 rpm  Fan 2 2502 rpm         │
+└────────────────────────────────────────┘
 ```
 
-It reads `AppleSMC` through the IOKit user client (read-only, no root) and
-reports the raw sensor keys present on the chip, fan RPM/min/max, and
-`PSTR`/`PPBR` power rails.  Fan **control** requires root and is not
-implemented.
+The values come from `AppleSMC` through the IOKit user client (read-only, no
+root).  SMC key names differ between chip generations, so the CPU/GPU sensor
+groups are selected per chip family and a missing key is simply shown as `--`.
+Fan **control** requires root and is not implemented.
+
+## Process view
+
+Press `3` for a macmon-style two-box layout.  The top box is titled with the
+SoC and core counts (as in views 1/2) and keeps the top-style CPU (E/P
+percentages and frequencies), GPU (%, MHz), RAM/swap and
+wired/active/inactive/free memory summary.  The second box is the
+process table with `PID`, `NAME`, `USER`, `CPU%`, `MEM` and `GPU%`; there is no
+power column.  The list is sorted by CPU usage by default; press `s` to cycle
+through CPU → MEM → GPU → PID → NAME → USER, and `↑` / `↓` to scroll.  The
+header shows the current sort column and direction.  Press `Space` to pause the
+list while you scroll through it; the footer changes to `Space resume` and the
+summary keeps updating.  The process table refreshes every 2 seconds (or
+`--interval`, if larger) to keep macpm's own CPU usage low; the summary above
+it refreshes every interval.  macpm's own process is listed as `macpm`.
+
+Per-process CPU and memory come from `psutil`, with `/bin/ps` for processes
+owned by other users (so system processes such as WindowServer appear too).
+GPU usage is the GPU time of the process' `IOAccelerator` user clients;
+processes without a readable GPU client show `0.0`.
 
 ## Compatibility
 
@@ -140,15 +170,15 @@ generation than on the macOS version:
 
 ## Standalone binaries
 
-Standalone unsigned/ad-hoc arm64 binaries (`macpm`, `macpm-sensors`) can be
-built with `packaging/build.sh` and attached to a GitHub release.  They bundle
-Python and all dependencies, so the target Mac needs no Python installation.
+Standalone unsigned/ad-hoc arm64 binary (`macpm`) can be built with
+`packaging/build.sh` and attached to a GitHub release.  It bundles Python and
+all dependencies, so the target Mac needs no Python installation.
 
 On first launch from a browser download, macOS Gatekeeper may ask you to
 right-click → Open, or you can remove the quarantine flag:
 
 ```sh
-xattr -d com.apple.quarantine ./macpm ./macpm-sensors ./macpm.command
+xattr -d com.apple.quarantine ./macpm ./macpm.command
 ```
 
 See [packaging/README.txt](https://github.com/visualcjy/macpm/blob/main/packaging/README.txt) for details.
@@ -185,13 +215,16 @@ Release steps are documented in [RELEASE.md](https://github.com/visualcjy/macpm/
 
 - **`macpm: command not found`** — add your Python user-base `bin` directory to
   `PATH`, or run `python3 -m macpm`.
-- **Power readings freeze on macOS 27** — some builds restrict unprivileged
-  `Energy Model` refreshes.  CPU/GPU usage and frequency still work.  Run
-  `macpm-dump` to inspect the raw values.
+- **Power readings freeze or show `n/a` on macOS 27** — some builds restrict
+  unprivileged `Energy Model` refreshes.  CPU/GPU usage and frequency still
+  work; a counter that never reports is shown as `n/a` instead of `0.00W`.
+  Run `macpm-dump` to inspect the raw values.
 - **M5/Ultra values look wrong** — CPU tier/channel mapping is not complete;
   see the compatibility table.
-- **`macpm-sensors` shows nothing** — not every SMC key exists on every chip;
-  the reader only reports the keys that are present.
+- **The Temps & Fans box says `SMC unavailable`** — the AppleSMC user client
+  could not be opened on this macOS build; the rest of macpm still works.
+- **A temperature shows `--`** — not every SMC key exists on every chip; the
+  reader only reports the keys that are present.
 
 ## Changelog
 

macpm-2.1/RELEASE.md

@@ -0,0 +1,155 @@
+# Releasing macpm 2.1
+
+This checklist prepares a GitHub tag and a PyPI upload.  It does not push or
+publish anything by itself.
+
+## 1. Preconditions
+
+- macOS Apple Silicon, Python 3.9+.
+- Clean working tree (`git status`), all tests passing.
+- Version is `2.1` in:
+  - `setup.py`
+  - `macpm/__init__.py`
+  - `macpm/macpm.py` (`version = 'macpm v2.1'`)
+- `CHANGELOG.md` has the 2.1 entry.
+
+## 2. Test from source
+
+```sh
+python3 -m venv .venv
+. .venv/bin/activate
+python3 -m pip install -e .
+python3 -m unittest discover -s tests -v
+
+macpm --help
+macpm-dump           # one sample per second, Ctrl+C to stop
+```
+
+## 3. Build and validate PyPI artifacts
+
+```sh
+python3 -m pip install --upgrade build twine
+rm -rf dist build *.egg-info
+python3 -m build
+python3 -m twine check dist/*
+```
+
+Test the wheel in a **clean** venv (this is the real "no source tree" test):
+
+```sh
+python3 -m venv /tmp/macpm-wheel-test
+/tmp/macpm-wheel-test/bin/pip install dist/macpm-2.1-py3-none-any.whl
+/tmp/macpm-wheel-test/bin/macpm --help
+/tmp/macpm-wheel-test/bin/macpm-dump   # Ctrl+C
+```
+
+## 4. Publish to PyPI
+
+Publishing uses PyPI Trusted Publishing (OIDC) — no API token is stored in
+the repository or in GitHub secrets.
+
+One-time setup:
+
+1. On PyPI, add a trusted publisher.  Because `macpm` already exists on
+   PyPI, use the project settings page —
+   <https://pypi.org/manage/project/macpm/settings/publishing/> —
+   not the account-level "pending publisher" page (that one is only for
+   projects that do not exist yet).
+
+   | Field | Value |
+   |---|---|
+   | Owner | `visualcjy` |
+   | Repository name | `macpm` |
+   | Workflow name | `release.yml` |
+   | Environment name | `pypi` |
+
+2. On GitHub, keep the repository variable
+   `PUBLISH_PYPI=true` (Settings → Secrets and variables → Actions →
+   Variables) and the `pypi` environment.  Without the variable the release
+   workflow only creates the GitHub release.
+
+After that, pushing a `v*` tag builds and uploads to PyPI automatically:
+the `release.yml` workflow runs in the `pypi` environment, and the PyPI job
+skips files that already exist, so re-runs are safe.  A manual
+`workflow_dispatch` on the tag re-runs only the build and PyPI jobs.
+
+Manual alternative (fallback, e.g. when OIDC is unavailable):
+
+```sh
+# requires a PyPI API token in ~/.pypirc or TWINE_PASSWORD
+python3 -m twine upload --non-interactive \
+    dist/macpm-2.1.tar.gz dist/macpm-2.1-py3-none-any.whl
+```
+
+Then verify:
+
+```sh
+python3 -m pip install --upgrade macpm==2.1
+macpm --version
+```
+
+## 5. Publish to GitHub
+
+```sh
+git add setup.py pyproject.toml MANIFEST.in README.md CHANGELOG.md RELEASE.md \
+        macpm packaging tests .github bin
+git commit -m "Release macpm 2.1: process view, SMC panel and power fixes"
+git tag -a v2.1 -m "macpm 2.1"
+git push origin main
+git push origin v2.1
+```
+
+The `Release` workflow builds the sdist/wheel, checks metadata and attaches
+the artifacts to a GitHub release.  The PyPI job is opt-in: set the repository
+variable `PUBLISH_PYPI=true` (Settings → Secrets and variables → Actions →
+Variables) to publish to PyPI via trusted publishing.  Leaving it unset keeps
+tag pushes to a GitHub release only.
+If you prefer a manual release, create one from the tag and upload
+`dist/*.whl`, `dist/*.tar.gz` and the standalone tarball.
+
+## 6. Standalone arm64 binaries (optional)
+
+On an Apple Silicon build machine:
+
+```sh
+PYTHON=python3 packaging/build.sh
+```
+
+This produces:
+
+```text
+dist/macpm-2.1-macos-arm64.tar.gz
+```
+
+Attach it to the GitHub release.  The binaries are ad-hoc signed, not
+notarized; see `packaging/README.txt` for the Gatekeeper note.  To notarize,
+pass `CODESIGN_ID` to the build script and submit/staple the archive with
+`notarytool`.
+
+## 7. Update the Homebrew tap
+
+`brew install visualcjy/macpm/macpm` installs the standalone tarball from the
+tap at <https://github.com/visualcjy/homebrew-macpm>.  After attaching a new
+`dist/macpm-X.Y-macos-arm64.tar.gz` to the release, bump the formula:
+
+```sh
+shasum -a 256 dist/macpm-X.Y-macos-arm64.tar.gz
+```
+
+then in the tap repository, `Formula/macpm.rb`:
+
+```ruby
+url "https://github.com/visualcjy/macpm/releases/download/vX.Y/macpm-X.Y-macos-arm64.tar.gz"
+sha256 "<the hash above>"
+```
+
+Verify before pushing:
+
+```sh
+brew audit --strict visualcjy/macpm/macpm
+brew style visualcjy/macpm/macpm
+brew reinstall visualcjy/macpm/macpm
+brew test macpm
+```
+
+The formula only needs a version/sha bump; `version` is derived from the URL.

{macpm-2.0 → macpm-2.1}/macpm/__init__.py

@@ -1,3 +1,3 @@
 """macpm: rootless performance monitor for Apple Silicon."""
 
-__version__ = "2.0"
+__version__ = "2.1"