Merge branch 'main' into tkp/tg

timkpaine · timkpaine · commit fc27334aa015 · 2026-05-27T17:14:27.000-04:00
Signed-off-by: Tim Paine &lt;3105306+timkpaine@users.noreply.github.com&gt;
diff --git a/.copier-answers.yaml b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 9be318c
+_commit: 0fa24ba
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Team Review
-* @neejweej @timkpaine @ptomecek
+* @timkpaine @ptomecek
 
 # Administrative
 LICENSE @ptomecek @timkpaine
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,29 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
+name: Bug Report
+about: Report a bug to help us improve
+title: '[BUG] '
+labels: 'type: bug'
 assignees: ''
-
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+**Description**
+A clear and concise description of the bug.
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+**Steps to Reproduce**
+1.
+2.
+3.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Expected Behavior**
+What you expected to happen.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**Actual Behavior**
+What actually happened. Include full error messages or tracebacks if available.
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Environment**
+- OS: [e.g. Ubuntu 22.04, macOS 14.0, Windows 11]
+- Python version: [e.g. 3.11.5] (`python --version`)
+- Package version: (`pip show csp-bot | grep Version`)
 
-**Additional context**
-Add any other context about the problem here.
+**Additional Context**
+Add any other relevant context, logs, or screenshots.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +1,19 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
+name: Feature Request
+about: Suggest a new feature or improvement
+title: '[FEATURE] '
+labels: 'type: enhancement'
 assignees: ''
-
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Problem Statement**
+A clear description of the problem this feature would solve. Ex. "I'm always frustrated when [...]"
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+**Proposed Solution**
+A clear description of the desired behavior or feature.
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**Alternatives Considered**
+Any alternative solutions or workarounds you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+**Additional Context**
+Add any other context, mockups, or examples.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,16 @@
+---
+name: Question
+about: Ask a question about usage or behavior
+title: '[QUESTION] '
+labels: 'tag: question'
+assignees: ''
+---
+
+**Question**
+A clear and concise description of your question.
+
+**Context**
+What are you trying to accomplish? Include relevant code snippets, configuration, or links to documentation you've already consulted.
+
+**Environment**
+If relevant, include your environment details (OS, language versions, package version).
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -3,14 +3,16 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     labels:
       - "part: github_actions"
 
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "monthly"
+    cooldown:
+      default-days: 7
     labels:
       - "lang: python"
       - "part: dependencies"
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+## Description
+
+Brief description of the changes in this PR.
+
+## Type of Change
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Documentation update
+- [ ] Refactor / code cleanup
+- [ ] CI / build configuration
+- [ ] Other (describe below)
+
+## Checklist
+
+- [ ] Linting passes (`make lint`)
+- [ ] Tests pass (`make test`)
+- [ ] New tests added for new functionality
+- [ ] Documentation updated (if applicable)
+- [ ] Changelog / version bump (if applicable)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
         python-version: ["3.11"]
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
     - uses: actions-ext/python/setup@main
       with:
@@ -55,26 +55,34 @@ jobs:
       run: make coverage
 
     - name: Upload test results (Python)
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
       with:
         name: test-results-${{ matrix.os }}-${{ matrix.python-version }}
         path: junit.xml
       if: ${{ always() }}
 
     - name: Publish Unit Test Results
-      uses: EnricoMi/publish-unit-test-result-action@v2
+      uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2
       with:
         files: '**/junit.xml'
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Make dist
       run: make dist
 
-    - uses: actions/upload-artifact@v7
+    - uses: actions-ext/python/test-wheel@main
+      with:
+        module: csp_bot
+
+    - uses: actions-ext/python/test-sdist@main
+      with:
+        module: csp_bot
+
+    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
       with:
         name: dist-${{matrix.os}}
         path: dist
diff --git a/.github/workflows/wiki.yaml b/.github/workflows/wiki.yaml
@@ -20,8 +20,8 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
       - run: cp README.md docs/wiki/Home.md
-      - uses: Andrew-Chen-Wang/github-wiki-action@v5
+      - uses: Andrew-Chen-Wang/github-wiki-action@64efa0a9436db17670a2259e0ac249d6f08bb352 # v5
         with:
           path: docs/wiki
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,8 @@ __pycache__/
 
 # C extensions
 *.a
+*.o
+*.dSYM
 *.so
 *.obj
 *.dll
@@ -13,6 +15,7 @@ __pycache__/
 
 # Rust
 target
+target-capi
 
 # Distribution / packaging
 .Python
@@ -112,11 +115,12 @@ dmypy.json
 /site
 index.md
 docs/_build/
-docs/src/_build/
 docs/api
-docs/index.md
 docs/html
