asher-cli 1.2.0__tar.gz → 1.4.0__tar.gz

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/bandit.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
 
       - name: Bandit scan
         # --exit-zero: findings must not fail the job, or the upload step below
@@ -41,7 +41,7 @@ jobs:
           -c pyproject.toml -r . -f sarif -o bandit.sarif --exit-zero
 
       - name: Upload SARIF to code scanning
-        uses: github/codeql-action/upload-sarif@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+        uses: github/codeql-action/upload-sarif@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
         with:
           sarif_file: bandit.sarif
           category: bandit

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
       - run: uv sync --no-default-groups --group dev
       - run: uv run ruff check .
       - run: uv run ruff format --check .
@@ -35,6 +35,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
       - run: uv sync --no-default-groups --group dev
       - run: uv run pytest tests/ -v --tb=short

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/claude-code-review.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Run Claude Code Review
         id: claude-review
-        uses: anthropics/claude-code-action@6b082c41935b4c8a3b8b0ef85ba4ba4d9eeb8975 # v1
+        uses: anthropics/claude-code-action@9c5ddab2e6d17b83ea679153b31f1d5f023cf636 # v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/claude.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Run Claude Code
         id: claude
-        uses: anthropics/claude-code-action@6b082c41935b4c8a3b8b0ef85ba4ba4d9eeb8975 # v1
+        uses: anthropics/claude-code-action@9c5ddab2e6d17b83ea679153b31f1d5f023cf636 # v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
 

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/coverage.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
       - run: uv sync --no-default-groups --group dev
       - name: Run tests with coverage
         run: uv run pytest tests/ --cov=asher --cov-report=lcov --cov-report=term-missing

asher_cli-1.4.0/.github/workflows/dependency-automerge.yml

@@ -0,0 +1,66 @@
+name: Dependency auto-merge
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened, edited, labeled]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.base.repo.full_name == github.repository
+    steps:
+      - name: Dependabot metadata
+        if: github.event.pull_request.user.login == 'dependabot[bot]'
+        id: dependabot-metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Decide eligibility
+        id: decide
+        env:
+          TITLE: ${{ github.event.pull_request.title }}
+          ACTOR: ${{ github.event.pull_request.user.login }}
+          LABELS: ${{ join(github.event.pull_request.labels.*.name, ',') }}
+          DEPENDABOT_UPDATE_TYPE: ${{ steps.dependabot-metadata.outputs.update-type }}
+        run: |
+          safe=false
+          if [ "$ACTOR" = "dependabot[bot]" ]; then
+            # Only semver patch/minor bumps auto-merge; majors always wait for review.
+            case "$DEPENDABOT_UPDATE_TYPE" in
+              version-update:semver-patch|version-update:semver-minor) safe=true ;;
+            esac
+          elif [ "$ACTOR" = "karanshukla" ]; then
+            # The dependency-update routine commits under this account rather than a
+            # bot identity. The `dependencies` label is the reliable signal; the title
+            # pattern is a fallback for when it is missing. Either way, a title
+            # mentioning "major"/"breaking" is left for manual merge. Only the
+            # title is scanned -- dependency-audit bodies routinely mention other
+            # packages' major versions, which used to veto safe patch-level PRs.
+            matched=false
+            case ",$LABELS," in
+              *,dependencies,*) matched=true ;;
+            esac
+            if [ "$matched" = false ]; then
+              if printf '%s' "$TITLE" | grep -Eiq '^(chore|fix)(\([a-z0-9/_-]+\))?:.*(dependenc|advisory|CVE|vulnerab|bump)'; then
+                matched=true
+              fi
+            fi
+            if [ "$matched" = true ]; then
+              if ! printf '%s' "$TITLE" | grep -Eiq '\b(major|breaking)\b'; then
+                safe=true
+              fi
+            fi
+          fi
+          echo "safe=$safe" >> "$GITHUB_OUTPUT"
+
+      - name: Enable auto-merge
+        if: steps.decide.outputs.safe == 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: gh pr merge --auto --squash "$PR_URL"

