Release v1.2.0 with single-repo packaging

Author: lxrzlyr

.github/workflows/build-release.yml

@@ -66,15 +66,17 @@ jobs:
           generate_release_notes: true
           files: dist/artifacts/*
 
-  sync-homebrew-tap:
+  refresh-homebrew-formula:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: package-macos
     runs-on: macos-14
     permissions:
-      contents: read
+      contents: write
     steps:
-      - name: Checkout
+      - name: Checkout Main
         uses: actions/checkout@v4
+        with:
+          ref: main
 
       - name: Resolve Version
         id: version
@@ -87,53 +89,21 @@ jobs:
           curl -L -o "/tmp/mtop-${VERSION}-source.tar.gz" "https://github.com/lxrzlyr/mtop/releases/download/v${VERSION}/mtop-${VERSION}-source.tar.gz"
           echo "value=$(shasum -a 256 /tmp/mtop-${VERSION}-source.tar.gz | awk '{print $1}')" >> "$GITHUB_OUTPUT"
 
-      - name: Start SSH Agent
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.HOMEBREW_TAP_SSH_KEY }}
-
-      - name: Trust GitHub Host Key
-        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan github.com >> ~/.ssh/known_hosts
-
-      - name: Clone Homebrew Tap
-        run: git clone git@github.com:lxrzlyr/homebrew-mtop.git /tmp/homebrew-mtop
-
-      - name: Generate Formula
+      - name: Update Formula
         run: |
-          ./scripts/generate_homebrew_formula.sh \
+          python3 ./scripts/update_homebrew_formula.py \
+            ./Formula/mtop.rb \
             "${{ steps.version.outputs.value }}" \
-            "${{ steps.sha.outputs.value }}" \
-            /tmp/homebrew-mtop/Formula/mtop.rb
+            "${{ steps.sha.outputs.value }}"
 
-      - name: Commit And Push
+      - name: Commit Formula Refresh
         run: |
-          cd /tmp/homebrew-mtop
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add Formula/mtop.rb
           if git diff --cached --quiet; then
-            echo "No tap changes to commit"
+            echo "Formula already matches release"
             exit 0
           fi
-          git commit -m "Update mtop formula to v${{ steps.version.outputs.value }}"
-          git push origin main
-
-      - name: Verify Tap Update
-        run: |
-          rm -rf /tmp/homebrew-mtop-verify
-          git clone git@github.com:lxrzlyr/homebrew-mtop.git /tmp/homebrew-mtop-verify
-          EXPECTED_VERSION="${{ steps.version.outputs.value }}"
-          ACTUAL_VERSION=$(python3 - <<'PY'
-from pathlib import Path
-import re
-text = Path('/tmp/homebrew-mtop-verify/Formula/mtop.rb').read_text()
-match = re.search(r'/releases/download/v([^/]+)/mtop-([^/]+)-source\.tar\.gz', text)
-print(match.group(1) if match else '')
-PY
-)
-          if [[ "$ACTUAL_VERSION" != "$EXPECTED_VERSION" ]]; then
-            echo "Tap verification failed: expected v${EXPECTED_VERSION}, got v${ACTUAL_VERSION}" >&2
-            exit 1
-          fi
+          git commit -m "Refresh Formula for v${{ steps.version.outputs.value }}"
+          git push origin HEAD:main

.github/workflows/update-homebrew-tap.yml

@@ -13,3 +13,4 @@ compile_commands.json
 微信图片_*.png
 REBUILD_PLAN.md
 UPGRADE_PLAN.md
+RELEASE_PROCESS.md

.gitignore

@@ -34,7 +34,7 @@ install(TARGETS mtop RUNTIME DESTINATION bin)
 
 set(CPACK_GENERATOR "TGZ")
 set(CPACK_PACKAGE_NAME "mtop")
-set(CPACK_PACKAGE_VERSION "1.0.1")
+set(CPACK_PACKAGE_VERSION "1.2.0")
 include(CPack)
 
 enable_testing()

CMakeLists.txt

@@ -1,8 +1,8 @@
 class Mtop < Formula
   desc "Apple Silicon terminal monitor for macOS"
   homepage "https://github.com/lxrzlyr/mtop"
-  url "https://github.com/lxrzlyr/mtop/releases/download/v1.0.1/mtop-1.0.1-source.tar.gz"
-  sha256 "d73e5bc8bea54f360bb83994b04d5904aa7392237d7ab7fd9a4f658075853013"
+  url "https://github.com/lxrzlyr/mtop/releases/download/v1.2.0/mtop-1.2.0-source.tar.gz"
+  sha256 "1f56fc7f55ae0ba00fd964d103a643b4203a6656ddbeb69dfa5b8cf266f2ac41"
   license "GPL-3.0-or-later"
 
   depends_on "cmake" => :build
@@ -14,6 +14,6 @@ def install
   end
 
   test do
-    system "#{bin}/mtop", "--demo"
+    system "#{bin}/mtop", "--version"
   end
 end

packaging/homebrew/mtop.rb Formula/mtop.rbpackaging/homebrew/mtop.rb renamed to Formula/mtop.rb

@@ -80,6 +80,22 @@ With root:
 - estimated SoC subsystem power from `powermetrics`
 - GPU power / frequency enrichment
 - process core-class mix derived from `powermetrics`
+- process IO and energy-impact columns derived from `powermetrics`
+
+## Process Extension Columns
+
+In root mode, the process table can show three extra columns sourced from `powermetrics`:
+
+- `MIX`: estimated core-class mix for the sampled window, such as `S:12% P:88%`
+- `IO`: per-process `Bytes Read / Bytes Written` activity during the sample window, such as `3.9K/7.8K`
+- `PWR`: per-process Energy Impact from `powermetrics`
+
+These columns are best-effort and sample-window based, so they should be read with a few caveats:
+
+- `0B/0B` or `0` means the metric was available and the sampled value was zero
+- `n/a` means root sampling succeeded, but `powermetrics` did not provide a usable value for that process in that sample
+- `wait` means root sampling has not delivered its first background sample yet
+- `root` means the column requires `sudo ./build/mtop`
 
 ## A Note About `SOC` Power
 
@@ -216,10 +232,10 @@ This will:
 - install into `dist/install`
 - produce a `.tar.gz` package through `cpack`
 
-There is also a Homebrew formula stub at:
+The repository also includes a Homebrew formula at:
 
 ```text
-packaging/homebrew/mtop.rb
+Formula/mtop.rb
 ```
 
 ## GitHub Actions
@@ -242,38 +258,32 @@ Current workflow file:
 Recommended release flow:
 
 1. Push normal commits and use the workflow artifacts to verify packaging.
-2. Create a version tag such as `v1.0.1`.
+2. Create a version tag such as `v1.2.0`.
 3. Push the tag.
 4. GitHub Actions will build and attach the package to the release.
-5. The same release workflow will update the Homebrew tap and verify the formula matches the new version.
-
-## Homebrew Tap Relationship
 
-`mtop` and `homebrew-mtop` should remain separate repositories.
+## Homebrew
 
-- `mtop` is the source repository
-- `homebrew-mtop` is the Homebrew tap repository
+`mtop` now uses a single-repository Homebrew layout.
 
-That separation is intentional:
+- source code, release artifacts, and the Homebrew formula all live in this repository
+- the checked-in formula is located at `Formula/mtop.rb`
 
-- some users want to build from source manually
-- some users want to install with Homebrew
-- the tap should only carry the formula, not the whole source history
+This keeps the release flow simpler:
 
-This repository includes a formula generator and a tap sync workflow:
+- one release repository to version and debug
+- no cross-repository sync job
+- no extra deploy key or tap-specific secret
 
-- [scripts/generate_homebrew_formula.sh](./scripts/generate_homebrew_formula.sh)
-- [.github/workflows/update-homebrew-tap.yml](./.github/workflows/update-homebrew-tap.yml)
+If you want to install from this repository with Homebrew, use:
 
-The tag-based release workflow also performs the tap update and verification step, so the release job fails if the tap does not match the published version.
-
-`update-homebrew-tap.yml` remains available as a manual repair path if a release needs the tap formula to be resynced explicitly.
-
-To enable automatic tap updates, add this secret to the `mtop` GitHub repository:
+```bash
+brew install lxrzlyr/mtop/mtop
+```
 
-- `HOMEBREW_TAP_SSH_KEY`
+To refresh the formula for a new version locally, regenerate or update `Formula/mtop.rb` so that its `url` and `sha256` match the new source release asset.
 
-That key should be a deploy key or SSH key with write access to `lxrzlyr/homebrew-mtop`.
+The release workflow now only builds, packages, and uploads artifacts for this repository.
 
 ## Project Layout
 
@@ -282,6 +292,7 @@ include/     public headers
 src/         C++ / Objective-C++ implementation
 docs/        design and platform notes
 tests/       test planning and future test code
+Formula/     Homebrew formula
 packaging/   package metadata
 scripts/     helper scripts
 ```

README.md

@@ -80,6 +80,22 @@ root 增强模式下：
 - 来自 `powermetrics` 的估算 SoC 子系统功耗
 - GPU 功率 / 频率增强信息
 - 基于 `powermetrics` 推导的进程核心类别混合信息
+- 基于 `powermetrics` 的进程 IO 与 Energy Impact 列
+
+## 进程扩展列说明
+
+在 root 模式下，进程表会尝试显示三列来自 `powermetrics` 的扩展信息：
+
+- `MIX`：采样窗口内的核心类别混合估计，例如 `S:12% P:88%`
+- `IO`：采样窗口内的进程 `Bytes Read / Bytes Written`，例如 `3.9K/7.8K`
+- `PWR`：来自 `powermetrics` 的进程 Energy Impact
+
+这些列都属于 best-effort 的采样窗口指标，阅读时需要注意：
+
+- `0B/0B` 或 `0` 表示该指标可用，但本次采样值为零
+- `n/a` 表示 root 采样已经成功，但 `powermetrics` 在本次采样里没有给这个进程提供可用值
+- `wait` 表示 root 后台采样线程还没有产出第一帧结果
+- `root` 表示这一列需要通过 `sudo ./build/mtop` 才能获得
 
 ## 关于 `SOC` 功耗
 
@@ -216,10 +232,10 @@ cmake --install build --prefix /usr/local
 - 安装到 `dist/install`
 - 用 `cpack` 生成 `.tar.gz`
 
-Homebrew formula stub 在：
+仓库里也包含 Homebrew formula，位置在：
 
 ```text
-packaging/homebrew/mtop.rb
+Formula/mtop.rb
 ```
 
 ## GitHub Actions
@@ -242,33 +258,32 @@ packaging/homebrew/mtop.rb
 推荐发布流程：
 
 1. 正常 push 代码，用 workflow artifacts 检查打包结果。
-2. 创建版本 tag，例如 `v1.0.1`。
+2. 创建版本 tag，例如 `v1.2.0`。
 3. push 这个 tag。
 4. GitHub Actions 会自动构建并把包挂到 Release 上。
 
-## Homebrew Tap 的关系
+## Homebrew
 
-`mtop` 和 `homebrew-mtop` 应该保持为两个独立仓库。
+`mtop` 现在采用单仓库的 Homebrew 布局。
 
-- `mtop` 是源码仓库
-- `homebrew-mtop` 是 Homebrew tap 仓库
+- 源码、release 产物和 Homebrew formula 都放在这个仓库里
+- 当前公式文件位于 `Formula/mtop.rb`
 
-这样做是有意为之：
+这样发布链路会更简单：
 
-- 有些用户会手动从源码构建
-- 有些用户只想通过 Homebrew 安装
-- tap 仓库只维护 formula，不需要承载完整源码历史
+- 只维护一个 release 仓库
+- 不再需要跨仓库同步 workflow
+- 不再需要额外 deploy key 或 tap secret
 
-主仓库里已经包含了公式生成脚本和 tap 同步工作流：
+如果你想直接从这个仓库通过 Homebrew 安装，可以使用：
 
-- [scripts/generate_homebrew_formula.sh](./scripts/generate_homebrew_formula.sh)
-- [.github/workflows/update-homebrew-tap.yml](./.github/workflows/update-homebrew-tap.yml)
-
-如果你希望在打 tag 后自动更新 tap，需要在 `mtop` 仓库中配置这个 secret：
+```bash
+brew install lxrzlyr/mtop/mtop
+```
 
-- `HOMEBREW_TAP_SSH_KEY`
+如果要为新版本更新公式，只需要同步修改 `Formula/mtop.rb` 中的 `url` 和 `sha256`，让它们对应新的 source release asset。
 
-这个 key 需要对 `lxrzlyr/homebrew-mtop` 有写权限。
+当前 release workflow 只负责本仓库的构建、打包和 release 资产上传。
 
 ## 项目结构
 
@@ -277,6 +292,7 @@ include/     公共头文件
 src/         C++ / Objective-C++ 实现
 docs/        设计与平台说明
 tests/       测试与测试计划
+Formula/     Homebrew formula
 packaging/   打包相关元数据
 scripts/     辅助脚本
 ```

README.zh-CN.md

@@ -37,6 +37,8 @@ struct ProcessSnapshot {
   char state = '?';
   bool gpu_active = false;
   std::string core_mix = "-";
+  std::string io = "-";
+  std::string power = "-";
 };
 
 struct CapabilitySnapshot {