Revert "Merge pull request 'feat: implement /timezone command to get/set room timezone' (#67) from feat/issue-53-timezone into main"

This reverts commit 015df15bd5, reversing
changes made to bd2627efe9.

CONTRIBUTING.md

@@ -5,27 +5,42 @@
 ```bash
 git clone https://git.fbrns.co/shoko/jigaido.git
 cd jigaido
+
+# Create virtual environment
 python -m venv venv
 source venv/bin/activate
-pip install -r requirements.txt
+
+# Install dependencies
+pip install -r apps/telegram-bot/requirements.txt
+
+# Run tests
+pytest
 
 # Run bot
-export JIGAIDO_BOT_TOKEN="test:token"
-python bot.py
+export JIGAIDO_BOT_TOKEN="your_bot_token"
+python -m apps.telegram-bot.bot
 ```
 
+## Architecture
+
+JIGAIDO follows hexagonal architecture:
+
+- **Core** (`core/`): Pure domain logic - models, ports (interfaces), and services
+- **Adapters** (`adapters/`): Infrastructure implementations - storage adapters
+- **Apps** (`apps/`): CLI applications - Telegram bot
+
 ## Code Style
 
-- Python (no strict formatter enforced yet)
+- Python 3.10+ with type hints
 - Async/await for Telegram handlers
-- Type hints where obvious
 - Docstrings for public functions
+- Follow existing code patterns
 
 ## Pull Request Workflow
 
 1. Branch from `main`
 2. Make changes
-3. Test locally
+3. Test locally with `pytest`
 4. Open PR with description of what changed and why
 5. Someone reviews and merges
 

README.md

@@ -22,14 +22,33 @@ A bounty tracking platform. Currently ships with a Telegram bot for managing and
 
 ```
 jigaido/
+├── core/                    # Domain layer (pure Python, no external deps)
+│   ├── models.py            # Domain dataclasses (Bounty, Tracking)
+│   ├── ports.py             # Port interfaces
+│   └── services.py          # Domain services
+├── adapters/                # Infrastructure adapters
+│   └── storage/
+│       └── json_file.py     # JSON file storage implementation
 ├── apps/
-│   └── telegram-bot/   ← first app (Python)
-│       ├── bot.py
-│       ├── commands.py
-│       ├── cron.py
-│       ├── db.py
-│       └── requirements.txt
-└── SPEC.md             ← full design specification
+│   └── telegram-bot/        # Telegram bot CLI application
+│       ├── bot.py            # Bot entry point
+│       └── commands.py       # Command handlers
+├── tests/                   # Unit tests
+├── config.py               # Configuration management
+└── SPEC.md                 # Full design specification
+```
+
+## Quick Start
+
+```bash
+# Install dependencies
+pip install -r apps/telegram-bot/requirements.txt
+
+# Set bot token
+export JIGAIDO_BOT_TOKEN="your_bot_token"
+
+# Run bot
+python -m apps.telegram-bot.bot
 ```
 
 ## License

SPEC.md

@@ -6,23 +6,21 @@
 
 ## Overview
 
-JIGAIDO is a Telegram bot that lets groups and individuals track bounties — tasks, obligations, and deadlines — with optional due dates and personal tracking/reminders.
+JIGAIDO is a Telegram bot that lets groups and individuals track bounties — tasks, obligations, and deadlines — with optional due dates and personal tracking.
 
-- **Group mode**: Each Telegram group has its own bounty list. Only group admins can add/update/delete bounties. Any member can track/untrack.
-- **DM mode**: Personal bounty list. No admin restrictions — anyone can manage their own bounties.
-- **Tracking**: Users can add any bounty (group or DM) to their personal tracking list.
-- **Reminders**: Daily cron checks for due dates within 7 days and DMs the user.
-- **Due dates**: Free-form text (`"april 15"`, `"in 3 days"`, `"tomorrow"`) parsed at add time, stored as Unix timestamp. If unparseable, stored as `NULL` — no reminder.
-- **Links**: Optional. If provided, deduplicated per group (no two bounties in the same group can share the same link). Multiple links in one bounty: first link only, user can update later.
-- **Informed by**: Every bounty stores the Telegram username of who posted/added it (not who created the record — the person whose message triggered the add).
+- **Group mode**: Each Telegram group has its own bounty list. Anyone can add bounties. Only creator can edit/delete.
+- **DM mode**: Personal bounty list. Anyone can manage their own bounties.
+- **Tracking**: Users can track any bounty (group or personal) to their tracking list.
+- **Due dates**: Free-form text (`"april 15"`, `"in 3 days"`, `"tomorrow"`) parsed at add time, stored as Unix timestamp. If unparseable, stored as `NULL`.
+- **Links**: Optional. If provided, stored with the bounty.
+- **Informed by**: Every bounty stores the user ID of who posted/added it.
 
 ---
-
 ## Architecture
 
 ### Stack
 - **Bot**: `python-telegram-bot` (pure Python, no C extensions)
-- **Database**: SQLite (zero-install, single file)
+- **Storage**: Per-group JSON files via `adapters/storage/json_file.py`
 - **Date parsing**: `dateparser`
 - **Runtime**: Python 3.10+
 - **Deployment**: Any $5 VPS with Python 3.10+
@@ -31,81 +29,91 @@ JIGAIDO is a Telegram bot that lets groups and individuals track bounties — ta
 
 ```
 jigaido/
+├── core/                    # Domain layer
+│   ├── models.py            # Domain dataclasses (Bounty, Tracking)
+│   ├── ports.py             # Port interfaces (abstract base classes)
+│   └── services.py          # Domain services (BountyService, TrackingService)
+├── adapters/                # Infrastructure adapters
+│   └── storage/
+│       └── json_file.py     # JSON file storage implementation
 ├── apps/
-│   └── telegram-bot/     # Telegram bot app
-│       ├── bot.py       # Entrypoint
-│       ├── commands.py  # Command handlers
-│       ├── cron.py      # Daily reminder job
-│       ├── db.py        # SQLite wrapper
-│       ├── schema.sql   # Database schema
-│       ├── requirements.txt
-│       └── .env.example
-├── SPEC.md          # This document
-├── README.md
-└── CONTRIBUTING.md
+│   └── telegram-bot/        # Telegram bot CLI application
+│       ├── bot.py            # Bot entry point
+│       └── commands.py       # Command handlers
+├── config.py               # Configuration management
+└── tests/                  # Unit tests
 ```
 
----
+### Hexagonal Architecture
 
-## Database Schema
+- **Core** (`core/`): Pure domain logic, no external dependencies
+  - `models.py`: Domain dataclasses
+  - `ports.py`: Abstract interfaces for storage
+  - `services.py`: Business logic
 
-```sql
-CREATE TABLE groups (
-    id              INTEGER PRIMARY KEY AUTOINCREMENT,
-    telegram_chat_id INTEGER UNIQUE NOT NULL,
-    creator_user_id  INTEGER NOT NULL,
-    created_at       INTEGER NOT NULL DEFAULT (unixepoch())
-);
+- **Adapters** (`adapters/`): Implementations of ports
+  - `storage/json_file.py`: JSON file-based storage
 
-CREATE TABLE group_admins (
-    group_id  INTEGER REFERENCES groups(id) ON DELETE CASCADE,
-    user_id   INTEGER NOT NULL,
-    PRIMARY KEY (group_id, user_id)
-);
+- **Apps** (`apps/`): CLI applications
+  - `telegram-bot/`: Telegram bot interface
 
-CREATE TABLE users (
-    id               INTEGER PRIMARY KEY AUTOINCREMENT,
-    telegram_user_id  INTEGER UNIQUE NOT NULL,
-    username          TEXT,
-    created_at        INTEGER NOT NULL DEFAULT (unixepoch())
-);
+### Data Storage
 
-CREATE TABLE bounties (
-    id                   INTEGER PRIMARY KEY AUTOINCREMENT,
-    group_id              INTEGER REFERENCES groups(id) ON DELETE CASCADE,
-    created_by_user_id    INTEGER REFERENCES users(id),
-    informed_by_username  TEXT NOT NULL,
-    text                  TEXT,
-    link                  TEXT,
-    due_date_ts           INTEGER,
-    created_at            INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(group_id, link)
-);
+Data is stored at `~/.jigaido/` (home directory), NOT inside the repository.
 
-CREATE TABLE user_bounty_tracking (
-    id         INTEGER PRIMARY KEY AUTOINCREMENT,
-    user_id    INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    bounty_id  INTEGER NOT NULL REFERENCES bounties(id) ON DELETE CASCADE,
-    added_at   INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(user_id, bounty_id)
-);
+**File: `~/.jigaido/{group_id}/group.json`**
 
-CREATE TABLE reminder_log (
-    id          INTEGER PRIMARY KEY AUTOINCREMENT,
-    user_id     INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    bounty_id   INTEGER NOT NULL REFERENCES bounties(id) ON DELETE CASCADE,
-    reminded_at INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(user_id, bounty_id)
-);
+```json
+{
+  "bounties": [
+    {
+      "id": 1,
+      "created_by_user_id": 123456,
+      "text": "Fix login bug",
+      "link": "https://github.com/example/repo/issues/1",
+      "due_date_ts": 1735689600,
+      "created_at": 1735603200
+    }
+  ],
+  "next_id": 2
+}
 ```
 
-### Notes
-- `group_id = NULL` means a personal/DM bounty.
-- `UNIQUE(group_id, link)` — only enforced when `link IS NOT NULL` (SQLite treats NULL as distinct).
-- `reminder_log` dedup ensures a user only gets one reminder per bounty.
+**File: `~/.jigaido/{group_id}/{user_id}.json`**
+
+```json
+{
+  "tracked": [
+    {"bounty_id": 1, "created_at": 1735600000}
+  ]
+}
+```
+
+**File: `~/.jigaido/{user_id}/user.json`**
+
+```json
+{
+  "bounties": [
+    {
+      "id": 1,
+      "text": "Personal task",
+      "link": null,
+      "due_date_ts": 1735689600,
+      "created_at": 1735603200
+    }
+  ],
+  "next_id": 2
+}
+```
+
+**Key design decisions:**
+
+1. **Hexagonal architecture** — Core domain is isolated from infrastructure
+2. **Group-isolated storage** — Each group has its own directory. No cross-group access.
+3. **Bounty IDs are sequential per group.json** — Not global. Each group's file has its own ID counter.
+4. **Atomic writes** — Uses `tempfile` + `rename` for safe writes.
 
 ---
-
 ## Commands
 
 ### In Group
@@ -114,24 +122,22 @@ CREATE TABLE reminder_log (
 |---|---|---|
 | `/bounty` | anyone | List all bounties in this group |
 | `/my` | anyone | List bounties tracked by you in this group |
-| `/add <text> [link] [due date]` | admin only | Add a new bounty to the group |
-| `/update <bounty_id> [text] [link] [due_date]` | admin only | Update an existing bounty |
-| `/delete <bounty_id>` | admin only | Delete a bounty |
-| `/track <bounty_id>` | anyone | Add a group bounty to your tracking |
-| `/untrack <bounty_id>` | anyone | Remove a bounty from your tracking |
-| `/admin_add <user>` | creator only | Promote a user to admin |
-| `/admin_remove <user>` | creator only | Demote an admin |
+| `/add <text> [link] [due date]` | anyone | Add a new bounty to the group |
+| `/edit <bounty_id> [text] [link] [due_date]` | creator only | Edit an existing bounty |
+| `/delete <bounty_id>` | creator only | Delete a bounty |
+| `/track <bounty_id>` | anyone | Track a group bounty |
+| `/untrack <bounty_id>` | anyone | Stop tracking a bounty |
 
 ### In DM (1:1 with bot)
 
 | Command | Description |
 |---|---|
 | `/bounty` | List all your personal bounties |
-| `/my` | List all your tracked personal bounties |
+| `/my` | List all your personal bounties |
 | `/add <text> [link] [due date]` | Add a personal bounty |
-| `/update <bounty_id> [text] [link] [due_date]` | Update a personal bounty |
-| `/delete <bounty_id>` | Delete a personal bounty (owner only) |
-| `/track <bounty_id>` | Add a personal bounty to your tracking |
+| `/edit <bounty_id> [text] [link] [due_date]` | Edit a personal bounty |
+| `/delete <bounty_id>` | Delete a personal bounty |
+| `/track <bounty_id>` | Track a personal bounty |
 
 ### Add/Update Syntax
 
@@ -143,19 +149,6 @@ CREATE TABLE reminder_log (
 
 - `link` is optional
 - `due_date` is optional, free-form
-- If link already exists in group → rejected with error
-
-### Tracking
-
-- `/track <bounty_id>` — works in both group and DM. In group: tracks a group bounty. In DM: tracks a personal bounty.
-- Users can track any bounty regardless of who created it.
-- A bounty can be tracked by multiple users.
-
----
-
-## Informed By
-
-When a user triggers `/add`, the bot captures `message.from_user.username` and stores it in `informed_by_username`. This is displayed on bounty listings so the group/DM knows who posted or requested the bounty.
 
 ---
 
@@ -168,40 +161,26 @@ Uses `dateparser` library. Examples:
 - `"2026-04-15"`
 - `"next friday"`
 
-If parsing fails → `due_date_ts = NULL`. No error is shown to user, reminder just won't fire.
+If parsing fails → `due_date_ts = NULL`. No error is shown to user.
 
 Stored as Unix timestamp. User-facing display can be localized/converted to any timezone at render time.
 
 ---
 
-## Reminders (Cron)
-
-Runs daily (e.g., 09:00 local). For each user:
-
-1. Find tracked bounties where `due_date_ts - now() < 7 days`
-2. Exclude any already in `reminder_log` for that user
-3. Send DM: `"Bounty '{title}' is due in {N} days."`
-4. Insert into `reminder_log`
-
-Does not re-remind. If a bounty is 2 days away today, you get one message. Tomorrow you don't get another.
-
----
-
-## Admin Management
-
-- **Creator**: The user who first added the bot to the group. Stored as `creator_user_id` in `groups`. Only the creator can run `/admin_add` and `/admin_remove`.
-- **Admins**: Added via `/admin_add <username>`. Can add/update/delete any bounty in the group. Regular members can only track/untrack.
-- First admin assignment is automatic when the bot detects a new group.
-
----
-
 ## Error Handling
 
 - Unknown command → help text with available commands
-- `/add` with duplicate link in same group → rejection message
-- `/update`/`/delete` by non-admin → "Admin only" message
-- `/admin_add`/`/admin_remove` by non-creator → "Creator only" message
-- `/track` already tracked → "Already tracking" (idempotent, no error)
-- `/untrack` not tracked → "Not tracking" (idempotent, no error)
+- `/edit`/`/delete` by non-creator → "⛔ Only the creator can edit/delete this bounty."
+- `/track` already tracked → "Already tracking" (idempotent)
+- `/untrack` not tracked → "Not tracking" (idempotent)
 - Bounty not found → "Bounty not found"
-- User not found → "User not found"
+
+---
+
+## When to Revert to SQLite
+
+- Multiple concurrent users with write conflicts
+- Complex queries across users
+- Reminder system with proper dedup
+- Scale > 1,000 users
+- Need ACID guarantees on concurrent writes

adapters/__init__.py

@@ -0,0 +1,5 @@
+"""Storage adapters for JIGAIDO."""
+
+from adapters.storage.json_file import JsonFileRoomStorage, JsonFileTrackingStorage
+
+__all__ = ["JsonFileRoomStorage", "JsonFileTrackingStorage"]

adapters/storage/__init__.py

@@ -0,0 +1,5 @@
+"""Storage adapters for JIGAIDO."""
+
+from adapters.storage.json_file import JsonFileRoomStorage, JsonFileTrackingStorage
+
+__all__ = ["JsonFileRoomStorage", "JsonFileTrackingStorage"]

adapters/storage/json_file.py

@@ -0,0 +1,256 @@
+"""JSON file storage adapter for JIGAIDO.
+
+Implements RoomStorage and TrackingStorage ports using JSON file persistence.
+Data stored at:
+- Rooms: ~/.jigaido/data/room/<room_id>.json
+- Tracking: ~/.jigaido/data/tracking/<room_id>_<user_id>.json
+"""
+
+import json
+import os
+import tempfile
+from pathlib import Path
+
+from core.models import Bounty, RoomData, TrackingData, TrackedBounty
+from core.ports import RoomStorage, TrackingStorage
+
+
+class JsonFileRoomStorage:
+    """RoomStorage implementation using JSON files.
+
+    Stores room data at ~/.jigaido/data/room/<room_id>.json
+    """
+
+    def __init__(self, data_dir: Path | None = None):
+        if data_dir is None:
+            data_dir = Path.home() / ".jigaido" / "data" / "room"
+        self._data_dir = data_dir
+        self._data_dir.mkdir(parents=True, exist_ok=True)
+
+    def _get_file_path(self, room_id: int) -> Path:
+        return self._data_dir / f"{room_id}.json"
+
+    def _atomic_write(self, path: Path, data: dict) -> None:
+        """Write data atomically using tempfile + rename."""
+        with tempfile.NamedTemporaryFile(
+            mode="w", dir=self._data_dir, delete=False
+        ) as tmp:
+            json.dump(data, tmp, indent=2)
+            tmp_path = tmp.name
+        os.rename(tmp_path, path)
+
+    def load(self, room_id: int) -> RoomData | None:
+        """Load room data from JSON file. Returns None if not found."""
+        file_path = self._get_file_path(room_id)
+        if not file_path.exists():
+            return None
+
+        with open(file_path, "r") as f:
+            data = json.load(f)
+
+        bounties = [
+            Bounty(
+                id=b["id"],
+                text=b.get("text"),
+                link=b.get("link"),
+                due_date_ts=b.get("due_date_ts"),
+                created_at=b["created_at"],
+                created_by_user_id=b["created_by_user_id"],
+                deleted_at=b.get("deleted_at"),
+                created_by_username=b.get("created_by_username"),
+            )
+            for b in data.get("bounties", [])
+        ]
+
+        return RoomData(
+            room_id=data["room_id"],
+            bounties=bounties,
+            next_id=data["next_id"],
+            timezone=data.get("timezone"),
+            admin_user_ids=data.get("admin_user_ids", []),
+        )
+
+    def save(self, room_data: RoomData) -> None:
+        """Save room data to JSON file."""
+        data = {
+            "room_id": room_data.room_id,
+            "next_id": room_data.next_id,
+            "timezone": room_data.timezone,
+            "admin_user_ids": room_data.admin_user_ids or [],
+            "bounties": [
+                {
+                    "id": b.id,
+                    "text": b.text,
+                    "link": b.link,
+                    "due_date_ts": b.due_date_ts,
+                    "created_at": b.created_at,
+                    "created_by_user_id": b.created_by_user_id,
+                    "deleted_at": b.deleted_at,
+                    "created_by_username": b.created_by_username,
+                }
+                for b in room_data.bounties
+            ],
+        }
+
+        self._atomic_write(self._get_file_path(room_data.room_id), data)
+
+    def add_bounty(self, room_id: int, bounty: Bounty) -> None:
+        """Add a bounty to a room, creating the room if necessary."""
+        room_data = self.load(room_id)
+        if room_data is None:
+            room_data = RoomData(room_id=room_id, bounties=[], next_id=1)
+
+        room_data.bounties.append(bounty)
+        if bounty.id >= room_data.next_id:
+            room_data.next_id = bounty.id + 1
+
+        self.save(room_data)
+
+    def update_bounty(self, room_id: int, bounty: Bounty) -> None:
+        """Update an existing bounty in a room."""
+        room_data = self.load(room_id)
+        if room_data is None:
+            return
+
+        for i, b in enumerate(room_data.bounties):
+            if b.id == bounty.id:
+                room_data.bounties[i] = bounty
+                break
+
+        self.save(room_data)
+
+    def delete_bounty(self, room_id: int, bounty_id: int) -> None:
+        """Delete a bounty from a room."""
+        room_data = self.load(room_id)
+        if room_data is None:
+            return
+
+        room_data.bounties = [b for b in room_data.bounties if b.id != bounty_id]
+        self.save(room_data)
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        """Get a specific bounty from a room by ID."""
+        room_data = self.load(room_id)
+        if room_data is None:
+            return None
+
+        for b in room_data.bounties:
+            if b.id == bounty_id:
+                return b
+
+        return None
+
+    def list_bounties(self, room_id: int) -> list[Bounty]:
+        """List all non-deleted bounties in a room.
+
+        This is the default method for normal queries - soft-deleted bounties
+        are excluded from results.
+        """
+        room_data = self.load(room_id)
+        if room_data is None:
+            return []
+        return [b for b in room_data.bounties if b.deleted_at is None]
+
+    def list_all_bounties(
+        self, room_id: int, include_deleted: bool = True
+    ) -> list[Bounty]:
+        """List all bounties including or excluding soft-deleted.
+
+        Args:
+            room_id: The room ID
+            include_deleted: If True, return all bounties including soft-deleted.
+                           If False, return only non-deleted bounties.
+                           Defaults to True for /recover functionality.
+        """
+        room_data = self.load(room_id)
+        if room_data is None:
+            return []
+        if include_deleted:
+            return room_data.bounties
+        return [b for b in room_data.bounties if b.deleted_at is None]
+
+
+class JsonFileTrackingStorage:
+    """TrackingStorage implementation using JSON files.
+
+    Stores tracking data at ~/.jigaido/data/tracking/<room_id>_<user_id>.json
+    """
+
+    def __init__(self, tracking_dir: Path | None = None):
+        if tracking_dir is None:
+            tracking_dir = Path.home() / ".jigaido" / "data" / "tracking"
+        self._tracking_dir = tracking_dir
+        self._tracking_dir.mkdir(parents=True, exist_ok=True)
+
+    def _get_file_path(self, room_id: int, user_id: int) -> Path:
+        return self._tracking_dir / f"{room_id}_{user_id}.json"
+
+    def _atomic_write(self, path: Path, data: dict) -> None:
+        """Write data atomically using tempfile + rename."""
+        with tempfile.NamedTemporaryFile(
+            mode="w", dir=self._tracking_dir, delete=False
+        ) as tmp:
+            json.dump(data, tmp, indent=2)
+            tmp_path = tmp.name
+        os.rename(tmp_path, path)
+
+    def load(self, room_id: int, user_id: int) -> TrackingData | None:
+        """Load tracking data from JSON file. Returns None if not found."""
+        file_path = self._get_file_path(room_id, user_id)
+        if not file_path.exists():
+            return None
+
+        with open(file_path, "r") as f:
+            data = json.load(f)
+
+        tracked = [
+            TrackedBounty(
+                bounty_id=t["bounty_id"],
+                created_at=t["created_at"],
+            )
+            for t in data.get("tracked", [])
+        ]
+
+        return TrackingData(
+            room_id=data["room_id"],
+            user_id=data["user_id"],
+            tracked=tracked,
+        )
+
+    def save(self, tracking_data: TrackingData) -> None:
+        """Save tracking data."""
+        data = {
+            "room_id": tracking_data.room_id,
+            "user_id": tracking_data.user_id,
+            "tracked": [
+                {
+                    "bounty_id": t.bounty_id,
+                    "created_at": t.created_at,
+                }
+                for t in tracking_data.tracked
+            ],
+        }
+
+        self._atomic_write(
+            self._get_file_path(tracking_data.room_id, tracking_data.user_id), data
+        )
+
+    def track_bounty(self, room_id: int, user_id: int, tracked: TrackedBounty) -> None:
+        """Add a bounty to a user's tracking list, creating the tracking entry if needed."""
+        tracking_data = self.load(room_id, user_id)
+        if tracking_data is None:
+            tracking_data = TrackingData(room_id=room_id, user_id=user_id, tracked=[])
+
+        tracking_data.tracked.append(tracked)
+        self.save(tracking_data)
+
+    def untrack_bounty(self, room_id: int, user_id: int, bounty_id: int) -> None:
+        """Remove a bounty from a user's tracking list."""
+        tracking_data = self.load(room_id, user_id)
+        if tracking_data is None:
+            return
+
+        tracking_data.tracked = [
+            t for t in tracking_data.tracked if t.bounty_id != bounty_id
+        ]
+        self.save(tracking_data)

apps/telegram-bot/bot.py

@@ -4,16 +4,20 @@ import logging
 import os
 import sys
 
-from telegram import Update
-from telegram.ext import (
-    Application,
-    CommandHandler,
-    MessageHandler,
-    filters,
-)
+from telegram.ext import Application, CommandHandler, MessageHandler, filters
 
-import db
-import commands
+from commands import (
+    cmd_add,
+    cmd_bounty,
+    cmd_delete,
+    cmd_edit,
+    cmd_help,
+    cmd_my,
+    cmd_start,
+    cmd_track,
+    cmd_untrack,
+    cmd_update,
+)
 
 logging.basicConfig(
     format="%(asctime)s %(levelname)s %(name)s: %(message)s",
@@ -21,42 +25,40 @@ logging.basicConfig(
 )
 log = logging.getLogger(__name__)
 
-# Token from environment or config
 BOT_TOKEN = os.environ.get("JIGAIDO_BOT_TOKEN", "")
 
 
 def build_app() -> Application:
     app = Application.builder().token(BOT_TOKEN).build()
 
-    # Core commands
-    app.add_handler(CommandHandler("start", commands.cmd_start))
-    app.add_handler(CommandHandler("help", commands.cmd_help))
-    app.add_handler(CommandHandler("bounty", commands.cmd_bounty))
-    app.add_handler(CommandHandler("my", commands.cmd_my))
-    app.add_handler(CommandHandler("add", commands.cmd_add))
-    app.add_handler(CommandHandler("update", commands.cmd_update))
-    app.add_handler(CommandHandler("delete", commands.cmd_delete))
-    app.add_handler(CommandHandler("track", commands.cmd_track))
-    app.add_handler(CommandHandler("untrack", commands.cmd_untrack))
-    app.add_handler(CommandHandler("admin_add", commands.cmd_admin_add))
-    app.add_handler(CommandHandler("admin_remove", commands.cmd_admin_remove))
+    app.add_handler(CommandHandler("start", cmd_start))
+    app.add_handler(CommandHandler("help", cmd_help))
+    app.add_handler(CommandHandler("bounty", cmd_bounty))
+    app.add_handler(CommandHandler("my", cmd_my))
+    app.add_handler(CommandHandler("add", cmd_add))
+    app.add_handler(CommandHandler("edit", cmd_edit))
+    app.add_handler(CommandHandler("update", cmd_update))
+    app.add_handler(CommandHandler("delete", cmd_delete))
+    app.add_handler(CommandHandler("track", cmd_track))
+    app.add_handler(CommandHandler("untrack", cmd_untrack))
 
-    # Fallback: unknown commands
-    app.add_handler(MessageHandler(filters.COMMAND, commands.cmd_help))
+    app.add_handler(MessageHandler(filters.COMMAND, cmd_help))
 
     return app
 
 
 async def post_init(app: Application) -> None:
-    # Set bot commands in menu
-    await app.bot.set_my_commands([
-        ("bounty", "List bounties"),
-        ("my", "Your tracked bounties"),
-        ("add", "Add a bounty"),
-        ("track", "Track a bounty"),
-        ("untrack", "Stop tracking"),
-        ("help", "Show help"),
-    ])
+    await app.bot.set_my_commands(
+        [
+            ("bounty", "List bounties"),
+            ("my", "Your tracked bounties"),
+            ("add", "Add a bounty"),
+            ("edit", "Edit a bounty"),
+            ("track", "Track a bounty"),
+            ("untrack", "Stop tracking"),
+            ("help", "Show help"),
+        ]
+    )
 
 
 def main() -> None:
@@ -64,9 +66,6 @@ def main() -> None:
         log.error("JIGAIDO_BOT_TOKEN environment variable not set.")
         sys.exit(1)
 
-    db.init_db()
-    log.info("Database initialized.")
-
     app = build_app()
     app.post_init = post_init
 

apps/telegram-bot/commands.py

@@ -1,33 +1,61 @@
-"""Telegram command handlers for JIGAIDO."""
+"""Telegram command handlers for JIGAIDO - Thin wrappers around core services."""
 
-import re
 import time
+from datetime import datetime
 from functools import wraps
+from typing import Optional
 
 import dateparser
 from telegram import Update
 from telegram.ext import ContextTypes
 
-import db
+from adapters.storage.json_file import JsonFileRoomStorage, JsonFileTrackingStorage
+from core.services import BountyService, TrackingService
 
-TELEGRAM_BOT_USERNAME = "your_bot_username"  # Set via set_bot_commands / config
+ROOM_STORAGE = JsonFileRoomStorage()
+TRACKING_STORAGE = JsonFileTrackingStorage()
+BOUNTY_SERVICE = BountyService(ROOM_STORAGE)
+TRACKING_SERVICE = TrackingService(TRACKING_STORAGE, ROOM_STORAGE)
 
-REMINDER_WINDOW_DAYS = 7
+TELEGRAM_BOT_USERNAME = "your_bot_username"
 
 
-# ── Helpers ─────────────────────────────────────────────────────────────────
+def format_due_date(due_date_ts: int | None, timezone_str: str) -> str:
+    """Format due date as human-readable with timezone.
+
+    Examples:
+        No due date:     (none shown)
+        Date only:       4 April 2026
+        Date + time:     4 April 2026 14:30
+        With timezone:   4 April 2026 14:30 (Asia/Jakarta)
+    """
+    if not due_date_ts:
+        return ""
+
+    try:
+        tz = ZoneInfo(timezone_str)
+    except (KeyError, ZoneInfoNotFoundError):
+        tz = ZoneInfo("UTC")
+
+    dt = datetime.fromtimestamp(due_date_ts, tz=tz)
+
+    date_str = dt.strftime("%-d %B %Y")
+
+    if dt.hour != 0 or dt.minute != 0:
+        date_str += f" {dt.strftime('%H:%M')}"
+        date_str += f" ({timezone_str})"
+
+    return date_str
+
 
 def extract_args(text: str) -> list[str]:
-    """Split command text into tokens, preserving URLs as single tokens."""
     if not text:
         return []
     tokens = text.strip().split()
-    # First token is the command itself (e.g. /add), rest is args
     return tokens[1:] if len(tokens) > 1 else []
 
 
-def parse_args(args: list[str]) -> tuple[str | None, str | None, int | None]:
-    """Parse /add args into (text, link, due_date_ts)."""
+def parse_args(args: list[str]) -> tuple[Optional[str], Optional[str], Optional[int]]:
     text = None
     link = None
     due_date_ts = None
@@ -49,24 +77,29 @@ def parse_args(args: list[str]) -> tuple[str | None, str | None, int | None]:
     return text, link, due_date_ts
 
 
-def format_bounty(b: dict, show_id: bool = True) -> str:
+def format_bounty(b, show_id: bool = True, room_id: int | None = None) -> str:
     parts = []
     if show_id:
-        parts.append(f"[#{b['id']}]")
-    if b["text"]:
-        parts.append(b["text"])
-    if b["link"]:
-        parts.append(f"🔗 {b['link']}")
-    if b["due_date_ts"]:
-        due_str = time.strftime("%Y-%m-%d", time.localtime(b["due_date_ts"]))
-        days_left = (b["due_date_ts"] - int(time.time())) // 86400
+        parts.append(f"[#{b.id}]")
+    if b.text:
+        parts.append(b.text)
+    if b.link:
+        parts.append(f"🔗 {b.link}")
+    if b.due_date_ts:
+        timezone_str = "UTC"
+        if room_id is not None:
+            timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
+
+        due_str = format_due_date(b.due_date_ts, timezone_str)
+        days_left = (b.due_date_ts - int(time.time())) // 86400
         if days_left < 0:
             parts.append(f"⏰ {due_str} (OVERDUE)")
         elif days_left == 0:
             parts.append(f"⏰ {due_str} (TODAY)")
         else:
             parts.append(f"⏰ {due_str} ({days_left}d)")
-    parts.append(f"by @{b['informed_by_username'] or 'unknown'}")
+    if b.created_by_user_id:
+        parts.append(f"by {b.created_by_user_id}")
     return " | ".join(parts)
 
 
@@ -74,103 +107,68 @@ def is_group(update: Update) -> bool:
     return update.effective_chat.type != "private"
 
 
-def ensure_user(update: Update) -> int:
-    user = update.effective_user
-    username = user.username
-    return db.upsert_user(user.id, username)
+def get_group_id(update: Update) -> int:
+    return update.effective_chat.id
 
 
-def ensure_group(update: Update) -> tuple[int, int]:
-    """Ensure group and admin-creator exist. Returns (group_id, creator_user_id)."""
-    user_id = ensure_user(update)
-    creator_user_id = db.upsert_user(update.effective_user.id, update.effective_user.username)
-    group_id = db.upsert_group(update.effective_chat.id, creator_user_id)
-    # Ensure creator is also an admin
-    db.add_group_admin(group_id, creator_user_id)
-    return group_id, creator_user_id
+def get_user_id(update: Update) -> int:
+    return update.effective_user.id
 
 
-def admin_only(func):
-    @wraps(func)
-    async def wrapper(update: Update, ctx: ContextTypes.DEFAULT_TYPE):
-        if is_group(update):
-            group = db.get_group(update.effective_chat.id)
-            if not group:
-                await update.message.reply_text("Group not found. Try /start in the group first.")
-                return
-            user_id = ensure_user(update)
-            if not db.is_group_admin(group["id"], user_id):
-                await update.message.reply_text("⛔ Admin only.")
-                return
-        return await func(update, ctx)
-    return wrapper
+def get_room_id(update: Update) -> int:
+    """Get room_id for the current context.
 
+    For groups: negative group_id
+    For DMs: positive user_id
+    """
+    if is_group(update):
+        return get_group_id(update)
+    return get_user_id(update)
 
-def creator_only(func):
-    @wraps(func)
-    async def wrapper(update: Update, ctx: ContextTypes.DEFAULT_TYPE):
-        if is_group(update):
-            group = db.get_group(update.effective_chat.id)
-            if not group:
-                await update.message.reply_text("Group not found.")
-                return
-            user_id = ensure_user(update)
-            if not db.is_group_creator(group["id"], user_id):
-                await update.message.reply_text("⛔ Group creator only.")
-                return
-        return await func(update, ctx)
-    return wrapper
-
-
-# ── Commands ─────────────────────────────────────────────────────────────────
 
 async def cmd_bounty(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """List all bounties. Group: group bounties. DM: user's personal bounties."""
-    if is_group(update):
-        group = db.get_group(update.effective_chat.id)
-        if not group:
-            await update.message.reply_text("Group not initialized. Try /start.")
-            return
-        bounties = db.get_group_bounties(group["id"])
-    else:
-        user_id = ensure_user(update)
-        bounties = db.get_user_personal_bounties(user_id)
+    room_id = get_room_id(update)
+    bounties = BOUNTY_SERVICE.list_bounties(room_id)
 
     if not bounties:
         await update.message.reply_text("No bounties yet.")
         return
 
-    lines = [format_bounty(dict(b), show_id=True) for b in bounties]
+    lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
 async def cmd_my(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """List bounties tracked by the user. Group: tracked group bounties. DM: tracked personal bounties."""
-    user_id = ensure_user(update)
+    user_id = get_user_id(update)
 
     if is_group(update):
-        group = db.get_group(update.effective_chat.id)
-        if not group:
-            await update.message.reply_text("Group not found.")
-            return
-        bounties = db.get_user_tracked_bounties_in_group(user_id, group["id"])
+        group_id = get_group_id(update)
+        bounties = TRACKING_SERVICE.get_tracked_bounties(group_id, user_id)
+        room_id = group_id
     else:
-        bounties = db.get_user_tracked_bounties_personal(user_id)
+        room_id = get_room_id(update)
+        bounties = BOUNTY_SERVICE.list_bounties(room_id)
 
     if not bounties:
-        await update.message.reply_text("You are not tracking any bounties.")
+        msg = (
+            "You are not tracking any bounties."
+            if is_group(update)
+            else "No personal bounties."
+        )
+        await update.message.reply_text(msg)
         return
 
-    lines = [format_bounty(dict(b), show_id=True) for b in bounties]
+    lines = [format_bounty(b, show_id=True, room_id=room_id) for b in bounties]
     await update.message.reply_text("\n".join(lines), disable_web_page_preview=True)
 
 
-@admin_only
 async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Add a bounty. Args: [text] [link] [due_date]."""
     args = extract_args(update.message.text)
     if not args:
-        await update.message.reply_text("Usage: /add <text> [link] [due_date]\nExample: /add Fix the bug https://github.com/foo/bar tomorrow")
+        await update.message.reply_text(
+            "Usage: /add <text> [link] [due_date]\n"
+            "Example: /add Fix the bug https://github.com/foo/bar tomorrow"
+        )
         return
 
     text, link, due_date_ts = parse_args(args)
@@ -178,37 +176,34 @@ async def cmd_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("A bounty needs at least text or a link.")
         return
 
-    if is_group(update):
-        group_id, creator_user_id = ensure_group(update)
-        created_by = creator_user_id
-    else:
-        group_id = None
-        created_by = ensure_user(update)
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
 
-    informed_by = update.effective_user.username or str(update.effective_user.id)
-
-    try:
-        bounty_id = db.add_bounty(group_id, created_by, informed_by, text, link, due_date_ts)
-    except ValueError as e:
-        await update.message.reply_text(f"⛔ {e}")
-        return
+    bounty = BOUNTY_SERVICE.add_bounty(
+        room_id=room_id,
+        user_id=user_id,
+        text=text,
+        link=link,
+        due_date_ts=due_date_ts,
+    )
 
     due_str = ""
     if due_date_ts:
-        due_str = f" | Due: {time.strftime('%Y-%m-%d', time.localtime(due_date_ts))}"
+        timezone_str = BOUNTY_SERVICE.get_timezone(room_id)
+        due_str = f" | Due: {format_due_date(due_date_ts, timezone_str)}"
 
     await update.message.reply_text(
-        f"✅ Bounty added (#{bounty_id}){due_str}",
+        f"✅ Bounty added (#{bounty.id}){due_str}",
         disable_web_page_preview=True,
     )
 
 
-@admin_only
 async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Update a bounty. Args: <bounty_id> [text] [link] [due_date]."""
     args = extract_args(update.message.text)
     if len(args) < 1:
-        await update.message.reply_text("Usage: /update <bounty_id> [text] [link] [due_date]")
+        await update.message.reply_text(
+            "Usage: /update <bounty_id> [text] [link] [due_date]"
+        )
         return
 
     try:
@@ -222,69 +217,69 @@ async def cmd_update(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Nothing to update.")
         return
 
-    # Verify bounty belongs to this group / user
-    bounty = db.get_bounty(bounty_id)
-    if not bounty:
-        await update.message.reply_text("Bounty not found.")
-        return
-
-    if is_group(update):
-        group = db.get_group(update.effective_chat.id)
-        if bounty["group_id"] != group["id"]:
-            await update.message.reply_text("Bounty not found in this group.")
-            return
-    else:
-        if bounty["group_id"] is not None:
-            await update.message.reply_text("This bounty belongs to a group, not your personal list.")
-            return
-        if bounty["created_by_user_id"] != ensure_user(update):
-            await update.message.reply_text("You can only update your own bounties.")
-            return
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
 
     try:
-        db.update_bounty(bounty_id, text, link, due_date_ts)
-    except ValueError as e:
+        success = BOUNTY_SERVICE.update_bounty(
+            room_id=room_id,
+            bounty_id=bounty_id,
+            user_id=user_id,
+            text=text,
+            link=link,
+            due_date_ts=due_date_ts,
+        )
+    except PermissionError as e:
         await update.message.reply_text(f"⛔ {e}")
         return
 
-    await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
+    if success:
+        await update.message.reply_text(f"✅ Bounty #{bounty_id} updated.")
+    else:
+        await update.message.reply_text("Bounty not found.")
+
+
+cmd_edit = cmd_update
 
 
-@admin_only
 async def cmd_delete(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Delete a bounty. Args: <bounty_id>."""
     args = extract_args(update.message.text)
     if not args:
-        await update.message.reply_text("Usage: /delete <bounty_id>")
+        await update.message.reply_text("Usage: /delete <bounty_id> [bounty_id ...]")
         return
 
     try:
-        bounty_id = int(args[0])
+        bounty_ids = [int(arg) for arg in args]
     except ValueError:
-        await update.message.reply_text("Invalid bounty ID.")
+        await update.message.reply_text("Invalid bounty ID(s).")
         return
 
-    bounty = db.get_bounty(bounty_id)
-    if not bounty:
-        await update.message.reply_text("Bounty not found.")
-        return
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
 
-    if is_group(update):
-        group = db.get_group(update.effective_chat.id)
-        if bounty["group_id"] != group["id"]:
-            await update.message.reply_text("Bounty not found in this group.")
-            return
-    else:
-        if bounty["group_id"] is not None:
-            await update.message.reply_text("This bounty belongs to a group.")
-            return
+    results = BOUNTY_SERVICE.delete_bounties(
+        room_id=room_id,
+        bounty_ids=bounty_ids,
+        user_id=user_id,
+    )
 
-    db.delete_bounty(bounty_id)
-    await update.message.reply_text(f"✅ Bounty #{bounty_id} deleted.")
+    lines = []
+    for bounty_id, result in results.items():
+        if result == "deleted":
+            lines.append(f"✅ Bounty #{bounty_id} deleted.")
+        elif result == "not_found":
+            lines.append(f"⛔ Bounty #{bounty_id} not found.")
+        elif result == "permission_denied":
+            lines.append(f"⛔ Bounty #{bounty_id} - only admins can delete.")
+
+    await update.message.reply_text("\n".join(lines))
 
 
 async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Track a bounty. Args: <bounty_id>."""
+    if not is_group(update):
+        await update.message.reply_text("⛔ /track is only available in groups.")
+        return
+
     args = extract_args(update.message.text)
     if not args:
         await update.message.reply_text("Usage: /track <bounty_id>")
@@ -296,31 +291,23 @@ async def cmd_track(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Invalid bounty ID.")
         return
 
-    bounty = db.get_bounty(bounty_id)
-    if not bounty:
-        await update.message.reply_text("Bounty not found.")
-        return
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
 
-    if is_group(update):
-        group = db.get_group(update.effective_chat.id)
-        if bounty["group_id"] != group["id"]:
-            await update.message.reply_text("Bounty not found in this group.")
-            return
-    else:
-        if bounty["group_id"] is not None:
-            await update.message.reply_text("Use /track from the group where the bounty belongs.")
-            return
-
-    user_id = ensure_user(update)
-    added = db.track_bounty(user_id, bounty_id)
-    if added:
-        await update.message.reply_text(f"✅ Now tracking bounty #{bounty_id}.")
-    else:
-        await update.message.reply_text(f"Already tracking bounty #{bounty_id}.")
+    try:
+        if TRACKING_SERVICE.track_bounty(room_id, user_id, bounty_id):
+            await update.message.reply_text(f"✅ Now tracking bounty #{bounty_id}.")
+        else:
+            await update.message.reply_text(f"Already tracking bounty #{bounty_id}.")
+    except ValueError as e:
+        await update.message.reply_text(str(e))
 
 
 async def cmd_untrack(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Untrack a bounty. Args: <bounty_id>."""
+    if not is_group(update):
+        await update.message.reply_text("⛔ /untrack is only available in groups.")
+        return
+
     args = extract_args(update.message.text)
     if not args:
         await update.message.reply_text("Usage: /untrack <bounty_id>")
@@ -332,83 +319,26 @@ async def cmd_untrack(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         await update.message.reply_text("Invalid bounty ID.")
         return
 
-    user_id = ensure_user(update)
-    removed = db.untrack_bounty(user_id, bounty_id)
-    if removed:
+    user_id = get_user_id(update)
+    room_id = get_room_id(update)
+
+    if TRACKING_SERVICE.untrack_bounty(room_id, user_id, bounty_id):
         await update.message.reply_text(f"✅ Untracked bounty #{bounty_id}.")
     else:
-        await update.message.reply_text(f"Not tracking bounty #{bounty_id}.")
-
-
-@creator_only
-async def cmd_admin_add(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Promote a user to admin. Args: <username>."""
-    if not is_group(update):
-        await update.message.reply_text("This command only works in groups.")
-        return
-
-    args = extract_args(update.message.text)
-    if not args:
-        await update.message.reply_text("Usage: /admin_add <username>")
-        return
-
-    username = args[0].lstrip("@")
-    user = db.get_user_by_username(username)
-    if not user:
-        await update.message.reply_text(f"User @{username} not found. They must interact with the bot first.")
-        return
-
-    group = db.get_group(update.effective_chat.id)
-    added = db.add_group_admin(group["id"], user["id"])
-    if added:
-        await update.message.reply_text(f"✅ @{username} is now a group admin.")
-    else:
-        await update.message.reply_text(f"@{username} is already an admin.")
-
-
-@creator_only
-async def cmd_admin_remove(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
-    """Demote an admin. Args: <username>."""
-    if not is_group(update):
-        await update.message.reply_text("This command only works in groups.")
-        return
-
-    args = extract_args(update.message.text)
-    if not args:
-        await update.message.reply_text("Usage: /admin_remove <username>")
-        return
-
-    username = args[0].lstrip("@")
-    user = db.get_user_by_username(username)
-    if not user:
-        await update.message.reply_text(f"User @{username} not found.")
-        return
-
-    group = db.get_group(update.effective_chat.id)
-    # Prevent removing the creator
-    if db.is_group_creator(group["id"], user["id"]):
-        await update.message.reply_text("Cannot remove the group creator.")
-        return
-
-    removed = db.remove_group_admin(group["id"], user["id"])
-    if removed:
-        await update.message.reply_text(f"✅ @{username} is no longer a group admin.")
-    else:
-        await update.message.reply_text(f"@{username} was not an admin.")
+        await update.message.reply_text("Not tracking bounty #{bounty_id}.")
 
 
 async def cmd_start(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
     if is_group(update):
-        ensure_group(update)
         await update.message.reply_text(
             "👻 JIGAIDO is watching.\n\n"
             "This group's bounty list is now active.\n"
-            "Only admins can add/update/delete bounties.\n"
-            "Anyone can /track and /untrack.\n\n"
-            "Try /bounty to see all bounties, /add to create one."
+            "/bounty — list bounties\n"
+            "/add — create a bounty\n"
+            "/track — track a bounty\n"
+            "/my — your tracked bounties"
         )
     else:
-        ensure_user(update)
         await update.message.reply_text(
             "👻 JIGAIDO activated.\n\n"
             "Personal bounty list ready.\n"
@@ -423,14 +353,12 @@ async def cmd_help(update: Update, ctx: ContextTypes.DEFAULT_TYPE) -> None:
         "👻 JIGAIDO Commands:\n\n"
         "/bounty — list all bounties\n"
         "/my — bounties you're tracking\n"
-        "/add <text> [link] [due] — add bounty (admin/DM only)\n"
-        "/update <id> [text] [link] [due] — update bounty (admin/DM only)\n"
-        "/delete <id> — delete bounty (admin/DM only)\n"
-        "/track <id> — track a bounty\n"
-        "/untrack <id> — stop tracking\n"
-        "/admin_add <user> — promote to admin (creator only, group)\n"
-        "/admin_remove <user> — demote admin (creator only, group)\n"
-        "/start — re-initialize group\n"
+        "/add <text> [link] [due] — add bounty\n"
+        "/update <id> [text> [link] [due] — update bounty\n"
+        "/delete <id> — delete bounty\n"
+        "/track <id> — track a bounty (groups only)\n"
+        "/untrack <id> — stop tracking (groups only)\n"
+        "/start — re-initialize\n"
         "/help — this message",
         disable_web_page_preview=True,
     )

apps/telegram-bot/cron.py

@@ -1,77 +0,0 @@
-"""Daily reminder cron job for JIGAIDO.
-
-Run with: python -m cron
-Or schedule via systemd timer / cron.
-"""
-
-import asyncio
-import logging
-import os
-import sys
-import time
-
-# Add project root to path
-sys.path.insert(0, os.path.dirname(__file__))
-
-import db
-
-logging.basicConfig(
-    format="%(asctime)s %(levelname)s %(name)s: %(message)s",
-    level=logging.INFO,
-)
-log = logging.getLogger(__name__)
-
-# Token from environment
-BOT_TOKEN = os.environ.get("JIGAIDO_BOT_TOKEN", "")
-
-REMINDER_WINDOW_DAYS = 7
-
-
-async def send_reminder(user_telegram_id: int, bounty: dict, bot) -> None:
-    days_left = (bounty["due_date_ts"] - int(time.time())) // 86400
-    if days_left < 0:
-        urgency = "OVERDUE"
-    elif days_left == 0:
-        urgency = "TODAY"
-    else:
-        urgency = f"{days_left} days left"
-
-    due_str = time.strftime("%Y-%m-%d", time.localtime(bounty["due_date_ts"]))
-    text = f"⏰ Reminder: bounty #{bounty['id']}"
-    if bounty["text"]:
-        text += f" — {bounty['text']}"
-    text += f"\nDue: {due_str} ({urgency})"
-
-    try:
-        await bot.send_message(chat_id=user_telegram_id, text=text, disable_web_page_preview=True)
-        log.info(f"Reminder sent to {user_telegram_id} for bounty #{bounty['id']}")
-    except Exception as e:
-        log.error(f"Failed to send reminder to {user_telegram_id}: {e}")
-
-
-async def run_reminders() -> None:
-    if not BOT_TOKEN:
-        log.error("JIGAIDO_BOT_TOKEN not set")
-        return
-
-    from telegram import Bot
-    bot = Bot(BOT_TOKEN)
-
-    user_ids = db.get_all_user_ids()
-    log.info(f"Running reminders for {len(user_ids)} users...")
-
-    for user_telegram_id in user_ids:
-        due_bounties = db.get_bounties_due_soon(user_telegram_id, REMINDER_WINDOW_DAYS)
-        for bounty in due_bounties:
-            await send_reminder(user_telegram_id, dict(bounty), bot)
-            db.log_reminder(user_telegram_id, bounty["id"])
-
-    log.info("Reminder run complete.")
-
-
-def main() -> None:
-    asyncio.run(run_reminders())
-
-
-if __name__ == "__main__":
-    main()

apps/telegram-bot/db.py

@@ -1,306 +0,0 @@
-"""SQLite database wrapper for JIGAIDO."""
-
-import sqlite3
-import time
-from pathlib import Path
-from typing import Optional
-
-DB_PATH = Path(__file__).parent / "jigaido.db"
-
-
-def get_conn() -> sqlite3.Connection:
-    # isolation_level=None enables autocommit mode.
-    # row_factory disables SQLite Python's implicit transaction management,
-    # so we need explicit autocommit to make writes work correctly.
-    conn = sqlite3.connect(DB_PATH, detect_types=sqlite3.PARSE_DECLTYPES)
-    conn.isolation_level = None
-    conn.execute("PRAGMA foreign_keys = ON")
-    conn.row_factory = sqlite3.Row
-    return conn
-
-
-def _row_to_dict(row: sqlite3.Row) -> dict:
-    return dict(row)
-
-
-def init_db() -> None:
-    schema = (Path(__file__).parent / "schema.sql").read_text()
-    with get_conn() as conn:
-        conn.executescript(schema)
-
-
-# ── Users ──────────────────────────────────────────────────────────────────
-
-def upsert_user(telegram_user_id: int, username: str | None) -> int:
-    with get_conn() as conn:
-        cur = conn.execute(
-            """INSERT INTO users (telegram_user_id, username)
-               VALUES (?, ?)
-               ON CONFLICT (telegram_user_id) DO UPDATE SET username = excluded.username
-               RETURNING id""",
-            (telegram_user_id, username),
-        )
-        return cur.fetchone()["id"]
-
-
-def get_user_by_telegram_id(telegram_user_id: int) -> Optional[dict]:
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT * FROM users WHERE telegram_user_id = ?",
-            (telegram_user_id,),
-        ).fetchone()
-        return _row_to_dict(row) if row else None
-
-
-# ── Groups ─────────────────────────────────────────────────────────────────
-
-def upsert_group(telegram_chat_id: int, creator_user_id: int) -> int:
-    """Insert group if not exists. Returns group id."""
-    with get_conn() as conn:
-        cur = conn.execute(
-            """INSERT INTO groups (telegram_chat_id, creator_user_id)
-               VALUES (?, ?)
-               ON CONFLICT (telegram_chat_id) DO UPDATE SET creator_user_id = excluded.creator_user_id
-               WHERE groups.creator_user_id IS NULL OR groups.creator_user_id = excluded.creator_user_id
-               RETURNING id""",
-            (telegram_chat_id, creator_user_id),
-        )
-        return cur.fetchone()["id"]
-
-
-def get_group(telegram_chat_id: int) -> Optional[dict]:
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT * FROM groups WHERE telegram_chat_id = ?",
-            (telegram_chat_id,),
-        ).fetchone()
-        return _row_to_dict(row) if row else None
-
-
-def get_group_creator_user_id(group_id: int) -> Optional[int]:
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT creator_user_id FROM groups WHERE id = ?",
-            (group_id,),
-        ).fetchone()
-        return row["creator_user_id"] if row else None
-
-
-# ── Group Admins ────────────────────────────────────────────────────────────
-
-def add_group_admin(group_id: int, user_id: int) -> bool:
-    """Add user as admin. Returns True if newly added, False if already admin."""
-    with get_conn() as conn:
-        try:
-            conn.execute(
-                "INSERT INTO group_admins (group_id, user_id) VALUES (?, ?)",
-                (group_id, user_id),
-            )
-            return True
-        except sqlite3.IntegrityError:
-            return False
-
-
-def remove_group_admin(group_id: int, user_id: int) -> bool:
-    """Remove user from admins. Returns True if removed, False if not an admin."""
-    with get_conn() as conn:
-        cur = conn.execute(
-            "DELETE FROM group_admins WHERE group_id = ? AND user_id = ?",
-            (group_id, user_id),
-        )
-        return cur.rowcount > 0
-
-
-def is_group_admin(group_id: int, user_id: int) -> bool:
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT 1 FROM group_admins WHERE group_id = ? AND user_id = ?",
-            (group_id, user_id),
-        ).fetchone()
-        return row is not None
-
-
-def is_group_creator(group_id: int, user_id: int) -> bool:
-    return get_group_creator_user_id(group_id) == user_id
-
-
-def get_user_by_username(username: str) -> Optional[dict]:
-    """Look up user by username (without @)."""
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT * FROM users WHERE username = ?",
-            (username,),
-        ).fetchone()
-        return _row_to_dict(row) if row else None
-
-
-# ── Bounties ────────────────────────────────────────────────────────────────
-
-def add_bounty(
-    group_id: int | None,
-    created_by_user_id: int,
-    informed_by_username: str,
-    text: str | None,
-    link: str | None,
-    due_date_ts: int | None,
-) -> int:
-    """Add a bounty. Returns bounty id. Raises ValueError on duplicate link."""
-    with get_conn() as conn:
-        try:
-            cur = conn.execute(
-                """INSERT INTO bounties
-                   (group_id, created_by_user_id, informed_by_username, text, link, due_date_ts)
-                   VALUES (?, ?, ?, ?, ?, ?)
-                   RETURNING id""",
-                (group_id, created_by_user_id, informed_by_username, text, link, due_date_ts),
-            )
-            return cur.fetchone()["id"]
-        except sqlite3.IntegrityError as e:
-            if "UNIQUE" in str(e) and "link" in str(e):
-                raise ValueError(f"Link already exists in this group: {link}")
-            raise
-
-
-def get_bounty(bounty_id: int) -> Optional[dict]:
-    with get_conn() as conn:
-        row = conn.execute("SELECT * FROM bounties WHERE id = ?", (bounty_id,)).fetchone()
-        return _row_to_dict(row) if row else None
-
-
-def get_group_bounties(group_id: int) -> list[dict]:
-    with get_conn() as conn:
-        return [_row_to_dict(r) for r in conn.execute(
-            "SELECT * FROM bounties WHERE group_id = ? ORDER BY created_at DESC",
-            (group_id,),
-        )]
-
-
-def get_user_personal_bounties(user_id: int) -> list[dict]:
-    """Bounties created by user in DM (group_id IS NULL)."""
-    with get_conn() as conn:
-        return [_row_to_dict(r) for r in conn.execute(
-            "SELECT * FROM bounties WHERE group_id IS NULL AND created_by_user_id = ? ORDER BY created_at DESC",
-            (user_id,),
-        )]
-
-
-def update_bounty(
-    bounty_id: int,
-    text: str | None,
-    link: str | None,
-    due_date_ts: int | None,
-) -> bool:
-    """Update bounty fields. Returns True if updated. Raises ValueError on duplicate link."""
-    with get_conn() as conn:
-        try:
-            cur = conn.execute(
-                """UPDATE bounties
-                   SET text = COALESCE(?, text),
-                       link = COALESCE(?, link),
-                       due_date_ts = COALESCE(?, due_date_ts)
-                   WHERE id = ?""",
-                (text, link, due_date_ts, bounty_id),
-            )
-            return cur.rowcount > 0
-        except sqlite3.IntegrityError as e:
-            if "UNIQUE" in str(e) and "link" in str(e):
-                raise ValueError(f"Link already exists in this group: {link}")
-            raise
-
-
-def delete_bounty(bounty_id: int) -> bool:
-    with get_conn() as conn:
-        cur = conn.execute("DELETE FROM bounties WHERE id = ?", (bounty_id,))
-        return cur.rowcount > 0
-
-
-# ── Tracking ────────────────────────────────────────────────────────────────
-
-def track_bounty(user_id: int, bounty_id: int) -> bool:
-    """Add bounty to user's tracking. Returns True if newly tracked, False if already tracking."""
-    with get_conn() as conn:
-        try:
-            conn.execute(
-                "INSERT INTO user_bounty_tracking (user_id, bounty_id) VALUES (?, ?)",
-                (user_id, bounty_id),
-            )
-            return True
-        except sqlite3.IntegrityError:
-            return False
-
-
-def untrack_bounty(user_id: int, bounty_id: int) -> bool:
-    with get_conn() as conn:
-        cur = conn.execute(
-            "DELETE FROM user_bounty_tracking WHERE user_id = ? AND bounty_id = ?",
-            (user_id, bounty_id),
-        )
-        return cur.rowcount > 0
-
-
-def is_tracking(user_id: int, bounty_id: int) -> bool:
-    with get_conn() as conn:
-        row = conn.execute(
-            "SELECT 1 FROM user_bounty_tracking WHERE user_id = ? AND bounty_id = ?",
-            (user_id, bounty_id),
-        ).fetchone()
-        return row is not None
-
-
-def get_user_tracked_bounties_in_group(user_id: int, group_id: int) -> list[dict]:
-    with get_conn() as conn:
-        return [_row_to_dict(r) for r in conn.execute(
-            """SELECT b.* FROM bounties b
-               JOIN user_bounty_tracking t ON t.bounty_id = b.id
-               WHERE t.user_id = ? AND b.group_id = ?
-               ORDER BY b.created_at DESC""",
-            (user_id, group_id),
-        )]
-
-
-def get_user_tracked_bounties_personal(user_id: int) -> list[dict]:
-    """Tracked bounties where group_id IS NULL (personal)."""
-    with get_conn() as conn:
-        return [_row_to_dict(r) for r in conn.execute(
-            """SELECT b.* FROM bounties b
-               JOIN user_bounty_tracking t ON t.bounty_id = b.id
-               WHERE t.user_id = ? AND b.group_id IS NULL
-               ORDER BY b.created_at DESC""",
-            (user_id,),
-        )]
-
-
-# ── Reminders ───────────────────────────────────────────────────────────────
-
-def get_bounties_due_soon(user_id: int, days: int = 7) -> list[dict]:
-    """Get tracked bounties with due_date within `days` that haven't been reminded yet."""
-    now = int(time.time())
-    deadline = now + days * 86400
-    with get_conn() as conn:
-        return [_row_to_dict(r) for r in conn.execute(
-            """SELECT b.*, u.username, u.telegram_user_id FROM bounties b
-               JOIN user_bounty_tracking t ON t.bounty_id = b.id
-               JOIN users u ON u.id = b.created_by_user_id
-               WHERE t.user_id = ?
-                 AND b.due_date_ts IS NOT NULL
-                 AND b.due_date_ts <= ?
-                 AND b.due_date_ts >= ?
-                 AND b.id NOT IN (
-                     SELECT bounty_id FROM reminder_log WHERE user_id = ?
-                 )
-               ORDER BY b.due_date_ts ASC""",
-            (user_id, deadline, now, user_id),
-        )]
-
-
-def log_reminder(user_id: int, bounty_id: int) -> None:
-    with get_conn() as conn:
-        conn.execute(
-            "INSERT OR IGNORE INTO reminder_log (user_id, bounty_id) VALUES (?, ?)",
-            (user_id, bounty_id),
-        )
-
-
-def get_all_user_ids() -> list[int]:
-    with get_conn() as conn:
-        return [row["telegram_user_id"] for row in conn.execute("SELECT telegram_user_id FROM users")]

apps/telegram-bot/requirements-dev.txt

@@ -1,4 +0,0 @@
-python-telegram-bot==21.6
-dateparser==1.2.0
-pytest==8.3.5
-pytest-asyncio==0.25.2

apps/telegram-bot/schema.sql

@@ -1,49 +0,0 @@
--- JIGAIDO Database Schema
-
-CREATE TABLE IF NOT EXISTS groups (
-    id              INTEGER PRIMARY KEY AUTOINCREMENT,
-    telegram_chat_id INTEGER UNIQUE NOT NULL,
-    creator_user_id  INTEGER NOT NULL,
-    created_at       INTEGER NOT NULL DEFAULT (unixepoch())
-);
-
-CREATE TABLE IF NOT EXISTS group_admins (
-    group_id  INTEGER REFERENCES groups(id) ON DELETE CASCADE,
-    user_id   INTEGER NOT NULL,
-    PRIMARY KEY (group_id, user_id)
-);
-
-CREATE TABLE IF NOT EXISTS users (
-    id               INTEGER PRIMARY KEY AUTOINCREMENT,
-    telegram_user_id  INTEGER UNIQUE NOT NULL,
-    username          TEXT,
-    created_at        INTEGER NOT NULL DEFAULT (unixepoch())
-);
-
-CREATE TABLE IF NOT EXISTS bounties (
-    id                   INTEGER PRIMARY KEY AUTOINCREMENT,
-    group_id              INTEGER REFERENCES groups(id) ON DELETE CASCADE,
-    created_by_user_id    INTEGER REFERENCES users(id),
-    informed_by_username  TEXT NOT NULL,
-    text                  TEXT,
-    link                  TEXT,
-    due_date_ts           INTEGER,
-    created_at            INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(group_id, link)
-);
-
-CREATE TABLE IF NOT EXISTS user_bounty_tracking (
-    id         INTEGER PRIMARY KEY AUTOINCREMENT,
-    user_id    INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    bounty_id  INTEGER NOT NULL REFERENCES bounties(id) ON DELETE CASCADE,
-    added_at   INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(user_id, bounty_id)
-);
-
-CREATE TABLE IF NOT EXISTS reminder_log (
-    id          INTEGER PRIMARY KEY AUTOINCREMENT,
-    user_id     INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-    bounty_id   INTEGER NOT NULL REFERENCES bounties(id) ON DELETE CASCADE,
-    reminded_at INTEGER NOT NULL DEFAULT (unixepoch()),
-    UNIQUE(user_id, bounty_id)
-);

apps/telegram-bot/tests/conftest.py

@@ -6,22 +6,5 @@ from pathlib import Path
 
 import pytest
 
-# Add the app directory to path so `import db` works when running pytest
+# Add the app directory to path so imports work when running pytest
 sys.path.insert(0, str(Path(__file__).parent.parent))
-
-
-@pytest.fixture(autouse=True)
-def fresh_db(monkeypatch):
-    """Replace DB_PATH with a temp file before any test runs."""
-    import db as _db
-
-    tmp = tempfile.NamedTemporaryFile(suffix=".db", delete=False)
-    tmp_path = Path(tmp.name)
-    tmp.close()
-
-    monkeypatch.setattr(_db, "DB_PATH", tmp_path)
-    _db.init_db()
-
-    yield tmp_path
-
-    tmp_path.unlink(missing_ok=True)

apps/telegram-bot/tests/test_commands.py

@@ -1,11 +1,33 @@
-"""Tests for commands.py — parsing and formatting functions only."""
+"""Tests for commands.py — parsing, formatting, and command handlers."""
 
 import time
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, patch, AsyncMock, sentinel
 
 import pytest
 
-from commands import extract_args, parse_args, format_bounty
+from telegram import Update, Message, User, Chat, CallbackQuery
+from telegram.ext import ContextTypes
+
+from commands import (
+    extract_args,
+    parse_args,
+    format_bounty,
+    cmd_bounty,
+    cmd_my,
+    cmd_add,
+    cmd_update,
+    cmd_delete,
+    cmd_track,
+    cmd_untrack,
+    cmd_start,
+    cmd_help,
+    is_group,
+    get_group_id,
+    get_user_id,
+    get_room_id,
+    BOUNTY_SERVICE,
+    TRACKING_SERVICE,
+)
 
 
 class TestExtractArgs:
@@ -101,13 +123,20 @@ class TestParseArgs:
 
 
 class TestFormatBounty:
-    def _row(self, id=1, text="Test bounty", link="https://example.com",
-             due_date_ts=None, informed_by_username="alice"):
+    def _row(
+        self,
+        id=1,
+        text="Test bounty",
+        link="https://example.com",
+        due_date_ts=None,
+        created_by_user_id=123456,
+    ):
         row = MagicMock()
-        row.__getitem__ = lambda s, k: {
-            "id": id, "text": text, "link": link,
-            "due_date_ts": due_date_ts, "informed_by_username": informed_by_username
-        }[k]
+        row.id = id
+        row.text = text
+        row.link = link
+        row.due_date_ts = due_date_ts
+        row.created_by_user_id = created_by_user_id
         return row
 
     def test_shows_id(self):
@@ -155,12 +184,382 @@ class TestFormatBounty:
         out = format_bounty(b)
         assert "OVERDUE" in out
 
-    def test_informed_by_shown(self):
-        b = self._row(informed_by_username="bob")
+    def test_created_by_shown(self):
+        b = self._row(created_by_user_id=999)
         out = format_bounty(b)
-        assert "@bob" in out
+        assert "999" in out
 
-    def test_informed_by_unknown_fallback(self):
-        b = self._row(informed_by_username=None)
-        out = format_bounty(b)
-        assert "@unknown" in out
+
+def create_mock_update(
+    user_id=123,
+    chat_id=-456,
+    chat_type="group",
+    message_text="/bounty",
+):
+    """Create a mock Telegram Update with common values."""
+    user = MagicMock(spec=User)
+    user.id = user_id
+
+    chat = MagicMock(spec=Chat)
+    chat.id = chat_id
+    chat.type = chat_type
+
+    message = MagicMock(spec=Message)
+    message.text = message_text
+    message.reply_text = AsyncMock()
+    message.user = user
+
+    update = MagicMock(spec=Update)
+    update.effective_user = user
+    update.effective_chat = chat
+    update.message = message
+
+    return update
+
+
+class TestHelperFunctions:
+    """Test helper functions."""
+
+    def test_is_group_true(self):
+        update = create_mock_update(chat_type="group")
+        assert is_group(update) is True
+
+    def test_is_group_false_for_private(self):
+        update = create_mock_update(chat_type="private")
+        assert is_group(update) is False
+
+    def test_get_group_id(self):
+        update = create_mock_update(chat_id=-789)
+        assert get_group_id(update) == -789
+
+    def test_get_user_id(self):
+        update = create_mock_update(user_id=999)
+        assert get_user_id(update) == 999
+
+    def test_get_room_id_group(self):
+        update = create_mock_update(chat_id=-456, chat_type="group", user_id=123)
+        assert get_room_id(update) == -456
+
+    def test_get_room_id_private(self):
+        update = create_mock_update(chat_id=123, chat_type="private", user_id=123)
+        assert get_room_id(update) == 123
+
+
+class TestCmdBounty:
+    """Test cmd_bounty command."""
+
+    @pytest.mark.asyncio
+    async def test_lists_bounties(self):
+        update = create_mock_update()
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 1
+        mock_bounty.text = "Test"
+        mock_bounty.link = None
+        mock_bounty.due_date_ts = None
+        mock_bounty.created_by_user_id = 123
+
+        with patch.object(
+            BOUNTY_SERVICE, "list_bounties", return_value=[mock_bounty]
+        ) as mock_list:
+            await cmd_bounty(update, ctx)
+            mock_list.assert_called_once_with(-456)
+            update.message.reply_text.assert_called_once()
+            call_args = update.message.reply_text.call_args[0][0]
+            assert "[#1]" in call_args
+            assert "Test" in call_args
+
+    @pytest.mark.asyncio
+    async def test_no_bounties(self):
+        update = create_mock_update()
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(BOUNTY_SERVICE, "list_bounties", return_value=[]):
+            await cmd_bounty(update, ctx)
+            update.message.reply_text.assert_called_once_with("No bounties yet.")
+
+
+class TestCmdMy:
+    """Test cmd_my command."""
+
+    @pytest.mark.asyncio
+    async def test_in_group_shows_tracked(self):
+        update = create_mock_update(chat_type="group")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 1
+        mock_bounty.text = "Tracked"
+        mock_bounty.link = None
+        mock_bounty.due_date_ts = None
+        mock_bounty.created_by_user_id = 123
+
+        with patch.object(
+            TRACKING_SERVICE, "get_tracked_bounties", return_value=[mock_bounty]
+        ) as mock_track:
+            await cmd_my(update, ctx)
+            mock_track.assert_called_once_with(-456, 123)
+            update.message.reply_text.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_in_private_shows_personal(self):
+        update = create_mock_update(chat_type="private", chat_id=123)
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 2
+        mock_bounty.text = "Personal"
+        mock_bounty.link = None
+        mock_bounty.due_date_ts = None
+        mock_bounty.created_by_user_id = 123
+
+        with patch.object(
+            BOUNTY_SERVICE, "list_bounties", return_value=[mock_bounty]
+        ) as mock_list:
+            await cmd_my(update, ctx)
+            mock_list.assert_called_once_with(123)
+            update.message.reply_text.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_no_bounties_tracked(self):
+        update = create_mock_update(chat_type="group")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(TRACKING_SERVICE, "get_tracked_bounties", return_value=[]):
+            await cmd_my(update, ctx)
+            update.message.reply_text.assert_called_once_with(
+                "You are not tracking any bounties."
+            )
+
+
+class TestCmdAdd:
+    """Test cmd_add command."""
+
+    @pytest.mark.asyncio
+    async def test_add_bounty_success(self):
+        update = create_mock_update(message_text="/add Fix the bug")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 42
+
+        with patch.object(
+            BOUNTY_SERVICE, "add_bounty", return_value=mock_bounty
+        ) as mock_add:
+            await cmd_add(update, ctx)
+            mock_add.assert_called_once()
+            call_kwargs = mock_add.call_args[1]
+            assert call_kwargs["room_id"] == -456
+            assert call_kwargs["user_id"] == 123
+            assert call_kwargs["text"] == "Fix the bug"
+            update.message.reply_text.assert_called_once()
+            assert "✅" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_add_without_args(self):
+        update = create_mock_update(message_text="/add")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_add(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "Usage" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_add_needs_text_or_link(self):
+        update = create_mock_update(message_text="/add")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        _, link, _ = parse_args([])
+        if not "test" and not link:
+            await update.message.reply_text("A bounty needs at least text or a link.")
+            update.message.reply_text.assert_called_once()
+
+
+class TestCmdUpdate:
+    """Test cmd_update command."""
+
+    @pytest.mark.asyncio
+    async def test_update_bounty_success(self):
+        update = create_mock_update(message_text="/update 1 New text")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(
+            BOUNTY_SERVICE, "update_bounty", return_value=True
+        ) as mock_update:
+            await cmd_update(update, ctx)
+            mock_update.assert_called_once()
+            call_kwargs = mock_update.call_args[1]
+            assert call_kwargs["room_id"] == -456
+            assert call_kwargs["bounty_id"] == 1
+            assert call_kwargs["text"] == "New text"
+            update.message.reply_text.assert_called_once()
+            assert "✅" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_update_without_args(self):
+        update = create_mock_update(message_text="/update")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_update(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "Usage" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_update_invalid_id(self):
+        update = create_mock_update(message_text="/update abc")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_update(update, ctx)
+        update.message.reply_text.assert_called_once_with("Invalid bounty ID.")
+
+    @pytest.mark.asyncio
+    async def test_update_permission_denied(self):
+        update = create_mock_update(message_text="/update 1 new text")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(
+            BOUNTY_SERVICE,
+            "update_bounty",
+            side_effect=PermissionError("Not your bounty"),
+        ):
+            await cmd_update(update, ctx)
+            update.message.reply_text.assert_called_once()
+            assert "⛔" in update.message.reply_text.call_args[0][0]
+
+
+class TestCmdDelete:
+    """Test cmd_delete command."""
+
+    @pytest.mark.asyncio
+    async def test_delete_bounty_success(self):
+        update = create_mock_update(message_text="/delete 1")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(
+            BOUNTY_SERVICE, "delete_bounty", return_value=True
+        ) as mock_delete:
+            await cmd_delete(update, ctx)
+            mock_delete.assert_called_once_with(room_id=-456, bounty_id=1, user_id=123)
+            update.message.reply_text.assert_called_once()
+            assert "✅" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_delete_without_args(self):
+        update = create_mock_update(message_text="/delete")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_delete(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "Usage" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_delete_invalid_id(self):
+        update = create_mock_update(message_text="/delete abc")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_delete(update, ctx)
+        update.message.reply_text.assert_called_once_with("Invalid bounty ID.")
+
+
+class TestCmdTrack:
+    """Test cmd_track command."""
+
+    @pytest.mark.asyncio
+    async def test_track_in_group(self):
+        update = create_mock_update(chat_type="group", message_text="/track 1")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(
+            TRACKING_SERVICE, "track_bounty", return_value=True
+        ) as mock_track:
+            await cmd_track(update, ctx)
+            mock_track.assert_called_once_with(-456, 123, 1)
+            update.message.reply_text.assert_called_once()
+            assert "✅" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_track_not_in_group(self):
+        update = create_mock_update(chat_type="private", message_text="/track 1")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_track(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "⛔" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_track_without_args(self):
+        update = create_mock_update(chat_type="group", message_text="/track")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_track(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "Usage" in update.message.reply_text.call_args[0][0]
+
+
+class TestCmdUntrack:
+    """Test cmd_untrack command."""
+
+    @pytest.mark.asyncio
+    async def test_untrack_in_group(self):
+        update = create_mock_update(chat_type="group", message_text="/untrack 1")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        with patch.object(
+            TRACKING_SERVICE, "untrack_bounty", return_value=True
+        ) as mock_untrack:
+            await cmd_untrack(update, ctx)
+            mock_untrack.assert_called_once_with(-456, 123, 1)
+            update.message.reply_text.assert_called_once()
+            assert "✅" in update.message.reply_text.call_args[0][0]
+
+    @pytest.mark.asyncio
+    async def test_untrack_not_in_group(self):
+        update = create_mock_update(chat_type="private", message_text="/untrack 1")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_untrack(update, ctx)
+        update.message.reply_text.assert_called_once()
+        assert "⛔" in update.message.reply_text.call_args[0][0]
+
+
+class TestCmdStart:
+    """Test cmd_start command."""
+
+    @pytest.mark.asyncio
+    async def test_start_in_group(self):
+        update = create_mock_update(chat_type="group")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_start(update, ctx)
+        update.message.reply_text.assert_called_once()
+        text = update.message.reply_text.call_args[0][0]
+        assert "👻" in text
+        assert "/bounty" in text
+
+    @pytest.mark.asyncio
+    async def test_start_in_private(self):
+        update = create_mock_update(chat_type="private")
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_start(update, ctx)
+        update.message.reply_text.assert_called_once()
+        text = update.message.reply_text.call_args[0][0]
+        assert "👻" in text
+        assert "/my" in text
+
+
+class TestCmdHelp:
+    """Test cmd_help command."""
+
+    @pytest.mark.asyncio
+    async def test_help_shows_commands(self):
+        update = create_mock_update()
+        ctx = MagicMock(spec=ContextTypes.DEFAULT_TYPE)
+
+        await cmd_help(update, ctx)
+        update.message.reply_text.assert_called_once()
+        text = update.message.reply_text.call_args[0][0]
+        assert "/bounty" in text
+        assert "/add" in text
+        assert "/help" in text

apps/telegram-bot/tests/test_db.py

@@ -1,298 +0,0 @@
-"""Tests for db.py"""
-
-import time
-import pytest
-import db as _db
-
-
-class TestUsers:
-    def test_upsert_user_creates_new(self):
-        uid = _db.upsert_user(123, "alice")
-        assert uid > 0
-        row = _db.get_user_by_telegram_id(123)
-        assert row is not None
-        assert row["telegram_user_id"] == 123
-        assert row["username"] == "alice"
-
-    def test_upsert_user_updates_username(self):
-        # Two upserts to the same telegram_user_id: second one updates the username.
-        # Returns the same id both times (idempotent).
-        uid1 = _db.upsert_user(123, "alice")
-        uid2 = _db.upsert_user(123, "alice_updated")
-        assert uid1 == uid2
-        row = _db.get_user_by_telegram_id(123)
-        assert row["username"] == "alice_updated"
-
-    def test_get_user_by_telegram_id_not_found(self):
-        row = _db.get_user_by_telegram_id(999999)
-        assert row is None
-
-
-class TestGroups:
-    def test_upsert_group_creates_new(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        assert gid > 0
-        row = _db.get_group(-100123)
-        assert row is not None
-        assert row["telegram_chat_id"] == -100123
-        assert row["creator_user_id"] == uid
-
-    def test_upsert_group_idempotent(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid1 = _db.upsert_group(-100123, uid)
-        gid2 = _db.upsert_group(-100123, uid)
-        assert gid1 == gid2
-
-    def test_get_group_creator_user_id(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        _db.upsert_group(-100123, uid)
-        assert _db.get_group_creator_user_id(_db.get_group(-100123)["id"]) == uid
-
-    def test_get_group_not_found(self, fresh_db):
-        row = _db.get_group(-999999)
-        assert row is None
-
-
-class TestGroupAdmins:
-    def test_add_remove_is_admin(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-
-        assert not _db.is_group_admin(gid, uid)
-        added = _db.add_group_admin(gid, uid)
-        assert added is True
-        assert _db.is_group_admin(gid, uid) is True
-
-        # Adding again returns False (already admin)
-        assert _db.add_group_admin(gid, uid) is False
-
-        removed = _db.remove_group_admin(gid, uid)
-        assert removed is True
-        assert _db.is_group_admin(gid, uid) is False
-
-    def test_remove_nonexistent_admin_returns_false(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        assert _db.remove_group_admin(gid, uid) is False
-
-    def test_is_group_creator(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        other = _db.upsert_user(2, "other")
-        gid = _db.upsert_group(-100123, uid)
-        _db.add_group_admin(gid, uid)
-
-        assert _db.is_group_creator(gid, uid) is True
-        assert _db.is_group_creator(gid, other) is False
-
-    def test_get_user_by_username(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        row = _db.get_user_by_username("alice")
-        assert row is not None
-        assert row["id"] == uid
-        assert _db.get_user_by_username("nobody") is None
-
-
-class TestBounties:
-    def test_add_bounty_group(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        _db.add_group_admin(gid, uid)
-
-        bid = _db.add_bounty(
-            group_id=gid,
-            created_by_user_id=uid,
-            informed_by_username="bob",
-            text="Fix bug",
-            link="https://github.com/bob/repo",
-            due_date_ts=int(time.time()) + 86400,
-        )
-        assert bid > 0
-        bounty = _db.get_bounty(bid)
-        assert bounty["text"] == "Fix bug"
-        assert bounty["link"] == "https://github.com/bob/repo"
-        assert bounty["informed_by_username"] == "bob"
-        assert bounty["group_id"] == gid
-
-    def test_add_bounty_personal(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        bid = _db.add_bounty(
-            group_id=None,
-            created_by_user_id=uid,
-            informed_by_username="alice",
-            text="Personal reminder",
-            link=None,
-            due_date_ts=None,
-        )
-        assert bid > 0
-        bounty = _db.get_bounty(bid)
-        assert bounty["group_id"] is None
-        assert bounty["text"] == "Personal reminder"
-
-    def test_add_bounty_duplicate_link_rejected(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-
-        _db.add_bounty(gid, uid, "user1", "text1", "https://example.com", None)
-        with pytest.raises(ValueError, match="Link already exists"):
-            _db.add_bounty(gid, uid, "user2", "text2", "https://example.com", None)
-
-    def test_add_bounty_null_link_allows_multiples(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-
-        bid1 = _db.add_bounty(gid, uid, "user1", "text only 1", None, None)
-        bid2 = _db.add_bounty(gid, uid, "user2", "text only 2", None, None)
-        assert bid1 != bid2
-
-    def test_get_group_bounties(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        _db.add_group_admin(gid, uid)
-
-        _db.add_bounty(gid, uid, "user", "bounty1", None, None)
-        _db.add_bounty(gid, uid, "user", "bounty2", None, None)
-
-        bounties = _db.get_group_bounties(gid)
-        assert len(bounties) == 2
-
-    def test_get_user_personal_bounties(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        _db.add_bounty(None, uid, "alice", "personal1", None, None)
-        _db.add_bounty(None, uid, "alice", "personal2", None, None)
-
-        # Group bounty should not appear
-        other = _db.upsert_user(2, "bob")
-        gid = _db.upsert_group(-100, other)
-        _db.add_bounty(gid, other, "bob", "group bounty", None, None)
-
-        personal = _db.get_user_personal_bounties(uid)
-        assert len(personal) == 2
-
-    def test_update_bounty(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        bid = _db.add_bounty(gid, uid, "user", "old text", None, None)
-
-        _db.update_bounty(bid, "new text", None, None)
-        updated = _db.get_bounty(bid)
-        assert updated["text"] == "new text"
-
-    def test_update_bounty_duplicate_link_rejected(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        _db.add_bounty(gid, uid, "user1", "bounty1", "https://a.com", None)
-        bid2 = _db.add_bounty(gid, uid, "user2", "bounty2", None, None)
-
-        with pytest.raises(ValueError, match="Link already exists"):
-            _db.update_bounty(bid2, None, "https://a.com", None)
-
-    def test_delete_bounty(self, fresh_db):
-        uid = _db.upsert_user(1, "creator")
-        gid = _db.upsert_group(-100123, uid)
-        bid = _db.add_bounty(gid, uid, "user", "to delete", None, None)
-
-        assert _db.delete_bounty(bid) is True
-        assert _db.get_bounty(bid) is None
-        # Deleting again returns False
-        assert _db.delete_bounty(bid) is False
-
-
-class TestTracking:
-    def test_track_untrack_is_tracking(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        uid2 = _db.upsert_user(2, "bob")
-        gid = _db.upsert_group(-100123, uid)
-        bid = _db.add_bounty(gid, uid, "alice", "task", None, None)
-
-        assert _db.track_bounty(uid, bid) is True
-        assert _db.is_tracking(uid, bid) is True
-        # Track again → False (already tracking)
-        assert _db.track_bounty(uid, bid) is False
-
-        # Other user tracking same bounty
-        assert _db.track_bounty(uid2, bid) is True
-        assert _db.is_tracking(uid2, bid) is True
-
-        # Untrack
-        assert _db.untrack_bounty(uid, bid) is True
-        assert _db.is_tracking(uid, bid) is False
-        assert _db.is_tracking(uid2, bid) is True  # other user still tracking
-        # Untrack again → False
-        assert _db.untrack_bounty(uid, bid) is False
-
-    def test_get_user_tracked_bounties_in_group(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        gid = _db.upsert_group(-100123, uid)
-        bid1 = _db.add_bounty(gid, uid, "alice", "task1", None, None)
-        bid2 = _db.add_bounty(gid, uid, "alice", "task2", None, None)
-
-        # Different group bounty
-        other_gid = _db.upsert_group(-100124, uid)
-        bid3 = _db.add_bounty(other_gid, uid, "alice", "other group task", None, None)
-
-        _db.track_bounty(uid, bid1)
-        _db.track_bounty(uid, bid3)
-
-        tracked = _db.get_user_tracked_bounties_in_group(uid, gid)
-        assert len(tracked) == 1
-        assert tracked[0]["id"] == bid1
-
-    def test_get_user_tracked_bounties_personal(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        bid1 = _db.add_bounty(None, uid, "alice", "personal1", None, None)
-        bid2 = _db.add_bounty(None, uid, "alice", "personal2", None, None)
-
-        gid = _db.upsert_group(-100123, uid)
-        bid3 = _db.add_bounty(gid, uid, "alice", "group task", None, None)
-
-        _db.track_bounty(uid, bid1)
-        _db.track_bounty(uid, bid3)
-
-        tracked = _db.get_user_tracked_bounties_personal(uid)
-        assert len(tracked) == 1
-        assert tracked[0]["id"] == bid1
-
-
-class TestReminders:
-    def test_get_bounties_due_soon(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        gid = _db.upsert_group(-100123, uid)
-
-        now = int(time.time())
-        # Due in 3 days (< 7 days)
-        bid_soon = _db.add_bounty(gid, uid, "alice", "soon", None, now + 3 * 86400)
-        # Due in 10 days (> 7 days)
-        _db.add_bounty(gid, uid, "alice", "later", None, now + 10 * 86400)
-        # No due date
-        bid_no_date = _db.add_bounty(gid, uid, "alice", "no date", None, None)
-
-        _db.track_bounty(uid, bid_soon)
-        _db.track_bounty(uid, bid_no_date)
-
-        due = _db.get_bounties_due_soon(uid, days=7)
-        assert len(due) == 1
-        assert due[0]["id"] == bid_soon
-
-    def test_reminder_log_prevents_duplicate_reminders(self, fresh_db):
-        uid = _db.upsert_user(1, "alice")
-        gid = _db.upsert_group(-100123, uid)
-        now = int(time.time())
-        bid = _db.add_bounty(gid, uid, "alice", "task", None, now + 2 * 86400)
-        _db.track_bounty(uid, bid)
-
-        due1 = _db.get_bounties_due_soon(uid, days=7)
-        assert len(due1) == 1
-
-        # Log that we reminded
-        _db.log_reminder(uid, bid)
-
-        # Should not appear again
-        due2 = _db.get_bounties_due_soon(uid, days=7)
-        assert len(due2) == 0
-
-    def test_get_all_user_ids(self, fresh_db):
-        _db.upsert_user(1, "alice")
-        _db.upsert_user(2, "bob")
-        ids = _db.get_all_user_ids()
-        assert sorted(ids) == [1, 2]

cli/main.py

@@ -0,0 +1,251 @@
+"""JIGAIDO CLI - Command line interface for bounty tracking."""
+
+import argparse
+import sys
+from pathlib import Path
+
+import dateparser
+
+from adapters.storage.json_file import JsonFileRoomStorage, JsonFileTrackingStorage
+from config import Config
+from core.services import BountyService, TrackingService
+
+
+def parse_due_date(due_str: str | None) -> int | None:
+    """Parse due date string to Unix timestamp."""
+    if not due_str:
+        return None
+    parsed = dateparser.parse(due_str)
+    if parsed:
+        return int(parsed.timestamp())
+    return None
+
+
+def create_services():
+    """Create service instances with storage."""
+    config = Config()
+    config.ensure_data_dir()
+    room_storage = JsonFileRoomStorage(config.data_dir / "room")
+    tracking_storage = JsonFileTrackingStorage(config.data_dir / "tracking")
+    bounty_service = BountyService(room_storage)
+    tracking_service = TrackingService(tracking_storage, room_storage)
+    return bounty_service, tracking_service
+
+
+def cmd_add(args):
+    """Add a new bounty."""
+    bounty_service, _ = create_services()
+    due_ts = parse_due_date(args.due)
+    bounty = bounty_service.add_bounty(
+        room_id=args.group_id or args.user_id,
+        user_id=args.user_id or 0,
+        text=args.text,
+        link=args.link,
+        due_date_ts=due_ts,
+    )
+    print(f"Added bounty #{bounty.id}")
+
+
+def cmd_list(args):
+    """List all bounties in a room."""
+    bounty_service, _ = create_services()
+    bounties = bounty_service.list_bounties(room_id=args.group_id or args.user_id)
+    if not bounties:
+        print("No bounties")
+        return
+    for b in bounties:
+        due_str = (
+            f", due: {dateparser.parse(str(b.due_date_ts)).strftime('%Y-%m-%d')}"
+            if b.due_date_ts
+            else ""
+        )
+        link_str = f", link: {b.link}" if b.link else ""
+        print(f"#{b.id}: {b.text or '(no text)'}{link_str}{due_str}")
+
+
+def cmd_my(args):
+    """List tracked bounties for a user."""
+    _, tracking_service = create_services()
+    room_id = args.group_id or args.user_id
+    tracked = tracking_service.get_tracked_bounties(
+        room_id=room_id, user_id=args.user_id
+    )
+    if not tracked:
+        print("Not tracking any bounties")
+        return
+    for b in tracked:
+        due_str = (
+            f", due: {dateparser.parse(str(b.due_date_ts)).strftime('%Y-%m-%d')}"
+            if b.due_date_ts
+            else ""
+        )
+        link_str = f", link: {b.link}" if b.link else ""
+        print(f"#{b.id}: {b.text or '(no text)'}{link_str}{due_str}")
+
+
+def cmd_update(args):
+    """Update a bounty."""
+    bounty_service, _ = create_services()
+    due_ts = parse_due_date(args.due)
+    try:
+        success = bounty_service.update_bounty(
+            room_id=args.group_id or args.user_id,
+            bounty_id=args.bounty_id,
+            user_id=args.user_id or 0,
+            text=args.text,
+            link=args.link,
+            due_date_ts=due_ts,
+            clear_link=args.clear_link,
+            clear_due=args.clear_due,
+        )
+        if success:
+            print(f"Updated bounty #{args.bounty_id}")
+        else:
+            print(f"Bounty #{args.bounty_id} not found", file=sys.stderr)
+            sys.exit(1)
+    except PermissionError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def cmd_delete(args):
+    """Delete a bounty."""
+    bounty_service, _ = create_services()
+    try:
+        success = bounty_service.delete_bounty(
+            room_id=args.group_id or args.user_id,
+            bounty_id=args.bounty_id,
+            user_id=args.user_id or 0,
+        )
+        if success:
+            print(f"Deleted bounty #{args.bounty_id}")
+        else:
+            print(f"Bounty #{args.bounty_id} not found", file=sys.stderr)
+            sys.exit(1)
+    except PermissionError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def cmd_track(args):
+    """Track a bounty."""
+    _, tracking_service = create_services()
+    try:
+        success = tracking_service.track_bounty(
+            room_id=args.group_id,
+            user_id=args.user_id,
+            bounty_id=args.bounty_id,
+        )
+        if success:
+            print(f"Tracking bounty #{args.bounty_id}")
+        else:
+            print(f"Already tracking bounty #{args.bounty_id}")
+    except ValueError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def cmd_untrack(args):
+    """Untrack a bounty."""
+    _, tracking_service = create_services()
+    success = tracking_service.untrack_bounty(
+        room_id=args.group_id,
+        user_id=args.user_id,
+        bounty_id=args.bounty_id,
+    )
+    if success:
+        print(f"Untracked bounty #{args.bounty_id}")
+    else:
+        print(f"Not tracking bounty #{args.bounty_id}", file=sys.stderr)
+        sys.exit(1)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="jigaido-cli", description="JIGAIDO bounty tracker CLI"
+    )
+    subparsers = parser.add_subparsers(dest="command", help="Commands")
+
+    parser_add = subparsers.add_parser("add", help="Add a new bounty")
+    parser_add.add_argument("text", help="Bounty description")
+    parser_add.add_argument("--link", help="Optional link")
+    parser_add.add_argument(
+        "--due", help="Optional due date (e.g., 'tomorrow', 'in 3 days')"
+    )
+
+    parser_list = subparsers.add_parser("list", help="List all bounties")
+
+    parser_my = subparsers.add_parser("my", help="List tracked bounties")
+
+    parser_update = subparsers.add_parser("update", help="Update a bounty")
+    parser_update.add_argument("bounty_id", type=int, help="Bounty ID to update")
+    parser_update.add_argument("text", nargs="?", help="New description")
+    parser_update.add_argument("--link", help="New link")
+    parser_update.add_argument("--due", help="New due date")
+    parser_update.add_argument("--clear-link", action="store_true", help="Clear link")
+    parser_update.add_argument(
+        "--clear-due", action="store_true", help="Clear due date"
+    )
+
+    parser_delete = subparsers.add_parser("delete", help="Delete a bounty")
+    parser_delete.add_argument("bounty_id", type=int, help="Bounty ID to delete")
+
+    parser_track = subparsers.add_parser("track", help="Track a bounty")
+    parser_track.add_argument("bounty_id", type=int, help="Bounty ID to track")
+
+    parser_untrack = subparsers.add_parser("untrack", help="Untrack a bounty")
+    parser_untrack.add_argument("bounty_id", type=int, help="Bounty ID to untrack")
+
+    for sp in [
+        parser_add,
+        parser_list,
+        parser_my,
+        parser_update,
+        parser_delete,
+        parser_track,
+        parser_untrack,
+    ]:
+        sp.add_argument(
+            "--group-id", type=int, help="Group context (use group room ID)"
+        )
+        sp.add_argument(
+            "--user-id", type=int, help="User context (use Telegram user ID)"
+        )
+
+    args = parser.parse_args()
+
+    if not args.command:
+        parser.print_help()
+        sys.exit(1)
+
+    if not args.group_id and not args.user_id:
+        print("Error: either --group-id or --user-id is required", file=sys.stderr)
+        sys.exit(1)
+
+    if args.command in ("add", "list", "my", "update", "delete"):
+        if not (args.group_id or args.user_id):
+            print("Error: --group-id or --user-id required", file=sys.stderr)
+            sys.exit(1)
+        if args.command == "add" and not args.text:
+            print("Error: text is required for add", file=sys.stderr)
+            sys.exit(1)
+
+    command_map = {
+        "add": cmd_add,
+        "list": cmd_list,
+        "my": cmd_my,
+        "update": cmd_update,
+        "delete": cmd_delete,
+        "track": cmd_track,
+        "untrack": cmd_untrack,
+    }
+
+    if args.command in command_map:
+        command_map[args.command](args)
+    else:
+        print(f"Unknown command: {args.command}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

config.py

@@ -0,0 +1,37 @@
+"""JIGAIDO Configuration Management."""
+
+import json
+import os
+from pathlib import Path
+from typing import Optional
+
+DEFAULT_DATA_DIR = Path.home() / ".jigaido"
+
+
+class Config:
+    """JIGAIDO configuration with precedence: ENV > config file > defaults."""
+
+    def __init__(self):
+        self.data_dir: Path = self._resolve_data_dir()
+        self.bot_token: Optional[str] = os.environ.get("JIGAIDO_BOT_TOKEN")
+
+    def _resolve_data_dir(self) -> Path:
+        env_dir = os.environ.get("JIGAIDO_DATA_DIR")
+        if env_dir:
+            return Path(env_dir)
+
+        config_file = Path("~/.jigaido/config.json").expanduser()
+        if config_file.exists():
+            with open(config_file) as f:
+                config_data = json.load(f)
+                if "data_dir" in config_data:
+                    return Path(config_data["data_dir"])
+
+        return DEFAULT_DATA_DIR
+
+    def ensure_data_dir(self) -> None:
+        """Ensure the data directory exists."""
+        self.data_dir.mkdir(parents=True, exist_ok=True)
+
+
+config = Config()

core/__init__.py

@@ -0,0 +1,21 @@
+"""Core domain models for JIGAIDO."""
+
+from core.models import (
+    Bounty,
+    TrackedBounty,
+    RoomData,
+    TrackingData,
+)
+from core.ports import (
+    RoomStorage,
+    TrackingStorage,
+)
+
+__all__ = [
+    "Bounty",
+    "TrackedBounty",
+    "RoomData",
+    "TrackingData",
+    "RoomStorage",
+    "TrackingStorage",
+]

core/models.py

@@ -0,0 +1,75 @@
+"""Domain dataclasses for JIGAIDO bounty tracker."""
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Bounty:
+    """A bounty created by a user.
+
+    The created_by_user_id field always refers to the user who created the bounty.
+    It does NOT indicate whether the bounty is a group or personal bounty.
+
+    The deleted_at field indicates soft-delete: None means not deleted,
+    a value means deleted at that Unix timestamp.
+    """
+
+    id: int
+    text: str | None
+    link: str | None
+    due_date_ts: int | None
+    created_at: int
+    created_by_user_id: int
+    deleted_at: int | None = None
+    created_by_username: str | None = None
+
+
+@dataclass
+class TrackedBounty:
+    """A bounty that a user is tracking.
+
+    Lightweight relation/pointer - the actual tracking context (including room)
+    lives in TrackingData, not here.
+    """
+
+    bounty_id: int
+    created_at: int
+
+
+@dataclass
+class RoomData:
+    """All data for a room (group or DM).
+
+    The room_id can be negative for Telegram groups or positive for DMs.
+    The next_id field is used to generate unique bounty IDs within this room.
+
+    The timezone field stores the room's timezone (e.g., "Asia/Jakarta"), default UTC+0.
+    The admin_user_ids field lists users who have admin privileges in this room.
+    """
+
+    room_id: int
+    bounties: list[Bounty]
+    next_id: int
+    timezone: str | None = None
+    admin_user_ids: list[int] | None = None
+
+    def __post_init__(self):
+        if self.admin_user_ids is None:
+            self.admin_user_ids = []
+
+
+@dataclass
+class TrackingData:
+    """User tracking state within a room (group or DM).
+
+    TrackingData vs TrackedBounty:
+    - Use TrackingData to store ALL tracked bounties for a user in a specific room.
+      It contains the room_id, user_id, and a list of TrackedBounty entries.
+    - Use TrackedBounty to represent a single tracked bounty entry within that list.
+
+    TrackingData is the container, TrackedBounty is the item.
+    """
+
+    room_id: int
+    user_id: int
+    tracked: list[TrackedBounty]

core/ports.py

@@ -0,0 +1,84 @@
+"""Abstract storage interfaces (Ports) for JIGAIDO storage adapters."""
+
+from typing import Protocol, runtime_checkable
+
+from core.models import Bounty, RoomData, TrackingData, TrackedBounty
+
+
+@runtime_checkable
+class RoomStorage(Protocol):
+    """Storage port for room bounties.
+
+    A room is identified by room_id:
+    - Negative room_id: Telegram group (e.g., -1001)
+    - Positive room_id: DM/personal context (user's Telegram ID)
+
+    This single port handles both group and personal bounties.
+    """
+
+    def load(self, room_id: int) -> RoomData | None:
+        """Load all data for a room. Returns None if room doesn't exist."""
+        ...
+
+    def save(self, room_data: RoomData) -> None:
+        """Save all data for a room."""
+        ...
+
+    def add_bounty(self, room_id: int, bounty: Bounty) -> None:
+        """Add a new bounty to a room. Creates room if it doesn't exist."""
+        ...
+
+    def update_bounty(self, room_id: int, bounty: Bounty) -> None:
+        """Update an existing bounty in a room."""
+        ...
+
+    def delete_bounty(self, room_id: int, bounty_id: int) -> None:
+        """Delete a bounty from a room."""
+        ...
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        """Get a specific bounty from a room by ID."""
+        ...
+
+    def list_bounties(self, room_id: int) -> list[Bounty]:
+        """List all non-deleted bounties in a room.
+
+        Soft-deleted bounties (where deleted_at is not None) are excluded.
+        """
+        ...
+
+    def list_all_bounties(
+        self, room_id: int, include_deleted: bool = True
+    ) -> list[Bounty]:
+        """List all bounties including or excluding soft-deleted.
+
+        Args:
+            room_id: The room ID
+            include_deleted: If True, return all bounties including soft-deleted.
+                           If False, return only non-deleted bounties.
+        """
+        ...
+
+
+@runtime_checkable
+class TrackingStorage(Protocol):
+    """Storage port for tracking data.
+
+    Tracks which bounties a user is tracking in a specific room.
+    """
+
+    def load(self, room_id: int, user_id: int) -> TrackingData | None:
+        """Load tracking data for a user in a room. Returns None if not tracking anything."""
+        ...
+
+    def save(self, tracking_data: TrackingData) -> None:
+        """Save tracking data."""
+        ...
+
+    def track_bounty(self, room_id: int, user_id: int, tracked: TrackedBounty) -> None:
+        """Add a bounty to a user's tracking list. Creates tracking entry if needed."""
+        ...
+
+    def untrack_bounty(self, room_id: int, user_id: int, bounty_id: int) -> None:
+        """Remove a bounty from a user's tracking list."""
+        ...

core/services.py

@@ -0,0 +1,291 @@
+"""Pure business logic services for JIGAIDO."""
+
+import time
+from typing import Optional
+
+from core.models import Bounty, RoomData, TrackedBounty, TrackingData
+from core.ports import RoomStorage, TrackingStorage
+
+
+class BountyService:
+    """Service for bounty operations in a room.
+
+    A room is identified by room_id:
+    - Negative room_id: Telegram group (e.g., -1001)
+    - Positive room_id: DM/personal context (user's Telegram ID)
+
+    This service handles both group and personal bounties through room_id.
+
+    Permissions:
+    - /add, /edit, /delete: admin only
+    - /admin, /admin add, /admin remove: admin only
+    - /bounty, /show, /track, /untrack, /my: everyone
+    """
+
+    def __init__(self, storage: RoomStorage):
+        self._storage = storage
+
+    def is_admin(self, room_id: int, user_id: int) -> bool:
+        """Check if user is admin in a room."""
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            return False
+        return user_id in (room_data.admin_user_ids or [])
+
+    def add_admin(
+        self, room_id: int, admin_user_id: int, requesting_user_id: int
+    ) -> None:
+        """Add an admin to a room. Requires admin permission."""
+        if not self.is_admin(room_id, requesting_user_id):
+            raise PermissionError("Only admins can add admins.")
+
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            room_data = RoomData(
+                room_id=room_id, bounties=[], next_id=1, admin_user_ids=[]
+            )
+
+        if admin_user_id not in (room_data.admin_user_ids or []):
+            (room_data.admin_user_ids or []).append(admin_user_id)
+            self._storage.save(room_data)
+
+    def remove_admin(
+        self, room_id: int, admin_user_id: int, requesting_user_id: int
+    ) -> None:
+        """Remove an admin from a room. Requires admin permission."""
+        if not self.is_admin(room_id, requesting_user_id):
+            raise PermissionError("Only admins can remove admins.")
+
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            return
+
+        if admin_user_id in (room_data.admin_user_ids or []):
+            (room_data.admin_user_ids or []).remove(admin_user_id)
+            self._storage.save(room_data)
+
+    def list_admins(self, room_id: int) -> list[int]:
+        """List all admin user IDs in a room."""
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            return []
+        return list(room_data.admin_user_ids or [])
+
+    def set_timezone(
+        self, room_id: int, timezone: str, requesting_user_id: int
+    ) -> None:
+        """Set the timezone for a room. Requires admin permission."""
+        if not self.is_admin(room_id, requesting_user_id):
+            raise PermissionError("Only admins can set timezone.")
+
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            room_data = RoomData(
+                room_id=room_id, bounties=[], next_id=1, admin_user_ids=[]
+            )
+
+        room_data.timezone = timezone
+        self._storage.save(room_data)
+
+    def get_timezone(self, room_id: int) -> str:
+        """Get the timezone for a room. Returns UTC+0 if not set."""
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            return "UTC+0"
+        return room_data.timezone or "UTC+0"
+
+    def check_link_unique(
+        self, room_id: int, link: str | None, exclude_bounty_id: int | None = None
+    ) -> bool:
+        """Check if a link is unique within a room (not used by another bounty)."""
+        if not link:
+            return True
+
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            return True
+
+        for bounty in room_data.bounties:
+            if bounty.deleted_at is not None:
+                continue
+            if bounty.link == link and bounty.id != exclude_bounty_id:
+                return False
+        return True
+
+    def add_bounty(
+        self,
+        room_id: int,
+        user_id: int,
+        text: Optional[str] = None,
+        link: Optional[str] = None,
+        due_date_ts: Optional[int] = None,
+    ) -> Bounty:
+        """Add a new bounty to the room. Requires admin permission."""
+        if not self.is_admin(room_id, user_id):
+            raise PermissionError("Only admins can add bounties.")
+
+        if not self.check_link_unique(room_id, link):
+            raise ValueError("A bounty with this link already exists in this room.")
+
+        room_data = self._storage.load(room_id)
+        if room_data is None:
+            room_data = RoomData(room_id=room_id, bounties=[], next_id=1)
+        else:
+            room_data.next_id += 1
+
+        bounty = Bounty(
+            id=room_data.next_id,
+            created_by_user_id=user_id,
+            text=text,
+            link=link,
+            due_date_ts=due_date_ts,
+            created_at=int(time.time()),
+        )
+        self._storage.add_bounty(room_id, bounty)
+        return bounty
+
+    def list_bounties(self, room_id: int) -> list[Bounty]:
+        """List all non-deleted bounties in a room."""
+        return self._storage.list_bounties(room_id)
+
+    def list_deleted_bounties(self, room_id: int) -> list[Bounty]:
+        """List all soft-deleted bounties in a room. For /recover functionality."""
+        all_bounties = self._storage.list_all_bounties(room_id, include_deleted=True)
+        return [b for b in all_bounties if b.deleted_at is not None]
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        """Get a specific bounty by ID. Excludes soft-deleted bounties."""
+        bounty = self._storage.get_bounty(room_id, bounty_id)
+        if bounty and bounty.deleted_at is not None:
+            return None
+        return bounty
+
+    def update_bounty(
+        self,
+        room_id: int,
+        bounty_id: int,
+        user_id: int,
+        text: Optional[str] = None,
+        link: Optional[str] = None,
+        due_date_ts: Optional[int] = None,
+        clear_link: bool = False,
+        clear_due: bool = False,
+    ) -> bool:
+        """Update a bounty. Only admins can update."""
+        bounty = self._storage.get_bounty(room_id, bounty_id)
+        if not bounty:
+            return False
+        if not self.is_admin(room_id, user_id):
+            raise PermissionError("Only admins can edit bounties.")
+
+        if link and not self.check_link_unique(
+            room_id, link, exclude_bounty_id=bounty_id
+        ):
+            raise ValueError("A bounty with this link already exists in this room.")
+
+        updated = Bounty(
+            id=bounty.id,
+            created_by_user_id=bounty.created_by_user_id,
+            text=text if text is not None else bounty.text,
+            link=None if clear_link else (link if link is not None else bounty.link),
+            due_date_ts=None
+            if clear_due
+            else (due_date_ts if due_date_ts is not None else bounty.due_date_ts),
+            created_at=bounty.created_at,
+            deleted_at=bounty.deleted_at,
+            created_by_username=bounty.created_by_username,
+        )
+        self._storage.update_bounty(room_id, updated)
+        return True
+
+    def delete_bounty(self, room_id: int, bounty_id: int, user_id: int) -> bool:
+        """Soft delete a bounty. Only admins can delete."""
+        bounty = self._storage.get_bounty(room_id, bounty_id)
+        if not bounty:
+            return False
+        if not self.is_admin(room_id, user_id):
+            raise PermissionError("Only admins can delete bounties.")
+
+        bounty.deleted_at = int(time.time())
+        self._storage.update_bounty(room_id, bounty)
+        return True
+
+    def delete_bounties(
+        self, room_id: int, bounty_ids: list[int], user_id: int
+    ) -> dict[int, str]:
+        """Soft delete multiple bounties. Only admins can delete.
+
+        Returns a dict mapping bounty_id to result:
+        - "deleted": Successfully soft-deleted
+        - "not_found": Bounty does not exist
+        - "permission_denied": User is not admin
+        """
+        results = {}
+        for bounty_id in bounty_ids:
+            bounty = self._storage.get_bounty(room_id, bounty_id)
+            if not bounty:
+                results[bounty_id] = "not_found"
+                continue
+            if not self.is_admin(room_id, user_id):
+                results[bounty_id] = "permission_denied"
+                continue
+
+            bounty.deleted_at = int(time.time())
+            self._storage.update_bounty(room_id, bounty)
+            results[bounty_id] = "deleted"
+        return results
+
+
+class TrackingService:
+    """Service for tracking bounty operations."""
+
+    def __init__(self, tracking_storage: TrackingStorage, room_storage: RoomStorage):
+        self._tracking = tracking_storage
+        self._room = room_storage
+
+    def track_bounty(self, room_id: int, user_id: int, bounty_id: int) -> bool:
+        """Start tracking a bounty. Returns True if newly tracked."""
+        bounty = self._room.get_bounty(room_id, bounty_id)
+        if not bounty:
+            raise ValueError("Bounty not found.")
+
+        tracking_data = self._tracking.load(room_id, user_id)
+        if tracking_data is None:
+            tracking_data = TrackingData(room_id=room_id, user_id=user_id, tracked=[])
+
+        for tracked in tracking_data.tracked:
+            if tracked.bounty_id == bounty_id:
+                return False
+
+        tracked = TrackedBounty(bounty_id=bounty_id, created_at=int(time.time()))
+        self._tracking.track_bounty(room_id, user_id, tracked)
+        return True
+
+    def untrack_bounty(self, room_id: int, user_id: int, bounty_id: int) -> bool:
+        """Stop tracking a bounty. Returns True if was tracking."""
+        tracking_data = self._tracking.load(room_id, user_id)
+        if tracking_data is None:
+            return False
+
+        for tracked in tracking_data.tracked:
+            if tracked.bounty_id == bounty_id:
+                self._tracking.untrack_bounty(room_id, user_id, bounty_id)
+                return True
+        return False
+
+    def get_tracked_bounties(self, room_id: int, user_id: int) -> list[Bounty]:
+        """Get all bounties tracked by a user in a room."""
+        tracking_data = self._tracking.load(room_id, user_id)
+        if tracking_data is None:
+            return []
+
+        room_data = self._room.load(room_id)
+        if room_data is None:
+            return []
+
+        bounty_map = {b.id: b for b in room_data.bounties if b.deleted_at is None}
+        return [
+            bounty_map[t.bounty_id]
+            for t in tracking_data.tracked
+            if t.bounty_id in bounty_map
+        ]

tests/test_cli.py

@@ -0,0 +1,376 @@
+"""Tests for cli/main.py — CLI commands with mocked dependencies."""
+
+import pytest
+from unittest.mock import patch, MagicMock
+from io import StringIO
+import sys
+
+from core.models import Bounty
+from core.ports import RoomStorage, TrackingStorage
+
+
+class MockRoomStorage(RoomStorage):
+    """Mock RoomStorage for testing."""
+
+    def __init__(self):
+        self._rooms: dict[int, dict] = {}
+
+    def load(self, room_id: int) -> dict | None:
+        return self._rooms.get(room_id)
+
+    def save(self, room_data: dict) -> None:
+        self._rooms[room_data["room_id"]] = room_data
+
+    def add_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id not in self._rooms:
+            self._rooms[room_id] = {"room_id": room_id, "bounties": [], "next_id": 1}
+        self._rooms[room_id]["bounties"].append(bounty)
+
+    def update_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id in self._rooms:
+            for i, b in enumerate(self._rooms[room_id]["bounties"]):
+                if b.id == bounty.id:
+                    self._rooms[room_id]["bounties"][i] = bounty
+                    break
+
+    def delete_bounty(self, room_id: int, bounty_id: int) -> None:
+        if room_id in self._rooms:
+            self._rooms[room_id]["bounties"] = [
+                b for b in self._rooms[room_id]["bounties"] if b.id != bounty_id
+            ]
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        if room_id in self._rooms:
+            for b in self._rooms[room_id]["bounties"]:
+                if b.id == bounty_id:
+                    return b
+        return None
+
+
+class MockTrackingStorage(TrackingStorage):
+    """Mock TrackingStorage for testing."""
+
+    def __init__(self):
+        self._tracking: dict[int, dict] = {}
+
+    def load(self, user_id: int) -> dict | None:
+        return self._tracking.get(user_id)
+
+    def save(self, tracking_data: dict) -> None:
+        self._tracking[tracking_data["user_id"]] = tracking_data
+
+    def track_bounty(self, user_id: int, bounty_id: int, room_id: int) -> bool:
+        if user_id not in self._tracking:
+            self._tracking[user_id] = {"user_id": user_id, "bounty_ids": []}
+        if bounty_id not in self._tracking[user_id]["bounty_ids"]:
+            self._tracking[user_id]["bounty_ids"].append(bounty_id)
+            return True
+        return False
+
+    def untrack_bounty(self, user_id: int, bounty_id: int) -> bool:
+        if user_id in self._tracking:
+            if bounty_id in self._tracking[user_id]["bounty_ids"]:
+                self._tracking[user_id]["bounty_ids"].remove(bounty_id)
+                return True
+        return False
+
+    def get_tracked_bounty_ids(self, user_id: int) -> list[int]:
+        if user_id in self._tracking:
+            return self._tracking[user_id]["bounty_ids"]
+        return []
+
+
+@pytest.fixture
+def mock_services():
+    """Create mock services for CLI testing."""
+    room_storage = MockRoomStorage()
+    tracking_storage = MockTrackingStorage()
+    return room_storage, tracking_storage
+
+
+class TestCLIParsing:
+    """Test CLI argument parsing through main()."""
+
+    def test_add_command_requires_text(self):
+        """Test that 'add' command requires text argument."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "add", "--group-id=-1001"]):
+            with patch("cli.main.create_services"):
+                with patch("sys.stderr", new=StringIO()) as stderr:
+                    with pytest.raises(SystemExit):
+                        main()
+                    assert "arguments are required: text" in stderr.getvalue()
+
+    def test_list_command(self):
+        """Test 'list' command parsing."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "list", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_create.return_value = (MagicMock(), MagicMock())
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.list_bounties.return_value = []
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "No bounties" in stdout.getvalue()
+
+    def test_my_command(self):
+        """Test 'my' command parsing."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv", ["jigaido-cli", "my", "--group-id=-1001", "--user-id=123"]
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_tracking_service = MagicMock()
+                mock_tracking_service.get_tracked_bounties.return_value = []
+                mock_create.return_value = (MagicMock(), mock_tracking_service)
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Not tracking any bounties" in stdout.getvalue()
+
+    def test_update_command(self):
+        """Test 'update' command parsing."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv", ["jigaido-cli", "update", "1", "--group-id=-1001", "new text"]
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.update_bounty.return_value = True
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Updated bounty #1" in stdout.getvalue()
+
+    def test_delete_command(self):
+        """Test 'delete' command parsing."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "delete", "1", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.delete_bounty.return_value = True
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Deleted bounty #1" in stdout.getvalue()
+
+    def test_track_command(self):
+        """Test 'track' command parsing."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "track", "1", "--group-id=-1001", "--user-id=123"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_tracking_service = MagicMock()
+                mock_tracking_service.track_bounty.return_value = True
+                mock_create.return_value = (MagicMock(), mock_tracking_service)
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Tracking bounty #1" in stdout.getvalue()
+
+    def test_untrack_command(self):
+        """Test 'untrack' command parsing."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "untrack", "1", "--group-id=-1001", "--user-id=123"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_tracking_service = MagicMock()
+                mock_tracking_service.untrack_bounty.return_value = True
+                mock_create.return_value = (MagicMock(), mock_tracking_service)
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Untracked bounty #1" in stdout.getvalue()
+
+
+class TestCLIValidation:
+    """Test CLI input validation."""
+
+    def test_requires_group_id_or_user_id(self):
+        """Test that commands require either --group-id or --user-id."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "add", "some text"]):
+            with patch("sys.stderr", new=StringIO()) as stderr:
+                with pytest.raises(SystemExit):
+                    main()
+                assert "group-id or --user-id is required" in stderr.getvalue()
+
+    def test_unknown_command(self):
+        """Test handling of unknown commands."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "unknown_cmd", "--group-id=-1001"]):
+            with patch("sys.stderr", new=StringIO()) as stderr:
+                with pytest.raises(SystemExit):
+                    main()
+                assert "invalid choice" in stderr.getvalue()
+
+    def test_update_clear_link_flag(self):
+        """Test update with --clear-link flag."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "update", "1", "--clear-link", "--group-id=-1001"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.update_bounty.return_value = True
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                main()
+                mock_bounty_service.update_bounty.assert_called_once()
+                call_kwargs = mock_bounty_service.update_bounty.call_args
+                assert call_kwargs.kwargs.get("clear_link") == True
+
+    def test_update_clear_due_flag(self):
+        """Test update with --clear-due flag."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "update", "1", "--clear-due", "--group-id=-1001"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.update_bounty.return_value = True
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                main()
+                mock_bounty_service.update_bounty.assert_called_once()
+                call_kwargs = mock_bounty_service.update_bounty.call_args
+                assert call_kwargs.kwargs.get("clear_due") == True
+
+
+class TestCLIOutput:
+    """Test CLI output formatting."""
+
+    def test_list_shows_bounties(self):
+        """Test that 'list' shows bounty details correctly."""
+        from cli.main import main
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 1
+        mock_bounty.text = "Fix bug"
+        mock_bounty.link = "https://github.com/issue/1"
+        mock_bounty.due_date_ts = None
+
+        with patch("sys.argv", ["jigaido-cli", "list", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.list_bounties.return_value = [mock_bounty]
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    output = stdout.getvalue()
+                    assert "#1:" in output
+                    assert "Fix bug" in output
+                    assert "https://github.com/issue/1" in output
+
+    def test_list_empty(self):
+        """Test that 'list' shows 'No bounties' when empty."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "list", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.list_bounties.return_value = []
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "No bounties" in stdout.getvalue()
+
+    def test_add_output(self):
+        """Test that 'add' outputs the new bounty ID."""
+        from cli.main import main
+
+        mock_bounty = MagicMock()
+        mock_bounty.id = 42
+
+        with patch("sys.argv", ["jigaido-cli", "add", "New task", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.add_bounty.return_value = mock_bounty
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Added bounty #42" in stdout.getvalue()
+
+
+class TestCLIErrorHandling:
+    """Test CLI error handling."""
+
+    def test_delete_nonexistent_bounty(self):
+        """Test deleting a non-existent bounty."""
+        from cli.main import main
+
+        with patch("sys.argv", ["jigaido-cli", "delete", "999", "--group-id=-1001"]):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.delete_bounty.return_value = False
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stderr", new=StringIO()) as stderr:
+                    with pytest.raises(SystemExit):
+                        main()
+                    assert "not found" in stderr.getvalue()
+
+    def test_update_permission_error(self):
+        """Test update with permission error."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "update", "1", "new text", "--group-id=-1001"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_bounty_service = MagicMock()
+                mock_bounty_service.update_bounty.side_effect = PermissionError(
+                    "Not owner"
+                )
+                mock_create.return_value = (mock_bounty_service, MagicMock())
+
+                with patch("sys.stderr", new=StringIO()) as stderr:
+                    with pytest.raises(SystemExit):
+                        main()
+                    assert "Not owner" in stderr.getvalue()
+
+    def test_track_already_tracking(self):
+        """Test tracking a bounty that's already tracked."""
+        from cli.main import main
+
+        with patch(
+            "sys.argv",
+            ["jigaido-cli", "track", "1", "--group-id=-1001", "--user-id=123"],
+        ):
+            with patch("cli.main.create_services") as mock_create:
+                mock_tracking_service = MagicMock()
+                mock_tracking_service.track_bounty.return_value = False
+                mock_create.return_value = (MagicMock(), mock_tracking_service)
+
+                with patch("sys.stdout", new=StringIO()) as stdout:
+                    main()
+                    assert "Already tracking" in stdout.getvalue()
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v"])

tests/test_config.py

@@ -0,0 +1,76 @@
+"""Tests for config.py — configuration management."""
+
+import json
+import os
+import tempfile
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from config import Config, DEFAULT_DATA_DIR
+
+
+class TestConfigDataDir:
+    def test_default_data_dir(self, tmp_path):
+        """Test that default data_dir is ~/.jigaido when no config exists."""
+        with patch.dict(os.environ, {}, clear=True):
+            with patch("pathlib.Path.exists", return_value=False):
+                cfg = Config()
+                assert cfg.data_dir == DEFAULT_DATA_DIR
+
+    def test_env_override_data_dir(self, tmp_path):
+        """Test that JIGAIDO_DATA_DIR env var overrides config file."""
+        env_dir = "/custom/env/data/dir"
+        with patch.dict(os.environ, {"JIGAIDO_DATA_DIR": env_dir}, clear=False):
+            cfg = Config()
+            assert cfg.data_dir == Path(env_dir)
+
+    def test_config_file_data_dir(self, tmp_path):
+        """Test that config file is read when JIGAIDO_DATA_DIR not set."""
+        config_dir = tmp_path / ".jigaido"
+        config_dir.mkdir()
+        config_file = config_dir / "config.json"
+        config_file.write_text(json.dumps({"data_dir": "/custom/config/data"}))
+
+        with patch.dict(os.environ, {}, clear=True):
+            with patch("pathlib.Path.expanduser", return_value=config_file):
+                cfg = Config()
+                assert cfg.data_dir == Path("/custom/config/data")
+
+    def test_bot_token_from_env(self):
+        """Test that bot_token is read from JIGAIDO_BOT_TOKEN env var."""
+        with patch.dict(
+            os.environ, {"JIGAIDO_BOT_TOKEN": "test_token_123"}, clear=False
+        ):
+            cfg = Config()
+            assert cfg.bot_token == "test_token_123"
+
+    def test_bot_token_none_when_not_set(self):
+        """Test that bot_token is None when JIGAIDO_BOT_TOKEN not set."""
+        with patch.dict(os.environ, {}, clear=True):
+            cfg = Config()
+            assert cfg.bot_token is None
+
+
+class TestConfigEnsureDataDir:
+    def test_ensure_data_dir_creates_directory(self, tmp_path):
+        """Test that ensure_data_dir creates the directory if it doesn't exist."""
+        data_dir = tmp_path / "test_data_dir"
+        with patch.object(Config, "__init__", lambda self: None):
+            cfg = Config()
+            cfg.data_dir = data_dir
+            assert not data_dir.exists()
+            cfg.ensure_data_dir()
+            assert data_dir.exists()
+            assert data_dir.is_dir()
+
+    def test_ensure_data_dir_does_nothing_if_exists(self, tmp_path):
+        """Test that ensure_data_dir doesn't fail if directory already exists."""
+        data_dir = tmp_path / "existing_dir"
+        data_dir.mkdir()
+        with patch.object(Config, "__init__", lambda self: None):
+            cfg = Config()
+            cfg.data_dir = data_dir
+            cfg.ensure_data_dir()
+            assert data_dir.exists()

tests/test_json_file.py

@@ -0,0 +1,269 @@
+"""Tests for adapters/storage/json_file.py — JSON file storage adapter."""
+
+import json
+import os
+import tempfile
+from pathlib import Path
+
+import pytest
+
+from adapters.storage.json_file import JsonFileRoomStorage, JsonFileTrackingStorage
+from core.models import Bounty, RoomData, TrackingData, TrackedBounty
+
+
+class TestJsonFileRoomStorage:
+    """Unit tests for JsonFileRoomStorage."""
+
+    def setup_method(self):
+        """Set up a temporary directory for each test."""
+        self.temp_dir = tempfile.mkdtemp()
+        self.storage = JsonFileRoomStorage(data_dir=Path(self.temp_dir))
+
+    def teardown_method(self):
+        """Clean up temporary directory after each test."""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def _create_bounty(
+        self,
+        id=1,
+        text="Test bounty",
+        link=None,
+        due_date_ts=None,
+        created_at=0,
+        created_by_user_id=123,
+    ):
+        """Helper to create a Bounty."""
+        return Bounty(
+            id=id,
+            text=text,
+            link=link,
+            due_date_ts=due_date_ts,
+            created_at=created_at,
+            created_by_user_id=created_by_user_id,
+        )
+
+    def test_load_returns_none_for_nonexistent_room(self):
+        """Test that load returns None for a room that doesn't exist."""
+        result = self.storage.load(-1001)
+        assert result is None
+
+    def test_save_and_load_room(self):
+        """Test that save and load work correctly."""
+        room = RoomData(room_id=-1001, bounties=[], next_id=1)
+        self.storage.save(room)
+
+        loaded = self.storage.load(-1001)
+        assert loaded is not None
+        assert loaded.room_id == -1001
+        assert loaded.bounties == []
+        assert loaded.next_id == 1
+
+    def test_add_bounty_creates_room(self):
+        """Test that add_bounty creates a room if it doesn't exist."""
+        bounty = self._create_bounty()
+        self.storage.add_bounty(-1001, bounty)
+
+        loaded = self.storage.load(-1001)
+        assert loaded is not None
+        assert len(loaded.bounties) == 1
+        assert loaded.bounties[0].text == "Test bounty"
+
+    def test_add_bounty_increments_next_id(self):
+        """Test that add_bounty properly handles next_id."""
+        bounty1 = self._create_bounty(id=1)
+        bounty2 = self._create_bounty(id=2)
+
+        self.storage.add_bounty(-1001, bounty1)
+        self.storage.add_bounty(-1001, bounty2)
+
+        loaded = self.storage.load(-1001)
+        assert loaded.next_id == 3  # Should be max id + 1
+
+    def test_update_bounty(self):
+        """Test that update_bounty correctly updates a bounty."""
+        bounty = self._create_bounty(id=1, text="Original")
+        self.storage.add_bounty(-1001, bounty)
+
+        updated = self._create_bounty(id=1, text="Updated")
+        self.storage.update_bounty(-1001, updated)
+
+        loaded = self.storage.load(-1001)
+        assert loaded.bounties[0].text == "Updated"
+
+    def test_update_bounty_nonexistent_room(self):
+        """Test that update_bounty does nothing for nonexistent room."""
+        updated = self._create_bounty(id=1, text="Updated")
+        self.storage.update_bounty(-1001, updated)  # Should not raise
+
+        assert self.storage.load(-1001) is None
+
+    def test_delete_bounty(self):
+        """Test that delete_bounty removes a bounty."""
+        bounty = self._create_bounty(id=1)
+        self.storage.add_bounty(-1001, bounty)
+        self.storage.delete_bounty(-1001, 1)
+
+        loaded = self.storage.load(-1001)
+        assert len(loaded.bounties) == 0
+
+    def test_get_bounty_found(self):
+        """Test that get_bounty returns the bounty when found."""
+        bounty = self._create_bounty(id=1)
+        self.storage.add_bounty(-1001, bounty)
+
+        result = self.storage.get_bounty(-1001, 1)
+        assert result is not None
+        assert result.text == "Test bounty"
+
+    def test_get_bounty_not_found(self):
+        """Test that get_bounty returns None when not found."""
+        result = self.storage.get_bounty(-1001, 999)
+        assert result is None
+
+    def test_file_path_format(self):
+        """Test that room data is stored in correct location."""
+        room = RoomData(room_id=-1001, bounties=[], next_id=1)
+        self.storage.save(room)
+
+        expected_path = Path(self.temp_dir) / "-1001.json"
+        assert expected_path.exists()
+
+    def test_atomic_write(self):
+        """Test that data is written atomically."""
+        room = RoomData(room_id=-1001, bounties=[], next_id=1)
+        self.storage.save(room)
+
+        # Check that the file is valid JSON
+        file_path = Path(self.temp_dir) / "-1001.json"
+        with open(file_path) as f:
+            data = json.load(f)
+        assert data["room_id"] == -1001
+
+
+class TestJsonFileTrackingStorage:
+    """Unit tests for JsonFileTrackingStorage."""
+
+    def setup_method(self):
+        """Set up a temporary directory for each test."""
+        self.temp_dir = tempfile.mkdtemp()
+        self.storage = JsonFileTrackingStorage(tracking_dir=Path(self.temp_dir))
+
+    def teardown_method(self):
+        """Clean up temporary directory after each test."""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def _create_tracked(self, bounty_id=1, created_at=0):
+        """Helper to create a TrackedBounty."""
+        return TrackedBounty(bounty_id=bounty_id, created_at=created_at)
+
+    def test_load_returns_none_for_nonexistent_tracking(self):
+        """Test that load returns None when no tracking exists."""
+        result = self.storage.load(-1001, 123456)
+        assert result is None
+
+    def test_save_and_load_tracking(self):
+        """Test that save and load work correctly."""
+        tracking = TrackingData(room_id=-1001, user_id=123456, tracked=[])
+        self.storage.save(tracking)
+
+        loaded = self.storage.load(-1001, 123456)
+        assert loaded is not None
+        assert loaded.room_id == -1001
+        assert loaded.user_id == 123456
+
+    def test_track_bounty(self):
+        """Test that track_bounty adds a bounty to tracking."""
+        tracked = self._create_tracked(bounty_id=5)
+        self.storage.track_bounty(-1001, 123456, tracked)
+
+        loaded = self.storage.load(-1001, 123456)
+        assert loaded is not None
+        assert len(loaded.tracked) == 1
+        assert loaded.tracked[0].bounty_id == 5
+
+    def test_untrack_bounty(self):
+        """Test that untrack_bounty removes a bounty from tracking."""
+        tracked = self._create_tracked(bounty_id=5)
+        self.storage.track_bounty(-1001, 123456, tracked)
+        self.storage.untrack_bounty(-1001, 123456, 5)
+
+        loaded = self.storage.load(-1001, 123456)
+        assert loaded is not None
+        assert len(loaded.tracked) == 0
+
+    def test_untrack_bounty_nonexistent(self):
+        """Test that untrack_bounty handles nonexistent tracking gracefully."""
+        self.storage.untrack_bounty(-1001, 123456, 999)  # Should not raise
+
+    def test_file_path_format(self):
+        """Test that tracking data is stored in correct location."""
+        tracked = self._create_tracked(bounty_id=5)
+        self.storage.track_bounty(-1001, 123456, tracked)
+
+        expected_path = Path(self.temp_dir) / "-1001_123456.json"
+        assert expected_path.exists()
+
+    def test_multiple_tracked_bounties(self):
+        """Test tracking multiple bounties."""
+        self.storage.track_bounty(-1001, 123456, self._create_tracked(bounty_id=1))
+        self.storage.track_bounty(-1001, 123456, self._create_tracked(bounty_id=2))
+        self.storage.track_bounty(-1001, 123456, self._create_tracked(bounty_id=3))
+
+        loaded = self.storage.load(-1001, 123456)
+        assert len(loaded.tracked) == 3
+
+    def test_different_users_independent_tracking(self):
+        """Test that different users have independent tracking."""
+        self.storage.track_bounty(-1001, 111, self._create_tracked(bounty_id=1))
+        self.storage.track_bounty(-1001, 222, self._create_tracked(bounty_id=1))
+
+        loaded_111 = self.storage.load(-1001, 111)
+        loaded_222 = self.storage.load(-1001, 222)
+
+        assert len(loaded_111.tracked) == 1
+        assert len(loaded_222.tracked) == 1
+
+
+class TestDuplicateTrackingBehavior:
+    """Test that duplicate tracking is handled correctly.
+
+    Note: The deduplication logic is in the TrackingService layer,
+    not in the adapter. This test verifies the adapter behavior
+    when the same bounty is tracked multiple times (which would only
+    happen if the service layer has a bug).
+    """
+
+    def setup_method(self):
+        """Set up a temporary directory for each test."""
+        self.temp_dir = tempfile.mkdtemp()
+        self.storage = JsonFileTrackingStorage(tracking_dir=Path(self.temp_dir))
+
+    def teardown_method(self):
+        """Clean up temporary directory after each test."""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_adapter_allows_duplicate_tracking(self):
+        """The adapter does NOT prevent duplicate tracking.
+
+        This is by design - deduplication should be handled by
+        TrackingService.track_bounty(), not the storage adapter.
+        """
+        # Add same bounty twice via adapter (bypassing service)
+        self.storage.track_bounty(
+            -1001, 123456, TrackedBounty(bounty_id=5, created_at=0)
+        )
+        self.storage.track_bounty(
+            -1001, 123456, TrackedBounty(bounty_id=5, created_at=0)
+        )
+
+        loaded = self.storage.load(-1001, 123456)
+        # Adapter allows duplicates - service should prevent them
+        assert len(loaded.tracked) == 2
+        assert loaded.tracked[0].bounty_id == 5
+        assert loaded.tracked[1].bounty_id == 5

tests/test_models.py

@@ -0,0 +1,184 @@
+"""Tests for core/models.py — domain dataclasses."""
+
+import time
+
+import pytest
+
+from core.models import (
+    Bounty,
+    TrackedBounty,
+    RoomData,
+    TrackingData,
+)
+
+
+class TestBounty:
+    def test_create_bounty(self):
+        b = Bounty(
+            id=1,
+            text="Fix the bug",
+            link="https://github.com/example/repo/issues/1",
+            due_date_ts=1735689600,
+            created_at=1735603200,
+            created_by_user_id=123,
+        )
+        assert b.id == 1
+        assert b.text == "Fix the bug"
+        assert b.link == "https://github.com/example/repo/issues/1"
+        assert b.due_date_ts == 1735689600
+        assert b.created_at == 1735603200
+        assert b.created_by_user_id == 123
+        assert b.deleted_at is None
+        assert b.created_by_username is None
+
+    def test_bounty_with_new_fields(self):
+        b = Bounty(
+            id=1,
+            text="Fix the bug",
+            link="https://github.com/example/repo/issues/1",
+            due_date_ts=1735689600,
+            created_at=1735603200,
+            created_by_user_id=123,
+            deleted_at=1736200000,
+            created_by_username="johndoe",
+        )
+        assert b.deleted_at == 1736200000
+        assert b.created_by_username == "johndoe"
+
+    def test_bounty_optional_fields_can_be_none(self):
+        b = Bounty(
+            id=1,
+            text=None,
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        assert b.text is None
+        assert b.link is None
+        assert b.due_date_ts is None
+        assert b.deleted_at is None
+        assert b.created_by_username is None
+
+    def test_bounty_comparison_equal(self):
+        b1 = Bounty(
+            id=1,
+            text="a",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        b2 = Bounty(
+            id=1,
+            text="a",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        assert b1 == b2
+
+    def test_bounty_comparison_not_equal(self):
+        b1 = Bounty(
+            id=1,
+            text="a",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        b2 = Bounty(
+            id=2,
+            text="b",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=456,
+        )
+        assert b1 != b2
+
+
+class TestTrackedBounty:
+    def test_create_tracked_bounty(self):
+        tb = TrackedBounty(bounty_id=5, created_at=1735600000)
+        assert tb.bounty_id == 5
+        assert tb.created_at == 1735600000
+
+    def test_tracked_bounty_comparison(self):
+        tb1 = TrackedBounty(bounty_id=1, created_at=0)
+        tb2 = TrackedBounty(bounty_id=1, created_at=0)
+        assert tb1 == tb2
+
+
+class TestRoomData:
+    def test_create_group_room_data(self):
+        rd = RoomData(
+            room_id=-1001,
+            bounties=[],
+            next_id=1,
+        )
+        assert rd.room_id == -1001
+        assert rd.bounties == []
+        assert rd.next_id == 1
+        assert rd.timezone is None
+        assert rd.admin_user_ids == []
+
+    def test_create_dm_room_data(self):
+        rd = RoomData(
+            room_id=123456,
+            bounties=[],
+            next_id=1,
+        )
+        assert rd.room_id == 123456
+        assert rd.bounties == []
+        assert rd.next_id == 1
+        assert rd.timezone is None
+        assert rd.admin_user_ids == []
+
+    def test_room_data_with_bounties(self):
+        b = Bounty(
+            id=1,
+            text="Task",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        rd = RoomData(room_id=-1001, bounties=[b], next_id=2)
+        assert len(rd.bounties) == 1
+        assert rd.bounties[0].text == "Task"
+        assert rd.bounties[0].created_by_user_id == 123
+
+    def test_room_data_with_new_fields(self):
+        rd = RoomData(
+            room_id=-1001,
+            bounties=[],
+            next_id=1,
+            timezone="Asia/Jakarta",
+            admin_user_ids=[123, 456],
+        )
+        assert rd.timezone == "Asia/Jakarta"
+        assert rd.admin_user_ids == [123, 456]
+
+    def test_room_data_admin_user_ids_defaults_to_empty_list(self):
+        rd = RoomData(
+            room_id=-1001,
+            bounties=[],
+            next_id=1,
+        )
+        assert rd.admin_user_ids == []
+
+
+class TestTrackingData:
+    def test_create_tracking_data(self):
+        td = TrackingData(room_id=-1001, user_id=123456, tracked=[])
+        assert td.room_id == -1001
+        assert td.user_id == 123456
+        assert td.tracked == []
+
+    def test_tracking_data_with_tracked(self):
+        tb = TrackedBounty(bounty_id=5, created_at=0)
+        td = TrackingData(room_id=-1001, user_id=123, tracked=[tb])
+        assert len(td.tracked) == 1
+        assert td.tracked[0].bounty_id == 5

tests/test_ports.py

@@ -0,0 +1,296 @@
+"""Tests for core/ports.py — storage interfaces."""
+
+import pytest
+
+from core.models import Bounty, RoomData, TrackingData, TrackedBounty
+from core.ports import RoomStorage, TrackingStorage
+
+
+class SimpleRoomStorage:
+    """Minimal mock without ensure_room - tests if add_bounty works without it.
+
+    This mock only has the basic CRUD methods. It does NOT implement ensure_room().
+    If add_bounty() still works with this simple mock, then ensure_room() may not
+    be needed as a public Protocol method.
+    """
+
+    def __init__(self):
+        self._rooms: dict[int, RoomData] = {}
+
+    def load(self, room_id: int) -> RoomData | None:
+        return self._rooms.get(room_id)
+
+    def save(self, room_data: RoomData) -> None:
+        self._rooms[room_data.room_id] = room_data
+
+    def add_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id not in self._rooms:
+            self._rooms[room_id] = RoomData(room_id=room_id, bounties=[], next_id=1)
+        self._rooms[room_id].bounties.append(bounty)
+
+    def update_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id in self._rooms:
+            for i, b in enumerate(self._rooms[room_id].bounties):
+                if b.id == bounty.id:
+                    self._rooms[room_id].bounties[i] = bounty
+                    break
+
+    def delete_bounty(self, room_id: int, bounty_id: int) -> None:
+        if room_id in self._rooms:
+            self._rooms[room_id].bounties = [
+                b for b in self._rooms[room_id].bounties if b.id != bounty_id
+            ]
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        if room_id in self._rooms:
+            for b in self._rooms[room_id].bounties:
+                if b.id == bounty_id:
+                    return b
+        return None
+
+    def list_bounties(self, room_id: int) -> list[Bounty]:
+        if room_id not in self._rooms:
+            return []
+        return [b for b in self._rooms[room_id].bounties if b.deleted_at is None]
+
+    def list_all_bounties(
+        self, room_id: int, include_deleted: bool = True
+    ) -> list[Bounty]:
+        if room_id not in self._rooms:
+            return []
+        if include_deleted:
+            return self._rooms[room_id].bounties
+        return [b for b in self._rooms[room_id].bounties if b.deleted_at is None]
+
+
+class SimpleTrackingStorage:
+    """Minimal mock without ensure_tracking - tests if track_bounty works without it.
+
+    This mock only has the basic methods. It does NOT implement ensure_tracking().
+    If track_bounty() still works with this simple mock, then ensure_tracking() may not
+    be needed as a public Protocol method.
+    """
+
+    def __init__(self):
+        self._tracking: dict[tuple[int, int], TrackingData] = {}
+
+    def load(self, room_id: int, user_id: int) -> TrackingData | None:
+        return self._tracking.get((room_id, user_id))
+
+    def save(self, tracking_data: TrackingData) -> None:
+        self._tracking[(tracking_data.room_id, tracking_data.user_id)] = tracking_data
+
+    def track_bounty(self, room_id: int, user_id: int, tracked: TrackedBounty) -> None:
+        key = (room_id, user_id)
+        if key not in self._tracking:
+            self._tracking[key] = TrackingData(
+                room_id=room_id, user_id=user_id, tracked=[]
+            )
+        self._tracking[key].tracked.append(tracked)
+
+    def untrack_bounty(self, room_id: int, user_id: int, bounty_id: int) -> None:
+        key = (room_id, user_id)
+        if key in self._tracking:
+            self._tracking[key].tracked = [
+                t for t in self._tracking[key].tracked if t.bounty_id != bounty_id
+            ]
+
+
+class MockRoomStorage:
+    """Mock implementation of RoomStorage for testing."""
+
+    def __init__(self):
+        self._rooms: dict[int, RoomData] = {}
+
+    def load(self, room_id: int) -> RoomData | None:
+        return self._rooms.get(room_id)
+
+    def save(self, room_data: RoomData) -> None:
+        self._rooms[room_data.room_id] = room_data
+
+    def add_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id not in self._rooms:
+            self._rooms[room_id] = RoomData(room_id=room_id, bounties=[], next_id=1)
+        self._rooms[room_id].bounties.append(bounty)
+
+    def update_bounty(self, room_id: int, bounty: Bounty) -> None:
+        if room_id in self._rooms:
+            for i, b in enumerate(self._rooms[room_id].bounties):
+                if b.id == bounty.id:
+                    self._rooms[room_id].bounties[i] = bounty
+                    break
+
+    def delete_bounty(self, room_id: int, bounty_id: int) -> None:
+        if room_id in self._rooms:
+            self._rooms[room_id].bounties = [
+                b for b in self._rooms[room_id].bounties if b.id != bounty_id
+            ]
+
+    def get_bounty(self, room_id: int, bounty_id: int) -> Bounty | None:
+        if room_id in self._rooms:
+            for b in self._rooms[room_id].bounties:
+                if b.id == bounty_id:
+                    return b
+        return None
+
+    def list_bounties(self, room_id: int) -> list[Bounty]:
+        if room_id not in self._rooms:
+            return []
+        return [b for b in self._rooms[room_id].bounties if b.deleted_at is None]
+
+    def list_all_bounties(
+        self, room_id: int, include_deleted: bool = True
+    ) -> list[Bounty]:
+        if room_id not in self._rooms:
+            return []
+        if include_deleted:
+            return self._rooms[room_id].bounties
+        return [b for b in self._rooms[room_id].bounties if b.deleted_at is None]
+
+
+class MockTrackingStorage:
+    """Mock implementation of TrackingStorage for testing."""
+
+    def __init__(self):
+        self._tracking: dict[tuple[int, int], TrackingData] = {}
+
+    def load(self, room_id: int, user_id: int) -> TrackingData | None:
+        return self._tracking.get((room_id, user_id))
+
+    def save(self, tracking_data: TrackingData) -> None:
+        self._tracking[(tracking_data.room_id, tracking_data.user_id)] = tracking_data
+
+    def track_bounty(self, room_id: int, user_id: int, tracked: TrackedBounty) -> None:
+        key = (room_id, user_id)
+        if key not in self._tracking:
+            self._tracking[key] = TrackingData(
+                room_id=room_id, user_id=user_id, tracked=[]
+            )
+        self._tracking[key].tracked.append(tracked)
+
+    def untrack_bounty(self, room_id: int, user_id: int, bounty_id: int) -> None:
+        key = (room_id, user_id)
+        if key in self._tracking:
+            self._tracking[key].tracked = [
+                t for t in self._tracking[key].tracked if t.bounty_id != bounty_id
+            ]
+
+
+class TestRoomStorage:
+    def test_simple_storage_without_ensure_room(self):
+        """Test that SimpleRoomStorage (no ensure_room) still works.
+
+        This verifies that ensure_room() is NOT needed as a public Protocol method,
+        since add_bounty() can create the room internally without it.
+        """
+        storage = SimpleRoomStorage()
+        bounty = Bounty(
+            id=1,
+            text="Test",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        storage.add_bounty(-1001, bounty)
+        room = storage.load(-1001)
+        assert room is not None
+        assert len(room.bounties) == 1
+        assert room.bounties[0].text == "Test"
+        assert room.next_id == 1
+
+    def test_mock_implements_room_storage_protocol(self):
+        storage: RoomStorage = MockRoomStorage()
+        assert isinstance(storage, RoomStorage)
+
+    def test_add_bounty_creates_room_if_not_exists(self):
+        storage = MockRoomStorage()
+        bounty = Bounty(
+            id=1,
+            text="Test",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        storage.add_bounty(-1001, bounty)
+        room = storage.load(-1001)
+        assert room is not None
+        assert len(room.bounties) == 1
+        assert room.bounties[0].text == "Test"
+
+    def test_update_bounty(self):
+        storage = MockRoomStorage()
+        bounty = Bounty(
+            id=1,
+            text="Original",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        storage.add_bounty(-1001, bounty)
+        updated = Bounty(
+            id=1,
+            text="Updated",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        storage.update_bounty(-1001, updated)
+        result = storage.get_bounty(-1001, 1)
+        assert result is not None
+        assert result.text == "Updated"
+
+    def test_delete_bounty(self):
+        storage = MockRoomStorage()
+        bounty = Bounty(
+            id=1,
+            text="Test",
+            link=None,
+            due_date_ts=None,
+            created_at=0,
+            created_by_user_id=123,
+        )
+        storage.add_bounty(-1001, bounty)
+        storage.delete_bounty(-1001, 1)
+        assert storage.get_bounty(-1001, 1) is None
+
+
+class TestTrackingStorage:
+    def test_simple_storage_without_ensure_tracking(self):
+        """Test that SimpleTrackingStorage (no ensure_tracking) still works.
+
+        This verifies that ensure_tracking() is NOT needed as a public Protocol method,
+        since track_bounty() can create the tracking entry internally without it.
+        """
+        storage = SimpleTrackingStorage()
+        tracked = TrackedBounty(bounty_id=5, created_at=0)
+        storage.track_bounty(-1001, 123456, tracked)
+        result = storage.load(-1001, 123456)
+        assert result is not None
+        assert len(result.tracked) == 1
+        assert result.tracked[0].bounty_id == 5
+
+    def test_mock_implements_tracking_storage_protocol(self):
+        storage: TrackingStorage = MockTrackingStorage()
+        assert isinstance(storage, TrackingStorage)
+
+    def test_track_bounty_creates_tracking_if_not_exists(self):
+        storage = MockTrackingStorage()
+        tracked = TrackedBounty(bounty_id=5, created_at=0)
+        storage.track_bounty(-1001, 123456, tracked)
+        result = storage.load(-1001, 123456)
+        assert result is not None
+        assert len(result.tracked) == 1
+        assert result.tracked[0].bounty_id == 5
+
+    def test_untrack_bounty(self):
+        storage = MockTrackingStorage()
+        tracked = TrackedBounty(bounty_id=5, created_at=0)
+        storage.track_bounty(-1001, 123456, tracked)
+        storage.untrack_bounty(-1001, 123456, 5)
+        result = storage.load(-1001, 123456)
+        assert result is not None
+        assert len(result.tracked) == 0

tests/test_services.py

@@ -0,0 +1,402 @@
+"""Tests for core/services.py — business logic services."""
+
+import pytest
+from unittest.mock import MagicMock
+
+from core.models import Bounty, RoomData, TrackingData, TrackedBounty
+from core.services import BountyService, TrackingService
+from tests.test_ports import MockRoomStorage, MockTrackingStorage
+
+
+class TestBountyService:
+    """Unit tests for BountyService."""
+
+    def setup_method(self):
+        """Set up fresh storage and service for each test."""
+        self.storage = MockRoomStorage()
+        self.service = BountyService(self.storage)
+        self.admin_user_id = 123
+        self._make_admin(-1001, self.admin_user_id)
+
+    def _make_admin(self, room_id: int, user_id: int):
+        """Helper to set up a room with an admin user."""
+        room_data = self.storage.load(room_id)
+        if room_data is None:
+            room_data = RoomData(
+                room_id=room_id, bounties=[], next_id=0, admin_user_ids=[]
+            )
+        if user_id not in (room_data.admin_user_ids or []):
+            room_data.admin_user_ids = room_data.admin_user_ids or []
+            room_data.admin_user_ids.append(user_id)
+        self.storage.save(room_data)
+
+    def test_add_bounty_creates_room_if_not_exists(self):
+        """Test that add_bounty creates a new room if it doesn't exist."""
+        bounty = self.service.add_bounty(
+            room_id=-1001,
+            user_id=self.admin_user_id,
+            text="Fix bug",
+            link="https://github.com/issue/1",
+        )
+        assert bounty.id == 1
+        assert bounty.text == "Fix bug"
+        assert bounty.created_by_user_id == self.admin_user_id
+
+        room = self.storage.load(-1001)
+        assert room is not None
+        assert len(room.bounties) == 1
+
+    def test_add_bounty_increments_id(self):
+        """Test that add_bounty increments bounty ID for each new bounty."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        b3 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Third"
+        )
+
+        assert b1.id == 1
+        assert b2.id == 2
+        assert b3.id == 3
+
+    def test_add_bounty_requires_admin(self):
+        """Test that add_bounty raises PermissionError when non-admin tries to add."""
+        with pytest.raises(PermissionError, match="Only admins can add bounties"):
+            self.service.add_bounty(room_id=-1001, user_id=999, text="Not admin")
+
+    def test_list_bounties_empty_room(self):
+        """Test list_bounties returns empty list for non-existent room."""
+        bounties = self.service.list_bounties(-1001)
+        assert bounties == []
+
+    def test_list_bounties_returns_all_bounties(self):
+        """Test list_bounties returns all bounties in a room."""
+        self.service.add_bounty(room_id=-1001, user_id=self.admin_user_id, text="First")
+        self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        # Add bounty to different room to verify isolation
+        self._make_admin(-999, self.admin_user_id)
+        self.service.add_bounty(
+            room_id=-999, user_id=self.admin_user_id, text="Other room"
+        )
+
+        bounties = self.service.list_bounties(-1001)
+        assert len(bounties) == 2
+        assert all(b.text in ["First", "Second"] for b in bounties)
+
+    def test_get_bounty_found(self):
+        """Test get_bounty returns bounty when it exists."""
+        created = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Test"
+        )
+        found = self.service.get_bounty(-1001, created.id)
+        assert found is not None
+        assert found.text == "Test"
+
+    def test_get_bounty_not_found(self):
+        """Test get_bounty returns None when bounty doesn't exist."""
+        found = self.service.get_bounty(-1001, 999)
+        assert found is None
+
+    def test_get_bounty_wrong_room(self):
+        """Test get_bounty returns None when bounty is in different room."""
+        self.service.add_bounty(room_id=-1001, user_id=self.admin_user_id, text="Test")
+        found = self.service.get_bounty(-999, 1)  # room -999 doesn't have bounty 1
+        assert found is None
+
+    def test_update_bounty_success(self):
+        """Test update_bounty succeeds when admin updates their bounty."""
+        bounty = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Original"
+        )
+        result = self.service.update_bounty(
+            room_id=-1001,
+            bounty_id=bounty.id,
+            user_id=self.admin_user_id,
+            text="Updated",
+        )
+        assert result is True
+        updated = self.service.get_bounty(-1001, bounty.id)
+        assert updated.text == "Updated"
+
+    def test_update_bounty_not_admin_raises_permission_error(self):
+        """Test update_bounty raises PermissionError when non-admin tries to update."""
+        bounty = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Original"
+        )
+        with pytest.raises(PermissionError, match="Only admins can edit bounties"):
+            self.service.update_bounty(
+                room_id=-1001,
+                bounty_id=bounty.id,
+                user_id=999,  # different user, not admin
+                text="Hacked",
+            )
+
+    def test_update_bounty_not_found(self):
+        """Test update_bounty returns False when bounty doesn't exist."""
+        result = self.service.update_bounty(
+            room_id=-1001,
+            bounty_id=999,
+            user_id=self.admin_user_id,
+            text="Updated",
+        )
+        assert result is False
+
+    def test_update_bounty_partial_update(self):
+        """Test update_bounty only updates provided fields."""
+        bounty = self.service.add_bounty(
+            room_id=-1001,
+            user_id=self.admin_user_id,
+            text="Original",
+            link="https://original.link",
+        )
+        self.service.update_bounty(
+            room_id=-1001,
+            bounty_id=bounty.id,
+            user_id=self.admin_user_id,
+            text="Updated only text",
+        )
+        updated = self.service.get_bounty(-1001, bounty.id)
+        assert updated.text == "Updated only text"
+        assert updated.link == "https://original.link"  # link unchanged
+
+    def test_update_bounty_clear_link(self):
+        """Test update_bounty can clear link."""
+        bounty = self.service.add_bounty(
+            room_id=-1001,
+            user_id=self.admin_user_id,
+            text="Test",
+            link="https://original.link",
+        )
+        self.service.update_bounty(
+            room_id=-1001,
+            bounty_id=bounty.id,
+            user_id=self.admin_user_id,
+            clear_link=True,
+        )
+        updated = self.service.get_bounty(-1001, bounty.id)
+        assert updated.link is None
+
+    def test_delete_bounty_success(self):
+        """Test delete_bounty soft deletes when admin deletes their bounty."""
+        bounty = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="To delete"
+        )
+        result = self.service.delete_bounty(-1001, bounty.id, self.admin_user_id)
+        assert result is True
+        # Soft delete - bounty should not be found via get_bounty
+        assert self.service.get_bounty(-1001, bounty.id) is None
+        # But still exists in list_deleted_bounties
+        deleted = self.service.list_deleted_bounties(-1001)
+        assert len(deleted) == 1
+        assert deleted[0].id == bounty.id
+
+    def test_delete_bounty_not_admin_raises_permission_error(self):
+        """Test delete_bounty raises PermissionError when non-admin tries to delete."""
+        bounty = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="To delete"
+        )
+        with pytest.raises(PermissionError, match="Only admins can delete bounties"):
+            self.service.delete_bounty(
+                -1001, bounty.id, 999
+            )  # different user, not admin
+
+    def test_delete_bounty_not_found(self):
+        """Test delete_bounty returns False when bounty doesn't exist."""
+        result = self.service.delete_bounty(-1001, 999, self.admin_user_id)
+        assert result is False
+
+    def test_delete_bounties_multiple_success(self):
+        """Test delete_bounties soft deletes multiple bounties."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        b3 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Third"
+        )
+        results = self.service.delete_bounties(
+            -1001, [b1.id, b2.id, b3.id], self.admin_user_id
+        )
+        assert results == {b1.id: "deleted", b2.id: "deleted", b3.id: "deleted"}
+        assert self.service.get_bounty(-1001, b1.id) is None
+        assert self.service.get_bounty(-1001, b2.id) is None
+        assert self.service.get_bounty(-1001, b3.id) is None
+
+    def test_delete_bounties_mixed_results(self):
+        """Test delete_bounties returns individual results per ID."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Exists"
+        )
+        results = self.service.delete_bounties(
+            -1001, [b1.id, 999, 888], self.admin_user_id
+        )
+        assert results == {b1.id: "deleted", 999: "not_found", 888: "not_found"}
+
+    def test_delete_bounties_permission_denied(self):
+        """Test delete_bounties returns permission_denied for non-admin."""
+        b1 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="First"
+        )
+        b2 = self.service.add_bounty(
+            room_id=-1001, user_id=self.admin_user_id, text="Second"
+        )
+        results = self.service.delete_bounties(
+            -1001,
+            [b1.id, b2.id],
+            999,  # non-admin user
+        )
+        assert results == {b1.id: "permission_denied", b2.id: "permission_denied"}
+        # Bounties should not be deleted
+        assert self.service.get_bounty(-1001, b1.id) is not None
+        assert self.service.get_bounty(-1001, b2.id) is not None
+
+
+class TestTrackingService:
+    """Unit tests for TrackingService."""
+
+    def setup_method(self):
+        """Set up fresh storage and service for each test."""
+        self.room_storage = MockRoomStorage()
+        self.tracking_storage = MockTrackingStorage()
+        self.service = TrackingService(self.tracking_storage, self.room_storage)
+        self.admin_user_id = 123
+        self._make_admin(-1001, self.admin_user_id)
+
+    def _make_admin(self, room_id: int, user_id: int):
+        """Helper to set up a room with an admin user."""
+        room_data = self.room_storage.load(room_id)
+        if room_data is None:
+            room_data = RoomData(
+                room_id=room_id, bounties=[], next_id=0, admin_user_ids=[]
+            )
+        if user_id not in (room_data.admin_user_ids or []):
+            room_data.admin_user_ids = room_data.admin_user_ids or []
+            room_data.admin_user_ids.append(user_id)
+        self.room_storage.save(room_data)
+
+    def _add_bounty(self, room_id=-1001, user_id=123, text="Test bounty"):
+        """Helper to add a bounty for tracking tests."""
+        if self.room_storage.load(room_id) is None or user_id not in (
+            self.room_storage.load(room_id).admin_user_ids or []
+        ):
+            self._make_admin(room_id, user_id)
+        bounty_service = BountyService(self.room_storage)
+        return bounty_service.add_bounty(room_id=room_id, user_id=user_id, text=text)
+
+    def test_track_bounty_success(self):
+        """Test track_bounty successfully tracks a bounty."""
+        bounty = self._add_bounty()
+        result = self.service.track_bounty(-1001, 123456, bounty.id)
+        assert result is True
+
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert len(tracked) == 1
+        assert tracked[0].id == bounty.id
+
+    def test_track_bounty_returns_false_if_already_tracking(self):
+        """Test track_bounty returns False if bounty is already tracked."""
+        bounty = self._add_bounty()
+        self.service.track_bounty(-1001, 123456, bounty.id)
+        result = self.service.track_bounty(-1001, 123456, bounty.id)
+        assert result is False
+
+    def test_track_bounty_raises_value_error_if_bounty_not_found(self):
+        """Test track_bounty raises ValueError if bounty doesn't exist."""
+        with pytest.raises(ValueError, match="Bounty not found"):
+            self.service.track_bounty(-1001, 123456, 999)
+
+    def test_track_bounty_different_users_can_track_same_bounty(self):
+        """Test that different users can track the same bounty."""
+        bounty = self._add_bounty()
+        self.service.track_bounty(-1001, 111, bounty.id)
+        self.service.track_bounty(-1001, 222, bounty.id)
+
+        tracked_by_111 = self.service.get_tracked_bounties(-1001, 111)
+        tracked_by_222 = self.service.get_tracked_bounties(-1001, 222)
+
+        assert len(tracked_by_111) == 1
+        assert len(tracked_by_222) == 1
+        assert tracked_by_111[0].id == bounty.id
+        assert tracked_by_222[0].id == bounty.id
+
+    def test_untrack_bounty_success(self):
+        """Test untrack_bounty successfully untracks a bounty."""
+        bounty = self._add_bounty()
+        self.service.track_bounty(-1001, 123456, bounty.id)
+
+        result = self.service.untrack_bounty(-1001, 123456, bounty.id)
+        assert result is True
+
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert len(tracked) == 0
+
+    def test_untrack_bounty_returns_false_if_not_tracking(self):
+        """Test untrack_bounty returns False if bounty was not being tracked."""
+        bounty = self._add_bounty()
+        result = self.service.untrack_bounty(-1001, 123456, bounty.id)
+        assert result is False
+
+    def test_untrack_bounty_returns_false_if_tracking_different_bounty(self):
+        """Test untrack_bounty returns False if tracking different bounty."""
+        b1 = self._add_bounty(text="Bounty 1")
+        b2 = self._add_bounty(text="Bounty 2")
+        self.service.track_bounty(-1001, 123456, b1.id)
+
+        result = self.service.untrack_bounty(-1001, 123456, b2.id)
+        assert result is False
+
+        # b1 should still be tracked
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert len(tracked) == 1
+        assert tracked[0].id == b1.id
+
+    def test_get_tracked_bounties_empty(self):
+        """Test get_tracked_bounties returns empty list when nothing tracked."""
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert tracked == []
+
+    def test_get_tracked_bounties_returns_tracked_bounties(self):
+        """Test get_tracked_bounties returns all bounties tracked by user."""
+        b1 = self._add_bounty(text="First")
+        b2 = self._add_bounty(text="Second")
+        self.service.track_bounty(-1001, 123456, b1.id)
+        self.service.track_bounty(-1001, 123456, b2.id)
+
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert len(tracked) == 2
+        assert all(t.text in ["First", "Second"] for t in tracked)
+
+    def test_get_tracked_bounties_ignores_deleted_bounties(self):
+        """Test get_tracked_bounties ignores bounties that were deleted."""
+        bounty_service = BountyService(self.room_storage)
+        bounty = bounty_service.add_bounty(room_id=-1001, user_id=123, text="To delete")
+        self.service.track_bounty(-1001, 123456, bounty.id)
+
+        # Delete the bounty
+        bounty_service.delete_bounty(-1001, bounty.id, 123)
+
+        tracked = self.service.get_tracked_bounties(-1001, 123456)
+        assert len(tracked) == 0  # deleted bounty not returned
+
+    def test_get_tracked_bounties_different_rooms_independent(self):
+        """Test that tracking in different rooms is independent."""
+        b1 = self._add_bounty(room_id=-1001, text="Room 1")
+        b2 = self._add_bounty(room_id=-999, text="Room 2")
+
+        self.service.track_bounty(-1001, 123456, b1.id)
+        self.service.track_bounty(-999, 123456, b2.id)
+
+        tracked_room1 = self.service.get_tracked_bounties(-1001, 123456)
+        tracked_room2 = self.service.get_tracked_bounties(-999, 123456)
+
+        assert len(tracked_room1) == 1
+        assert len(tracked_room2) == 1
+        assert tracked_room1[0].text == "Room 1"
+        assert tracked_room2[0].text == "Room 2"