Add code to send mesage to specific thread in Slack

env_self.txt

@@ -0,0 +1,11 @@
+WORKSPACE_ID=hari-smulie
+BITBUCKET_USERNAME=hari_huynh
+BITBUCKET_APP_PASSWORD=ATBBCxY7PwfsMrFG3CjncNGRM7Wf3F223CF7
+GOOGLE_API_KEY=AIzaSyD_fOfuu7stUwMxCSkUtQvgMpaPbWyt51c
+DEFAULT_BASE_URL=https://api.bitbucket.org/2.0
+REPO_SLUG=pr-code-review
+SLACK_WEBHOOK_URL=https://hooks.slack.com/services/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
+SLACK_BOT_TOKEN=xoxb-2157611119911-9373773680839-9MF0EE59Nzwp3ItE3ZCq1rHP
+SLACK_CHANNEL=pull-request
+LOGFIRE_API_KEY=pylf_v1_us_JPMBdvqjgCH8xFhFj2QTVgyvWB2QBpvKsX2bt4lHQhyS
+TEAM_DEV_SLACK_ID=S0956194QAX

env_smulie.txt

@@ -0,0 +1,11 @@
+WORKSPACE_ID=thuantran_smulie
+BITBUCKET_USERNAME=hari_huynh
+BITBUCKET_APP_PASSWORD= ATBB8eRzA8UbH6jrjTtjRDqFDDePF0B131DA
+GOOGLE_API_KEY=AIzaSyD_fOfuu7stUwMxCSkUtQvgMpaPbWyt51c
+DEFAULT_BASE_URL = "https://api.bitbucket.org/2.0"
+REPO_SLUG="pr-code-review"
+SLACK_WEBHOOK_URL = "https://hooks.slack.com/services/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"
+SLACK_BOT_TOKEN = "xoxb-2157611119911-9373773680839-9MF0EE59Nzwp3ItE3ZCq1rHP"
+SLACK_CHANNEL = "pull-request"
+LOGFIRE_API_KEY=pylf_v1_us_JPMBdvqjgCH8xFhFj2QTVgyvWB2QBpvKsX2bt4lHQhyS
+TEAM_DEV_SLACK_ID=S0956194QAX

index.py

@@ -1,5 +1,5 @@
 from flask import Flask, request, jsonify
-from tool import create_session, get_pull_request_overview, get_diff, send_slack_message, save_md_report
+from tool import create_session, get_pull_request_overview, get_diff, send_slack_message, save_md_report, reply_slack_thread
 from dotenv import load_dotenv
 import os
 from agent.code_review import code_review_agent, read_text_file, DiffDeps
@@ -79,7 +79,7 @@ def webhook():
                         f"**🔗 Link Pull Request:** {pr_link}\n"
                     )
 
-                    save_md_report("PR.md", pr_report)
+                    print(pr_report)
 
                     # Lấy diff và chạy agent
                     diff = get_diff(session, diff_url)
@@ -88,25 +88,37 @@ def webhook():
                     code_review_text = getattr(code_review_result, "output", None) or str(code_review_result)
 
                     # Gộp thông tin PR + kết quả review vào 1 lần gửi
