Fix lazy token loading in tools, add github_list_commits tool, load_dotenv in main

main.py

@@ -1,4 +1,6 @@
 import logging
+from dotenv import load_dotenv
+load_dotenv()
 
 from contextlib import asynccontextmanager
 

toolsforgitnotionslack/tools/github_tools.py

@@ -4,21 +4,19 @@ GitHub tools — discovery-first, markdown-only reads, paginated, rate-limit awa
 import os
 import httpx
 
-GH           = "https://api.github.com"
-GITHUB_TOKEN = os.environ.get("GITHUB_TOKEN", "")
-GITHUB_REPO  = os.environ.get("GITHUB_REPO", "")
+GH = "https://api.github.com"
 
 
 def _headers() -> dict:
     return {
-        "Authorization":        f"Bearer {GITHUB_TOKEN}",
+        "Authorization":        f"Bearer {os.environ.get('GITHUB_TOKEN', '')}",
         "Accept":               "application/vnd.github+json",
         "X-GitHub-Api-Version": "2022-11-28",
     }
 
 
 def _target(repo: str) -> str:
-    return repo or GITHUB_REPO
+    return repo or os.environ.get("GITHUB_REPO", "")
 
 
 def _rate_warn(resp: httpx.Response) -> str | None:
@@ -170,6 +168,31 @@ async def github_list_markdown_files(repo: str = "", folder: str = "") -> str:
     return f"[{t}] {len(items)} markdown file(s):\n" + "\n".join(f"• {i['path']}" for i in items)
 
 
+async def github_list_commits(repo: str = "", branch: str = "", page: int = 1) -> str:
+    t = _target(repo)
+    if not t: return "Provide repo as 'owner/repo' or set GITHUB_REPO."
+    params = {"per_page": 20, "page": page}
+    if branch:
+        params["sha"] = branch
+    async with httpx.AsyncClient(timeout=15) as h:
+        r = await h.get(f"{GH}/repos/{t}/commits", headers=_headers(), params=params)
+    if w := _rate_warn(r): return w
+    if r.status_code == 404: return f"Repo not found: {t}"
+    if r.status_code != 200: return f"GitHub error {r.status_code}: {r.text[:200]}"
+    commits = r.json()
+    if not commits: return "No commits found."
+    lines = []
+    for c in commits:
+        sha = c["sha"][:7]
+        msg = c["commit"]["message"].split("\n")[0][:80]
+        author = c["commit"]["author"]["name"]
+        date = c["commit"]["author"]["date"][:10]
+        lines.append(f"• {sha}  {date}  {author}: {msg}")
+    if len(commits) == 20:
+        lines.append(f"[Page {page} — call with page={page+1} for more]")
+    return "\n".join(lines)
+
+
 # ── Registry ───────────────────────────────────────────────────────────────────
 
 GITHUB_TOOL_FNS = {
@@ -179,6 +202,7 @@ GITHUB_TOOL_FNS = {
     "github_read_file":           github_read_file,
     "github_search_code":         github_search_code,
     "github_list_markdown_files": github_list_markdown_files,
+    "github_list_commits":        github_list_commits,
 }
 
 GITHUB_TOOLS = [
@@ -253,4 +277,17 @@ GITHUB_TOOLS = [
             "repo":   {"type": "string"}, "folder": {"type": "string"},
         }},
     }},
+    {"type": "function", "function": {
+        "name": "github_list_commits",
+        "description": (
+            "List recent commits in a GitHub repo. "
+            "Use this when asked about recent changes, commit history, or who changed what. "
+            "Returns SHA, date, author, and commit message for each commit."
+        ),
+        "parameters": {"type": "object", "properties": {
+            "repo":   {"type": "string", "description": "owner/repo"},
+            "branch": {"type": "string", "description": "Branch name, default is the repo default branch"},
+            "page":   {"type": "integer", "description": "Page number, default 1"},
+        }},
+    }},
 ]

toolsforgitnotionslack/tools/notion_tools.py

@@ -3,15 +3,12 @@ Notion tools — search, read pages, list and query databases.
 """
 import os
 import httpx
-from dotenv import load_dotenv
-load_dotenv()
-NOTION_TOKEN = os.environ.get("NOTION_API_TOKEN", "")
-
-NOTION_HEADERS = {
-    "Authorization":  f"Bearer {NOTION_TOKEN}",
-    "Notion-Version": "2022-06-28",
-    "Content-Type":   "application/json",
-}
+def _notion_headers() -> dict:
+    return {
+        "Authorization":  f"Bearer {os.environ.get('NOTION_API_TOKEN', '')}",
+        "Notion-Version": "2022-06-28",
+        "Content-Type":   "application/json",
+    }
 
 
 def _extract_rich_text(rt: list) -> str:
@@ -24,7 +21,7 @@ async def notion_search(query: str, filter_type: str = "") -> str:
         body["filter"] = {"value": filter_type, "property": "object"}
     async with httpx.AsyncClient(timeout=15) as h:
         r = await h.post("https://api.notion.com/v1/search",
-                         headers=NOTION_HEADERS, json=body)
+                         headers=_notion_headers(), json=body)
     if r.status_code != 200: return f"Notion error {r.status_code}: {r.text[:300]}"
     results = r.json().get("results", [])
     if not results: return "No Notion pages or databases found."
@@ -49,7 +46,7 @@ async def notion_read_page(page_id: str, max_blocks: int = 80) -> str:
     async with httpx.AsyncClient(timeout=15) as h:
         r = await h.get(
             f"https://api.notion.com/v1/blocks/{page_id}/children",
-            headers=NOTION_HEADERS,
+            headers=_notion_headers(),
             params={"page_size": max_blocks},
         )
     if r.status_code != 200: return f"Notion error {r.status_code}: {r.text[:300]}"
@@ -91,7 +88,7 @@ async def notion_list_databases(query: str = "") -> str:
     if query: body["query"] = query
     async with httpx.AsyncClient(timeout=15) as h:
         r = await h.post("https://api.notion.com/v1/search",
-                         headers=NOTION_HEADERS, json=body)
+                         headers=_notion_headers(), json=body)
     if r.status_code != 200: return f"Notion error {r.status_code}: {r.text[:300]}"
     results = r.json().get("results", [])
     if not results: return "No databases found."
@@ -112,7 +109,7 @@ async def notion_query_database(database_id: str, filter_property: str = "",
     async with httpx.AsyncClient(timeout=15) as h:
         r = await h.post(
             f"https://api.notion.com/v1/databases/{database_id}/query",
-            headers=NOTION_HEADERS, json=body,
+            headers=_notion_headers(), json=body,
         )
     if r.status_code != 200: return f"Notion error {r.status_code}: {r.text[:300]}"
     results = r.json().get("results", [])

toolsforgitnotionslack/tools/slack_tools.py

@@ -4,11 +4,8 @@ Slack tools — search, history, threads, channel metadata.
 import os
 import httpx
 
-SLACK_TOKEN = os.environ.get("SLACK_BOT_TOKEN", "")
-
-
 def _headers() -> dict:
-    return {"Authorization": f"Bearer {SLACK_TOKEN}"}
+    return {"Authorization": f"Bearer {os.environ.get('SLACK_BOT_TOKEN', '')}"}
 
 
 async def slack_list_channels(filter_name: str = "") -> str: