fix: stop an open activity draft from swallowing unrelated messages

Reported from a screenshot: the user had an activity draft open, then typed
"hitungin kalor sate 10 tusuk dan lontong", "ginchie" and "aku makan sate 10
tusuk dan lontong" -- and the bot answered all three with "masih kurang:
judulnya apa nih?, hari apa tanggal berapa?, jam berapa?".

Root cause: the draft was only dropped when the router returned a different
action AND `_looks_like_slot_answer()` was false. That helper counts any
message of eight words or fewer as a slot answer, so a seven-word food-log
request kept the draft alive forever and the food was never logged.

- Draft continuation now requires the router to still see the same action, or
the text to be a pure schedule answer (`_is_pure_schedule_answer`, which
needs an actual date/time token). "aku makan sate 10 tusuk dan lontong" and
"ginchie" no longer keep a draft alive.
- `_merge_draft` is only used for ADD_ACTIVITY drafts; other actions go
through `_merge_generic_draft`, which previously would have been rewritten
as an activity.
- Drafts expire after 15 minutes instead of lingering for the whole session.
- `_looks_like_slot_answer` removed (dead, and the source of the bug).
- The missing-slot question is phrased once; it used to appear both as the
question and inside the "masih kurang" list.
- "hitungin kalor X" now routes to LOG_FOOD: in a food-logging bot, asking for
calories means recording the food, not just quoting a number.

63 tests pass (up from 59), ruff clean, agenda flow verified end to end.

bot/handlers/message_handler.py

@@ -95,6 +95,15 @@ _ACTIVITY_SLOT_ORDER = ("title", "date", "time")
 #: Kept for backwards compatibility with older call sites.
 _REQUIRED_ACTIVITY_SLOTS = _ACTIVITY_SLOT_ORDER
 
+#: Required slots per action, used when completing a draft.
+_REQUIRED_SLOTS_FOR = {
+    ACTION_ADD_ACTIVITY: _ACTIVITY_SLOT_ORDER,
+    ACTION_CHANGE_NAME: ("name",),
+}
+
+#: A draft older than this is abandoned rather than kept alive forever.
+DRAFT_TTL_SECONDS = 15 * 60
+
 
 # ── Formatting helpers ────────────────────────────────────────────────────────
 
@@ -142,6 +151,13 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
         logger.debug("Failed to send typing action: %s", exc)
 
     draft = context.user_data.get(KEY_DRAFT)
+
+    # An abandoned draft must not outlive the conversation that created it.
+    if draft and (time.time() - draft.get("started_at", 0)) > DRAFT_TTL_SECONDS:
+        logger.info("Dropping expired %s draft", draft.get("action"))
+        context.user_data.pop(KEY_DRAFT, None)
+        draft = None
+
     pending_note = _draft_note(draft) if draft else ""
 
     intent = await route_message(
@@ -155,23 +171,40 @@ async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE) ->
 
     # A pending activity draft absorbs follow-up slot-filling messages.
     if draft:
-        merged = _merge_draft(draft, intent, text)
+        # Only keep the draft when the new message is genuinely part of it:
+        # either the router still sees the same action, or the text is a pure
+        # schedule answer ("Hari Minggu, 11 Oktober 2026", "Jam 9 pagi").
+        #
+        # `_looks_like_slot_answer` is NOT used here: it counts any message of
+        # eight words or fewer as an answer, so "aku makan sate 10 tusuk dan
+        # lontong" kept an activity draft alive and the bot asked for a title
+        # instead of logging the food.
+        same_action = intent.action == draft.get("action")
+        if not same_action and not _is_pure_schedule_answer(text):
+            logger.info(
+                "Dropping stale %s draft; user moved on to %s",
+                draft.get("action"), intent.action,
+            )
+            context.user_data.pop(KEY_DRAFT, None)
+        else:
+            merged = (
+                _merge_draft(draft, intent, text)
+                if draft.get("action") == ACTION_ADD_ACTIVITY
+                else _merge_generic_draft(draft, intent)
+            )
 
-        # Deterministic safety net: the model sometimes answers CHAT for a plain
-        # "Hari Minggu, 11 Oktober 2026" while a draft is open, which used to
-        # strand the user mid-flow. Extract dates/times locally so slot filling
-        # never depends on the model remembering the draft.
-        merged = _fill_slots_locally(merged, text)
+            # Deterministic safety net: the model sometimes answers CHAT for a
+            # plain "Hari Minggu, 11 Oktober 2026" while a draft is open, which
+            # used to strand the user mid-flow. Extract dates/times locally so
+            # slot filling never depends on the model remembering the draft.
+            if draft.get("action") == ACTION_ADD_ACTIVITY:
+                merged = _fill_slots_locally(merged, text)
 
