Update app.py

app.py

@@ -66,7 +66,7 @@ OAUTH_CONFIGS = {
         "client_secret": "ec8548ef297ed59d8372e5bc549d8ed9adc996f7",
         "auth_url": "https://github.com/login/oauth/authorize",
         "token_url": "https://github.com/login/oauth/access_token",
-        "scope": "read:user repo workflow"
+        "scope": "repo read:user user"
     },
     "figma": {
         "client_id": "Cg79RWBHaeyW2afGJVSQi8",
@@ -137,12 +137,14 @@ STRICT IDENTITY RULES:
    - To Delete/Remove a page: Search for the page_id, then call `notion_delete_page`. NEVER tell the user to delete manually.
    - To Create a new page: Use `notion_create_page`.
 
-4. GITHUB CONNECTOR WORKFLOW RULES (FULL CAPABILITY):
-   - READ & SEARCH: Use `github_get_repo_content` to read files/folders, `github_search_code` to search code, `github_list_commits` for history.
-   - EDIT & WRITE: Use `github_create_or_update_file` to create or edit files, `github_delete_file` to remove files.
-   - BRANCHES & PRS: Use `github_create_branch`, `github_delete_branch`, `github_list_pull_requests`, `github_get_pull_request`, `github_create_pull_request`, `github_merge_pull_request`.
-   - ISSUES & COMMENTS: Use `github_list_issues`, `github_create_issue`, `github_update_issue` (to edit/close/reopen), `github_create_comment`.
-   - AUTOMATION: Use `github_list_workflow_runs` to check CI/CD build status.
+4. GITHUB CONNECTOR WORKFLOW RULES:
+   - Always call `github_list_repos` first if you do not know the exact owner or repo name.
+   - To inspect repository structure or read files, use `github_get_file_or_dir`.
+   - To search code or find functions across repository, use `github_search_code`.
+   - To create or edit code/files, use `github_create_or_update_file`.
+   - To delete files, use `github_delete_file`.
+   - For Git workflow, use `github_list_branches`, `github_create_branch`, `github_list_commits`, `github_create_pull_request`, or `github_merge_pull_request`.
+   - For Issue management, use `github_list_issues`, `github_create_issue`, `github_update_issue`, or `github_add_issue_comment`.
 
 5. NATURAL CONVERSATION & TOOL RESPONSE STYLE:
    - Do NOT introduce your company, founder, or model name in general responses unless requested.
@@ -465,41 +467,45 @@ TOOLS = [
     {
         "type": "function",
         "function": {
-            "name": "github_get_user_profile",
-            "description": "Get GitHub user profile details including username, public repos, and bio",
+            "name": "github_list_repos",
+            "description": "List all GitHub repositories accessible by the user",
             "parameters": {
                 "type": "object",
-                "properties": {}
+                "properties": {
+                    "max_results": {"type": "integer", "description": "Max repositories to list, default 10"}
+                }
             }
         }
     },
     {
         "type": "function",
         "function": {
-            "name": "github_list_repos",
-            "description": "List or search user repositories in connected GitHub account",
+            "name": "github_get_file_or_dir",
+            "description": "Read file content or list directory contents in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
-                    "max_results": {"type": "integer", "description": "Number of repositories to fetch, default 10"}
-                }
+                    "owner": {"type": "string", "description": "Repository owner/username"},
+                    "repo": {"type": "string", "description": "Repository name"},
+                    "path": {"type": "string", "description": "File or folder path e.g. 'src/index.js' or '' for root"},
+                    "ref": {"type": "string", "description": "Branch, tag, or commit SHA, default 'main'"}
+                },
+                "required": ["owner", "repo"]
             }
         }
     },
     {
         "type": "function",
         "function": {
-            "name": "github_get_repo_content",
-            "description": "Read directory files or specific file text content from a GitHub repository",
+            "name": "github_search_code",
+            "description": "Search code, functions, or text across GitHub repositories",
             "parameters": {
                 "type": "object",
                 "properties": {
-                    "owner": {"type": "string", "description": "Repository owner / username"},
-                    "repo": {"type": "string", "description": "Repository name"},
-                    "path": {"type": "string", "description": "Path to file or folder, default empty for root"},
-                    "branch": {"type": "string", "description": "Branch name, default main/master"}
+                    "query": {"type": "string", "description": "Code or text to search for"},
+                    "repo": {"type": "string", "description": "Optional target repository e.g. 'owner/repo'"}
                 },
-                "required": ["owner", "repo"]
+                "required": ["query"]
             }
         }
     },
@@ -507,18 +513,19 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_create_or_update_file",
-            "description": "Create a new file or edit/update an existing file in GitHub repository",
+            "description": "Create a new file or update/edit an existing file in GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
-                    "path": {"type": "string", "description": "File path in repository e.g. 'src/App.kt'"},
-                    "content": {"type": "string", "description": "Text content for the file"},
+                    "path": {"type": "string", "description": "File path in repository"},
                     "message": {"type": "string", "description": "Commit message"},
-                    "branch": {"type": "string", "description": "Target branch name"}
+                    "content": {"type": "string", "description": "Text content of the file"},
+                    "branch": {"type": "string", "description": "Target branch, default 'main'"},
+                    "sha": {"type": "string", "description": "SHA of existing file if updating"}
                 },
