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:
@@ -66,6 +66,32 @@ purge_garbled_paths() {
|
||||
# then vault) before any commit happens.
|
||||
reconcile_git_identity() {
|
||||
local want_name="$1" want_email="$2" cur
|
||||
# Bot-context override: when invoked by the Discord bot, attribute the COMMIT
|
||||
# to the human who requested it (git AUTHOR = mapped requester from users.json)
|
||||
# with "ClaudeTools Bot" as the COMMITTER. Unmapped/unknown requester falls
|
||||
# back to bot-as-author. Strict no-op when CLAUDETOOLS_ACTOR is unset, so
|
||||
# interactive sessions keep identity.json attribution.
|
||||
if [ "${CLAUDETOOLS_ACTOR:-}" = "discord-bot" ]; then
|
||||
local _bot_id
|
||||
_bot_id=$("${PYTHON:-python}" - "$REPO_ROOT/.claude/users.json" "${CLAUDETOOLS_REQUESTER_USER:-}" <<'BOTID'
|
||||
import json, sys
|
||||
usersp, ukey = sys.argv[1], sys.argv[2]
|
||||
name, email = "ClaudeTools Bot", "bot@azcomputerguru.com"
|
||||
if ukey:
|
||||
try:
|
||||
u = json.load(open(usersp))["users"].get(ukey, {})
|
||||
name = u.get("git_name") or u.get("full_name") or name
|
||||
email = u.get("git_email") or u.get("email") or email
|
||||
except Exception:
|
||||
pass
|
||||
print(name + "|" + email)
|
||||
BOTID
|
||||
)
|
||||
want_name="${_bot_id%%|*}"
|
||||
want_email="${_bot_id##*|}"
|
||||
export GIT_COMMITTER_NAME="ClaudeTools Bot"
|
||||
export GIT_COMMITTER_EMAIL="bot@azcomputerguru.com"
|
||||
fi
|
||||
if [ -n "$want_name" ]; then
|
||||
cur=$(git config user.name 2>/dev/null || true)
|
||||
if [ "$cur" != "$want_name" ]; then
|
||||
|
||||
Reference in New Issue
Block a user