discord-bot: fix "no response", serialize turns, attribution, mentions, post-at-bottom
client.py: send() falls back to ResultMessage.result when no TextBlock streams (the "(no response)" bug) and reconnects+retries once on a closed SDK session. message_handler.py: per-thread turn lock so messages arriving mid-turn or from a second user queue in order (nothing dropped); per-session requester-attribution env (discord_id -> users.json key), pinned to the thread opener; _USER_MAP caches only on a successful load; final answer posts as a fresh message at the BOTTOM (no edit-in-place); a <@id> tag goes out as a fresh send so it actually pings. main.py: allowed_mentions permits user pings, blocks @everyone/@here/roles. DISCORD_CLAUDE.md: no thread auto-delete; tiered close-out (Q&A -> one-line rolling log, substantive -> /save); @mention guidance; opener-pinned attribution note. whoami-block.sh / sync.sh: bot-context attribution (Executed by ClaudeTools Bot / Requested by <person>; git author = mapped requester, committer = bot). Strict no-op for interactive sessions. users.json: discord_id for Mike/Howard; added Winter Williams (bot-only, full trust). Reviewed by Code Review Agent + Grok + Gemini (Gemini's "malformed email" finding verified as a false positive). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -30,6 +30,34 @@ if [ -z "$PYTHON" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Bot-context override: the Discord bot sets CLAUDETOOLS_ACTOR=discord-bot plus
|
||||
# the requester it is acting for (CLAUDETOOLS_REQUESTER / _USER, per session).
|
||||
# Attribute the log to the BOT as executor and the human requester as originator.
|
||||
# Strict no-op when the env is unset — interactive sessions are unaffected.
|
||||
if [ "${CLAUDETOOLS_ACTOR:-}" = "discord-bot" ]; then
|
||||
"$PYTHON" - "$ID" "$USERS" <<'BOTEOF'
|
||||
import json, os, sys
|
||||
idp, usersp = sys.argv[1], sys.argv[2]
|
||||
try:
|
||||
machine = json.load(open(idp)).get("machine", "unknown")
|
||||
except Exception:
|
||||
machine = "unknown"
|
||||
requester = os.environ.get("CLAUDETOOLS_REQUESTER", "an unrecognized Discord user")
|
||||
ukey = os.environ.get("CLAUDETOOLS_REQUESTER_USER", "")
|
||||
role = ""
|
||||
if ukey:
|
||||
try:
|
||||
role = json.load(open(usersp))["users"].get(ukey, {}).get("role", "")
|
||||
except Exception:
|
||||
pass
|
||||
print("## User")
|
||||
print(f"- **Executed by:** ClaudeTools Discord Bot ({machine})")
|
||||
print(f"- **Requested by:** {requester}" + (f" - {role}" if role else ""))
|
||||
print("- **Role:** automation (acting on the requester's behalf)")
|
||||
BOTEOF
|
||||
exit 0
|
||||
fi
|
||||
|
||||
"$PYTHON" - "$ID" "$USERS" <<'PYEOF'
|
||||
import json, sys, socket, re
|
||||
idp, usersp = sys.argv[1], sys.argv[2]
|
||||
|
||||
Reference in New Issue
Block a user