Trevin Chow
997708ad48
12 fixes from the multi-agent code review on PR #400: Version 3.2.1 -> 3.2.2 across all manifests (SKILL.md frontmatter + body header, pyproject.toml, .claude-plugin/{plugin,marketplace}.json, sync.sh cache path). The PR ships observable behavior changes (STEP 0 logic flip, resolver order change, badge fallback) that should not silently appear under the same version number — the new fallback reads SKILL.md version directly so the badge would otherwise be misleading. render.py::_skill_version: - `import re` moved to module top - _VERSION_RE extracted as a module-level compiled pattern that accepts double-quoted, single-quoted, and unquoted YAML version scalars - `break` -> `continue` on corrupt manifest, so a corrupt inner manifest no longer shadows a valid outer one - Wrap SKILL.md read_text() in try/except for UnicodeDecodeError to keep badge emission from crashing on mis-encoded SKILL.md - Docstring clarifies precedence; inline comment marks the fallback boundary between the manifest walk and the SKILL.md walk tests/test_skill_version.py (new): 7 unit tests for the fallback paths (manifest absent, manifest corrupt, corrupt-inner + valid-outer, both absent, SKILL.md without version, single-quoted, unquoted). tests/test_plugin_contract.py: tombstone test asserting .codex-plugin/ stays removed (was the only CI guard against accidental reintroduction). SKILL.md: - STEP 0 bash echoes CLAUDE_CACHE_LATEST so the model can see the resolved value when deciding whether to hop - "Both shapes ship in the wild" comment now names the two cache layouts (nested {cache}/{version}/skills/last30days/ vs flat {cache}/{version}/) - Comparison-mode bash invocation gets its own inline SKILL_ROOT resolver (latent gap: the contract tells the model to skip Step 1 on comparison queries, so SKILL_ROOT was previously unset there) CHANGELOG.md: [Unreleased] entries for the resolver rewrite and the breaking removal of Codex native-plugin support. All 9 reviewer personas surfaced findings; 3 cross-reviewer corroboration clusters were promoted (import re, "both shapes" comment, missing fallback tests). Maintainability follow-up flagged: regex now duplicated across render.py and 2 test files; could consolidate via shared lib/skill_meta.py helper in a future PR.
127 lines
3.9 KiB
Bash
Executable File
127 lines
3.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# sync.sh - Deploy last30days skill to all host locations
|
|
# Usage: bash skills/last30days/scripts/sync.sh (run from repo root)
|
|
set -euo pipefail
|
|
|
|
SRC="$(cd "$(dirname "$0")/.." && pwd)"
|
|
echo "Source: $SRC"
|
|
|
|
COMMON_TARGETS=(
|
|
# Claude Code plugin cache for this (public) repo's marketplace install.
|
|
# Marketplace name = last30days-skill (.claude-plugin/marketplace.json).
|
|
# Plugin name = last30days (.claude-plugin/plugin.json).
|
|
# Path shape = .../cache/{marketplace-name}/{plugin-name}/{version}.
|
|
# Marketplace pulls overwrite this on update; local sync keeps it fresh
|
|
# against the working tree so /last30days reflects local dev without
|
|
# waiting for a release. Do NOT add ~/.claude/skills/last30days - it
|
|
# creates a duplicate slash-command entry alongside the plugin version.
|
|
"$HOME/.claude/plugins/cache/last30days-skill/last30days/3.2.2"
|
|
"$HOME/.agents/skills/last30days"
|
|
"$HOME/.codex/skills/last30days"
|
|
)
|
|
OPENCLAW_TARGET="$HOME/.openclaw/skills/last30days"
|
|
|
|
sync_target() {
|
|
local target="$1"
|
|
local skill_md="$2"
|
|
|
|
echo ""
|
|
echo "--- Syncing to $target ---"
|
|
mkdir -p "$target/scripts/lib"
|
|
|
|
cp "$skill_md" "$target/SKILL.md"
|
|
|
|
rsync -a \
|
|
"$SRC/scripts/last30days.py" \
|
|
"$SRC/scripts/watchlist.py" \
|
|
"$SRC/scripts/briefing.py" \
|
|
"$SRC/scripts/store.py" \
|
|
"$target/scripts/"
|
|
rsync -a "$SRC/scripts/lib/"*.py "$target/scripts/lib/"
|
|
|
|
# The OpenClaw variant lives in the private repo only. Skip cleanly when
|
|
# running this script from the public repo where variants/open does not exist.
|
|
if [ -d "$SRC/variants/open" ]; then
|
|
mkdir -p "$target/variants/open/references"
|
|
rsync -a "$SRC/variants/open/" "$target/variants/open/"
|
|
fi
|
|
|
|
if [ -d "$SRC/scripts/lib/vendor" ]; then
|
|
rsync -a "$SRC/scripts/lib/vendor" "$target/scripts/lib/"
|
|
fi
|
|
|
|
if [ -d "$SRC/fixtures" ]; then
|
|
mkdir -p "$target/fixtures"
|
|
rsync -a "$SRC/fixtures/" "$target/fixtures/"
|
|
fi
|
|
|
|
mod_count=$(ls "$target/scripts/lib/"*.py 2>/dev/null | wc -l | tr -d ' ')
|
|
echo " Copied $mod_count modules"
|
|
|
|
if (
|
|
cd "$target/scripts" &&
|
|
python3 -c "import briefing, store, watchlist; from lib import youtube_yt, bird_x, render, ui; print(' Import check: OK')"
|
|
); then
|
|
true
|
|
else
|
|
echo " Import check FAILED"
|
|
fi
|
|
}
|
|
|
|
for t in "${COMMON_TARGETS[@]}"; do
|
|
sync_target "$t" "$SRC/SKILL.md"
|
|
done
|
|
|
|
# Hermes sync: deploy to Hermes skills directory if it exists
|
|
HERMES_TARGET="$HOME/.hermes/skills/research/last30days"
|
|
if [ -d "$HOME/.hermes/skills/research" ]; then
|
|
echo ""
|
|
echo "--- Syncing to Hermes ---"
|
|
mkdir -p "$HERMES_TARGET/scripts/lib"
|
|
|
|
cp "$SRC/SKILL.md" "$HERMES_TARGET/SKILL.md"
|
|
|
|
rsync -a \
|
|
"$SRC/scripts/last30days.py" \
|
|
"$SRC/scripts/watchlist.py" \
|
|
"$SRC/scripts/briefing.py" \
|
|
"$SRC/scripts/store.py" \
|
|
"$HERMES_TARGET/scripts/"
|
|
rsync -a "$SRC/scripts/lib/"*.py "$HERMES_TARGET/scripts/lib/"
|
|
|
|
if [ -d "$SRC/scripts/lib/vendor" ]; then
|
|
rsync -a "$SRC/scripts/lib/vendor" "$HERMES_TARGET/scripts/lib/"
|
|
fi
|
|
|
|
if [ -d "$SRC/fixtures" ]; then
|
|
mkdir -p "$HERMES_TARGET/fixtures"
|
|
rsync -a "$SRC/fixtures/" "$HERMES_TARGET/fixtures/"
|
|
fi
|
|
|
|
mod_count=$(ls "$HERMES_TARGET/scripts/lib/"*.py 2>/dev/null | wc -l | tr -d ' ')
|
|
echo " Copied $mod_count modules to Hermes"
|
|
|
|
if (
|
|
cd "$HERMES_TARGET/scripts" &&
|
|
python3 -c "import briefing, store, watchlist; from lib import youtube_yt, bird_x, render, ui; print(' Import check: OK')"
|
|
); then
|
|
true
|
|
else
|
|
echo " Import check FAILED"
|
|
fi
|
|
fi
|
|
|
|
# OpenClaw sync only runs when the private-repo OpenClaw variant is present
|
|
# in the source tree. The public repo does not ship variants/open (the variant
|
|
# is sanitized via strip_for_openclaw.py and published separately from
|
|
# last30days-skill-private).
|
|
if [ -d "$SRC/variants/open" ]; then
|
|
sync_target "$OPENCLAW_TARGET" "$SRC/variants/open/SKILL.md"
|
|
else
|
|
echo ""
|
|
echo "Skipping OpenClaw target (no variants/open in this repo)"
|
|
fi
|
|
|
|
echo ""
|
|
echo "Sync complete."
|