-                "required": ["owner", "repo", "path", "content", "message"]
+                "required": ["owner", "repo", "path", "message", "content"]
             }
         }
     },
@@ -533,8 +540,9 @@ TOOLS = [
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
                     "path": {"type": "string", "description": "File path to delete"},
-                    "message": {"type": "string", "description": "Commit message"},
-                    "branch": {"type": "string", "description": "Branch name"}
+                    "message": {"type": "string", "description": "Commit message for deletion"},
+                    "branch": {"type": "string", "description": "Target branch, default 'main'"},
+                    "sha": {"type": "string", "description": "SHA of file to delete"}
                 },
                 "required": ["owner", "repo", "path", "message"]
             }
@@ -543,33 +551,32 @@ TOOLS = [
     {
         "type": "function",
         "function": {
-            "name": "github_create_branch",
-            "description": "Create a new Git branch in GitHub repository",
+            "name": "github_list_branches",
+            "description": "List all branches in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
-                    "repo": {"type": "string", "description": "Repository name"},
-                    "new_branch": {"type": "string", "description": "Name of new branch"},
-                    "base_branch": {"type": "string", "description": "Source branch to copy from, default 'main'"}
+                    "repo": {"type": "string", "description": "Repository name"}
                 },
-                "required": ["owner", "repo", "new_branch"]
+                "required": ["owner", "repo"]
             }
         }
     },
     {
         "type": "function",
         "function": {
-            "name": "github_delete_branch",
-            "description": "Delete a branch from GitHub repository",
+            "name": "github_create_branch",
+            "description": "Create a new branch in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
-                    "branch": {"type": "string", "description": "Branch name to delete"}
+                    "branch_name": {"type": "string", "description": "Name for new branch"},
+                    "from_branch": {"type": "string", "description": "Source branch name, default 'main'"}
                 },
-                "required": ["owner", "repo", "branch"]
+                "required": ["owner", "repo", "branch_name"]
             }
         }
     },
@@ -577,14 +584,14 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_list_commits",
-            "description": "List commit history for a GitHub repository or specific file path",
+            "description": "List recent commits in a GitHub repository branch",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
-                    "path": {"type": "string", "description": "Optional file path filter"},
-                    "max_results": {"type": "integer", "description": "Number of commits, default 10"}
+                    "branch": {"type": "string", "description": "Branch name, default 'main'"},
+                    "max_results": {"type": "integer", "description": "Max commits to list, default 10"}
                 },
                 "required": ["owner", "repo"]
             }
@@ -594,50 +601,34 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_list_pull_requests",
-            "description": "List Pull Requests (PRs) in a GitHub repository",
+            "description": "List Pull Requests in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
-                    "state": {"type": "string", "description": "State e.g. 'open', 'closed', 'all'"}
+                    "state": {"type": "string", "description": "'open', 'closed', or 'all', default 'open'"}
                 },
                 "required": ["owner", "repo"]
             }
         }
     },
-    {
-        "type": "function",
-        "function": {
-            "name": "github_get_pull_request",
-            "description": "Get detailed information and diff summary of a Pull Request",
-            "parameters": {
-                "type": "object",
-                "properties": {
-                    "owner": {"type": "string", "description": "Repository owner"},
-                    "repo": {"type": "string", "description": "Repository name"},
-                    "pull_number": {"type": "integer", "description": "PR number"}
-                },
-                "required": ["owner", "repo", "pull_number"]
-            }
-        }
-    },
     {
         "type": "function",
         "function": {
             "name": "github_create_pull_request",
-            "description": "Create a new Pull Request in GitHub repository",
+            "description": "Create a new Pull Request in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
                     "title": {"type": "string", "description": "PR title"},
-                    "head": {"type": "string", "description": "Branch containing new code"},
-                    "base": {"type": "string", "description": "Target branch to merge into e.g. 'main'"},
+                    "head": {"type": "string", "description": "Feature branch name containing changes"},
+                    "base": {"type": "string", "description": "Target branch to merge into, default 'main'"},
                     "body": {"type": "string", "description": "PR description"}
                 },
-                "required": ["owner", "repo", "title", "head", "base"]
+                "required": ["owner", "repo", "title", "head"]
             }
         }
     },
@@ -645,7 +636,7 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_merge_pull_request",
-            "description": "Merge a Pull Request in GitHub repository",
+            "description": "Merge a Pull Request in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
@@ -668,7 +659,7 @@ TOOLS = [
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
-                    "state": {"type": "string", "description": "State of issues e.g. 'open', 'closed', 'all'"}
+                    "state": {"type": "string", "description": "'open', 'closed', or 'all', default 'open'"}
                 },
                 "required": ["owner", "repo"]
             }
@@ -678,14 +669,16 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_create_issue",
-            "description": "Create a new issue in a GitHub repository",
+            "description": "Create a new Issue in a GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
                     "owner": {"type": "string", "description": "Repository owner"},
                     "repo": {"type": "string", "description": "Repository name"},
                     "title": {"type": "string", "description": "Issue title"},
-                    "body": {"type": "string", "description": "Optional issue body content"}
+                    "body": {"type": "string", "description": "Issue body content"},
+                    "labels": {"type": "array", "items": {"type": "string"}, "description": "Labels list"},
+                    "assignees": {"type": "array", "items": {"type": "string"}, "description": "Usernames to assign"}
                 },
                 "required": ["owner", "repo", "title"]
             }