-        if _draft_complete(merged):
-            context.user_data.pop(KEY_DRAFT, None)
-            await _finish_activity_draft(update, context, user_id, merged, text)
-            return
+            if _draft_complete(merged):
+                context.user_data.pop(KEY_DRAFT, None)
+                await _finish_activity_draft(update, context, user_id, merged, text)
+                return
 
-        # The user switched to an unrelated topic: drop the draft.
-        if intent.action not in (ACTION_ADD_ACTIVITY,) and not _looks_like_slot_answer(text):
-            context.user_data.pop(KEY_DRAFT, None)
-        else:
             context.user_data[KEY_DRAFT] = merged
             await _ask_for_missing(update, merged)
             return
@@ -392,39 +425,6 @@ def _draft_note(draft: dict) -> str:
     )
 
 
-def _looks_like_slot_answer(text: str) -> bool:
-    """Whether a message plausibly supplies a missing slot value.
-
-    Used to decide whether to keep an open draft alive. Deliberately narrow:
-    while a draft is open, a bare "besok" or "jam 3" is part of it, but a
-    sentence about something else should be allowed to start a new topic.
-    """
-    stripped = (text or "").strip()
-    if not stripped or stripped.startswith("/"):
-        return False
-
-    lowered = stripped.lower()
-
-    # Signals that the user is changing the subject entirely.
-    for cue in ("hadeh", "lupakan", "udahan", "stop", "batal", "nggajadi", "nggak jadi"):
-        if cue in lowered:
-            return False
-
-    # Anything short is treated as an answer to the pending question.
-    if len(stripped.split()) <= 8:
-        return True
-
-    # Longer messages still count when they carry a concrete date/time.
-    return bool(
-        _CLOCK_HOUR.search(lowered)
-        or _BARE_TIME.search(lowered)
-        or _DATE_DAY_MONTH.search(lowered)
-        or _DATE_NUMERIC.search(lowered)
-        or any(word in lowered for word in ("besok", "lusa", "hari ini", "minggu", "senin",
-                                            "selasa", "rabu", "kamis", "jumat", "sabtu"))
-    )
-
-
 #: Words that carry no meaning of their own when answering "jam berapa?".
 _SCHEDULE_FILLER = {
     "jam", "pukul", "hari", "tanggal", "tgl", "nih", "ya", "dong", "aja", "saja",
@@ -490,6 +490,27 @@ def _is_pure_schedule_answer(text: str) -> bool:
     return not _content_beyond_schedule(text)
 
 
+def _merge_generic_draft(draft: dict, intent: Intent) -> dict:
+    """Fold a single-slot intent (e.g. CHANGE_NAME) into its draft."""
+    merged = {
+        "action": draft.get("action"),
+        "slots": dict(draft.get("slots") or {}),
+        "missing": list(draft.get("missing") or []),
+        "started_at": draft.get("started_at", time.time()),
+    }
+
+    incoming = intent.slots or {}
+    for key, value in incoming.items():
+        if value in (None, "", 0):
+            continue
+        if not merged["slots"].get(key):
+            merged["slots"][key] = value
+
+    required = _REQUIRED_SLOTS_FOR.get(merged["action"], ())
+    merged["missing"] = [slot for slot in required if not merged["slots"].get(slot)]
+    return merged
+
+
 def _merge_draft(draft: dict, intent: Intent, text: str = "") -> dict:
     """Fold newly-detected slot values into a pending draft."""
     merged = {
@@ -693,16 +714,19 @@ async def _ask_for_missing(update: Update, draft: dict) -> None:
         known.append(f"🕒 {slots['time']}")
 
     # Ask for the highest-priority missing slot, and list the rest so the user
-    # knows exactly what is still outstanding.
+    # knows exactly what is still outstanding. The question is phrased once;
+    # repeating it inside the "masih kurang" list made the reply read as if the
+    # bot were asking the same thing twice.
     question = SLOT_QUESTIONS.get(missing[0], missing[0])
     if len(missing) > 1:
+        others = ", ".join(SLOT_QUESTIONS.get(m, m) for m in missing[1:])
         lines = [
             "oke, ini yang aku tangkep sejauh ini:",
             *known,
             "",
             f"{question}",
             "",
-            f"_masih kurang: {', '.join(SLOT_QUESTIONS.get(m, m) for m in missing)}_",
+            f"_masih kurang: {others}_",
         ]
     else:
         lines = [
@@ -1153,3 +1177,4 @@ def build_message_handlers():
     ]
 
 
+

services/intent_service.py

@@ -196,7 +196,10 @@ Pilih TEPAT SATU action:
    Isi: {{"foods": [{{"name": "nasi goreng", "amount_g": 200, "calories": 320, "protein_g": 8, "carbs_g": 45, "fat_g": 10}}]}}
    Wajib isi calories. Jika user tidak sebut gram, perkirakan porsi wajar.
    Contoh: "tadi aku makan nasi goreng", "aku minum susu 1 gelas", "habis makan ayam geprek",
-   "itu ga termasuk, kurang 1 makanan lagi", "oh iya tadi aku juga ngemil biskuit".
+   "itu ga termasuk, kurang 1 makanan lagi", "oh iya tadi aku juga ngemil biskuit",
+   "hitungin kalor sate 10 tusuk dan lontong", "aku makan sate 10 tusuk".
+   "hitungin kalor X" dianggap mencatat makanan: di bot ini menghitung kalori
+   berarti mencatat dan menghitung, bukan sekadar tanya angka.
    CATATAN: ini adalah catatan BARU. Jangan berubah jadi CHAT hanya karena namanya
    sama dengan makanan yang sudah ada di arsip.
    JANGAN pilih ini untuk niat/keinginan (mis. "pengen nasi goreng", "mau makan sushi nanti") -

tests/test_slot_extraction.py

@@ -27,6 +27,7 @@ from bot.handlers.message_handler import (  # noqa: E402
     _fill_slots_locally,
     _is_pure_schedule_answer,
     _merge_draft,
+    _merge_generic_draft,
 )
 from services.intent_service import (  # noqa: E402
     ACTION_ADD_ACTIVITY,
@@ -234,5 +235,60 @@ class TitleLeakGuardTests(unittest.TestCase):
         self.assertEqual(merged["missing"], [])
 
 
+class DraftDoesNotTrapOtherTopicsTests(unittest.TestCase):
+    """A food-log request must never be swallowed by an open activity draft.
+
+    Regression for a reported bug: the user had an activity draft open, then
+    typed "aku makan sate 10 tusuk dan lontong" and "ginchie", and the bot kept
+    asking for the activity's title/date/time instead of logging the food.
+    """
+
+    def test_food_log_is_not_a_schedule_answer(self) -> None:
+        for text in [
+            "aku makan sate 10 tusuk dan lontong",
+            "hitungin kalor sate 10 tusuk dan lontong",
+            "ginchie",
+            "makasih ya ginchiee",
+            "agenda aku apa aja",
+        ]:
+            with self.subTest(text=text):
+                self.assertFalse(_is_pure_schedule_answer(text), text)
+
+    def test_schedule_answers_still_count(self) -> None:
+        for text in [
+            "Hari Minggu, 11 Oktober 2026",
+            "Jam 9 pagi ginchiee",
+            "besok",
+            "11/10",
+        ]:
+            with self.subTest(text=text):
+                self.assertTrue(_is_pure_schedule_answer(text), text)
+
+    def test_merge_generic_draft_fills_a_single_slot(self) -> None:
+        from services.intent_service import ACTION_CHANGE_NAME
+
+        draft = {
+            "action": ACTION_CHANGE_NAME,
+            "slots": {"name": ""},
+            "missing": ["name"],
+        }
+        intent = Intent(action=ACTION_CHANGE_NAME, slots={"name": "Bella"}, missing=[])
+        merged = _merge_generic_draft(draft, intent)
+        self.assertEqual(merged["slots"]["name"], "Bella")
+        self.assertEqual(merged["missing"], [])
+
+    def test_merge_generic_draft_does_not_overwrite(self) -> None:
+        from services.intent_service import ACTION_CHANGE_NAME
+
+        draft = {
+            "action": ACTION_CHANGE_NAME,
+            "slots": {"name": "Ayyi"},
+            "missing": [],
+        }
+        intent = Intent(action=ACTION_CHANGE_NAME, slots={"name": "Bella"}, missing=[])
+        merged = _merge_generic_draft(draft, intent)
+        self.assertEqual(merged["slots"]["name"], "Ayyi")
+
+
 if __name__ == "__main__":
     unittest.main()