+docs/index.md
 docs/jupyter_execute
+docs/src/_build/
+docs/superpowers
 index.md
 
 # JS
@@ -136,12 +140,12 @@ csp_bot/extension
 csp_bot/nbextension
 csp_bot/labextension
 
+# Emscripten SDK (locally installed)
+emsdk
+
 # Mac
 .DS_Store
 
-# Rust
-target
-
 # Hydra
 outputs/
 multirun/
@@ -150,6 +154,7 @@ multirun/
 ROADMAP.md
 AGENTS.md
 .github/hooks/sdlc.json
+.superpowers
 
 # Secrets
 .discord_token
diff --git a/csp_bot/bot.py b/csp_bot/bot.py
@@ -684,6 +684,13 @@ def _extract_commands(
 
             # Strip bot mention from beginning if present
             bot_name = self._get_bot_name(backend)
+            bot_id = self._get_bot_id(backend)
+
+            # Strip <@BOT_ID> format (Slack/Discord)
+            if bot_id:
+                content = re.sub(rf"<@!?{re.escape(bot_id)}>", "", content).strip()
+
+            # Strip @bot_name format (Symphony/generic)
             if bot_name and content.startswith(f"@{bot_name}"):
                 content = content[len(f"@{bot_name}") :].strip()
 
diff --git a/csp_bot/tests/test_bot_integration.py b/csp_bot/tests/test_bot_integration.py
@@ -16,7 +16,7 @@
 
 from csp_bot import Bot, BotCommand, BotConfig, BotMessage
 from csp_bot.bot_config import SymphonyConfig
-from csp_bot.commands import ReplyToOtherCommand
+from csp_bot.commands import HelpCommand, ReplyToOtherCommand
 from csp_bot.structs import CommandVariant
 
 # Test Fixtures
@@ -544,6 +544,81 @@ def execute(self, cmd):
         if result:
             assert result.command == "test"
 
+    @pytest.mark.parametrize(
+        "text,backend,bot_id",
+        [
+            ("<@UBOT123> /test", "slack", "UBOT123"),
+            ("<@UBOT123>/test", "slack", "UBOT123"),
+            ("<@UBOT123>!test", "slack", "UBOT123"),
+            ("<@!UBOT123> /test", "discord", "UBOT123"),
+        ],
+    )
+    def test_extract_command_strips_bot_mention(self, bot_with_symphony, text, backend, bot_id):
+        """Test that <@BOT_ID> mentions are stripped before command parsing."""
+        bot_with_symphony._configs[backend] = MagicMock()
+        bot_with_symphony._bot_user_ids[backend] = bot_id
+        bot_with_symphony._bot_names[backend] = "TestBot"
+
+        class TestCmd(ReplyToOtherCommand):
+            def command(self):
+                return "test"
+
+            def name(self):
+                return "Test"
+
+            def help(self):
+                return "Test"
+
+            def execute(self, cmd):
+                return None
+
+        bot_with_symphony._commands["test"] = TestCmd()
+
+        msg = Message(
+            id="msg1",
+            content=text,
+            author=User(id="user1"),
+            channel=Channel(id="ch1"),
+            metadata={"backend": backend},
+        )
+
+        result = bot_with_symphony._extract_commands(
+            msg=msg,
+            backend=backend,
+            channel_id="ch1",
+            text=text,
+            mentions=[User(id=bot_id)],
+        )
+
+        assert result is not None
+        assert result.command == "test"
+
+    def test_extract_command_without_prefix_shows_help(self, bot_with_symphony):
+        """Test that messages without / or ! prefix show help."""
+        bot_with_symphony._configs["slack"] = MagicMock()
+        bot_with_symphony._bot_user_ids["slack"] = "UBOT"
+        bot_with_symphony._bot_names["slack"] = "TestBot"
+        bot_with_symphony._commands["help"] = HelpCommand()
+
+        msg = Message(
+            id="msg1",
+            content="<@UBOT> just some text",
+            author=User(id="user1"),
+            channel=Channel(id="ch1"),
+            metadata={"backend": "slack"},
+        )
+
+        result = bot_with_symphony._extract_commands(
+            msg=msg,
+            backend="slack",
+            channel_id="ch1",
+            text="<@UBOT> just some text",
+            mentions=[User(id="UBOT")],
+        )
+
+        assert result is not None
+        assert result.command == "help"
+
 
 # Filter Messages for Backend Tests
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -43,7 +43,7 @@ dependencies = [
     "chatom",
     "croniter",
     "csp>=0.9,<1",
-    "csp-gateway>=2.5,<2.6",
+    "csp-gateway>=2.5,<2.7",
     "dateparser",
     "hydra-core",
     "pandas",
