AI agent skill that researches any topic across Reddit, X, YouTube, HN, Polymarket, and the web - then synthesizes a grounded summary
Python ai-promptsai-skillblueskyclaudeclaude-codeclawhubdeep-researchhackernewsinstagramopenclawpolymarketrecencyredditresearchsocial-mediatiktoktrendstwitterweb-searchyoutube
fix(keychain): single source of truth for key list + robust USER fallback
Trevin Chowd0dcf751f1df
diff --git a/skills/last30days/scripts/lib/env.py b/skills/last30days/scripts/lib/env.pyindex 70fbaf9c..b8dee185 100644--- a/skills/last30days/scripts/lib/env.py+++ b/skills/last30days/scripts/lib/env.py@@ -34,6 +34,18 @@ CODEX_AUTH_FILE = Path(os.environ.get("CODEX_AUTH_FILE", str(Path.home() / ".cod# Example: `security add-generic-password -a "$USER" -s last30days-XAI_API_KEY -w "xai-..."`.KEYCHAIN_SERVICE_PREFIX = "last30days-"+# Single source of truth for which credentials the Keychain loader looks up.+# The setup-keychain.sh helper mirrors this list and is held in sync via+# tests/test_env_keychain.py::test_keychain_keys_match_setup_script.+KEYCHAIN_KEYS = (+ "OPENAI_API_KEY", "XAI_API_KEY", "GOOGLE_API_KEY", "GEMINI_API_KEY",+ "GOOGLE_GENAI_API_KEY", "SCRAPECREATORS_API_KEY", "APIFY_API_TOKEN",+ "AUTH_TOKEN", "CT0", "BSKY_HANDLE", "BSKY_APP_PASSWORD",+ "TRUTHSOCIAL_TOKEN", "BRAVE_API_KEY", "EXA_API_KEY", "SERPER_API_KEY",+ "OPENROUTER_API_KEY", "PARALLEL_API_KEY", "XQUIK_API_KEY",+ "XIAOHONGSHU_API_BASE",+)+AuthSource = Literal["api_key", "codex", "none"]AuthStatus = Literal["ok", "missing", "expired", "missing_account_id"]@@ -114,7 +126,11 @@ def _load_keychain(keys: list[str]) -> dict[str, str]:return {}import subprocess- user = os.environ.get("USER", "")+ import pwd+ # USER can be unset under sudo, in Docker without --env USER, or in some CI+ # runners; fall back to the OS user record so lookups still match items+ # stored by setup-keychain.sh (which uses $USER).+ user = os.environ.get("USER") or pwd.getpwuid(os.getuid()).pw_nameenv: dict[str, str] = {}for key in keys:try:@@ -269,14 +285,7 @@ def get_config() -> dict[str, Any]:# Keychain is the lowest-priority source (Darwin only; no-op elsewhere).# Loaded before openai_auth so OPENAI_API_KEY can come from Keychain too.- keychain_env = _load_keychain([- 'OPENAI_API_KEY', 'XAI_API_KEY', 'GOOGLE_API_KEY', 'GEMINI_API_KEY',- 'GOOGLE_GENAI_API_KEY', 'SCRAPECREATORS_API_KEY', 'APIFY_API_TOKEN',- 'AUTH_TOKEN', 'CT0', 'BSKY_HANDLE', 'BSKY_APP_PASSWORD',- 'TRUTHSOCIAL_TOKEN', 'BRAVE_API_KEY', 'EXA_API_KEY', 'SERPER_API_KEY',- 'OPENROUTER_API_KEY', 'PARALLEL_API_KEY', 'XQUIK_API_KEY',- 'XIAOHONGSHU_API_BASE',- ])+ keychain_env = _load_keychain(list(KEYCHAIN_KEYS))merged_env = {**keychain_env, **merged_env}openai_auth = get_openai_auth(merged_env)diff --git a/skills/last30days/scripts/setup-keychain.sh b/skills/last30days/scripts/setup-keychain.shindex e0b75ebf..d66d87b3 100755--- a/skills/last30days/scripts/setup-keychain.sh+++ b/skills/last30days/scripts/setup-keychain.sh@@ -17,11 +17,14 @@set -euo pipefailPREFIX="last30days-"+# Mirrors lib/env.py::KEYCHAIN_KEYS — kept in sync via+# tests/test_env_keychain.py::test_keychain_keys_match_setup_script.ALL_KEYS=(OPENAI_API_KEYXAI_API_KEYGOOGLE_API_KEYGEMINI_API_KEY+ GOOGLE_GENAI_API_KEYSCRAPECREATORS_API_KEYAPIFY_API_TOKENAUTH_TOKEN@@ -35,6 +38,7 @@ ALL_KEYS=(OPENROUTER_API_KEYPARALLEL_API_KEYXQUIK_API_KEY+ XIAOHONGSHU_API_BASE)if [[ "${OSTYPE:-}" != darwin* ]]; thendiff --git a/tests/test_env_keychain.py b/tests/test_env_keychain.pyindex 47db302b..bd972488 100644--- a/tests/test_env_keychain.py+++ b/tests/test_env_keychain.py@@ -10,6 +10,7 @@ Covers:from __future__ import annotations+import reimport subprocessimport sysfrom pathlib import Path@@ -21,6 +22,8 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "skills" / "last30dfrom lib import env # noqa: E402+SETUP_KEYCHAIN_SH = Path(__file__).resolve().parents[1] / "skills" / "last30days" / "scripts" / "setup-keychain.sh"+# ---------------------------------------------------------------------------# _load_keychain unit tests@@ -150,3 +153,30 @@ def test_get_config_openai_key_can_come_from_keychain(clean_env):cfg = env.get_config()assert cfg["OPENAI_API_KEY"] == "sk-from-kc"assert cfg["OPENAI_AUTH_SOURCE"] == "api_key"+++# ---------------------------------------------------------------------------+# Drift guard: lib/env.py KEYCHAIN_KEYS and setup-keychain.sh ALL_KEYS must+# stay in lockstep. A mismatch means users storing a key via the helper script+# wouldn't see it picked up by the loader, or vice versa.+# ---------------------------------------------------------------------------+++def _parse_all_keys_from_shell(script: Path) -> list[str]:+ text = script.read_text(encoding="utf-8")+ match = re.search(r"ALL_KEYS=\(\s*(.*?)\s*\)", text, re.DOTALL)+ if not match:+ raise AssertionError(f"ALL_KEYS=( ... ) array not found in {script}")+ body = match.group(1)+ # Strip shell comments and split on whitespace+ body = re.sub(r"#[^\n]*", "", body)+ return [tok for tok in body.split() if tok]+++def test_keychain_keys_match_setup_script():+ shell_keys = _parse_all_keys_from_shell(SETUP_KEYCHAIN_SH)+ python_keys = list(env.KEYCHAIN_KEYS)+ assert shell_keys == python_keys, (+ "lib/env.py::KEYCHAIN_KEYS and scripts/setup-keychain.sh::ALL_KEYS "+ f"have drifted.\n python: {python_keys}\n shell: {shell_keys}"+ )