@@ -695,7 +688,7 @@ TOOLS = [
         "type": "function",
         "function": {
             "name": "github_update_issue",
-            "description": "Update or close/reopen an existing issue or Pull Request in GitHub",
+            "description": "Update or close an Issue in GitHub repository",
             "parameters": {
                 "type": "object",
                 "properties": {
@@ -703,8 +696,8 @@ TOOLS = [
                     "repo": {"type": "string", "description": "Repository name"},
                     "issue_number": {"type": "integer", "description": "Issue number"},
                     "title": {"type": "string", "description": "New title"},
-                    "body": {"type": "string", "description": "New body content"},
-                    "state": {"type": "string", "description": "State 'open' or 'closed'"}
+                    "body": {"type": "string", "description": "New body"},
+                    "state": {"type": "string", "description": "'open' or 'closed'"}
                 },
                 "required": ["owner", "repo", "issue_number"]
             }
@@ -713,8 +706,8 @@ TOOLS = [
     {
         "type": "function",
         "function": {
-            "name": "github_create_comment",
-            "description": "Add a comment to an issue or Pull Request in GitHub",
+            "name": "github_add_issue_comment",
+            "description": "Add a comment to an Issue or PR in GitHub",
             "parameters": {
                 "type": "object",
                 "properties": {
@@ -726,35 +719,6 @@ TOOLS = [
                 "required": ["owner", "repo", "issue_number", "body"]
             }
         }
-    },
-    {
-        "type": "function",
-        "function": {
-            "name": "github_search_code",
-            "description": "Search code across user repositories on GitHub",
-            "parameters": {
-                "type": "object",
-                "properties": {
-                    "query": {"type": "string", "description": "Search text or function name e.g. 'function_name user:owner'"}
-                },
-                "required": ["query"]
-            }
-        }
-    },
-    {
-        "type": "function",
-        "function": {
-            "name": "github_list_workflow_runs",
-            "description": "List GitHub Actions CI/CD workflow runs and build status",
-            "parameters": {
-                "type": "object",
-                "properties": {
-                    "owner": {"type": "string", "description": "Repository owner"},
-                    "repo": {"type": "string", "description": "Repository name"}
-                },
-                "required": ["owner", "repo"]
-            }
-        }
     }
 ]
 
@@ -841,362 +805,6 @@ async def get_google_creds(user_id: str, service_name: str = "google"):
             pass
     return creds
 
-async def github_get_headers(user_id: str):
-    token_data = await get_token_from_supabase(user_id, "github")
-    if not token_data:
-        return None
-    access_token = token_data.get("access_token") or token_data.get("token")
-    if not access_token:
-        return None
-    return {
-        "Authorization": f"Bearer {access_token}",
-        "Accept": "application/vnd.github+json",
-        "User-Agent": "Spark-App"
-    }
-
-async def github_get_user_profile(user_id: str):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected. Please connect GitHub account."
-    try:
-        async with httpx.AsyncClient() as c:
-            res = await c.get("https://api.github.com/user", headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching GitHub profile: {res.text}"
-            data = res.json()
-            return f"GitHub User: {data.get('login')} | Name: {data.get('name')} | Public Repos: {data.get('public_repos')} | Bio: {data.get('bio')}"
-    except Exception as e:
-        return f"Error fetching GitHub profile: {str(e)}"
-
-async def github_list_repos(user_id: str, max_results: int = 10):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected. Please connect GitHub account."
-    try:
-        async with httpx.AsyncClient() as c:
-            res = await c.get(f"https://api.github.com/user/repos?sort=updated&per_page={max_results}", headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching repositories: {res.text}"
-            repos = res.json()
-            if not repos:
-                return "No repositories found in GitHub account."
-            items = []
-            for r in repos:
-                items.append(f"Repo: {r.get('full_name')} | Private: {r.get('private')} | Stars: {r.get('stargazers_count')} | Language: {r.get('language')} | Description: {r.get('description')}")
-            return "\n".join(items)
-    except Exception as e:
-        return f"Error listing GitHub repos: {str(e)}"
-
-async def github_get_repo_content(user_id: str, owner: str, repo: str, path: str = "", branch: str = None):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"
-        if branch:
-            url += f"?ref={branch}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching repository content: {res.text}"
-            data = res.json()
-            if isinstance(data, list):
-                items = []
-                for item in data:
-                    items.append(f"Type: {item.get('type')} | Name: {item.get('name')} | Path: {item.get('path')}")
-                return "\n".join(items)
-            elif isinstance(data, dict):
-                if data.get("encoding") == "base64" and data.get("content"):
-                    content = base64.b64decode(data.get("content")).decode("utf-8", errors="ignore")
-                    return content
-                return f"File Name: {data.get('name')} | Size: {data.get('size')} bytes | SHA: {data.get('sha')}"
-            return "Unable to parse content."
-    except Exception as e:
-        return f"Error reading GitHub content: {str(e)}"
-
-async def github_create_or_update_file(user_id: str, owner: str, repo: str, path: str, content: str, message: str, branch: str = None):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"
-        encoded_content = base64.b64encode(content.encode("utf-8")).decode("utf-8")
-        payload = {
-            "message": message,
-            "content": encoded_content
-        }
-        if branch:
-            payload["branch"] = branch
-        async with httpx.AsyncClient() as c:
-            get_res = await c.get(url + (f"?ref={branch}" if branch else ""), headers=headers)
-            if get_res.status_code == 200:
-                file_info = get_res.json()
-                if isinstance(file_info, dict) and "sha" in file_info:
-                    payload["sha"] = file_info["sha"]
-            res = await c.put(url, headers=headers, json=payload)
-            if res.status_code not in [200, 201]:
-                return f"Error updating file: {res.text}"
-            data = res.json()
-            return f"Successfully saved file '{path}' in commit: {data.get('commit', {}).get('sha')}"
-    except Exception as e:
-        return f"Error modifying file: {str(e)}"
-
-async def github_delete_file(user_id: str, owner: str, repo: str, path: str, message: str, branch: str = None):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"
-        async with httpx.AsyncClient() as c:
-            get_res = await c.get(url + (f"?ref={branch}" if branch else ""), headers=headers)
-            if get_res.status_code != 200:
-                return f"File '{path}' not found."
-            file_info = get_res.json()
-            sha = file_info.get("sha")
-            payload = {"message": message, "sha": sha}
-            if branch: payload["branch"] = branch
-            del_res = await c.request("DELETE", url, headers=headers, json=payload)
-            if del_res.status_code != 200:
-                return f"Error deleting file: {del_res.text}"
-            return f"Successfully deleted file '{path}'."
-    except Exception as e:
-        return f"Error deleting file: {str(e)}"
-
-async def github_create_branch(user_id: str, owner: str, repo: str, new_branch: str, base_branch: str = "main"):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        async with httpx.AsyncClient() as c:
-            ref_res = await c.get(f"https://api.github.com/repos/{owner}/{repo}/git/ref/heads/{base_branch}", headers=headers)
-            if ref_res.status_code != 200:
-                ref_res = await c.get(f"https://api.github.com/repos/{owner}/{repo}/git/ref/heads/master", headers=headers)
-                if ref_res.status_code != 200:
-                    return f"Error getting base branch SHA: {ref_res.text}"
-            sha = ref_res.json().get("object", {}).get("sha")
-            payload = {
-                "ref": f"refs/heads/{new_branch}",
-                "sha": sha
-            }
-            res = await c.post(f"https://api.github.com/repos/{owner}/{repo}/git/refs", headers=headers, json=payload)
-            if res.status_code != 201:
-                return f"Error creating branch: {res.text}"
-            return f"Successfully created branch '{new_branch}'."
-    except Exception as e:
-        return f"Error creating branch: {str(e)}"
-
-async def github_delete_branch(user_id: str, owner: str, repo: str, branch: str):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/git/refs/heads/{branch}"
-        async with httpx.AsyncClient() as c:
-            res = await c.delete(url, headers=headers)
-            if res.status_code != 204:
-                return f"Error deleting branch: {res.text}"
-            return f"Successfully deleted branch '{branch}'."
-    except Exception as e:
-        return f"Error deleting branch: {str(e)}"
-
-async def github_list_commits(user_id: str, owner: str, repo: str, path: str = None, max_results: int = 10):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/commits?per_page={max_results}"
-        if path: url += f"&path={path}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching commits: {res.text}"
-            commits = res.json()
-            items = []
-            for cm in commits:
-                sha = cm.get("sha", "")[:7]
-                msg = cm.get("commit", {}).get("message", "").split("\n")[0]
-                author = cm.get("commit", {}).get("author", {}).get("name", "")
-                date = cm.get("commit", {}).get("author", {}).get("date", "")
-                items.append(f"Commit [{sha}]: {msg} | Author: {author} | Date: {date}")
-            return "\n".join(items)
-    except Exception as e:
-        return f"Error listing commits: {str(e)}"
-
-async def github_list_pull_requests(user_id: str, owner: str, repo: str, state: str = "open"):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/pulls?state={state}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching PRs: {res.text}"
-            prs = res.json()
-            if not prs: return "No Pull Requests found."
-            items = []
-            for p in prs:
-                items.append(f"PR #{p.get('number')}: {p.get('title')} | State: {p.get('state')} | User: {p.get('user', {}).get('login')} | Head: {p.get('head', {}).get('ref')} -> Base: {p.get('base', {}).get('ref')}")
-            return "\n".join(items)
-    except Exception as e:
-        return f"Error listing PRs: {str(e)}"
-
-async def github_get_pull_request(user_id: str, owner: str, repo: str, pull_number: int):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching PR detail: {res.text}"
-            p = res.json()
-            return f"PR #{p.get('number')}: {p.get('title')}\nState: {p.get('state')}\nMergeable: {p.get('mergeable')}\nBody:\n{p.get('body')}"
-    except Exception as e:
-        return f"Error fetching PR detail: {str(e)}"
-
-async def github_create_pull_request(user_id: str, owner: str, repo: str, title: str, head: str, base: str = "main", body: str = ""):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/pulls"
-        payload = {"title": title, "head": head, "base": base, "body": body}
-        async with httpx.AsyncClient() as c:
-            res = await c.post(url, headers=headers, json=payload)
-            if res.status_code not in [200, 201]:
-                return f"Error creating PR: {res.text}"
-            p = res.json()
-            return f"Successfully created PR #{p.get('number')}: {p.get('html_url')}"
-    except Exception as e:
-        return f"Error creating PR: {str(e)}"
-
-async def github_merge_pull_request(user_id: str, owner: str, repo: str, pull_number: int, commit_title: str = None):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}/merge"
-        payload = {}
-        if commit_title: payload["commit_title"] = commit_title
-        async with httpx.AsyncClient() as c:
-            res = await c.put(url, headers=headers, json=payload)
-            if res.status_code != 200:
-                return f"Error merging PR: {res.text}"
-            return f"Successfully merged PR #{pull_number}."
-    except Exception as e:
-        return f"Error merging PR: {str(e)}"
-
-async def github_list_issues(user_id: str, owner: str, repo: str, state: str = "open"):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/issues?state={state}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching issues: {res.text}"
-            issues = res.json()
-            if not issues:
-                return "No issues found."
-            items = []
-            for i in issues:
-                items.append(f"Issue #{i.get('number')}: {i.get('title')} | State: {i.get('state')} | User: {i.get('user', {}).get('login')}")
-            return "\n".join(items)
-    except Exception as e:
-        return f"Error fetching GitHub issues: {str(e)}"
-
-async def github_create_issue(user_id: str, owner: str, repo: str, title: str, body: str = ""):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/issues"
-        payload = {"title": title, "body": body}
-        async with httpx.AsyncClient() as c:
-            res = await c.post(url, headers=headers, json=payload)
-            if res.status_code not in [200, 201]:
-                return f"Error creating issue: {res.text}"
-            data = res.json()
-            return f"Successfully created issue #{data.get('number')}: {data.get('html_url')}"
-    except Exception as e:
-        return f"Error creating GitHub issue: {str(e)}"
-
-async def github_update_issue(user_id: str, owner: str, repo: str, issue_number: int, title: str = None, body: str = None, state: str = None):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}"
-        payload = {}
-        if title: payload["title"] = title
-        if body: payload["body"] = body
-        if state: payload["state"] = state
-        async with httpx.AsyncClient() as c:
-            res = await c.patch(url, headers=headers, json=payload)
-            if res.status_code != 200:
-                return f"Error updating issue: {res.text}"
-            return f"Successfully updated Issue #{issue_number}."
-    except Exception as e:
-        return f"Error updating issue: {str(e)}"
-
-async def github_create_comment(user_id: str, owner: str, repo: str, issue_number: int, body: str):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}/comments"
-        payload = {"body": body}
-        async with httpx.AsyncClient() as c:
-            res = await c.post(url, headers=headers, json=payload)
-            if res.status_code not in [200, 201]:
-                return f"Error adding comment: {res.text}"
-            return f"Successfully added comment to Issue/PR #{issue_number}."
-    except Exception as e:
-        return f"Error adding comment: {str(e)}"
-
-async def github_search_code(user_id: str, query: str):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        encoded_q = urllib.parse.quote(query)
-        url = f"https://api.github.com/search/code?q={encoded_q}"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error searching code: {res.text}"
-            data = res.json()
-            items = data.get("items", [])
-            if not items: return "No code matches found."
-            results = []
-            for item in items[:10]:
-                results.append(f"Repo: {item.get('repository', {}).get('full_name')} | File: {item.get('path')} | URL: {item.get('html_url')}")
-            return "\n".join(results)
-    except Exception as e:
-        return f"Error searching code: {str(e)}"
-
-async def github_list_workflow_runs(user_id: str, owner: str, repo: str):
-    headers = await github_get_headers(user_id)
-    if not headers:
-        return "GitHub is not connected."
-    try:
-        url = f"https://api.github.com/repos/{owner}/{repo}/actions/runs?per_page=5"
-        async with httpx.AsyncClient() as c:
-            res = await c.get(url, headers=headers)
-            if res.status_code != 200:
-                return f"Error fetching workflow runs: {res.text}"
-            runs = res.json().get("workflow_runs", [])
-            if not runs: return "No CI/CD workflow runs found."
-            items = []
-            for r in runs:
-                items.append(f"Run #{r.get('run_number')}: {r.get('name')} | Status: {r.get('status')} | Conclusion: {r.get('conclusion')} | Branch: {r.get('head_branch')}")
-            return "\n".join(items)
-    except Exception as e:
-        return f"Error fetching workflow runs: {str(e)}"
-
 async def notion_get_headers(user_id: str):
     token_data = await get_token_from_supabase(user_id, "notion")
     if not token_data:
@@ -1654,6 +1262,338 @@ async def drive_update_file(user_id: str, file_id: str, content: str):
     except Exception as e:
         return f"Error updating Drive file: {str(e)}"
 
+async def github_get_headers(user_id: str):
+    token_data = await get_token_from_supabase(user_id, "github")
+    if not token_data:
+        return None
+    token = token_data.get("access_token") or token_data.get("token")
+    if not token:
+        return None
+    return {
+        "Authorization": f"Bearer {token}",
+        "Accept": "application/vnd.github.v3+json",
+        "User-Agent": "Spark-App"
+    }
+
+async def github_list_repos(user_id: str, max_results: int = 10):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected. Please connect your GitHub account."
+    try:
+        url = f"https://api.github.com/user/repos?sort=updated&per_page={max_results}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error fetching GitHub repositories: {res.text}"
+            data = res.json()
+            if not data:
+                return "No repositories found in user's GitHub account."
+            repos = []
+            for r in data:
+                repos.append(f"Repo: {r.get('full_name')} | Default Branch: {r.get('default_branch', 'main')} | Private: {r.get('private')} | URL: {r.get('html_url')}")
+            return "\n".join(repos)
+    except Exception as e:
+        return f"Error fetching GitHub repositories: {str(e)}"
+
+async def github_get_file_or_dir(user_id: str, owner: str, repo: str, path: str = "", ref: str = "main"):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}?ref={ref}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error reading GitHub path '{path}': {res.text}"
+            data = res.json()
+            if isinstance(data, list):
+                items = []
+                for item in data:
+                    items.append(f"[{item.get('type')}] {item.get('name')} (Path: {item.get('path')})")
+                return "\n".join(items)
+            elif isinstance(data, dict):
+                content_b64 = data.get("content", "")
+                if content_b64:
+                    decoded = base64.b64decode(content_b64.encode()).decode("utf-8", errors="ignore")
+                    sha = data.get("sha", "")
+                    return f"File: {data.get('path')} | SHA: {sha}\n\nContent:\n{decoded}"
+                return f"File metadata retrieved (Path: {data.get('path')}, SHA: {data.get('sha')}). Content unavailable or empty."
+            return "Unknown content structure."
+    except Exception as e:
+        return f"Error accessing GitHub repository: {str(e)}"
+
+async def github_search_code(user_id: str, query: str, repo: str = None):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        q = f"{query}+repo:{repo}" if repo else query
+        url = f"https://api.github.com/search/code?q={q}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error searching GitHub code: {res.text}"
+            data = res.json()
+            items = data.get("items", [])
+            if not items:
+                return f"No code found matching query: '{query}'"
+            results = []
+            for item in items[:10]:
+                results.append(f"Repo: {item.get('repository', {}).get('full_name')} | File: {item.get('path')} | URL: {item.get('html_url')}")
+            return "\n".join(results)
+    except Exception as e:
+        return f"Error searching code: {str(e)}"
+
+async def github_create_or_update_file(user_id: str, owner: str, repo: str, path: str, message: str, content: str, branch: str = "main", sha: str = None):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"
+        if not sha:
+            async with httpx.AsyncClient() as c:
+                get_res = await c.get(f"{url}?ref={branch}", headers=headers)
+                if get_res.status_code == 200:
+                    sha = get_res.json().get("sha")
+
+        encoded_content = base64.b64encode(content.encode("utf-8")).decode("utf-8")
+        payload = {
+            "message": message,
+            "content": encoded_content,
+            "branch": branch
+        }
+        if sha:
+            payload["sha"] = sha
+
+        async with httpx.AsyncClient() as c:
+            res = await c.put(url, headers=headers, json=payload)
+            if res.status_code not in [200, 201]:
+                return f"Error committing file to GitHub: {res.text}"
+            res_data = res.json()
+            commit_sha = res_data.get("commit", {}).get("sha", "")
+            return f"Successfully committed file '{path}' to branch '{branch}' (Commit SHA: {commit_sha})."
+    except Exception as e:
+        return f"Error writing file to GitHub: {str(e)}"
+
+async def github_delete_file(user_id: str, owner: str, repo: str, path: str, message: str, branch: str = "main", sha: str = None):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}"
+        if not sha:
+            async with httpx.AsyncClient() as c:
+                get_res = await c.get(f"{url}?ref={branch}", headers=headers)
+                if get_res.status_code == 200:
+                    sha = get_res.json().get("sha")
+                else:
+                    return f"Cannot find file '{path}' to delete."
+
+        payload = {
+            "message": message,
+            "sha": sha,
+            "branch": branch
+        }
+        async with httpx.AsyncClient() as c:
+            res = await c.request("DELETE", url, headers=headers, json=payload)
+            if res.status_code != 200:
+                return f"Error deleting file from GitHub: {res.text}"
+            return f"Successfully deleted file '{path}' from branch '{branch}'."
+    except Exception as e:
+        return f"Error deleting GitHub file: {str(e)}"
+
+async def github_list_branches(user_id: str, owner: str, repo: str):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/branches"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error listing branches: {res.text}"
+            data = res.json()
+            branches = [f"Branch: {b.get('name')} | SHA: {b.get('commit', {}).get('sha')}" for b in data]
+            return "\n".join(branches) if branches else "No branches found."
+    except Exception as e:
+        return f"Error listing branches: {str(e)}"
+
+async def github_create_branch(user_id: str, owner: str, repo: str, branch_name: str, from_branch: str = "main"):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        async with httpx.AsyncClient() as c:
+            ref_res = await c.get(f"https://api.github.com/repos/{owner}/{repo}/git/ref/heads/{from_branch}", headers=headers)
+            if ref_res.status_code != 200:
+                return f"Error getting reference SHA for branch '{from_branch}': {ref_res.text}"
+            source_sha = ref_res.json().get("object", {}).get("sha")
+
+            payload = {
+                "ref": f"refs/heads/{branch_name}",
+                "sha": source_sha
+            }
+            res = await c.post(f"https://api.github.com/repos/{owner}/{repo}/git/refs", headers=headers, json=payload)
+            if res.status_code != 201:
+                return f"Error creating branch: {res.text}"
+            return f"Successfully created branch '{branch_name}' from '{from_branch}'."
+    except Exception as e:
+        return f"Error creating branch: {str(e)}"
+
+async def github_list_commits(user_id: str, owner: str, repo: str, branch: str = "main", max_results: int = 10):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/commits?sha={branch}&per_page={max_results}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error fetching commits: {res.text}"
+            data = res.json()
+            commits = []
+            for cm in data:
+                sha = cm.get("sha", "")[:7]
+                msg = cm.get("commit", {}).get("message", "").split("\n")[0]
+                author = cm.get("commit", {}).get("author", {}).get("name", "Unknown")
+                commits.append(f"Commit: {sha} | Author: {author} | Message: {msg}")
+            return "\n".join(commits) if commits else "No commits found."
+    except Exception as e:
+        return f"Error fetching commits: {str(e)}"
+
+async def github_list_pull_requests(user_id: str, owner: str, repo: str, state: str = "open"):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/pulls?state={state}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error fetching pull requests: {res.text}"
+            data = res.json()
+            prs = []
+            for pr in data:
+                prs.append(f"PR #{pr.get('number')}: {pr.get('title')} | State: {pr.get('state')} | Head: {pr.get('head', {}).get('ref')} -> Base: {pr.get('base', {}).get('ref')}")
+            return "\n".join(prs) if prs else f"No {state} Pull Requests found."
+    except Exception as e:
+        return f"Error fetching Pull Requests: {str(e)}"
+
+async def github_create_pull_request(user_id: str, owner: str, repo: str, title: str, head: str, base: str = "main", body: str = ""):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/pulls"
+        payload = {
+            "title": title,
+            "head": head,
+            "base": base,
+            "body": body
+        }
+        async with httpx.AsyncClient() as c:
+            res = await c.post(url, headers=headers, json=payload)
+            if res.status_code != 201:
+                return f"Error creating Pull Request: {res.text}"
+            data = res.json()
+            return f"Successfully created Pull Request #{data.get('number')} '{title}' (URL: {data.get('html_url')})."
+    except Exception as e:
+        return f"Error creating Pull Request: {str(e)}"
+
+async def github_merge_pull_request(user_id: str, owner: str, repo: str, pull_number: int, commit_title: str = ""):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}/merge"
+        payload = {}
+        if commit_title:
+            payload["commit_title"] = commit_title
+        async with httpx.AsyncClient() as c:
+            res = await c.put(url, headers=headers, json=payload)
+            if res.status_code != 200:
+                return f"Error merging Pull Request: {res.text}"
+            return f"Successfully merged Pull Request #{pull_number}."
+    except Exception as e:
+        return f"Error merging Pull Request: {str(e)}"
+
+async def github_list_issues(user_id: str, owner: str, repo: str, state: str = "open"):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/issues?state={state}"
+        async with httpx.AsyncClient() as c:
+            res = await c.get(url, headers=headers)
+            if res.status_code != 200:
+                return f"Error fetching issues: {res.text}"
+            data = res.json()
+            issues = []
+            for issue in data:
+                if "pull_request" not in issue:
+                    issues.append(f"Issue #{issue.get('number')}: {issue.get('title')} | State: {issue.get('state')} | Author: {issue.get('user', {}).get('login')}")
+            return "\n".join(issues) if issues else f"No {state} issues found."
+    except Exception as e:
+        return f"Error fetching issues: {str(e)}"
+
+async def github_create_issue(user_id: str, owner: str, repo: str, title: str, body: str = "", labels: list = None, assignees: list = None):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/issues"
+        payload = {
+            "title": title,
+            "body": body
+        }
+        if labels:
+            payload["labels"] = labels
+        if assignees:
+            payload["assignees"] = assignees
+
+        async with httpx.AsyncClient() as c:
+            res = await c.post(url, headers=headers, json=payload)
+            if res.status_code != 201:
+                return f"Error creating issue: {res.text}"
+            data = res.json()
+            return f"Successfully created Issue #{data.get('number')} '{title}' (URL: {data.get('html_url')})."
+    except Exception as e:
+        return f"Error creating GitHub issue: {str(e)}"
+
+async def github_update_issue(user_id: str, owner: str, repo: str, issue_number: int, title: str = None, body: str = None, state: str = None):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}"
+        payload = {}
+        if title: payload["title"] = title
+        if body: payload["body"] = body
+        if state: payload["state"] = state
+
+        async with httpx.AsyncClient() as c:
+            res = await c.patch(url, headers=headers, json=payload)
+            if res.status_code != 200:
+                return f"Error updating issue: {res.text}"
+            return f"Successfully updated Issue #{issue_number}."
+    except Exception as e:
+        return f"Error updating GitHub issue: {str(e)}"
+
+async def github_add_issue_comment(user_id: str, owner: str, repo: str, issue_number: int, body: str):
+    headers = await github_get_headers(user_id)
+    if not headers:
+        return "GitHub is not connected."
+    try:
+        url = f"https://api.github.com/repos/{owner}/{repo}/issues/{issue_number}/comments"
+        payload = {"body": body}
+        async with httpx.AsyncClient() as c:
+            res = await c.post(url, headers=headers, json=payload)
+            if res.status_code != 201:
+                return f"Error adding comment: {res.text}"
+            return f"Successfully commented on Issue/PR #{issue_number}."
+    except Exception as e:
+        return f"Error commenting on GitHub issue: {str(e)}"
+
 async def execute_tool_call(user_id: str, func_name: str, args: dict) -> str:
     if func_name == "gmail_search_emails":
         return await gmail_search_emails(user_id, args.get("query", ""), args.get("max_results", 5))
