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

{asher_cli-1.4.0 → asher_cli-1.4.1}/.claude/skills/mcp-bridge/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: mcp-bridge
-description: How asher-cli's /mcp command and the asher-mcp-launch credential bridge work. Load before changing asher/mcp_config.py, asher/mcp_bridge.py, or the /mcp slash command.
+description: How asher-cli's /mcp command and the asher-mcp-launch credential bridge work. Load before changing asher/mcp/config.py, asher/mcp/bridge.py, or the /mcp slash command.
 user-invocable: false
 ---
 
@@ -8,8 +8,8 @@ user-invocable: false
 
 pylitterbot ships an optional MCP server (`pip install pylitterbot[mcp]`, run via `python -m pylitterbot.mcp`) that lets an MCP client like Claude Desktop monitor/control the robot directly. Its own docs configure it with plaintext credentials in the client's JSON config — asher-cli avoids that:
 
-- `/mcp on|off|status` (in `asher/commands/__init__.py`, logic in `asher/mcp_config.py`) adds/removes an entry (named by `mcp_config._SERVER_NAME`) in every `claude_desktop_config.json` this OS's Claude Desktop might read (`mcp_config.config_paths()` — on Windows this includes both the standard installer path and any MSIX/Microsoft Store virtualized path). The entry's `command` is `sys.executable -m asher.mcp_bridge` — never the credentials themselves.
+- `/mcp on|off|status` (in `asher/tui/commands/slash.py`, logic in `asher/mcp/config.py`) adds/removes an entry (named by `mcp.config._SERVER_NAME`) in every `claude_desktop_config.json` this OS's Claude Desktop might read (`mcp.config.config_paths()` — on Windows this includes both the standard installer path and any MSIX/Microsoft Store virtualized path). The entry's `command` is `sys.executable -m asher.mcp.bridge` — never the credentials themselves.
 - `/mcp on` also auto-installs pylitterbot's `mcp` extra via `sys.executable -m pip install "pylitterbot[mcp]==<installed version>"` if the `mcp` package isn't importable yet.
