feat(bot): centralize defaults, refine ambiguity lifecycle, improve entity resolution and auto-create new projects

bot/app/handlers/__init__.py

@@ -18,7 +18,7 @@ from app.storage import save_proforma_file
 from app.stt import transcribe, transcribe_multi
 from app.texts import CANCELLED, LINK_START, NOTHING_TO_COMMIT, STT_FAILED, UNKNOWN_HINT, VOICE_EMPTY, esc
 
-from . import commands, callbacks, quote, supplier, material, queries, decisions
+from . import commands, callbacks, quote, supplier, material, project, queries, decisions
 
 logger = logging.getLogger("bot.handlers")
 
@@ -98,6 +98,12 @@ async def handle_message(ctx: BotContext, chat_id: int, message: dict) -> None:
     # BRANCH 1: EDIT MODE — Strictly requires reply_to_message_id on a draft
     # =========================================================================
     if reply_to_msg_id is not None:
+        # Check if replying to an ambiguity message (Requirement 2.b)
+        amb_draft, target_amb = await draft_store.get_by_ambiguity_message_id(chat_id, reply_to_msg_id)
+        if amb_draft is not None and target_amb is not None:
+            await _handle_ambiguity_user_reply(ctx, chat_id, user, amb_draft, target_amb, message, message_id)
+            return
+
         target_draft = await draft_store.get_by_message_id(chat_id, reply_to_msg_id)
         if target_draft is None:
             await ctx.send(
@@ -221,6 +227,8 @@ async def handle_message(ctx: BotContext, chat_id: int, message: dict) -> None:
             await supplier.commit(ctx, chat_id, user, active)
         elif active.kind == draft_store.KIND_MATERIAL:
             await material.commit(ctx, chat_id, user, active)
+        elif active.kind == draft_store.KIND_PROJECT:
+            await project.commit(ctx, chat_id, user, active)
     elif intent == "discard_draft":
         active = target_draft or await draft_store.get_active(chat_id)
         if active:
@@ -242,10 +250,14 @@ async def handle_message(ctx: BotContext, chat_id: int, message: dict) -> None:
             await supplier.render(ctx, chat_id, active)
         elif active.kind == draft_store.KIND_MATERIAL:
             await material.render(ctx, chat_id, active)
+        elif active.kind == draft_store.KIND_PROJECT:
+            await project.render(ctx, chat_id, active)
     elif intent == "add_supplier":
         await supplier.handle_entities(ctx, chat_id, user, patch, source)
     elif intent == "add_material":
         await material.handle_entities(ctx, chat_id, user, patch, source)
+    elif intent == "add_project":
+        await project.handle_entities(ctx, chat_id, user, patch, source)
     elif intent == "status_query":
         await queries.handle_query(ctx, chat_id, user, patch)
     elif intent == "accept_quote":
@@ -323,3 +335,63 @@ def _draft_summary(draft) -> str | None:
     else:
         summary = json.dumps(payload, ensure_ascii=False)[:500]
     return summary
+
+
+async def _handle_ambiguity_user_reply(
+    ctx: BotContext, chat_id: int, user: LinkedUser,
+    draft, amb: dict, message: dict, incoming_msg_id: int | None
+) -> None:
+    """Handle text/audio correction sent directly as a reply to an ambiguity sub-message (Requirement 2.b)."""
+    text = (message.get("text") or message.get("caption") or "").strip()
+    if not text and (message.get("voice") or message.get("audio")):
+        try:
+            audio_media = message.get("voice") or message.get("audio")
+            audio_bytes = await ctx.bale.download_file(audio_media["file_id"])
+            text = await transcribe(settings, audio_bytes)
+        except Exception:
+            text = ""
+
+    if text:
+        draft_summary = _draft_summary(draft)
+        result = await understand(settings, text, draft_summary)
+        patch = result.get("patch") or {}
+
+        # Apply user correction specifically to the target field
+        if amb.get("kind") == "payment_schedule":
+            if patch.get("payment_terms"):
+                draft_store.merge_quote_patch(draft.payload, patch)
+            else:
+                draft_store.merge_quote_patch(draft.payload, amb.get("proposed_patch") or {})
+                if not draft.payload.get("notes"):
+                    draft.payload["notes"] = f"نحوه پرداخت: {text}"
+                else:
+                    draft.payload["notes"] += f"\nنحوه پرداخت: {text}"
+        elif amb.get("kind") == "project_assignment":
+            if patch.get("items") or patch.get("project_name") or patch.get("project_names"):
+                draft_store.merge_quote_patch(draft.payload, patch)
+            else:
+                draft_store.merge_quote_patch(draft.payload, amb.get("proposed_patch") or {})
+        else:
+            draft_store.merge_quote_patch(draft.payload, patch)
+
+        amb["status"] = "applied"
+        await quote.resolve_payload(ctx, draft.payload)
+        await draft_store.save_payload(draft, mark_bale_synced=True)
+
+        # In-place edit main review card (Requirement 2.b)
+        await quote.render(ctx, chat_id, draft, fresh=False)
+
+    # Delete the ambiguity message (Requirement 2.b)
+    if amb.get("message_id"):
+        try:
+            await ctx.delete(chat_id, amb["message_id"])
+        except Exception:
+            pass
+
+    # Delete user's message to keep chat clean (Requirement 2.b)
+    if incoming_msg_id:
+        try:
+            await ctx.delete(chat_id, incoming_msg_id)
+        except Exception:
+            pass
+