-                    combined_message = (
-                        f"{pr_report}\n\n"
-                        f"---\n\n"
+                    code_review_message = (
                         f"## 🤖 Code Review Summary\n\n"
                         f"{code_review_text}"
                     )
 
-                    send_slack_message(
-                        message_text = combined_message,
+                    resp = send_slack_message(
+                        message_text = pr_report,
                         webhook_url = SLACK_WEBHOOK_URL,
                         bot_token = SLACK_BOT_TOKEN,
                         channel = "pull-request",
                         blocks = [
                             {
                                 "type": "markdown",
-                                "text": combined_message
+                                "text": pr_report
                             }
                         ]
                     )
+
+                    first_message_ts = resp["response"]["ts"]  # lấy ts để trả lời sau
+
+                    reply_slack_thread(
+                        thread_ts=first_message_ts,
+                        message_text=code_review_message,
+                        channel="pull-request",
+                        blocks = [
+                            {
+                                "type": "markdown",
+                                "text": pr_report
+                            }
+                        ]
+                    ) 
                     print("Sent combined PR + code review")
 
                     return jsonify({"status": "ok", "message": "Pull request processed successfully"}), 200

prompt/code_review.toml

@@ -0,0 +1,338 @@
+[pr_review_prompt]
+system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
+Your task is to provide constructive and concise feedback for the PR.
+The review should focus on new code added in the PR code diff (lines starting with '+')
+
+
+The format we will use to present the PR code diff:
+======
+## File: 'src/file1.py'
+{%- if is_ai_metadata %}
+### AI-generated changes summary:
+* ...
+* ...
+{%- endif %}
+
+
+@@ ... @@ def func1():
+__new hunk__
+11  unchanged code line0
+12  unchanged code line1
+13 +new code line2 added
+14  unchanged code line3
+__old hunk__
+ unchanged code line0
+ unchanged code line1
+-old code line2 removed
+ unchanged code line3
+
+@@ ... @@ def func2():
+__new hunk__
+ unchanged code line4
++new code line5 added
+ unchanged code line6
+
+## File: 'src/file2.py'
+...
+======
+
+- In the format above, the diff is organized into separate '__new hunk__' and '__old hunk__' sections for each code chunk. '__new hunk__' contains the updated code, while '__old hunk__' shows the removed code. If no code was removed in a specific chunk, the __old hunk__ section will be omitted.
+- We also added line numbers for the '__new hunk__' code, to help you refer to the code lines in your suggestions. These line numbers are not part of the actual code, and should only be used for reference.
+- Code lines are prefixed with symbols ('+', '-', ' '). The '+' symbol indicates new code added in the PR, the '-' symbol indicates code removed in the PR, and the ' ' symbol indicates unchanged code. \
+ The review should address new code added in the PR code diff (lines starting with '+').
+{%- if is_ai_metadata %}
+- If available, an AI-generated summary will appear and provide a high-level overview of the file changes. Note that this summary may not be fully accurate or complete.
+{%- endif %}
+- When quoting variables, names or file paths from the code, use backticks (`) instead of single quote (').
+- Note that you only see changed code segments (diff hunks in a PR), not the entire codebase. Avoid suggestions that might duplicate existing functionality or questioning code elements (like variables declarations or import statements) that may be defined elsewhere in the codebase.
+- Also note that if the code ends at an opening brace or statement that begins a new scope (like 'if', 'for', 'try'), don't treat it as incomplete. Instead, acknowledge the visible scope boundary and analyze only the code shown.
+
+{%- if extra_instructions %}
+
+
+Extra instructions from the user:
+======
+{{ extra_instructions }}
+======
+{% endif %}
+
+
+The output must be a YAML object equivalent to type $PRReview, according to the following Pydantic definitions:
+=====
+{%- if require_can_be_split_review %}
+class SubPR(BaseModel):
+    relevant_files: List[str] = Field(description="The relevant files of the sub-PR")
+    title: str = Field(description="Short and concise title for an independent and meaningful sub-PR, composed only from the relevant files")
+{%- endif %}
+
+class KeyIssuesComponentLink(BaseModel):
+    relevant_file: str = Field(description="The full file path of the relevant file")
+    issue_header: str = Field(description="One or two word title for the issue. For example: 'Possible Bug', etc.")
+    issue_content: str = Field(description="A short and concise summary of what should be further inspected and validated during the PR review process for this issue. Do not mention line numbers in this field.")
+    start_line: int = Field(description="The start line that corresponds to this issue in the relevant file")
+    end_line: int = Field(description="The end line that corresponds to this issue in the relevant file")
+
+{%- if require_todo_scan %}
+class TodoSection(BaseModel):
+    relevant_file: str = Field(description="The full path of the file containing the TODO comment")
+    line_number: int = Field(description="The line number where the TODO comment starts")
+    content: str = Field(description="The content of the TODO comment. Only include actual TODO comments within code comments (e.g., comments starting with '#', '//', '/*', '<!--', ...).  Remove leading 'TODO' prefixes. If more than 10 words, summarize the TODO comment to a single short sentence up to 10 words.")
+{%- endif %}
+
+{%- if related_tickets %}
+
+class TicketCompliance(BaseModel):
+    ticket_url: str = Field(description="Ticket URL or ID")
+    ticket_requirements: str = Field(description="Repeat, in your own words (in bullet points), all the requirements, sub-tasks, DoD, and acceptance criteria raised by the ticket")
+    fully_compliant_requirements: str = Field(description="Bullet-point list of items from the  'ticket_requirements' section above that are fulfilled by the PR code. Don't explain how the requirements are met, just list them shortly. Can be empty")
+    not_compliant_requirements: str = Field(description="Bullet-point list of items from the 'ticket_requirements' section above that are not fulfilled by the PR code. Don't explain how the requirements are not met, just list them shortly. Can be empty")
+    requires_further_human_verification: str = Field(description="Bullet-point list of items from the 'ticket_requirements' section above that cannot be assessed through code review alone, are unclear, or need further human review (e.g., browser testing, UI checks). Leave empty if all 'ticket_requirements' were marked as fully compliant or not compliant")
+{%- endif %}
+
+{%- if require_estimate_contribution_time_cost %}
+
+class ContributionTimeCostEstimate(BaseModel):
+    best_case: str = Field(description="An expert in the relevant technology stack, with no unforeseen issues or bugs during the work.", examples=["45m", "5h", "30h"])
+    average_case: str = Field(description="A senior developer with only brief familiarity with this specific technology stack, and no major unforeseen issues.", examples=["45m", "5h", "30h"])
+    worst_case: str = Field(description="A senior developer with no prior experience in this specific technology stack, requiring significant time for research, debugging, or resolving unexpected errors.", examples=["45m", "5h", "30h"])
+{%- endif %}
+
+class Review(BaseModel):
+{%- if related_tickets %}
+    ticket_compliance_check: List[TicketCompliance] = Field(description="A list of compliance checks for the related tickets")
+{%- endif %}
+{%- if require_estimate_effort_to_review %}
+    estimated_effort_to_review_[1-5]: int = Field(description="Estimate, on a scale of 1-5 (inclusive), the time and effort required to review this PR by an experienced and knowledgeable developer. 1 means short and easy review , 5 means long and hard review. Take into account the size, complexity, quality, and the needed changes of the PR code diff.")
+{%- endif %}
+{%- if require_estimate_contribution_time_cost %}
+    contribution_time_cost_estimate: ContributionTimeCostEstimate = Field(description="An estimate of the time required to implement the changes, based on the quantity, quality, and complexity of the contribution, as well as the context from the PR description and commit messages.")
+{%- endif %}
+{%- if require_score %}
+    score: str = Field(description="Rate this PR on a scale of 0-100 (inclusive), where 0 means the worst possible PR code, and 100 means PR code of the highest quality, without any bugs or performance issues, that is ready to be merged immediately and run in production at scale.")
+{%- endif %}
+{%- if require_tests %}
+    relevant_tests: str = Field(description="yes/no question: does this PR have relevant tests added or updated ?")
+{%- endif %}
+{%- if question_str %}
+    insights_from_user_answers: str = Field(description="shortly summarize the insights you gained from the user's answers to the questions")
+{%- endif %}
+    key_issues_to_review: List[KeyIssuesComponentLink] = Field("A short and diverse list (0-{{ num_max_findings }} issues) of high-priority bugs, problems or performance concerns introduced in the PR code, which the PR reviewer should further focus on and validate during the review process.")
+{%- if require_security_review %}
+    security_concerns: str = Field(description="Does this PR code introduce vulnerabilities such as exposure of sensitive information (e.g., API keys, secrets, passwords), or security concerns like SQL injection, XSS, CSRF, and others ? Answer 'No' (without explaining why) if there are no possible issues. If there are security concerns or issues, start your answer with a short header, such as: 'Sensitive information exposure: ...', 'SQL injection: ...', etc. Explain your answer. Be specific and give examples if possible")
+{%- endif %}
+{%- if require_todo_scan %}
+    todo_sections: Union[List[TodoSection], str] = Field(description="A list of TODO comments found in the PR code. Return 'No' (as a string) if there are no TODO comments in the PR")
+{%- endif %}
+{%- if require_can_be_split_review %}
+    can_be_split: List[SubPR] = Field(min_items=0, max_items=3, description="Can this PR, which contains {{ num_pr_files }} changed files in total, be divided into smaller sub-PRs with distinct tasks that can be reviewed and merged independently, regardless of the order ? Make sure that the sub-PRs are indeed independent, with no code dependencies between them, and that each sub-PR represent a meaningful independent task. Output an empty list if the PR code does not need to be split.")
+{%- endif %}
+
+class PRReview(BaseModel):
+    review: Review
+=====
+
+
+Example output:
+```yaml
+review:
+{%- if related_tickets %}
+  ticket_compliance_check:
+    - ticket_url: |
+        ...
+      ticket_requirements: |
+        ...
+      fully_compliant_requirements: |
+        ...
+      not_compliant_requirements: |
+        ...
+      overall_compliance_level: |
+        ...
+{%- endif %}
+{%- if require_estimate_effort_to_review %}
+  estimated_effort_to_review_[1-5]: |
+    3
+{%- endif %}
+{%- if require_score %}
+  score: 89
+{%- endif %}
+  relevant_tests: |
+    No
+  key_issues_to_review:
+    - relevant_file: |
+        directory/xxx.py
+      issue_header: |
+        Possible Bug
+      issue_content: |
+        ...
+      start_line: 12
+      end_line: 14
+    - ...
+  security_concerns: |
+    No
+{%- if require_todo_scan %}
+  todo_sections: |
+    No
+{%- endif %} 
+{%- if require_can_be_split_review %}
+  can_be_split:
+  - relevant_files:
+    - ...
+    - ...
+    title: ...
+  - ...
+{%- endif %}
+{%- if require_estimate_contribution_time_cost %}
+  contribution_time_cost_estimate:
+    best_case: |
+      ...
+    average_case: |
+      ...
+    worst_case: |
+      ...
+{%- endif %}
+```
+
+Answer should be a valid YAML, and nothing else. Each YAML output MUST be after a newline, with proper indent, and block scalar indicator ('|')
+"""
+
+user="""
+{%- if related_tickets %}
+--PR Ticket Info--
+{%- for ticket in related_tickets %}
+=====
+Ticket URL: '{{ ticket.ticket_url }}'
+
+Ticket Title: '{{ ticket.title }}'
+
+{%- if ticket.labels %}
+
+Ticket Labels: {{ ticket.labels }}
+
+{%- endif %}
+{%- if ticket.body %}
+
+Ticket Description:
+#####
+{{ ticket.body }}
+#####
+{%- endif %}
+
+{%- if ticket.requirements %}
+Ticket Requirements:
+#####
+{{ ticket.requirements }}
+#####
+{%- endif %}
+=====
+{% endfor %}
+{%- endif %}
+
+
+--PR Info--
+{%- if date %}
+
+Today's Date: {{date}}
+{%- endif %}
+
+Title: '{{title}}'
+
+Branch: '{{branch}}'
+
+{%- if description %}
+
+PR Description:
+======
+{{ description|trim }}
+======
+{%- endif %}
+
+{%- if question_str %}
+
+=====
+Here are questions to better understand the PR. Use the answers to provide better feedback.
+
+{{ question_str|trim }}
+
+User answers:
+'
+{{ answer_str|trim }}
+'
+=====
+{%- endif %}
+
+
+The PR code diff:
+======
+{{ diff|trim }}
+======
+
+
+{%- if duplicate_prompt_examples %}
+
+
+Example output:
+```yaml
+review:
+{%- if related_tickets %}
+  ticket_compliance_check:
+    - ticket_url: |
+        ...
+      ticket_requirements: |
+        ...
+      fully_compliant_requirements: |
+        ...
+      not_compliant_requirements: |
+        ...
+      overall_compliance_level: |
+        ...
+{%- endif %}
+{%- if require_estimate_effort_to_review %}
+  estimated_effort_to_review_[1-5]: |
+    3
+{%- endif %}
+{%- if require_score %}
+  score: 89
+{%- endif %}
+  relevant_tests: |
+    No
+  key_issues_to_review:
+    - relevant_file: |
+        ...
+      issue_header: |
+        ...
+      issue_content: |
+        ...
+      start_line: ...
+      end_line: ...
+    - ...
+  security_concerns: |
+    No
+{%- if require_todo_scan %}
+  todo_sections: |
+    No
+{%- endif %}
+{%- if require_can_be_split_review %}
+  can_be_split:
+  - relevant_files:
+    - ...
+    - ...
+    title: ...
+  - ...
+{%- endif %}
+{%- if require_estimate_contribution_time_cost %}
+  contribution_time_cost_estimate:
+    best_case: |
+      ...
+    average_case: |
+      ...
+    worst_case: |
+      ...
+{%- endif %}
+```
+(replace '...' with the actual values)
+{%- endif %}
+
+
+Response (should be a valid YAML, and nothing else):
+```yaml
+"""

requirements.txt

@@ -1,5 +1,6 @@
 python-dotenv
 requests
 pydantic-ai
+pydantic-ai[logfire]
 flask
 logfire

test_logfire.py

@@ -60,7 +60,7 @@ load_dotenv()
 #     # Test async tracing
 #     asyncio.run(test_logfire_tracing())
     
-from tool import send_slack_message, list_slack_users, get_slack_usergroups
+from tool import send_slack_message, list_slack_users, get_slack_usergroups, reply_slack_thread
 from dotenv import load_dotenv
 
 load_dotenv()
@@ -105,12 +105,10 @@ users = list_slack_users()
 groups = get_slack_usergroups(SLACK_BOT_TOKEN)
 
 # print(users)
-print(groups)
+# print(groups)
 
 send_slack_message(
     message_text = "",
-    webhook_url = SLACK_WEBHOOK_URL,
-    bot_token = SLACK_BOT_TOKEN,
     channel = "pull-request",
     blocks = [
         {
@@ -118,4 +116,13 @@ send_slack_message(
             "text": "<@U099W8UMBAQ>"
         }
     ]
-) 
+) 
+
+resp = send_slack_message("Xin chào team! 🚀", channel="pull-request")
+first_message_ts = resp["response"]["ts"]  # lấy ts để trả lời sau
+
+reply_slack_thread(
+    thread_ts=first_message_ts,
+    message_text="Đây là câu trả lời trong thread 🌱",
+    channel="pull-request",
+)

tool.py

@@ -105,129 +105,99 @@ def save_md_report(filename, content):
         print(f"Saved {filename} file")
 
 
-def send_slack_message(
+def _send_via_webhook(message_text: str, blocks: Optional[List[Dict[str, Any]]] = None) -> Dict[str, Any]:
+    """Gửi tin nhắn qua Incoming Webhook."""
+    if not SLACK_WEBHOOK_URL:
+        raise ValueError("Missing SLACK_WEBHOOK_URL for webhook message")
+
+    payload: Dict[str, Any] = {"text": message_text}
+    if blocks is not None:
+        payload["blocks"] = blocks
+
+    response = requests.post(SLACK_WEBHOOK_URL, json=payload, timeout=15)
+    if 200 <= response.status_code < 300 and response.text.strip().lower() in ("ok", ""):
+        return {
+            "ok": True,
+            "method": "webhook",
+            "status_code": response.status_code,
+            "response": response.text,
+        }
+
+    raise ValueError(f"Slack webhook failed (status {response.status_code}): {response.text}")
+
+
+def _send_via_api(
     message_text: str,
     *,
-    webhook_url: Optional[str] = None,
-    bot_token: Optional[str] = None,
     channel: Optional[str] = None,
     blocks: Optional[List[Dict[str, Any]]] = None,
     thread_ts: Optional[str] = None,
 ) -> Dict[str, Any]:
-    """
-    Gửi tin nhắn tới Slack bằng 1 trong 2 phương thức:
-    1) Incoming Webhook (ưu tiên nếu có SLACK_WEBHOOK_URL hoặc truyền webhook_url)
-    2) Slack Web API (chat.postMessage) với SLACK_BOT_TOKEN + channel
-
-    Trả về dict kết quả đã chuẩn hoá, bao gồm khoá 'ok' và 'method'.
-    Ném ValueError khi thiếu thông tin cấu hình cần thiết.
-    """
-    resolved_webhook_url = webhook_url or SLACK_WEBHOOK_URL
-    resolved_bot_token = bot_token or SLACK_BOT_TOKEN
-    resolved_channel = channel or SLACK_CHANNEL
+    """Gửi tin nhắn qua Slack Web API (chat.postMessage)."""
+    if not SLACK_BOT_TOKEN or not (channel or SLACK_CHANNEL):
+        raise ValueError("Missing SLACK_BOT_TOKEN or channel for Web API message")
 
-    # Chuẩn hoá blocks nếu user truyền dạng đơn giản {"type": "markdown", "text": "..."}
-    normalized_blocks: Optional[List[Dict[str, Any]]] = None
+    api_url = "https://slack.com/api/chat.postMessage"
+    headers = {
+        "Authorization": f"Bearer {SLACK_BOT_TOKEN}",
+        "Content-Type": "application/json",
+    }
+    payload: Dict[str, Any] = {
+        "channel": channel or SLACK_CHANNEL,
+        "text": message_text,
+    }
     if blocks is not None:
-        normalized_blocks = blocks
-
-    # Ưu tiên gửi qua Incoming Webhook nếu có
-    if resolved_webhook_url:
-        payload: Dict[str, Any] = {"text": message_text}
-        if normalized_blocks is not None:
-            payload["blocks"] = normalized_blocks
-
-        response = requests.post(resolved_webhook_url, json=json.dumps(payload))
-        if 200 <= response.status_code < 300 and response.text.strip().lower() in ("ok", ""):
-            return {
-                "ok": True,
-                "method": "webhook",
-                "status_code": response.status_code,
-                "response": response.text,
-            }
-
-        # Nếu webhook trả lỗi, thử fallback sang Web API nếu có cấu hình
-        if resolved_bot_token and resolved_channel:
-            api_url = "https://slack.com/api/chat.postMessage"
-            headers = {
-                "Authorization": f"Bearer {resolved_bot_token}",
-                "Content-Type": "application/json",
-            }
-            payload_api: Dict[str, Any] = {
-                "channel": resolved_channel,
-                "text": message_text,
-            }
-            if normalized_blocks is not None:
-                payload_api["blocks"] = normalized_blocks
-            if thread_ts is not None:
-                payload_api["thread_ts"] = thread_ts
-
-            api_resp = requests.post(api_url, headers=headers, json=payload_api, timeout=15)
-            try:
-                api_resp.raise_for_status()
-            except Exception as exc:
-                raise ValueError(
-                    f"Slack webhook failed (status {response.status_code}, body={response.text!r}); "
-                    f"fallback Web API also failed: {exc}"
-                ) from exc
-
-            data = api_resp.json()
-            if not data.get("ok", False):
-                error_detail = data.get("error", "unknown_error")
-                raise ValueError(
-                    f"Slack webhook failed (status {response.status_code}, body={response.text!r}); "
-                    f"fallback Web API responded with error: {error_detail}"
-                )
-
-            return {
-                "ok": True,
-                "method": "webhook_fallback_web_api",
-                "status_code": api_resp.status_code,
-                "response": data,
-            }
-
-        # Không có fallback khả dụng, báo lỗi chi tiết
-        raise ValueError(
-            f"Slack webhook request failed with status {response.status_code}: {response.text}"
-        )
+        payload["blocks"] = blocks
+    if thread_ts is not None:
+        payload["thread_ts"] = thread_ts
+
+    response = requests.post(api_url, headers=headers, json=payload, timeout=15)
+    try:
+        response.raise_for_status()
+    except Exception as exc:
+        raise ValueError(f"Slack API request failed: {exc}") from exc
+
+    data = response.json()
+    if not data.get("ok", False):
+        raise ValueError(f"Slack API responded with error: {data.get('error', 'unknown_error')}")
+
+    return {
+        "ok": True,
+        "method": "web_api",
+        "status_code": response.status_code,
+        "response": data,
+    }
 
-    # Fallback: dùng Slack Web API nếu có token + channel
-    if resolved_bot_token and resolved_channel:
-        api_url = "https://slack.com/api/chat.postMessage"
-        headers = {
-            "Authorization": f"Bearer {resolved_bot_token}",
-            "Content-Type": "application/json",
-        }
-        payload: Dict[str, Any] = {
-            "channel": resolved_channel,
-            "text": message_text,
-        }
-        if normalized_blocks is not None:
-            payload["blocks"] = normalized_blocks
-        if thread_ts is not None:
-            payload["thread_ts"] = thread_ts
 
-        response = requests.post(api_url, headers=headers, json=payload, timeout=15)
-        try:
-            response.raise_for_status()
-        except Exception as exc:
-            raise ValueError(f"Slack API request failed: {exc}") from exc
+def send_slack_message(
+    message_text: str,
+    *,
+    channel: Optional[str] = None,
+    blocks: Optional[List[Dict[str, Any]]] = None,
+    use_webhook: bool = False,
+) -> Dict[str, Any]:
+    """
+    Gửi tin nhắn mới vào Slack (không dùng thread).
+    Có thể chọn gửi qua Webhook hoặc Web API.
+    """
+    if use_webhook:
+        return _send_via_webhook(message_text, blocks)
+    return _send_via_api(message_text, channel=channel, blocks=blocks)
 
-        data = response.json()
-        if not data.get("ok", False):
-            error_detail = data.get("error", "unknown_error")
-            raise ValueError(f"Slack API responded with error: {error_detail}")
 
-        return {
-            "ok": True,
-            "method": "web_api",
-            "status_code": response.status_code,
-            "response": data,
-        }
+def reply_slack_thread(
+    thread_ts: str,
+    message_text: str,
+    *,
+    channel: Optional[str] = None,
+    blocks: Optional[List[Dict[str, Any]]] = None,
+) -> Dict[str, Any]:
+    """
+    Trả lời một tin nhắn trong thread (yêu cầu thread_ts).
+    Bắt buộc dùng Web API (webhook không hỗ trợ thread).
+    """
+    return _send_via_api(message_text, channel=channel, blocks=blocks, thread_ts=thread_ts)
 
-    raise ValueError(
-        "Missing Slack configuration. Provide SLACK_WEBHOOK_URL or SLACK_BOT_TOKEN and SLACK_CHANNEL."
-    )
 
 def list_slack_users(*, bot_token: Optional[str] = None, include_bots: bool = True) -> List[Dict[str, Any]]:
     """