phases 1-4 vendoring

Author: Irving Popovetsky

docs/UPGRADE_PLAN.md

@@ -519,7 +519,10 @@ This warning is expected and relates to aiohttp's deprecation patterns. It will
 
 ---
 
-## Phase 1: Setup and Preparation (Days 5-6)
+## Phase 1: Setup and Preparation (Days 5-6) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: All source files vendored (22 files total), feature branch created
 
 ### 1.1 Create Development Environment
 
@@ -530,10 +533,7 @@ cd /path/to/operationcode-pybot
 pyenv local 3.12.1
 
 # Verify Python version
-python --version  # Should show 3.12.x
-
-# Install poetry if needed
-curl -sSL https://install.python-poetry.org | python3 -
+python3 --version  # Should show 3.12.x
 ```
 
 ### 1.2 Create Feature Branch
@@ -563,7 +563,10 @@ git clone https://github.com/pyslackers/sir-bot-a-lot-2.git
 
 ---
 
-## Phase 2: Vendor slack-sansio (Day 2-3)
+## Phase 2: Vendor slack-sansio (Day 2-3) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: slack-sansio already Python 3.12 compatible - no loop= parameters, no asyncio.coroutine usage
 
 ### 2.1 Copy Required Files
 
@@ -646,7 +649,10 @@ __all__ = ["methods"]
 
 ---
 
-## Phase 3: Vendor sirbot (Day 3-4)
+## Phase 3: Vendor sirbot (Day 3-4) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: sirbot modernized for Python 3.12+ - removed asyncio.coroutine(), fixed loop= parameters, added type hints
 
 ### 3.1 Copy Required Files
 
@@ -965,7 +971,10 @@ from pybot._vendor.slack.io.aiohttp import SlackAPI
 
 ---
 
-## Phase 4: Create Vendor Package Init (Day 4)
+## Phase 4: Create Vendor Package Init (Day 4) ✅ COMPLETE
+
+> **Status**: Completed January 4, 2026
+> **Result**: All vendored packages verified working - imports, instantiation, and Python 3.12 compatibility confirmed
 
 ### 4.1 Create pybot/_vendor/__init__.py
 

pybot/_vendor/__init__.py

@@ -0,0 +1,12 @@
+"""
+Vendored dependencies for operationcode-pybot.
+
+These are modified copies of abandoned libraries, updated for Python 3.12+:
+- sirbot: https://github.com/pyslackers/sir-bot-a-lot-2 (MIT License)
+- slack-sansio: https://github.com/pyslackers/slack-sansio (MIT License)
+
+Both libraries were last updated in 2019-2020 and are no longer maintained.
+We vendor them here with minimal modifications for modern Python compatibility.
+"""
+
+__all__ = ["sirbot", "slack"]

pybot/_vendor/sirbot/LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Original work Copyright (c) 2017-2019 pyslackers
+Modified work Copyright (c) 2026 Operation Code
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pybot/_vendor/sirbot/__init__.py

@@ -0,0 +1,7 @@
+"""
+Vendored sirbot library for Python 3.12+
+Original: https://github.com/pyslackers/sir-bot-a-lot-2
+"""
+from pybot._vendor.sirbot.bot import SirBot
+
+__all__ = ["SirBot"]

pybot/_vendor/sirbot/bot.py

@@ -0,0 +1,56 @@
+"""
+Vendored sirbot library for Python 3.12+
+Original: https://github.com/pyslackers/sir-bot-a-lot-2
+"""
+
+import logging
+from typing import Any
+
+import aiohttp.web
+
+from . import endpoints
+
+LOG = logging.getLogger(__name__)
+
+
+class SirBot(aiohttp.web.Application):
+    def __init__(self, user_agent: str | None = None, **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+
+        self.router.add_route("GET", "/sirbot/plugins", endpoints.plugins)
+
+        self["plugins"] = {}
+        self["http_session"] = None  # Created on startup
+        self["user_agent"] = user_agent or "sir-bot-a-lot"
+
+        self.on_startup.append(self._create_session)
+        self.on_shutdown.append(self.stop)
+
+    async def _create_session(self, app: aiohttp.web.Application) -> None:
+        """Create HTTP session on startup (when event loop exists)."""
+        self["http_session"] = aiohttp.ClientSession()
+
+    def start(self, **kwargs: Any) -> None:
+        LOG.info("Starting SirBot")
+        aiohttp.web.run_app(self, **kwargs)
+
+    def load_plugin(self, plugin: Any, name: str | None = None) -> None:
+        name = name or plugin.__name__
+        self["plugins"][name] = plugin
+        plugin.load(self)
+
+    async def stop(self, sirbot: "SirBot") -> None:
+        if self["http_session"]:
+            await self["http_session"].close()
+
+    @property
+    def plugins(self) -> dict:
+        return self["plugins"]
+
+    @property
+    def http_session(self) -> aiohttp.ClientSession:
+        return self["http_session"]
+
+    @property
+    def user_agent(self) -> str:
+        return self["user_agent"]

pybot/_vendor/sirbot/endpoints/__init__.py

@@ -0,0 +1,6 @@
+from aiohttp.web import json_response
+
+
+async def plugins(request):
+    data = [k for k in request.app["plugins"].keys()]
+    return json_response({"plugins": data})

pybot/_vendor/sirbot/plugins/__init__.py

@@ -0,0 +1,4 @@
+"""Slack plugin for sirbot."""
+from pybot._vendor.sirbot.plugins.slack.plugin import SlackPlugin
+
+__all__ = ["SlackPlugin"]

pybot/_vendor/sirbot/plugins/slack/__init__.py

@@ -0,0 +1,170 @@
+import asyncio
+import logging
+
+import aiohttp.web
+from aiohttp.web import Response
+
+from pybot._vendor.slack.events import Event
+from pybot._vendor.slack.sansio import validate_request_signature
+from pybot._vendor.slack.actions import Action
+from pybot._vendor.slack.commands import Command
+from pybot._vendor.slack.exceptions import InvalidTimestamp, FailedVerification, InvalidSlackSignature
+
+LOG = logging.getLogger(__name__)
+
+
+async def incoming_event(request):
+    slack = request.app.plugins["slack"]
+    payload = await request.json()
+    LOG.log(5, "Incoming event payload: %s", payload)
+
+    if payload.get("type") == "url_verification":
+        if slack.signing_secret:
+            try:
+                raw_payload = await request.read()
+                validate_request_signature(
+                    raw_payload.decode("utf-8"), request.headers, slack.signing_secret
+                )
+                return Response(body=payload["challenge"])
+            except (InvalidSlackSignature, InvalidTimestamp):
+                return Response(status=500)
+        elif payload["token"] == slack.verify:
+            return Response(body=payload["challenge"])
+        else:
+            return Response(status=500)
+
+    try:
+        verification_token = await _validate_request(request, slack)
+        event = Event.from_http(payload, verification_token=verification_token)
+    except (FailedVerification, InvalidSlackSignature, InvalidTimestamp):
+        return Response(status=401)
+
+    if event["type"] == "message":
+        return await _incoming_message(event, request)
+    else:
+        futures = list(_dispatch(slack.routers["event"], event, request.app))
+        if futures:
+            return await _wait_and_check_result(futures)
+
+    return Response(status=200)
+
+
+async def _incoming_message(event, request):
+    slack = request.app.plugins["slack"]
+
+    if slack.bot_id and (
+        event.get("bot_id") == slack.bot_id
+        or event.get("message", {}).get("bot_id") == slack.bot_id
+    ):
+        return Response(status=200)
+
+    LOG.debug("Incoming message: %s", event)
+    text = event.get("text")
+    if slack.bot_user_id and text:
+        mention = slack.bot_user_id in event["text"] or event["channel"].startswith("D")
+    else:
+        mention = False
+
+    if mention and text and text.startswith(f"<@{slack.bot_user_id}>"):
+        event["text"] = event["text"][len(f"<@{slack.bot_user_id}>") :]
+        event["text"] = event["text"].strip()
+
+    futures = []
+    for handler, configuration in slack.routers["message"].dispatch(event):
+        if configuration["mention"] and not mention:
+            continue
+        elif configuration["admin"] and event["user"] not in slack.admins:
+            continue
+
+        f = asyncio.ensure_future(handler(event, request.app))
+        if configuration["wait"]:
+            futures.append(f)
+        else:
+            f.add_done_callback(_callback)
+
+    if futures:
+        return await _wait_and_check_result(futures)
+
+    return Response(status=200)
+
+
+async def incoming_command(request):
+    slack = request.app.plugins["slack"]
+    payload = await request.post()
+
+    try:
+        verification_token = await _validate_request(request, slack)
+        command = Command(payload, verification_token=verification_token)
+    except (FailedVerification, InvalidSlackSignature, InvalidTimestamp):
+        return Response(status=401)
+
+    LOG.debug("Incoming command: %s", command)
+    futures = list(_dispatch(slack.routers["command"], command, request.app))
+    if futures:
+        return await _wait_and_check_result(futures)
+
+    return Response(status=200)
+
+
+async def incoming_action(request):
+    slack = request.app.plugins["slack"]
+    payload = await request.post()
+    LOG.log(5, "Incoming action payload: %s", payload)
+
+    try:
+        verification_token = await _validate_request(request, slack)
+        action = Action.from_http(payload, verification_token=verification_token)
+    except (FailedVerification, InvalidSlackSignature, InvalidTimestamp):
+        return Response(status=401)
+
+    LOG.debug("Incoming action: %s", action)
+
+    futures = list(_dispatch(slack.routers["action"], action, request.app))
+    if futures:
+        return await _wait_and_check_result(futures)
+
+    return Response(status=200)
+
+
+def _callback(f):
+    try:
+        f.result()
+    except Exception as e:
+        LOG.exception(e)
+
+
+def _dispatch(router, event, app):
+    for handler, configuration in router.dispatch(event):
+        f = asyncio.ensure_future(handler(event, app))
+        if configuration["wait"]:
+            yield f
+        else:
+            f.add_done_callback(_callback)
+
+
+async def _wait_and_check_result(futures):
+    dones, _ = await asyncio.wait(futures, return_when=asyncio.ALL_COMPLETED)
+    try:
+        results = [done.result() for done in dones]
+    except Exception as e:
+        LOG.exception(e)
+        return Response(status=500)
+
+    results = [result for result in results if isinstance(result, aiohttp.web.Response)]
+    if len(results) > 1:
+        LOG.warning("Multiple web.Response for handler, returning none")
+    elif results:
+        return results[0]
+
+    return Response(status=200)
+
+
+async def _validate_request(request, slack):
+    if slack.signing_secret:
+        raw_payload = await request.read()
+        validate_request_signature(
+            raw_payload.decode("utf-8"), request.headers, slack.signing_secret
+        )
+        return None
+    else:
+        return slack.verify