napcat-cli 2.0.0__tar.gz → 2.0.1__tar.gz

napcat_cli-2.0.1/.github/workflows/release.yml

@@ -0,0 +1,138 @@
+# Unified release workflow for napcat-cli + napcat-cli-fs
+#
+# Trigger: manual (workflow_dispatch).
+#   - Builds napcat-cli (pure Python wheel) and napcat-cli-fs (platform wheels
+#     for linux/macos/windows × amd64/arm64).
+#   - Uploads all artifacts.
+#   - If ``publish`` is checked AND ``PYPI_TOKEN`` secret exists, publishes
+#     everything to PyPI.
+#
+# Setup (one time):
+#   1. Go to repo Settings → Secrets and variables → Actions
+#   2. Add repository secret ``PYPI_TOKEN`` with your PyPI API token
+#      (user: __token__, password: pypi-...)
+---
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      publish:
+        description: "Upload to PyPI (requires PYPI_TOKEN secret)"
+        type: boolean
+        default: false
+
+jobs:
+  # ── napcat-cli (pure Python wheel) ──────────────────────────────────
+  build-napcat-cli:
+    name: Build napcat-cli wheel
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Build wheel + sdist
+        run: |
+          pip install build
+          python -m build
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheel-napcat-cli
+          path: dist/*.whl dist/*.tar.gz
+
+  # ── napcat-cli-fs (platform wheels) ────────────────────────────────
+  build-fs:
+    name: skills-fs ${{ matrix.label }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: linux-amd64
+            runner: ubuntu-latest
+            goos: linux; goarch: amd64
+            binary: skills-fs
+            tag: manylinux_2_17_x86_64.manylinux2014_x86_64
+
+          - label: linux-arm64
+            runner: ubuntu-latest
+            goos: linux; goarch: arm64
+            binary: skills-fs
+            tag: manylinux_2_17_aarch64.manylinux2014_aarch64
+
+          - label: macos-amd64
+            runner: macos-13
+            goos: darwin; goarch: amd64
+            binary: skills-fs
+            tag: macosx_10_9_x86_64
+
+          - label: macos-arm64
+            runner: macos-14
+            goos: darwin; goarch: arm64
+            binary: skills-fs
+            tag: macosx_11_0_arm64
+
+          - label: windows-amd64
+            runner: windows-latest
+            goos: windows; goarch: amd64
+            binary: skills-fs.exe
+            tag: win_amd64
+
+    env:
+      GOOS: ${{ matrix.goos }}
+      GOARCH: ${{ matrix.goarch }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 1
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "~1.24"
+          check-latest: true
+          cache-dependency-path: skills-fs/go.sum
+
+      - name: Build skills-fs binary
+        working-directory: skills-fs
+        run: CGO_ENABLED=0 go build -o ../napcat-cli-fs/${{ matrix.binary }} ./cmd/skills-fs
+
+      - name: Build platform wheel
+        working-directory: napcat-cli-fs
+        run: python scripts/build-wheel.py ${{ matrix.binary }} "${{ matrix.tag }}" --output-dir dist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheel-fs-${{ matrix.label }}
+          path: napcat-cli-fs/dist/*.whl
+
+  # ── Publish to PyPI (only when publish=true) ────────────────────────
+  publish:
+    name: Publish to PyPI
+    needs: [build-napcat-cli, build-fs]
+    if: inputs.publish
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/project/napcat-cli/${{ github.ref_name }}
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          pattern: wheel-*
+          merge-multiple: true
+          path: dist
+
+      - name: Upload napcat-cli (pure) + napcat-cli-fs (platform wheels)
+        uses: pypa/gh-action-pypi-publish@v1.12.4
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
+          packages-dir: dist

napcat_cli-2.0.0/README.md → napcat_cli-2.0.1/PKG-INFO

@@ -1,7 +1,25 @@
+Metadata-Version: 2.4
+Name: napcat-cli
+Version: 2.0.1
+Summary: Standalone CLI and daemon for NapCat QQ bot management with skills-fs integration
+License-Expression: MIT
+Requires-Python: >=3.10
+Requires-Dist: textual>=0.40
+Provides-Extra: all
+Requires-Dist: napcat-cli-fs>=2.0.0; extra == 'all'
+Provides-Extra: dev
+Requires-Dist: pytest>=7; extra == 'dev'
+Provides-Extra: fs
+Requires-Dist: napcat-cli-fs>=2.0.0; extra == 'fs'
+Description-Content-Type: text/markdown
+
 # napcat-cli
 
 Standalone CLI and daemon for NapCat QQ bot management with skills-fs integration.
 
+[![PyPI](https://img.shields.io/pypi/v/napcat-cli.svg?label=PyPI)](https://pypi.org/project/napcat-cli/)
+[![Python versions](https://img.shields.io/pypi/pyversions/napcat-cli.svg)](https://pypi.org/project/napcat-cli/)
+
 > 📝 **介绍博文：** [napcat-cli 群配置与管理速查](https://yvxi.pages.dev/blog/napcat-cli-group-config/) — 从零配置、群消息收发、Agent Wake 的完整链路。
 
 ---
@@ -48,7 +66,7 @@ napcat wake --reason NEW_MESSAGE
 ## Setup
 
 ```bash
-uv tool install napcat-cli
+uv tool install napcat-cli  # recommended — isolated install via uv (alternative: pip install napcat-cli)
 napcat setup          # interactive — guides token, data dir, skills-fs, wake
 napcat daemon start
 ```
@@ -165,6 +183,21 @@ to read/write NapCat API endpoints through the virtual filesystem.
 When `skills_fs_enabled` is true in `daemon.json`, the daemon spawns skills-fs
 automatically with the configured mountpoint and config file.
 
+> ⚙️ **Distribution note:** `skills-fs` is a **compiled Go binary** (git submodule
+> pinned at [`cb13f37`](https://github.com/yandu-app/skills-fs/tree/cb13f37)).
+> It is **not bundled** in the pip/uv install of `napcat-cli`. If you need the
+> FUSE mount (optional), build it separately:
+>
+> ```bash
+> git clone https://github.com/yandu-app/skills-fs
+> cd skills-fs && make build              # produces ./skills-fs
+> napcat config set skills_fs_binary /path/to/skills-fs
+> napcat daemon stop && napcat daemon start
+> ```
+>
+> Or place `skills-fs` on your `PATH` and the daemon will find it. This feature
+> is **optional** — the CLI, daemon, and wake system work without it.
+
 Manual start:
 
 ```bash

napcat_cli-2.0.0/PKG-INFO → napcat_cli-2.0.1/README.md

@@ -1,18 +1,10 @@
-Metadata-Version: 2.4
-Name: napcat-cli
-Version: 2.0.0
-Summary: Standalone CLI and daemon for NapCat QQ bot management with skills-fs integration
-License-Expression: MIT
-Requires-Python: >=3.10
-Requires-Dist: textual>=0.40
-Provides-Extra: dev
-Requires-Dist: pytest>=7; extra == 'dev'
-Description-Content-Type: text/markdown
-
 # napcat-cli
 
 Standalone CLI and daemon for NapCat QQ bot management with skills-fs integration.
 
+[![PyPI](https://img.shields.io/pypi/v/napcat-cli.svg?label=PyPI)](https://pypi.org/project/napcat-cli/)
+[![Python versions](https://img.shields.io/pypi/pyversions/napcat-cli.svg)](https://pypi.org/project/napcat-cli/)
+
 > 📝 **介绍博文：** [napcat-cli 群配置与管理速查](https://yvxi.pages.dev/blog/napcat-cli-group-config/) — 从零配置、群消息收发、Agent Wake 的完整链路。
 
 ---
@@ -59,7 +51,7 @@ napcat wake --reason NEW_MESSAGE
 ## Setup
 
 ```bash
-uv tool install napcat-cli
+uv tool install napcat-cli  # recommended — isolated install via uv (alternative: pip install napcat-cli)
 napcat setup          # interactive — guides token, data dir, skills-fs, wake
 napcat daemon start
 ```
@@ -176,6 +168,21 @@ to read/write NapCat API endpoints through the virtual filesystem.
 When `skills_fs_enabled` is true in `daemon.json`, the daemon spawns skills-fs
 automatically with the configured mountpoint and config file.
 
+> ⚙️ **Distribution note:** `skills-fs` is a **compiled Go binary** (git submodule
+> pinned at [`cb13f37`](https://github.com/yandu-app/skills-fs/tree/cb13f37)).
+> It is **not bundled** in the pip/uv install of `napcat-cli`. If you need the
+> FUSE mount (optional), build it separately:
+>
+> ```bash
+> git clone https://github.com/yandu-app/skills-fs
+> cd skills-fs && make build              # produces ./skills-fs
+> napcat config set skills_fs_binary /path/to/skills-fs
+> napcat daemon stop && napcat daemon start
+> ```
+>
+> Or place `skills-fs` on your `PATH` and the daemon will find it. This feature
+> is **optional** — the CLI, daemon, and wake system work without it.
+
 Manual start:
 
 ```bash

napcat_cli-2.0.1/napcat-cli-fs/pyproject.toml

@@ -0,0 +1,13 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "napcat-cli-fs"
+version = "2.0.0"
+description = "Pre-built skills-fs FUSE binary for napcat-cli"
+readme = "README.md"
+license = "MIT"
+requires-python = ">=3.10"
+# No runtime Python dependencies — the package is a shipping vehicle for the
+# compiled Go binary, which napcat-cli's SkillsFsManager discovers at runtime.

napcat_cli-2.0.1/napcat-cli-fs/scripts/build-wheel.py

@@ -0,0 +1,128 @@
+"""Build a platform-specific wheel that wraps a compiled skills-fs binary.
+
+Usage::
+
+    python scripts/build-wheel.py <binary> <wheel-tag> [--version X.Y.Z] [--output-dir dist]
+
+Example::
+
+    # After building skills-fs for linux/amd64:
+    python scripts/build-wheel.py skills-fs manylinux_2_17_x86_64.manylinux2014_x86_64
+
+The output wheel is named ``napcat_cli_fs-{version}-py3-none-{tag}.whl`` and
+contains::
+
+    napcat_cli_fs/
+        __init__.py
+        bin/skills-fs                   (or skills-fs.exe on Windows)
+    napcat_cli_fs-{version}.dist-info/
+        METADATA
+        WHEEL
+        RECORD
+"""
+from __future__ import annotations
+
+import argparse
+import hashlib
+import os
+import shutil
+import tempfile
+import zipfile
+
+PACKAGE = "napcat_cli_fs"
+VERSION = "2.0.0"
+
+WHEEL_METADATA = """\
+Metadata-Version: 2.1
+Name: napcat-cli-fs
+Version: {version}
+Summary: Pre-built skills-fs FUSE binary for napcat-cli
+License: MIT
+Requires-Python: >=3.10
+"""
+
+
+def build_wheel(
+    binary_path: str,
+    wheel_tag: str,
+    version: str = VERSION,
+    output_dir: str = "dist",
+) -> str:
+    """Build a single platform wheel.
+
+    Returns the path to the created .whl file.
+    """
+    is_win = wheel_tag.startswith("win")
+    bin_name = "skills-fs.exe" if is_win else "skills-fs"
+
+    os.makedirs(output_dir, exist_ok=True)
+    wheel_name = f"{PACKAGE}-{version}-py3-none-{wheel_tag}.whl"
+    wheel_path = os.path.join(output_dir, wheel_name)
+
+    records: list[str] = []
+
+    def add_file(zf: zipfile.ZipFile, arcname: str, content: bytes, path: str = "") -> None:
+        """Add a file to the wheel and record its hash."""
+        if path:
+            arcname = os.path.join(path, arcname)
+        else:
+            arcname = arcname
+        info = zipfile.ZipInfo(arcname)
+        info.date_time = (2026, 1, 1, 0, 0, 0)
+        info.external_attr = 0o644 << 16
+        zf.writestr(info, content)
+        sha = hashlib.sha256(content).hexdigest()
+        records.append(f"{arcname},sha256={sha},{len(content)}")
+
+    def add_data_file(zf: zipfile.ZipFile, src_path: str, arcname: str) -> None:
+        """Read *src_path* (disk) and write into *arcname* inside the wheel."""
+        with open(src_path, "rb") as f:
+            data = f.read()
+        info = zipfile.ZipInfo(arcname)
+        info.date_time = (2026, 1, 1, 0, 0, 0)
+        info.external_attr = 0o755 << 16  # executable
+        zf.writestr(info, data)
+        sha = hashlib.sha256(data).hexdigest()
+        records.append(f"{arcname},sha256={sha},{len(data)}")
+
+    with zipfile.ZipFile(wheel_path, "w", zipfile.ZIP_DEFLATED) as zf:
+        # WHEEL
+        wheel_content = (
+            "Wheel-Version: 1.0\n"
+            f"Generator: napcat-cli-fs build-wheel.py\n"
+            "Root-Is-Purelib: false\n"
+            f"Tag: py3-none-{wheel_tag}\n"
+        )
+        add_file(zf, "WHEEL", wheel_content.encode(), f"{PACKAGE}-{version}.dist-info")
+
+        # METADATA
+        meta = WHEEL_METADATA.format(version=version)
+        add_file(zf, "METADATA", meta.encode(), f"{PACKAGE}-{version}.dist-info")
+
+        # napcat_cli_fs/__init__.py
+        init_py = f'"""skills-fs binary bundle (platform: {wheel_tag})."""\n__version__ = "{version}"\n'
+        add_file(zf, "__init__.py", init_py.encode(), PACKAGE)
+
+        # napcat_cli_fs/bin/skills-fs
+        add_data_file(zf, binary_path, f"{PACKAGE}/bin/{bin_name}")
+
+        # RECORD (must be last)
+        record_content = "\n".join(records) + "\n"
+        add_file(zf, "RECORD", record_content.encode(), f"{PACKAGE}-{version}.dist-info")
+
+    print(f"Built: {wheel_path}  ({os.path.getsize(wheel_path)} bytes)")
+    return wheel_path
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Build a skills-fs platform wheel")
+    parser.add_argument("binary", help="Path to compiled skills-fs binary")
+    parser.add_argument("tag", help="Wheel platform tag (e.g. manylinux_2_17_x86_64)")
+    parser.add_argument("--version", default=VERSION, help=f"Version (default {VERSION})")
+    parser.add_argument("--output-dir", default="dist", help="Output directory (default dist/)")
+    args = parser.parse_args()
+    build_wheel(args.binary, args.tag, version=args.version, output_dir=args.output_dir)
+
+
+if __name__ == "__main__":
+    main()

napcat_cli-2.0.1/napcat-cli-fs/src/napcat_cli_fs/__init__.py

@@ -0,0 +1,23 @@
+"""napcat_cli_fs — compiled skills-fs Go binary for napcat-cli.
+
+This package contains a pre-built ``skills-fs`` (or ``skills-fs.exe`` on
+Windows) binary.  It is installed automatically when you choose the ``[fs]``
+extra::
+
+    pip install napcat-cli[fs]
+    # or
+    uv tool install napcat-cli --with napcat-cli-fs
+
+The daemon's ``SkillsFsManager`` finds the binary via this package and uses it
+to mount a FUSE overlay on the napcat-cli skill directory.
+
+Platform support
+----------------
+- **Linux**           (builds tested on amd64; arm64 via CI)
+- **macOS**           (amd64 + arm64 via CI; FUSE is **untested** — open a PR if
+                      you hit issues)
+- **Windows**         (amd64 via CI; FUSE is **untested** — open a PR if you hit
+                      issues)
+"""
+
+__version__ = "2.0.0"

{napcat_cli-2.0.0 → napcat_cli-2.0.1}/napcat_cli/daemon/watch.py

@@ -672,12 +672,23 @@ class SkillsFsManager:
             shipped = Path(_resolve_shipped_binary())
             if shipped.exists() and shipped.is_file():
                 self.binary = str(shipped)
-            else:
-                # Search PATH
-                import shutil
-                found = shutil.which("skills-fs")
-                if found:
-                    self.binary = found
+        # Try the bundled napcat_cli_fs package (pip install napcat-cli[fs])
+        if not self.binary:
+            try:
+                import napcat_cli_fs as _nfs
+                import importlib.resources as _ir
+                _bin = "skills-fs.exe" if os.name == "nt" else "skills-fs"
+                _p = _ir.files("napcat_cli_fs").joinpath("bin", _bin)
+                if _p.exists():
+                    self.binary = str(_p)
+            except (ImportError, ModuleNotFoundError, Exception):
+                pass
+        # Search PATH
+        if not self.binary:
+            import shutil
+            found = shutil.which("skills-fs")
+            if found:
+                self.binary = found
         self._pid: int | None = None
         self._status: str = "stopped"  # healthy | degraded | stopped
         self._max_restarts = 3

{napcat_cli-2.0.0 → napcat_cli-2.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "napcat-cli"
-version = "2.0.0"
+version = "2.0.1"
 description = "Standalone CLI and daemon for NapCat QQ bot management with skills-fs integration"
 readme = "README.md"
 license = "MIT"
@@ -16,6 +16,8 @@ napcat = "napcat_cli.cli:main"
 
 [project.optional-dependencies]
 dev = ["pytest>=7"]
+fs = ["napcat-cli-fs>=2.0.0"]
+all = ["napcat-cli[fs]"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["napcat_cli"]