-- `asher/mcp_bridge.py` (console script `asher-mcp-launch`) is what Claude Desktop actually spawns. It reads email/password from the OS keyring at process start, sets them as `LITTER_ROBOT_USERNAME`/`LITTER_ROBOT_PASSWORD` (pylitterbot's expected names — note these differ from asher-cli's own `.env` var `LITTER_ROBOT_USER`) in that process's environment only, then execs `python -m pylitterbot.mcp`. No credentials ever touch the on-disk MCP config.
+- `asher/mcp/bridge.py` (console script `asher-mcp-launch`) is what Claude Desktop actually spawns. It reads email/password from the OS keyring at process start, sets them as `LITTER_ROBOT_USERNAME`/`LITTER_ROBOT_PASSWORD` (pylitterbot's expected names — note these differ from asher-cli's own `.env` var `LITTER_ROBOT_USER`) in that process's environment only, then execs `python -m pylitterbot.mcp`. No credentials ever touch the on-disk MCP config.
 - `/mcp on` requires keyring credentials. If none are found but `.env` fallback credentials are set, it copies them into the keyring automatically (since the bridge process can't reliably discover a project-relative `.env` — Claude Desktop controls its working directory, not asher-cli).
 - Requires the `mcp` extra: `uv sync --extra mcp` / `pip install asher-cli[mcp]`. Restart Claude Desktop after toggling for the change to take effect.

{asher_cli-1.4.0 → asher_cli-1.4.1}/.claude/skills/pylitterbot-ref/SKILL.md

@@ -6,7 +6,7 @@ user-invocable: false
 
 # pylitterbot Confirmed API Surface
 
-Load this skill whenever working on `asher/commands/`, `asher/monitoring/`, `asher/robot_adapters.py`, or anything that touches `robot.*`.
+Load this skill whenever working on `asher/tui/commands/`, `asher/tui/monitoring.py`, `asher/robot/adapters.py`, or anything that touches `robot.*`.
 
 ## Robot attributes (LR4 confirmed)
 
@@ -32,6 +32,8 @@ await robot.set_panel_lockout(enabled: bool)
 await robot.set_night_light_brightness(brightness: int)   # or:
 await robot.set_night_light_mode(mode: NightLightMode)
 await robot.get_activity_history(limit: int)  # -> list[Activity]
+# LR4 only (2025.6.6+): start= reaches past the ~6 days the API returns without it
+await robot.get_activity_history(limit: int, start: datetime | None = None)
 ```
 
 ## Activity objects
@@ -54,7 +56,7 @@ model_name = type(robot).__name__  # "LitterRobot4", "LitterRobot3", etc.
 | `set_sleep_mode()` | Simple on/off | Per-weekday schedule | TBD |
 | Night light | `set_night_light_brightness(int)` | `set_night_light_mode(NightLightMode)` | TBD |
 
-Use `asher/robot_adapters.py` for all model-specific dispatch — do not branch on `type(robot).__name__` inline in command handlers.
+Use `asher/robot/adapters.py` for all model-specific dispatch — do not branch on `type(robot).__name__` inline in command handlers.
 
 ## Timing / cloud queuing gotcha
 

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

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
 
       - 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@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+        uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           sarif_file: bandit.sarif
           category: bandit

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

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       - 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@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       - run: uv sync --no-default-groups --group dev
       - run: uv run pytest tests/ -v --tb=short

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

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
-      - uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       - 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 → asher_cli-1.4.1}/.github/workflows/dependency-automerge.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Dependabot metadata
         if: github.event.pull_request.user.login == 'dependabot[bot]'
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

{asher_cli-1.4.0 → asher_cli-1.4.1}/.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@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       - run: uv build
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:

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

@@ -7,7 +7,35 @@ 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
+## [1.4.1] - 2026-10-01
+
+### 🐛 Bug Fixes
+
+- *(export)* Reach the full 30 days on the LR4
+- *(tui)* Hang wrapped log lines under their message
+
+### 🛡️ Security
+
+- *(deps)* Refresh `uv.lock` to patch pyjwt and urllib3 CVEs (#101)
+
+### ♻️ Refactor
+
+- Group the asher package into core, robot, tui, desktop and mcp
+
+### 📚 Documentation
+
+- Trim the roadmap to what's left, move process docs to CONTRIBUTING
+
+### 🧪 Tests
+
+- *(layering)* Compare paths in posix form so the check passes on Windows
+
+### 🔧 Miscellaneous
+
+- Remove claude.yml
+- Remove claude-code-review.yml
+
+## [1.4.0] - 2026-09-09
 
 ### 🐛 Bug Fixes
 

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

@@ -20,41 +20,61 @@ asher                  # after: uv sync && uv run asher  OR  pip install -e .
 
 ```
 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(), 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
-  watcher.py        background notification loop with no TUI — pure WatchState (robot snapshots → Alert list) + supervising watch() that reconnects with backoff, plus WatcherRunner (asyncio on a worker thread, for the tray)
-  daemon.py         detached watcher process control — `start` pre-flights `connection.credentials_available()` (presence only, no network, so starting offline still works) because the watcher claims the pid file *before* authenticating and would otherwise report a pid for a process that stops a moment later — pid file/log in ~/.asher-cli, start/stop/status/run, cross-platform detach + liveness (os.kill would *terminate* on Windows)
-  tray.py           optional pystray/Pillow system-tray icon over WatcherRunner; every path degrades to a headless watcher. Icon is a panel-toned silhouette + status dot — colour rides the badge, never the whole glyph
-  launcher.py       open_app() — start the TUI in a new terminal from the tray (a detached tray has none): new console on Windows, Terminal.app via AppleScript on macOS, first installed emulator on Linux (desktop's own preferred)
-  desktoptheme.py   panel_is_dark() — is the tray/menu-bar background dark? kdeglobals luma / gsettings / AppleInterfaceStyle / the Personalize registry keys, behind a TTL cache; every probe degrades to a fallback, never raises
-  autostart.py      login items — AutostartBackend ABC + launchd/systemd-user/registry subclasses + backend() factory; all per-user, no admin rights, disable() removes exactly what enable() wrote
-  updates.py        PyPI release check — read-only over HTTPS, once a day, reports only. Never installs (see its docstring for why that stays manual)
-  cats.py           CATS dict (ASCII art)
-  login_flow.py     LoginFlow state machine — inline email/password prompt in command bar
-  robot_protocol.py RobotProtocol structural Protocol for pylitterbot robot objects
-  robot_adapters.py RobotAdapter ABC + LR3/LR4/LR5 subclasses + make_adapter() factory
-  mcp_config.py     Claude Desktop config read/write for the /mcp slash command
-  mcp_bridge.py     asher-mcp-launch console script — keyring-backed pylitterbot MCP launcher
-  faults.py         check_faults(robot) — model-scoped safety/component fault detection (status enum + per-model attr allowlist incl. LR4 USB power fault; hopper never a fault)
-  history_view.py   HistoryScreen (ModalScreen) + format_history_rows()/format_history_text() — scrollable activity-history pager pushed by the `history` command; `c` copies the full history (plain text) to the clipboard via action_copy_all()
-  export.py         shared activity-history CSV core + exit-code contract: build_history_csv(), resolve_dest(), resolve_robot(), parse_days(), EXIT_*, ExportError — no Textual imports; the TUI `export` command and `asher export` both call build_history_csv()
-  headless.py       headless command surface for `asher <command>` — Session/Result/CommandError, the COMMANDS registry, and run(); plain strings only, no Textual, routes model differences through RobotAdapter
-  completion.py     pure helpers for command completion: slash popup (slash_matches, enter_completes, render_completion) + inline ghost text (CommandSuggester) — fed by _registry, no Textual imports except the Suggester base class
   __main__.py       main() entry point — argparse subcommands (headless) vs no-args (TUI); `--export` kept as a deprecated alias
-  commands/
-    base.py         Command ABC, SlashCommand, CommandRegistry
-    __init__.py     CommandsMixin — all command classes + registry + dispatch
-  connection/       ConnectionMixin — keyring auth, _connect_worker, keyring helpers, _connect_headless() (no-UI auth for `asher --export`)
-  monitoring/       MonitoringMixin — _poll_status_interval, _refresh_status
-  ui/               UIMixin — CSS, compose(), log helpers, cat helpers
-  slash-commands/   Convention doc
+  headless.py       headless command surface for `asher <command>` — Session/Result/CommandError, the COMMANDS registry, run(), run_legacy_export(); plain strings only, no Textual, routes model differences through RobotAdapter
+
+  core/             shared domain + infrastructure — no Textual, imported by every surface
+    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)
+    credentials.py    keyring + dev-mode .env credentials — load()/save()/delete(), load_token()/save_token(), preferred robot, password_login(), available() (presence only, no network), connect_headless(), HeadlessAuthError
+    faults.py         check_faults(robot) — model-scoped safety/component fault detection (status enum + per-model attr allowlist incl. LR4 USB power fault; hopper never a fault)
+    activity.py       ACTION_LABELS + format_activity() — raw pylitterbot activity strings → readable (label, colour); shared by `history` and export
+    export.py         shared activity-history CSV core + exit-code contract: build_history_csv(), resolve_dest(), resolve_robot(), parse_days(), EXIT_*, ExportError — the TUI `export` command and `asher export` both call build_history_csv()
+    updates.py        PyPI release check — read-only over HTTPS, once a day, reports only. Never installs (see its docstring for why that stays manual)
+
+  robot/
+    protocol.py       RobotProtocol structural Protocol for pylitterbot robot objects
+    adapters.py       RobotAdapter ABC + LR3/LR4/LR5 subclasses + make_adapter() factory
+
+  tui/              the Textual dashboard — nothing outside tui/ imports it except __main__
+    app.py            AsherApp class (thin orchestrator — composes mixins)
+    ui.py             UIMixin — compose(), log helpers (_log_ok/err/warn/info, _log_stamped for hanging-indent lines), cat helpers
+    style.tcss        the app stylesheet ($asher-* variables)
+    connection.py     ConnectionMixin — _connect_worker, token/password connect, post-connect setup (credentials come from core.credentials)
+    monitoring.py     MonitoringMixin — _poll_status_interval, _refresh_status
+    loginflow.py      LoginFlow state machine — inline email/password prompt in command bar
+    loginscreen.py    LoginScreen modal (ModalScreen[tuple[str,str]]) — available, not primary flow
+    completion.py     pure helpers for command completion: slash popup (slash_matches, enter_completes, render_completion) + inline ghost text (CommandSuggester) — fed by _registry, no Textual imports except the Suggester base class
+    history.py        HistoryScreen (ModalScreen) + format_history_rows()/format_history_text() — scrollable activity-history pager pushed by the `history` command; `c` copies the full history (plain text) to the clipboard via action_copy_all()
+    cats.py           CATS dict (ASCII art)
+    commands/
+      __init__.py     CommandsMixin — input routing, dispatch, history nav, completion keys, help rendering
+      base.py         Command ABC, SlashCommand, CommandRegistry, HINT_* bar texts
+      registry.py     _registry — every command instance, registered in one place
+      robot.py        robot commands (clean, status, info, lock, …, sleep-schedule, history, export)
+      lr5.py          LR5-only robot commands (privacy, volume, camera-audio, drawer-reset)
+      builtin.py      help, clear, quit
+      slash.py        slash commands (app management) + _persist()
+
+  desktop/          background + OS integration — never imports tui/
+    watcher.py        background notification loop with no TUI — pure WatchState (robot snapshots → Alert list) + supervising watch() that reconnects with backoff, plus WatcherRunner (asyncio on a worker thread, for the tray)
+    daemon.py         detached watcher process control — `start` pre-flights `credentials.available()` (presence only, no network, so starting offline still works) because the watcher claims the pid file *before* authenticating and would otherwise report a pid for a process that stops a moment later — pid file/log in ~/.asher-cli, start/stop/status/run, cross-platform detach + liveness (os.kill would *terminate* on Windows)
+    tray.py           optional pystray/Pillow system-tray icon over WatcherRunner; every path degrades to a headless watcher. Icon is a panel-toned silhouette + status dot — colour rides the badge, never the whole glyph
+    launcher.py       open_app() — start the TUI in a new terminal from the tray (a detached tray has none): new console on Windows, Terminal.app via AppleScript on macOS, first installed emulator on Linux (desktop's own preferred)
+    desktoptheme.py   panel_is_dark() — is the tray/menu-bar background dark? kdeglobals luma / gsettings / AppleInterfaceStyle / the Personalize registry keys, behind a TTL cache; every probe degrades to a fallback, never raises
+    autostart.py      login items — AutostartBackend ABC + launchd/systemd-user/registry subclasses + backend() factory; all per-user, no admin rights, disable() removes exactly what enable() wrote
+    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
+
+  mcp/
+    config.py         Claude Desktop config read/write for the /mcp slash command
+    bridge.py         asher-mcp-launch console script — keyring-backed pylitterbot MCP launcher
+```
+
+**Layering** (enforced by `tests/test_layering.py`): `core/` and `robot/` import only each other; `mcp/` imports neither `tui/` nor `desktop/`; `desktop/` may use `core/`, `robot/` and `headless`, never `tui/`; only `__main__` imports `tui/`. Something both the TUI and the watcher need belongs in `core/`.
 
+```
 tests/
   testhelpers.py          unit tests for helpers.py
   test_cats.py            CATS dict structure
@@ -62,7 +82,8 @@ tests/
   test_auth_pilot.py      Textual Pilot integration tests for LoginScreen
   test_app_pilot.py       Textual Pilot integration tests for AsherApp
   test_commands_pilot.py  Textual Pilot integration tests for command dispatch
-  test_connection.py      keyring helper functions
+  test_credentials.py     keyring/env credential helpers (core.credentials)
+  test_layering.py        subpackage import boundaries (AST scan of asher/)
   test_connection_mixin.py ConnectionMixin structure
   test_monitoring.py      MonitoringMixin async methods
   test_ui.py              UIMixin constants, CSS, helper existence
@@ -109,21 +130,21 @@ LITTER_ROBOT_USER=...
 LITTER_ROBOT_PASSWORD=...
 ```
 
-Every environment read goes through `_env_credentials()` in
-`asher/connection/__init__.py` — the one place the gate is applied. Don't call
+Every environment read goes through `credentials.from_env()` in
+`asher/core/credentials.py` — the one place the gate is applied. Don't call
 `os.getenv("LITTER_ROBOT_*")` anywhere else. `helpers.dev_mode()` is the shared
 predicate (it also selects the `dev` version string).
 
 Keyring service name: `asher-cli`, keys `email` and `password`.
-Helper functions in `asher/connection/__init__.py`: `_keyring_load()`, `_keyring_save()`, `_keyring_delete()`.
+Helpers live in `asher/core/credentials.py` (`load()`, `save()`, `delete()`, …); call them through the module (`credentials.load()`) so tests have one patch target.
 
 ## Command convention
 
-Command names, slash-command names, and their args are not listed here — see the `_registry` in `asher/commands/__init__.py`, which is authoritative; `/help` renders it at runtime. `/mcp`'s credential-bridging design is documented in the `mcp-bridge` skill.
+Command names, slash-command names, and their args are not listed here — see `_registry` in `asher/tui/commands/registry.py`, which is authoritative; `/help` renders it at runtime. `/mcp`'s credential-bridging design is documented in the `mcp-bridge` skill.
 
 **Normal commands** (no prefix) are robot actions only; **slash commands** (`/` prefix) are app management only.
 
-`/refresh`, `/cat`, `/pet`, and `/notify` persist their settings to `~/.asher-cli/config.json` (via `asher.config.update()`), so they survive restarts. That file is also the only channel to a running watcher, which re-reads it per alert rather than caching at startup. Credentials and the preferred-robot serial stay in the OS keyring; the config file holds only non-secret UI preferences.
+`/refresh`, `/cat`, `/pet`, and `/notify` persist their settings to `~/.asher-cli/config.json` (via `asher.core.config.update()`), so they survive restarts. That file is also the only channel to a running watcher, which re-reads it per alert rather than caching at startup. Credentials and the preferred-robot serial stay in the OS keyring; the config file holds only non-secret UI preferences.
 
 Do not add robot-control commands as slash commands, and do not add app-management commands as bare commands.
 
@@ -132,7 +153,7 @@ Do not add robot-control commands as slash commands, and do not add app-manageme
 
 **Headless commands** (`asher <command>`) are a parallel registry in `asher/headless.py`: same robot actions, no Textual, plain-string + JSON output. `asher watch` and `asher update` are deliberately *not* in that registry — `watch` manages a long-lived process rather than doing one thing and exiting, and `update` talks to PyPI rather than a robot, so neither should be forced through `open_session()` and made to authenticate. Both declare their subparser directly in `__main__.py`. Slash commands have no headless equivalent — they configure the TUI, which isn't running. A robot command worth scripting should exist in both registries; the shared logic lives in `RobotAdapter`, not in either command class.
 
-> If you add a command, update the tables in `README.md` and the list in `asher/slash-commands/__init__.py`. If it's a robot command, consider adding it to `COMMANDS` in `asher/headless.py` too.
+> If you add a command, update the tables in `README.md`. If it's a robot command, consider adding it to `COMMANDS` in `asher/headless.py` too.
 
 ## Architecture
 
@@ -180,19 +201,19 @@ LoginScreen (ModalScreen) — available in auth.py but not the primary auth path
 | `on_key()` | `↑`/`↓` history nav, plus completion nav (arrows cycle the slash popup, `Tab`/`Enter` accept, `Esc` dismisses); `Tab` also accepts the inline ghost-text suggestion when the popup is closed |
 | `_start_login_flow()` | begin inline email/password prompt in command bar |
 | `_cmd_logout()` | delete creds from keyring, disconnect |
-| `make_adapter(robot)` | factory in `robot_adapters.py` — returns correct `RobotAdapter` subclass |
+| `make_adapter(robot)` | factory in `robot/adapters.py` — returns correct `RobotAdapter` subclass |
 | `_log_ok/err/warn/info()` | timestamped log helpers |
 
 ## Robot compatibility
 
-pylitterbot auto-detects robot type. Commands that differ per model are handled by `RobotAdapter` subclasses in `robot_adapters.py` — `make_adapter(robot)` returns the right one based on `type(robot).__name__`. Status-bar reads use `getattr(..., default)` for graceful degradation on older models. See the `pylitterbot-ref` skill for the confirmed API surface.
+pylitterbot auto-detects robot type. Commands that differ per model are handled by `RobotAdapter` subclasses in `robot/adapters.py` — `make_adapter(robot)` returns the right one based on `type(robot).__name__`. Status-bar reads use `getattr(..., default)` for graceful degradation on older models. See the `pylitterbot-ref` skill for the confirmed API surface.
 
 ## Colour
 
-Every colour comes from `asher/theme.py` (Catppuccin Mocha). Reference the **semantic roles** (`theme.MUTED`, `theme.DANGER`, …), not the raw swatches (`theme.OVERLAY0`) and never a hex literal — a re-flavour then only repoints the roles.
+Every colour comes from `asher/core/theme.py` (Catppuccin Mocha). Reference the **semantic roles** (`theme.MUTED`, `theme.DANGER`, …), not the raw swatches (`theme.OVERLAY0`) and never a hex literal — a re-flavour then only repoints the roles.
 
 - **Rich styles:** `style=theme.ACCENT`, or `style=f"bold {theme.ACCENT}"`. Prefer building `Text` objects with explicit styles over `Text.from_markup` with inline colours.
-- **`ui/style.tcss`:** use the `$asher-*` variables; `AsherApp.get_css_variables()` supplies them.
+- **`tui/style.tcss`:** use the `$asher-*` variables; `AsherApp.get_css_variables()` supplies them.
 - **Inline `CSS`/`DEFAULT_CSS` on a Screen or Widget:** wrap the block in `theme.apply(...)`, which bakes the `$asher-*` values in at class-definition time. A screen mounted on a host app that isn't `AsherApp` (as the Pilot tests do) would otherwise fail to parse.
 
 ## Code comments
@@ -206,7 +227,7 @@ Don't add comments above functions or inline unless the WHY is genuinely non-obv
 - Cat modes: `idle`, `happy`, `cleaning` (animated), `sleeping`, `error`, `full`
 - `VERSION` is read from `importlib.metadata.version("asher-cli")` — falls back to `"dev"` when running from source
 - **No `assert` in `asher/`** — Bandit enforces this (B101 is enabled; only `tests/` is exempt, via `exclude_dirs`). For a `requires_robot` command, narrow with `if app._robot is None: return` rather than an assert: `_dispatch_command` already rejects the disconnected case, and unlike `assert` the guard survives `python -O`
-- The primary login path is the inline flow in `login_flow.py` (`LoginFlow` state machine: `IDLE` → `AWAITING_EMAIL` → `AWAITING_PASSWORD`). `LoginScreen` (`auth.py`) still exists as a modal but is not used in the current main flow.
+- The primary login path is the inline flow in `tui/loginflow.py` (`LoginFlow` state machine: `IDLE` → `AWAITING_EMAIL` → `AWAITING_PASSWORD`). `LoginScreen` (`tui/loginscreen.py`) still exists as a modal but is not used in the current main flow.
 - `LoginScreen` uses `event.stop()` on `Input.Submitted` and `Button.Pressed` to prevent bubbling to the App's `on_input_submitted` (relevant if re-activating the modal path)
 
 ### IoT command timing — optimistic UI updates
@@ -217,15 +238,15 @@ Commands that need a confirmed cloud state before showing a result (e.g. sleep/w
 
 ## Common tasks
 
-**Add a robot command:** create a class inheriting `Command` in `asher/commands/__init__.py`, implement `async def run(self, app, args)`, and call `_registry.register(MyCommand())`.
+**Add a robot command:** create a class inheriting `Command` in `asher/tui/commands/robot.py` (or `lr5.py`), implement `async def run(self, app, args)`, and register it in `registry.py`.
 
-**Add a slash command:** create a class inheriting `SlashCommand` (sets `prefix = "/"`), implement `async def run(self, app, args)`, register it, and document in `asher/slash-commands/__init__.py`.
+**Add a slash command:** create a class inheriting `SlashCommand` (sets `prefix = "/"`) in `asher/tui/commands/slash.py`, implement `async def run(self, app, args)`, and register it in `registry.py`.
 
 **Add a headless command:** write `async def _my_command(session, args) -> Result` in `asher/headless.py` and add a `HeadlessCommand(...)` entry to `COMMANDS`. The argparse subparser is generated from the registry — nothing to add in `__main__.py`. Build the `Result` with `_rows()` (read commands) or `_outcome()` (actions) so text and JSON stay in step, and raise `CommandError` rather than printing.
 
 **Change poll interval:** `self.set_interval(300, ...)` in `on_mount`.
 
-**Add a new cat state:** add entry to `CATS` dict in `asher/cats.py` (str for static, list[str] for animated), then call `_set_cat("name", "label")`.
+**Add a new cat state:** add entry to `CATS` dict in `asher/tui/cats.py` (str for static, list[str] for animated), then call `_set_cat("name", "label")`.
 
 **File naming convention:** no underscores in filenames (except Python-required `__init__.py` and `__main__.py`).
 
@@ -254,5 +275,5 @@ Regenerate with `changelog-release X.Y.Z`, never plain `changelog` — the workf
 - Pilot-based integration tests use `app.run_test()` with `await pilot.pause()` before querying widgets
 - Helper app wrappers for screens must **not** start with `Test` (pytest will try to collect them); use e.g. `LoginTestApp`
 - Mock external deps with `unittest.mock.AsyncMock` for async robot/account methods
-- `from pylitterbot import Account` is a local import inside `_connect_worker` — patch it at `pylitterbot.Account`, not `asher.connection.Account`
+- `from pylitterbot import Account` is a local import inside `_connect_worker` — patch it at `pylitterbot.Account`, not `asher.tui.connection.Account`
 - Coverage: ~76% overall; main gaps are async exception paths and `_connect_worker` auth flow

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: asher-cli
-Version: 1.4.0
+Version: 1.4.1
 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.5
+Requires-Dist: pylitterbot==2025.6.6
 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.5; extra == 'mcp'
+Requires-Dist: pylitterbot[mcp]==2025.6.6; extra == 'mcp'
 Provides-Extra: tray
 Requires-Dist: pillow>=10.0; extra == 'tray'
 Requires-Dist: pygobject>=3.42; (sys_platform == 'linux') and extra == 'tray'
@@ -85,7 +85,7 @@ A Claude Code-style terminal dashboard for monitoring and controlling Litter Rob
 - Headless mode — every robot command also runs without the TUI (`asher status`, `asher clean`, `asher night-light auto`, `asher export 7`), with `--json` output and documented exit codes for cron / Task Scheduler / SSH
 - Background watcher — `asher watch start` detaches a notifier process that keeps toasting faults, a filling drawer, and offline/online changes **after you close the terminal**; `asher watch enable` starts it at login (launchd / systemd / registry); optional system-tray icon shows live status with Open Asher / Notifications / Quit
 - Update notices — checks PyPI once a day and tells you when a newer release exists, with the right upgrade command for how you installed it. It never installs anything itself
-- Catppuccin Mocha throughout — one palette in `asher/theme.py` drives the TUI stylesheet and every Rich style
+- Catppuccin Mocha throughout — one palette in `asher/core/theme.py` drives the TUI stylesheet and every Rich style
 - Cat animation panel that reacts to robot state
 - Command history (↑/↓ arrows)
 - Real-time updates via WebSocket; 5-minute poll fallback

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

@@ -29,7 +29,7 @@ A Claude Code-style terminal dashboard for monitoring and controlling Litter Rob
 - Headless mode — every robot command also runs without the TUI (`asher status`, `asher clean`, `asher night-light auto`, `asher export 7`), with `--json` output and documented exit codes for cron / Task Scheduler / SSH
 - Background watcher — `asher watch start` detaches a notifier process that keeps toasting faults, a filling drawer, and offline/online changes **after you close the terminal**; `asher watch enable` starts it at login (launchd / systemd / registry); optional system-tray icon shows live status with Open Asher / Notifications / Quit
 - Update notices — checks PyPI once a day and tells you when a newer release exists, with the right upgrade command for how you installed it. It never installs anything itself
-- Catppuccin Mocha throughout — one palette in `asher/theme.py` drives the TUI stylesheet and every Rich style
+- Catppuccin Mocha throughout — one palette in `asher/core/theme.py` drives the TUI stylesheet and every Rich style
 - Cat animation panel that reacts to robot state
 - Command history (↑/↓ arrows)
 - Real-time updates via WebSocket; 5-minute poll fallback

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

@@ -22,7 +22,7 @@ import argparse
 import asyncio
 import sys
 
-from .daemon import ACTIONS as DAEMON_ACTIONS
+from .desktop.daemon import ACTIONS as DAEMON_ACTIONS
 from .headless import COMMANDS
 
 
@@ -156,12 +156,12 @@ def main() -> None:
     args = _build_parser().parse_args()
 
     if args.command == "watch":
-        from .daemon import dispatch  # noqa: PLC0415
+        from .desktop.daemon import dispatch  # noqa: PLC0415
 
         sys.exit(dispatch(args.action, robot=args.robot, tray=not args.no_tray))
 
     if args.command == "update":
-        from .updates import report  # noqa: PLC0415
+        from .core.updates import report  # noqa: PLC0415
 
         up_to_date, message = report(as_json=args.json)
         print(message)
@@ -183,11 +183,11 @@ def main() -> None:
         )
 
     if args.export is not None:
-        from .export import _run_headless_export  # noqa: PLC0415
+        from .headless import run_legacy_export  # noqa: PLC0415
 
-        sys.exit(asyncio.run(_run_headless_export(args)))
+        sys.exit(asyncio.run(run_legacy_export(args)))
 
-    from .app import AsherApp  # noqa: PLC0415
+    from .tui.app import AsherApp  # noqa: PLC0415
 
     AsherApp().run()
 

{asher_cli-1.4.0/asher → asher_cli-1.4.1/asher/core}/config.py

@@ -7,7 +7,7 @@ the OS keyring; this file holds only non-secret UI preferences, so a corrupt
 or hand-edited file degrades to defaults rather than crashing the app.
 
 It is also the only channel between the dashboard and a detached watcher
-(:mod:`asher.watcher`), which is why the watcher re-reads it per alert rather
+(:mod:`asher.desktop.watcher`), which is why the watcher re-reads it per alert rather
 than caching at startup: toggling ``/notify`` in the TUI, or the tray's own
 Notifications item, has to reach a process that may have been up for days.
 """