@@ -1697,42 +1637,36 @@ async def execute_tool_call(user_id: str, func_name: str, args: dict) -> str:
         return await notion_delete_page(user_id, args.get("page_id", ""))
     elif func_name == "notion_append_block_children":
         return await notion_append_block_children(user_id, args.get("page_id", ""), args.get("content", ""))
-    elif func_name == "github_get_user_profile":
-        return await github_get_user_profile(user_id)
     elif func_name == "github_list_repos":
         return await github_list_repos(user_id, args.get("max_results", 10))
-    elif func_name == "github_get_repo_content":
-        return await github_get_repo_content(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("branch"))
+    elif func_name == "github_get_file_or_dir":
+        return await github_get_file_or_dir(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("ref", "main"))
+    elif func_name == "github_search_code":
+        return await github_search_code(user_id, args.get("query", ""), args.get("repo"))
     elif func_name == "github_create_or_update_file":
-        return await github_create_or_update_file(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("content", ""), args.get("message", ""), args.get("branch"))
+        return await github_create_or_update_file(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("message", ""), args.get("content", ""), args.get("branch", "main"), args.get("sha"))
     elif func_name == "github_delete_file":
-        return await github_delete_file(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("message", ""), args.get("branch"))
+        return await github_delete_file(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path", ""), args.get("message", ""), args.get("branch", "main"), args.get("sha"))
+    elif func_name == "github_list_branches":
+        return await github_list_branches(user_id, args.get("owner", ""), args.get("repo", ""))
     elif func_name == "github_create_branch":
-        return await github_create_branch(user_id, args.get("owner", ""), args.get("repo", ""), args.get("new_branch", ""), args.get("base_branch", "main"))
-    elif func_name == "github_delete_branch":
-        return await github_delete_branch(user_id, args.get("owner", ""), args.get("repo", ""), args.get("branch", ""))
+        return await github_create_branch(user_id, args.get("owner", ""), args.get("repo", ""), args.get("branch_name", ""), args.get("from_branch", "main"))
     elif func_name == "github_list_commits":
-        return await github_list_commits(user_id, args.get("owner", ""), args.get("repo", ""), args.get("path"), args.get("max_results", 10))
+        return await github_list_commits(user_id, args.get("owner", ""), args.get("repo", ""), args.get("branch", "main"), args.get("max_results", 10))
     elif func_name == "github_list_pull_requests":
         return await github_list_pull_requests(user_id, args.get("owner", ""), args.get("repo", ""), args.get("state", "open"))
-    elif func_name == "github_get_pull_request":
-        return await github_get_pull_request(user_id, args.get("owner", ""), args.get("repo", ""), args.get("pull_number", 1))
     elif func_name == "github_create_pull_request":
         return await github_create_pull_request(user_id, args.get("owner", ""), args.get("repo", ""), args.get("title", ""), args.get("head", ""), args.get("base", "main"), args.get("body", ""))
     elif func_name == "github_merge_pull_request":
-        return await github_merge_pull_request(user_id, args.get("owner", ""), args.get("repo", ""), args.get("pull_number", 1), args.get("commit_title"))
+        return await github_merge_pull_request(user_id, args.get("owner", ""), args.get("repo", ""), args.get("pull_number", 0), args.get("commit_title", ""))
     elif func_name == "github_list_issues":
         return await github_list_issues(user_id, args.get("owner", ""), args.get("repo", ""), args.get("state", "open"))
     elif func_name == "github_create_issue":
-        return await github_create_issue(user_id, args.get("owner", ""), args.get("repo", ""), args.get("title", ""), args.get("body", ""))
+        return await github_create_issue(user_id, args.get("owner", ""), args.get("repo", ""), args.get("title", ""), args.get("body", ""), args.get("labels"), args.get("assignees"))
     elif func_name == "github_update_issue":
-        return await github_update_issue(user_id, args.get("owner", ""), args.get("repo", ""), args.get("issue_number", 1), args.get("title"), args.get("body"), args.get("state"))
-    elif func_name == "github_create_comment":
-        return await github_create_comment(user_id, args.get("owner", ""), args.get("repo", ""), args.get("issue_number", 1), args.get("body", ""))
-    elif func_name == "github_search_code":
-        return await github_search_code(user_id, args.get("query", ""))
-    elif func_name == "github_list_workflow_runs":
-        return await github_list_workflow_runs(user_id, args.get("owner", ""), args.get("repo", ""))
+        return await github_update_issue(user_id, args.get("owner", ""), args.get("repo", ""), args.get("issue_number", 0), args.get("title"), args.get("body"), args.get("state"))
+    elif func_name == "github_add_issue_comment":
+        return await github_add_issue_comment(user_id, args.get("owner", ""), args.get("repo", ""), args.get("issue_number", 0), args.get("body", ""))
     return "Unknown tool function."
 
 def count_tokens(messages):