{asher_cli-1.2.0 → asher_cli-1.4.0}/.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Extract version from branch name
         id: version
         run: echo "version=${GITHUB_REF_NAME#release/}" >> "$GITHUB_OUTPUT"
-      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
       - run: uv build
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:

{asher_cli-1.2.0 → asher_cli-1.4.0}/CHANGELOG.md

@@ -7,6 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [git-cliff](https://git-cliff.org) from conventional commits.
 
+## [1.4.0] - 2026-09-13
+
+### 🐛 Bug Fixes
+
+- *(ci)* Only scan the PR title for major/breaking in auto-merge (#86)
+- *(deps)* Update dependency pylitterbot to v2025.6.5 (#82)
+
+### 👷 CI/CD
+
+- Auto-merge non-major dependency PRs once checks pass (#85)
+
+### 🔧 Miscellaneous
+
+- *(renovate)* Squash automerged updates (#84)
+- *(renovate)* Auto-merge non-major updates once checks pass (#83)
+
+## [1.3.0] - 2026-08-23
+
+### 🚀 Features
+
+- *(commands)* Close the remaining robot-command gaps in the roadmap
+- *(monitoring)* Shorten cat-panel status labels that overflow the panel width
+
+### 🐛 Bug Fixes
+
+- *(monitoring)* Render readable status text in cat panel, not raw cloud code
+
+### 🧪 Tests
+
+- *(version)* Keep the /version pilot tests off the network
+
 ## [1.2.0] - 2026-08-16
 
 ### 🚀 Features

{asher_cli-1.2.0 → asher_cli-1.4.0}/CLAUDE.md

@@ -23,8 +23,8 @@ asher/
   __init__.py
   app.py            AsherApp class (thin orchestrator — composes mixins)
   auth.py           LoginScreen modal (ModalScreen[tuple[str,str]]) — available, not primary flow
-  helpers.py        fmt_ago(), drawer_bar(), ts(), robot_model()  (pure, testable)
-  constants.py      STATUS_COLORS, ROBOT_MODELS
+  helpers.py        fmt_ago(), fmt_until(), drawer_bar(), ts(), robot_model(), status_text() + argument parsing shared by the TUI and headless surfaces: hex_colour(), parse_clock(), parse_day(), split_type_flag(), activity_type()  (pure, testable)
+  constants.py      STATUS_COLORS, CAT_PANEL_STATUS_LABELS, ACTIVITY_TYPES, ROBOT_MODELS
   theme.py          Catppuccin Mocha palette + semantic roles (BACKGROUND, MUTED, DANGER, …) + CSS_VARIABLES/apply() — the only place a hex literal belongs
   config.py         runtime settings persistence — load()/save()/update() over ~/.asher-cli/config.json; holds poll interval, cat-panel visibility/colour, active pet index, notification settings (non-secret UI prefs only; credentials stay in keyring)
   notifications.py  desktop toast + audible alert façade — plyer first, then the platform's own tool (osascript/notify-send); fire/beep are always-safe no-ops on failure/headless

{asher_cli-1.2.0 → asher_cli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: asher-cli
-Version: 1.2.0
+Version: 1.4.0
 Summary: Terminal dashboard for Litter Robot (LR3/LR4/LR5) via the Whisker cloud API
 Project-URL: Homepage, https://github.com/karanshukla/asher-cli
 Project-URL: Repository, https://github.com/karanshukla/asher-cli
@@ -40,14 +40,14 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.10
 Requires-Dist: keyring>=24.0.0
 Requires-Dist: plyer>=2.1.0
-Requires-Dist: pylitterbot==2025.6.4
+Requires-Dist: pylitterbot==2025.6.5
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: textual>=0.47.0
 Requires-Dist: tzlocal>=5.4
 Provides-Extra: mcp
 Requires-Dist: mcp<2; extra == 'mcp'
-Requires-Dist: pylitterbot[mcp]==2025.6.4; extra == 'mcp'
+Requires-Dist: pylitterbot[mcp]==2025.6.5; extra == 'mcp'
 Provides-Extra: tray
 Requires-Dist: pillow>=10.0; extra == 'tray'
 Requires-Dist: pygobject>=3.42; (sys_platform == 'linux') and extra == 'tray'
@@ -66,7 +66,9 @@ Description-Content-Type: text/markdown
 
 A Claude Code-style terminal dashboard for monitoring and controlling Litter Robot via the Whisker cloud API.
 
-<img width="808" height="351" alt="image" src="https://github.com/user-attachments/assets/6599966f-837c-419c-8692-bfda3533e730" />
+<img width="1165" height="885" alt="image" src="https://github.com/user-attachments/assets/03be7ed3-95f6-45cf-93db-cf5bf84d6499" />
+
+<img width="1165" height="885" alt="image" src="https://github.com/user-attachments/assets/5aa60ff1-6e6b-4c71-8376-d96d52d96809" />
 
 ## Features
 
@@ -75,8 +77,8 @@ A Claude Code-style terminal dashboard for monitoring and controlling Litter Rob
 - Real-time cycling indicator with elapsed time (`⟳ Cycling  M:SS`)
 - Fault & safety monitoring — model-scoped in-panel alerts for cat detected, pinch, motor/position/gas faults (LR5: bonnet/laser/drawer); press `d` to dismiss
 - Cat panel with mode label + status badges (status chip, lock, night light, sleep, wait time) under the art
-- Scrollable activity-history pager — `history [count|all]` opens a full-screen, paginated view (arrow keys, `Page Up`/`Page Down`, `Home`/`End`); `c` copies the whole history to the clipboard; `q`/`Esc`/`Enter` to close
-- Commands: `clean`, `status`, `info`, `lock`, `unlock`, `sleep`, `wake`, `night-light on|off|auto`, `night-light-brightness`, `panel-brightness <low|medium|high>` (LR4/LR5), `wait-time`, `power on|off`, `rename`, `insight`, `sleep-schedule`, plus LR5 extras (`privacy`, `volume`, `camera-audio`, `drawer-reset`), `history [count|all]`, `export [days|month]`, `help`, `quit`
+- Scrollable activity-history pager — `history [count|all] [--type <kind>]` opens a full-screen, paginated view (arrow keys, `Page Up`/`Page Down`, `Home`/`End`); `c` copies the whole history to the clipboard; `q`/`Esc`/`Enter` to close
+- Commands: `clean`, `status`, `info`, `lock`, `unlock`, `sleep`, `wake`, `night-light on|off|auto|color <hex>`, `night-light-brightness`, `panel-brightness <low|medium|high>` (LR4/LR5), `wait-time`, `power on|off`, `rename`, `insight`, `sleep-schedule [set|disable]`, plus LR5 extras (`privacy`, `volume`, `camera-audio`, `drawer-reset`), `history [count|all] [--type <kind>]`, `export [days|month]`, `help`, `quit`
 - Slash commands for app management: `/login`, `/logout`, `/robots`, `/robot <index|name>`, `/pets`, `/pet <index|name>`, `/cat on|off|colour <hex>`, `/refresh [seconds|off]`, `/config`, `/notify on|off|sound on|off|test`, `/watch start|stop|status|enable|disable`, `/version`, `/mcp on|off|status`, `/exit`
 - Slash-command tab completion — type `/` and a Claude Code-style overlay lists matching commands; `↑`/`↓` to move, `Tab` or `Enter` to accept, `Esc` to dismiss
 - Inline ghost-text completion for bare commands — type a prefix (`cle`) and the rest (`an`) appears greyed; `Tab` or `→` to accept → `clean`
@@ -142,18 +144,21 @@ The keyring is the only place an installed copy reads credentials from. Working
 | `lock` / `unlock` | Toggle panel lockout |
 | `sleep` / `wake` | Toggle sleep mode |
 | `night-light on\|off\|auto` | Set night light mode |
+| `night-light color <hex>` | Set the LR5 night light colour (`#RRGGBB`, or the 3-digit shorthand) |
 | `night-light-brightness <level>` | Set brightness (LR5: 0-100; LR4: 25/50/100) |
 | `panel-brightness <low\|medium\|high>` | Set control-panel brightness (LR4/LR5 only; shows current if omitted) |
 | `wait-time <minutes>` | Set clean-cycle wait time (shows valid values / current if omitted) |
 | `power on\|off` | Hard-power the unit on or off |
 | `rename <new name>` | Rename the unit in the Whisker cloud |
 | `insight [days\|month]` | Show cycle-usage statistics (default: 30 days) |
-| `sleep-schedule` | Show the per-day sleep schedule (read-only) |
+| `sleep-schedule` | Show the per-day sleep schedule |
+| `sleep-schedule set <day\|all> <HH:MM> <HH:MM>` | Set the sleep → wake window (LR3: one window for every day, wake time fixed; LR4: read-only, use the Whisker app) |
+| `sleep-schedule disable` | Turn every scheduled sleep window off |
 | `privacy on\|off` | Toggle LR5 privacy mode |
 | `volume <0-100>` | Set LR5 sound volume |
 | `camera-audio on\|off` | Toggle LR5 camera audio |
 | `drawer-reset` | Reset the LR5 waste drawer level indicator |
-| `history [count\|all]` | Show recent activity in a scrollable pager (default: 50 events) |
+| `history [count\|all] [--type <kind>]` | Show recent activity in a scrollable pager (default: 50 events); `--type cat\|clean\|litter\|offline\|…` filters on the LR5 |
 | `export [days\|month]` | Export activity history to CSV in `~/Downloads` (default: 30 days) |
 | `clear` | Clear the log |
 | `help` | Show command list |
@@ -193,6 +198,8 @@ asher clean                              start a clean cycle
 asher night-light auto                   set night light mode
 asher wait-time 7                        set the clean-cycle wait time
 asher history 20                         recent activity, newest first
+asher history 20 --type cat              only cat visits (LR5)
+asher sleep-schedule set all 22:00 07:00 sleep 22:00 → 07:00 every day
 asher insight 7                          cycle-usage statistics
 asher export 7 --output ~/hist.csv       activity history to CSV
 ```

{asher_cli-1.2.0 → asher_cli-1.4.0}/README.md

@@ -10,7 +10,9 @@
 
 A Claude Code-style terminal dashboard for monitoring and controlling Litter Robot via the Whisker cloud API.
 
-<img width="808" height="351" alt="image" src="https://github.com/user-attachments/assets/6599966f-837c-419c-8692-bfda3533e730" />
+<img width="1165" height="885" alt="image" src="https://github.com/user-attachments/assets/03be7ed3-95f6-45cf-93db-cf5bf84d6499" />
+
+<img width="1165" height="885" alt="image" src="https://github.com/user-attachments/assets/5aa60ff1-6e6b-4c71-8376-d96d52d96809" />
 
 ## Features
 
@@ -19,8 +21,8 @@ A Claude Code-style terminal dashboard for monitoring and controlling Litter Rob
 - Real-time cycling indicator with elapsed time (`⟳ Cycling  M:SS`)
 - Fault & safety monitoring — model-scoped in-panel alerts for cat detected, pinch, motor/position/gas faults (LR5: bonnet/laser/drawer); press `d` to dismiss
 - Cat panel with mode label + status badges (status chip, lock, night light, sleep, wait time) under the art
-- Scrollable activity-history pager — `history [count|all]` opens a full-screen, paginated view (arrow keys, `Page Up`/`Page Down`, `Home`/`End`); `c` copies the whole history to the clipboard; `q`/`Esc`/`Enter` to close
-- Commands: `clean`, `status`, `info`, `lock`, `unlock`, `sleep`, `wake`, `night-light on|off|auto`, `night-light-brightness`, `panel-brightness <low|medium|high>` (LR4/LR5), `wait-time`, `power on|off`, `rename`, `insight`, `sleep-schedule`, plus LR5 extras (`privacy`, `volume`, `camera-audio`, `drawer-reset`), `history [count|all]`, `export [days|month]`, `help`, `quit`
+- Scrollable activity-history pager — `history [count|all] [--type <kind>]` opens a full-screen, paginated view (arrow keys, `Page Up`/`Page Down`, `Home`/`End`); `c` copies the whole history to the clipboard; `q`/`Esc`/`Enter` to close
+- Commands: `clean`, `status`, `info`, `lock`, `unlock`, `sleep`, `wake`, `night-light on|off|auto|color <hex>`, `night-light-brightness`, `panel-brightness <low|medium|high>` (LR4/LR5), `wait-time`, `power on|off`, `rename`, `insight`, `sleep-schedule [set|disable]`, plus LR5 extras (`privacy`, `volume`, `camera-audio`, `drawer-reset`), `history [count|all] [--type <kind>]`, `export [days|month]`, `help`, `quit`
 - Slash commands for app management: `/login`, `/logout`, `/robots`, `/robot <index|name>`, `/pets`, `/pet <index|name>`, `/cat on|off|colour <hex>`, `/refresh [seconds|off]`, `/config`, `/notify on|off|sound on|off|test`, `/watch start|stop|status|enable|disable`, `/version`, `/mcp on|off|status`, `/exit`
 - Slash-command tab completion — type `/` and a Claude Code-style overlay lists matching commands; `↑`/`↓` to move, `Tab` or `Enter` to accept, `Esc` to dismiss
 - Inline ghost-text completion for bare commands — type a prefix (`cle`) and the rest (`an`) appears greyed; `Tab` or `→` to accept → `clean`
@@ -86,18 +88,21 @@ The keyring is the only place an installed copy reads credentials from. Working
 | `lock` / `unlock` | Toggle panel lockout |
 | `sleep` / `wake` | Toggle sleep mode |
 | `night-light on\|off\|auto` | Set night light mode |
+| `night-light color <hex>` | Set the LR5 night light colour (`#RRGGBB`, or the 3-digit shorthand) |
 | `night-light-brightness <level>` | Set brightness (LR5: 0-100; LR4: 25/50/100) |
 | `panel-brightness <low\|medium\|high>` | Set control-panel brightness (LR4/LR5 only; shows current if omitted) |
 | `wait-time <minutes>` | Set clean-cycle wait time (shows valid values / current if omitted) |
 | `power on\|off` | Hard-power the unit on or off |
 | `rename <new name>` | Rename the unit in the Whisker cloud |
 | `insight [days\|month]` | Show cycle-usage statistics (default: 30 days) |
-| `sleep-schedule` | Show the per-day sleep schedule (read-only) |
+| `sleep-schedule` | Show the per-day sleep schedule |
+| `sleep-schedule set <day\|all> <HH:MM> <HH:MM>` | Set the sleep → wake window (LR3: one window for every day, wake time fixed; LR4: read-only, use the Whisker app) |
+| `sleep-schedule disable` | Turn every scheduled sleep window off |
 | `privacy on\|off` | Toggle LR5 privacy mode |
 | `volume <0-100>` | Set LR5 sound volume |
 | `camera-audio on\|off` | Toggle LR5 camera audio |
 | `drawer-reset` | Reset the LR5 waste drawer level indicator |
-| `history [count\|all]` | Show recent activity in a scrollable pager (default: 50 events) |
+| `history [count\|all] [--type <kind>]` | Show recent activity in a scrollable pager (default: 50 events); `--type cat\|clean\|litter\|offline\|…` filters on the LR5 |
 | `export [days\|month]` | Export activity history to CSV in `~/Downloads` (default: 30 days) |
 | `clear` | Clear the log |
 | `help` | Show command list |
@@ -137,6 +142,8 @@ asher clean                              start a clean cycle
 asher night-light auto                   set night light mode
 asher wait-time 7                        set the clean-cycle wait time
 asher history 20                         recent activity, newest first
+asher history 20 --type cat              only cat visits (LR5)
+asher sleep-schedule set all 22:00 07:00 sleep 22:00 → 07:00 every day
 asher insight 7                          cycle-usage statistics
 asher export 7 --output ~/hist.csv       activity history to CSV
 ```

{asher_cli-1.2.0 → asher_cli-1.4.0}/asher/__main__.py

@@ -132,9 +132,26 @@ def _build_parser() -> argparse.ArgumentParser:
                 metavar="PATH",
                 help="write to this path instead of ~/Downloads.",
             )
+        if command.name == "history":
+            sub.add_argument(
+                "--type",
+                metavar="KIND",
+                help="only events of this kind (LR5 only), e.g. cat, clean, litter.",
+            )
     return parser
 
 
+def _handler_args(parsed: argparse.Namespace) -> list[str]:
+    """Rebuild the word list a headless handler parses.
+
+    The handlers take raw words so the TUI and the CLI read the same grammar;
+    argparse only declares the flags it needs in order to document them in
+    ``--help``, and they are folded back in here.
+    """
+    kind = getattr(parsed, "type", None)
+    return [*parsed.args, "--type", kind] if kind else list(parsed.args)
+
+
 def main() -> None:
     args = _build_parser().parse_args()
 
@@ -157,7 +174,7 @@ def main() -> None:
             asyncio.run(
                 run(
                     args.command,
-                    args.args,
+                    _handler_args(args),
                     robot=args.robot,
                     output=args.output,
                     as_json=getattr(args, "json", False),

{asher_cli-1.2.0 → asher_cli-1.4.0}/asher/activity_labels.py

@@ -35,6 +35,13 @@ ACTION_LABELS: dict[str, tuple[str, str]] = {
     "motor fault": ("Motor fault", theme.DANGER),
     "pinch detect": ("Pinch detected", theme.DANGER),
     "timing fault": ("Timing fault", theme.WARN),
+    # The LR5 activity endpoint reports SCREAMING_SNAKE type codes rather than
+    # the sentence-style text the LR3/LR4 history returns.
+    "pet_visit": ("Cat visit", theme.WARN),
+    "cat_detect": ("Cat detected", theme.WARN),
+    "cycle_completed": ("Clean cycle complete", theme.OK),
+    "cycle_interrupted": ("Cycle interrupted", theme.WARN),
+    "litter_low": ("Litter low", theme.WARN),
 }
 
 # Fallback colour for unknown event types — muted grey rather than crashing.

{asher_cli-1.2.0 → asher_cli-1.4.0}/asher/commands/__init__.py

@@ -7,7 +7,7 @@ import contextlib
 import shutil
 import subprocess
 import sys
-from datetime import time
+from datetime import datetime, time
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as pkg_version
 from pathlib import Path
@@ -26,8 +26,21 @@ from textual.widgets import Input, RichLog, Static
 
 from .. import theme
 from ..completion import enter_completes, render_completion, slash_matches
+from ..constants import ACTIVITY_TYPES
 from ..export import ExportError, build_history_csv, resolve_dest
-from ..helpers import fmt_ago, robot_model, ts
+from ..helpers import (
+    DAY_NAMES,
+    activity_type,
+    fmt_ago,
+    fmt_until,
+    hex_colour,
+    parse_clock,
+    parse_day,
+    robot_model,
+    split_type_flag,
+    status_text,
+    ts,
+)
 from ..history_view import HistoryScreen
 from ..login_flow import LoginFlow, LoginState
 from .base import Command, CommandRegistry, SlashCommand
@@ -43,22 +56,6 @@ def _fmt_wait_time(minutes: object) -> str:
         return "—"
 
 
-def _status_text(status: object) -> str:
-    """Render a robot status as human-readable text.
-
-    ``LitterBoxStatus`` is a plain ``Enum`` (not ``StrEnum``), so ``str()`` yields
-    the verbose ``"LitterBoxStatus.READY"``; the readable form ("Ready") lives in
-    its ``text`` property. Falls back to ``str()`` for plain strings, and to an
-    em dash when status is missing.
-    """
-    if status is None:
-        return "—"
-    text = getattr(status, "text", None)
-    if isinstance(text, str):
-        return text
-    return str(status)
-
-
 _POWER_LABELS = {"AC": "AC (mains)", "DC": "Battery", "NC": "Off/unknown"}
 
 
@@ -188,7 +185,7 @@ class StatusCommand(Command):
         last_seen = getattr(app, "_last_cat_seen", None) or getattr(r, "last_seen", None)
         rows = [
             ("Online", "yes" if getattr(r, "is_online", False) else "no"),
-            ("Status", _status_text(getattr(r, "status", None))),
+            ("Status", status_text(getattr(r, "status", None))),
             ("Drawer", f"{float(getattr(r, 'waste_drawer_level', 0) or 0):.0f}%"),
             ("Last seen", fmt_ago(last_seen)),
             ("Cat weight", weight),
@@ -251,6 +248,9 @@ class InfoCommand(Command):
             ("Online", _yn(getattr(r, "is_online", False))),
             ("Last seen", fmt_ago(last_seen)),
         ]
+        filter_due = getattr(r, "next_filter_replacement_date", None)
+        if isinstance(filter_due, datetime):
+            rows.insert(-2, ("Filter due", fmt_until(filter_due)))
         log = app.query_one("#log", RichLog)
         for k, v in rows:
             t = Text()
@@ -348,19 +348,22 @@ class WakeCommand(Command):
 class NightLightCommand(Command):
     name = "night-light"
     aliases = ("nightlight", "nl")
-    description = "set night light mode"
+    description = "on|off|auto|color <hex>  set night light mode"
     requires_robot = True
 
     @property
     def display_name(self) -> str:
-        return "night-light on|off|auto"
+        return "night-light"
 
     async def run(self, app: AsherApp, args: list[str]) -> None:
         if app._adapter is None:
             return
         arg = args[0].lower() if args else ""
+        if arg in ("color", "colour"):
+            await self._set_colour(app, args[1:])
+            return
         if arg not in ("on", "off", "auto"):
-            app._log_warn("Usage: night-light on|off|auto")
+            app._log_warn("Usage: night-light on|off|auto|color <hex>")
             return
         ok, msg = await app._adapter.set_night_light(arg)
         if ok:
@@ -375,6 +378,19 @@ class NightLightCommand(Command):
         else:
             app._log_warn(msg)
 
+    async def _set_colour(self, app: AsherApp, args: list[str]) -> None:
+        if app._adapter is None:
+            return
+        colour = hex_colour(args[0]) if args else None
+        if colour is None:
+            app._log_warn("Usage: night-light color <hex>  e.g. night-light color #FF9E64")
+            return
+        ok, msg = await app._adapter.set_night_light_color(colour)
+        if ok:
+            app._log_ok(msg)
+        else:
+            app._log_warn(msg)
+
 
 class NightLightBrightnessCommand(Command):
     name = "night-light-brightness"
@@ -440,13 +456,14 @@ class PanelBrightnessCommand(Command):
 class HistoryCommand(Command):
     name = "history"
     aliases = ("hist",)
-    description = "[count|all]  show recent activity in a scrollable pager"
+    description = "[count|all] [--type <kind>]  recent activity in a scrollable pager"
     requires_robot = True
 
     async def run(self, app: AsherApp, args: list[str]) -> None:
-        if app._robot is None:
+        if app._robot is None or app._adapter is None:
             return
-        raw = args[0].lower() if args else ""
+        counts, wanted_type = split_type_flag(args)
+        raw = counts[0].lower() if counts else ""
         if raw in ("all", "max"):
             limit = 500
         elif raw:
@@ -457,10 +474,15 @@ class HistoryCommand(Command):
                 return
         else:
             limit = 50
-        try:
-            acts = await app._robot.get_activity_history(limit=limit)
-        except Exception as exc:
-            app._log_err(f"Failed to get history: {exc}")
+
+        wanted = activity_type(wanted_type)
+        if wanted_type is not None and wanted is None:
+            app._log_warn(f"Usage: history [count|all] --type <{'|'.join(ACTIVITY_TYPES)}>")
+            return
+
+        acts, problem = await app._adapter.get_history(limit, wanted)
+        if acts is None:
+            app._log_err(problem)
             return
         robot_name = getattr(app._robot, "name", "robot")
         app.push_screen(HistoryScreen(acts, app._pets, robot_name))
@@ -616,9 +638,6 @@ class InsightCommand(Command):
             log.write(t)
 
 
-_DAY_NAMES = ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun")
-
-
 def _fmt_sleep_time(t: object) -> str:
     if t is None:
         return "—"
@@ -645,10 +664,16 @@ def _parse_sleep_day(day: Any) -> tuple[int, bool, object, object] | None:
         return None
 
 
+_EVERY_DAY = ("all", "every", "daily", "everyday")
+_SCHEDULE_USAGE = (
+    "Usage: sleep-schedule · sleep-schedule set <day|all> <HH:MM> <HH:MM> · sleep-schedule disable"
+)
+
+
 class SleepScheduleCommand(Command):
     name = "sleep-schedule"
     aliases = ("sleepschedule",)
-    description = "show the per-day sleep schedule (read-only)"
+    description = "[set <day|all> <HH:MM> <HH:MM>|disable]  per-day sleep windows"
     requires_robot = True
 
     @property
@@ -656,6 +681,52 @@ class SleepScheduleCommand(Command):
         return "sleep-schedule"
 
     async def run(self, app: AsherApp, args: list[str]) -> None:
+        action = args[0].lower() if args else ""
+        if action == "set":
+            await self._set_window(app, args[1:])
+            return
+        if action in ("disable", "off"):
+            await self._disable(app)
+            return
+        if action:
+            app._log_warn(_SCHEDULE_USAGE)
+            return
+        await self._show(app)
+
+    async def _set_window(self, app: AsherApp, args: list[str]) -> None:
+        if app._adapter is None:
+            return
+        if len(args) < 3:
+            app._log_warn("Usage: sleep-schedule set <day|all> <HH:MM> <HH:MM>")
+            return
+        day_arg = args[0].lower()
+        weekday = None if day_arg in _EVERY_DAY else parse_day(day_arg)
+        if weekday is None and day_arg not in _EVERY_DAY:
+            app._log_warn(f"Unknown day '{args[0]}' — use {'/'.join(DAY_NAMES)} or 'all'")
+            return
+        sleep, wake = parse_clock(args[1]), parse_clock(args[2])
+        if sleep is None or wake is None:
+            app._log_warn("Times must be 24-hour HH:MM — e.g. sleep-schedule set all 22:00 07:00")
+            return
+
+        ok, msg = await app._adapter.set_sleep_window(weekday, sleep, wake)
+        if not ok:
+            app._log_warn(msg)
+            return
+        app._log_ok(msg)
+        await app._refresh_status()
+
+    async def _disable(self, app: AsherApp) -> None:
+        if app._adapter is None:
+            return
+        ok, msg = await app._adapter.disable_sleep_schedule()
+        if not ok:
+            app._log_warn(msg)
+            return
+        app._log_ok(msg)
+        await app._refresh_status()
+
+    async def _show(self, app: AsherApp) -> None:
         if app._robot is None:
             return
         try:
@@ -704,7 +775,7 @@ class SleepScheduleCommand(Command):
                 continue
             idx, day_enabled, sleep_t, wake_t = parsed
 
-            name = _DAY_NAMES[idx]
+            name = DAY_NAMES[idx]
             t = Text()
             t.append(f"  {name} ", style=theme.MUTED)
             if day_enabled: