youmd 0.7.0 → 0.8.0

package/scripts/env-vault/README.md

@@ -1,8 +1,22 @@
-# env-vault — Secure .env.local Backup & Restore
+# env-vault — Secure .env.local + Agent-Auth Backup & Restore
 
-Backs up all `.env.local` files across your CODE_2025 projects into a single
-encrypted archive, and restores them on a new Mac. No secret values ever appear
-in plaintext outside the encrypted blob.
+Backs up all `.env.local` files across your CODE_2025 projects **and** a fixed
+set of hard agent-auth secret files into a single encrypted archive, and
+restores them on a new Mac. No secret values ever appear in plaintext outside
+the encrypted blob.
+
+### What's in the vault
+
+| Source path | Archive path | Restore destination |
+|---|---|---|
+| `<CODE_2025>/<project>/.env.local` | `<project>/.env.local` | `<CODE_2025>/<project>/.env.local` |
+| `~/.codex/auth.json` | `agent-auth/codex-auth.json` | `~/.codex/auth.json` |
+| `~/.cursor/mcp.json` | `agent-auth/cursor-mcp.json` | `~/.cursor/mcp.json` |
+| `~/.claude.json` | `agent-auth/claude.json` | `~/.claude.json` |
+
+To add more agent-auth files, extend the `AGENT_SECRET_FILES` array near the
+top of `backup.sh` and add the matching entry to `AGENT_AUTH_MAP` in
+`restore.sh`.
 
 ---
 
@@ -21,7 +35,7 @@ bash cli/scripts/env-vault/backup.sh
 
 This writes two files to `.env-vault/`:
 - `env-vault-<date>.tar.<ext>` — encrypted archive (safe to transport)
-- `manifest-<date>.txt` — variable names + counts only (safe to read, no values)
+- `manifest-<date>.txt` — variable names + counts + agent-auth file paths/sizes only (safe to read, no values)
 
 You will be prompted for a passphrase. Store it in **1Password** immediately.
 
@@ -40,7 +54,7 @@ Do NOT transfer via unencrypted email or public Slack.
 # Install dependencies first (e.g. Node, pnpm, etc.), then:
 youmd env restore /path/to/env-vault-<date>.tar.<ext>
 
-# If project dirs already exist with .env.local files:
+# If files already exist on the new Mac:
 youmd env restore --force /path/to/env-vault-<date>.tar.<ext>
 
 # or directly via bash:
@@ -48,8 +62,11 @@ bash cli/scripts/env-vault/restore.sh /path/to/env-vault-<date>.tar.<ext>
 bash cli/scripts/env-vault/restore.sh --force /path/to/env-vault-<date>.tar.<ext>
 ```
 
-The script creates `<CODE_2025>/<project>/.env.local` for each project.
-Existing files are backed up to `.env.local.bak.<timestamp>` (or overwritten with `--force`).
+The script:
+1. Creates `<CODE_2025>/<project>/.env.local` for each project.
+2. Restores agent-auth files to their absolute home paths (`~/.codex/auth.json`, `~/.cursor/mcp.json`, `~/.claude.json`), creating parent directories as needed.
+
+Existing files are backed up to `<path>.bak.<timestamp>` before overwrite (or silently overwritten with `--force`).
 
 ---
 
@@ -70,8 +87,8 @@ The encrypted file itself is safe to store anywhere. The passphrase is the secre
 ## Security Model
 
 - **Encryption:** `age` (preferred) → `gpg AES-256` → `openssl AES-256-CBC PBKDF2`
-- **What's in the encrypted archive:** full `.env.local` file contents
-- **What's in plaintext:** only the project name + variable NAMES + count (the manifest)
+- **What's in the encrypted archive:** full `.env.local` file contents + agent-auth files (`~/.codex/auth.json`, `~/.cursor/mcp.json`, `~/.claude.json`)
+- **What's in plaintext:** only the project name + variable NAMES + count + agent-auth file paths/byte-sizes (the manifest)
 - **Values:** never printed, echoed, logged, or written anywhere outside the encrypted blob
 - **Passphrase:** stored nowhere by these scripts — you must store it in 1Password
 

package/scripts/env-vault/backup.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
-# env-vault/backup.sh — backs up all .env.local files under CODE_2025 into an
-# encrypted vault. NEVER prints, echoes, logs, or writes any secret VALUE.
-# Only variable NAMES and counts appear in plaintext output.
+# env-vault/backup.sh — backs up all .env.local files under CODE_2025 AND a
+# fixed set of agent-auth secret files into an encrypted vault. NEVER prints,
+# echoes, logs, or writes any secret VALUE. Only variable NAMES, counts, and
+# file paths appear in plaintext output.
 #
 # Usage: bash backup.sh [--root <search-root>] [--out <output-dir>]
 # Defaults:
@@ -14,6 +15,16 @@ set -euo pipefail
 SEARCH_ROOT="${ENV_VAULT_ROOT:-/Users/houstongolden/Desktop/CODE_2025}"
 OUTPUT_DIR="${ENV_VAULT_OUT:-/Users/houstongolden/Desktop/CODE_2025/youmd/.env-vault}"
 
+# ── agent-auth secret files ────────────────────────────────────────────────────
+# Absolute paths to hard agent-auth secrets that must travel with the vault.
+# Each entry is archived as agent-auth/<stable-name> inside the tar.
+# To add more: append to this array. Format: "absolute-path:stable-archive-name"
+AGENT_SECRET_FILES=(
+  "${HOME}/.codex/auth.json:codex-auth.json"
+  "${HOME}/.cursor/mcp.json:cursor-mcp.json"
+  "${HOME}/.claude.json:claude.json"
+)
+
 # ── parse flags ────────────────────────────────────────────────────────────────
 while [[ $# -gt 0 ]]; do
   case $1 in
@@ -94,6 +105,38 @@ for ENV_FILE in "${ENV_FILES[@]}"; do
     >> "${MANIFEST_PATH}"
 done
 
+# ── stage agent-auth secret files ─────────────────────────────────────────────
+# Each entry in AGENT_SECRET_FILES has format "absolute-path:stable-archive-name".
+# Files are stored under agent-auth/<stable-name> inside the archive.
+# Only the path and byte-size appear in the manifest — never the contents.
+AGENT_AUTH_STAGING="${STAGING_DIR}/agent-auth"
+mkdir -p "${AGENT_AUTH_STAGING}"
+AGENT_AUTH_COUNT=0
+
+echo "" >> "${MANIFEST_PATH}"
+echo "agent-auth files:" >> "${MANIFEST_PATH}"
+
+for ENTRY in "${AGENT_SECRET_FILES[@]}"; do
+  SRC_PATH="${ENTRY%%:*}"
+  ARCHIVE_NAME="${ENTRY##*:}"
+
+  if [[ -f "${SRC_PATH}" ]]; then
+    cp "${SRC_PATH}" "${AGENT_AUTH_STAGING}/${ARCHIVE_NAME}"
+    FILE_BYTES=$(wc -c < "${SRC_PATH}" | tr -d ' ')
+    echo "  agent-auth/${ARCHIVE_NAME} (${SRC_PATH}): ${FILE_BYTES} bytes" \
+      >> "${MANIFEST_PATH}"
+    echo "  Staged agent-auth: ${SRC_PATH} → agent-auth/${ARCHIVE_NAME}"
+    (( AGENT_AUTH_COUNT++ )) || true
+  else
+    echo "  agent-auth/${ARCHIVE_NAME} (${SRC_PATH}): NOT FOUND — skipped" \
+      >> "${MANIFEST_PATH}"
+    echo "  Skipped (not found): ${SRC_PATH}"
+  fi
+done
+
+echo ""
+echo "Staged ${AGENT_AUTH_COUNT} agent-auth file(s)."
+
 echo "" >> "${MANIFEST_PATH}"
 echo "SECURITY: The encrypted archive is safe to transport. Keep the passphrase private." \
   >> "${MANIFEST_PATH}"

package/scripts/env-vault/restore.sh

@@ -1,15 +1,31 @@
 #!/usr/bin/env bash
-# env-vault/restore.sh — restores .env.local files from an encrypted vault
-# created by backup.sh. NEVER prints, echoes, or logs any secret VALUES.
-# Only prints which file paths were restored or skipped.
+# env-vault/restore.sh — restores .env.local files AND agent-auth secrets from
+# an encrypted vault created by backup.sh. NEVER prints, echoes, or logs any
+# secret VALUES. Only prints which file paths were restored or skipped.
 #
 # Usage: bash restore.sh [--force] [--root <target-root>] <vault-file>
 #   vault-file: path to env-vault-*.tar.age / .tar.gpg / .tar.enc
-#   --force:    overwrite existing .env.local files without backing them up
-#   --root:     destination root (default: /Users/houstongolden/Desktop/CODE_2025)
+#   --force:    overwrite existing files without backing them up
+#   --root:     destination root for .env.local files
+#               (default: /Users/houstongolden/Desktop/CODE_2025)
+#
+# agent-auth restore map (archive name → absolute home path):
+#   agent-auth/codex-auth.json  → ~/.codex/auth.json
+#   agent-auth/cursor-mcp.json  → ~/.cursor/mcp.json
+#   agent-auth/claude.json      → ~/.claude.json
 
 set -euo pipefail
 
+# ── agent-auth restore map ─────────────────────────────────────────────────────
+# Maps archive name (inside agent-auth/) to its absolute home destination.
+# Format: "archive-name:absolute-destination-path"
+# Must stay in sync with AGENT_SECRET_FILES in backup.sh.
+AGENT_AUTH_MAP=(
+  "codex-auth.json:${HOME}/.codex/auth.json"
+  "cursor-mcp.json:${HOME}/.cursor/mcp.json"
+  "claude.json:${HOME}/.claude.json"
+)
+
 # ── defaults ──────────────────────────────────────────────────────────────────
 TARGET_ROOT="${ENV_VAULT_RESTORE_ROOT:-/Users/houstongolden/Desktop/CODE_2025}"
 FORCE=false
@@ -139,11 +155,61 @@ while IFS= read -r -d '' ENV_FILE; do
   fi
 done < <(find "${EXTRACT_DIR}" -name ".env.local" -print0)
 
+# ── restore agent-auth files ───────────────────────────────────────────────────
+AGENT_RESTORED=0
+AGENT_SKIPPED=0
+AGENT_BACKED_UP=0
+
+AGENT_AUTH_SRC="${EXTRACT_DIR}/agent-auth"
+
+if [[ -d "${AGENT_AUTH_SRC}" ]]; then
+  echo "Restoring agent-auth files…"
+  for ENTRY in "${AGENT_AUTH_MAP[@]}"; do
+    ARCHIVE_NAME="${ENTRY%%:*}"
+    DEST_PATH="${ENTRY##*:}"
+    SRC_FILE="${AGENT_AUTH_SRC}/${ARCHIVE_NAME}"
+
+    if [[ ! -f "${SRC_FILE}" ]]; then
+      echo "  SKIPPED (not in vault): agent-auth/${ARCHIVE_NAME}"
+      (( AGENT_SKIPPED++ )) || true
+      continue
+    fi
+
+    DEST_DIR="$(dirname "${DEST_PATH}")"
+    mkdir -p "${DEST_DIR}"
+
+    if [[ -f "${DEST_PATH}" ]]; then
+      if [[ "${FORCE}" == "true" ]]; then
+        cp "${SRC_FILE}" "${DEST_PATH}"
+        echo "  RESTORED (overwrite): ${DEST_PATH}"
+        (( AGENT_RESTORED++ )) || true
+      else
+        TS="$(date -u +%Y%m%dT%H%M%SZ)"
+        BAK="${DEST_PATH}.bak.${TS}"
+        cp "${DEST_PATH}" "${BAK}"
+        cp "${SRC_FILE}" "${DEST_PATH}"
+        echo "  RESTORED (backed up old → $(basename "${BAK}")): ${DEST_PATH}"
+        (( AGENT_RESTORED++ )) || true
+        (( AGENT_BACKED_UP++ )) || true
+      fi
+    else
+      cp "${SRC_FILE}" "${DEST_PATH}"
+      echo "  RESTORED (new): ${DEST_PATH}"
+      (( AGENT_RESTORED++ )) || true
+    fi
+  done
+  echo ""
+else
+  echo "No agent-auth/ directory in vault — skipping agent-auth restore."
+  echo ""
+fi
+
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "  Restore summary"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "  Restored: ${RESTORED}  |  Skipped: ${SKIPPED}  |  Old files backed up: ${BACKED_UP}"
+echo "  .env.local  — Restored: ${RESTORED}  |  Skipped: ${SKIPPED}  |  Old files backed up: ${BACKED_UP}"
+echo "  agent-auth  — Restored: ${AGENT_RESTORED}  |  Skipped: ${AGENT_SKIPPED}  |  Old files backed up: ${AGENT_BACKED_UP}"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo ""
-echo "Secrets are now in place. Do not print or share .env.local files."
+echo "Secrets are now in place. Do not print or share secret files."

package/scripts/skillstack-sync/bootstrap-new-mac.sh

@@ -101,14 +101,29 @@ for skill in ${LOOSE_SKILLS}; do
 done
 
 # ---------------------------------------------------------------------------
-step "5. Reminder: restore secrets"
+step "5. Restore agent config from agent-shared"
+# ---------------------------------------------------------------------------
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+RESTORE_SCRIPT="${SCRIPT_DIR}/restore-agent-config.sh"
+
+if [ -f "${RESTORE_SCRIPT}" ]; then
+  info "Running restore-agent-config.sh (backs up existing files, safe to re-run)..."
+  bash "${RESTORE_SCRIPT}"
+  info "Agent config restored."
+else
+  warn "restore-agent-config.sh not found at ${RESTORE_SCRIPT} — skipping agent config restore."
+  warn "You can run it manually later once youmd is fully installed:"
+  warn "  bash ${RESTORE_SCRIPT}"
+fi
+
+# ---------------------------------------------------------------------------
+step "6. Reminder: restore secrets"
 # ---------------------------------------------------------------------------
 echo ""
 echo "  !! IMPORTANT: Secrets are NOT in git. Restore them separately:"
 echo ""
-echo "     If you use the env-vault (~/Desktop/CODE_2025/youmd/cli/scripts/env-vault/):"
+echo "     If you use the env-vault:"
 echo "       youmd env restore <vault-file>   # CLI wrapper (preferred)"
-echo "       bash ~/Desktop/CODE_2025/youmd/cli/scripts/env-vault/restore.sh <vault-file>"
 echo ""
 echo "     Secrets to restore (set in your shell profile or .env files):"
 echo "       OPENROUTER_API_KEY"
@@ -119,7 +134,7 @@ echo "       ANTHROPIC_API_KEY"
 echo ""
 
 # ---------------------------------------------------------------------------
-step "6. Next steps"
+step "7. Next steps"
 # ---------------------------------------------------------------------------
 echo ""
 echo "  Bootstrap complete. To activate the auto-sync daemons, run:"
@@ -127,7 +142,6 @@ echo ""
 echo "    youmd stack daemon install        # preferred (CLI-native)"
 echo ""
 echo "  Or run the raw script directly:"
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 echo "    bash ${SCRIPT_DIR}/install-daemons.sh"
 echo ""
 echo "  To do a manual sync now:"

package/scripts/skillstack-sync/capture-agent-config.sh

@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+# capture-agent-config.sh — snapshot NON-SECRET agent config into ~/.agent-shared/
+#
+# This captures the agent-behavior config that isn't already in a synced repo —
+# Claude/Codex/Warp settings, slash commands, plugin list, the orphaned
+# ~/.agents skills, and the launchd/cron automations — into the agent-shared
+# repo so they travel across machines. The skillstack-sync daemon then commits +
+# pushes agent-shared, and `youmd machine setup`/restore applies them on a new Mac.
+#
+# SECRETS NEVER GO HERE. agent-shared is a git repo. Live secrets (codex
+# auth.json, cursor mcp.json, ~/.claude.json BAMF token, .env.local) travel via
+# the ENCRYPTED env-vault instead. This script captures only files confirmed to
+# be secret-free, and a final guard greps the staged output for secret patterns
+# and ABORTS if any are found (nothing is left in agent-shared on abort).
+#
+# bash 3.2 / BSD safe. Idempotent. --dry-run to preview.
+
+set -euo pipefail
+
+AGENT_SHARED="${HOME}/.agent-shared"
+DEST="${AGENT_SHARED}/agent-config"
+LOG_DIR="${HOME}/.youmd/logs"
+LOG_FILE="${LOG_DIR}/capture-agent-config.log"
+
+DRY_RUN=0
+for arg in "$@"; do
+  case "$arg" in
+    --dry-run) DRY_RUN=1 ;;
+    *) echo "Unknown flag: $arg" >&2; exit 1 ;;
+  esac
+done
+
+mkdir -p "${LOG_DIR}"
+log() { local ts; ts="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"; echo "[${ts}] $*"; echo "[${ts}] $*" >> "${LOG_FILE}"; }
+is_dry() { [ "${DRY_RUN}" -eq 1 ]; }
+
+if [ ! -d "${AGENT_SHARED}/.git" ]; then
+  log "ERROR: ${AGENT_SHARED} is not a git repo — run machine setup first."
+  exit 1
+fi
+
+# copy_in <src> <dest-subpath>  — copy a file/dir into the staging dest if it exists
+copy_in() {
+  local src="$1" rel="$2" target
+  target="${DEST}/${rel}"
+  if [ ! -e "${src}" ]; then return 0; fi
+  if is_dry; then log "DRY would capture ${src} → agent-config/${rel}"; return 0; fi
+  mkdir -p "$(dirname "${target}")"
+  if [ -d "${src}" ]; then
+    rsync -a --delete "${src}/" "${target}/"
+  else
+    cp "${src}" "${target}"
+  fi
+  log "captured ${src} → agent-config/${rel}"
+}
+
+log "=== capture-agent-config START ($([ "${DRY_RUN}" -eq 1 ] && echo DRY || echo LIVE)) ==="
+
+# ── Claude config (settings have no raw secrets; ~/.claude.json is EXCLUDED — vaulted) ──
+copy_in "${HOME}/.claude/settings.json"               "claude/settings.json"
+copy_in "${HOME}/.claude/settings.local.json"         "claude/settings.local.json"
+copy_in "${HOME}/.claude/commands"                    "claude/commands"
+copy_in "${HOME}/.claude/mcp.json"                    "claude/mcp.json"
+copy_in "${HOME}/.claude/plugins/installed_plugins.json" "claude/plugins/installed_plugins.json"
+
+# ── Codex config (config.toml only; auth.json is EXCLUDED — vaulted) ──
+copy_in "${HOME}/.codex/config.toml"                  "codex/config.toml"
+
+# ── Warp (no secrets) ──
+copy_in "${HOME}/.warp/settings.toml"                 "warp/settings.toml"
+copy_in "${HOME}/.warp/keybindings.yaml"              "warp/keybindings.yaml"
+
+# ── Orphaned ~/.agents skills (no repo of their own today) ──
+copy_in "${HOME}/.agents/skills/find-skills"          "agents-skills/find-skills"
+copy_in "${HOME}/.agents/skills/ui-ux-pro-max"        "agents-skills/ui-ux-pro-max"
+
+# ── Automations: launchd plists (HOME-templated) + crontab snapshot ──
+capture_plist() {
+  local label="$1" src="${HOME}/Library/LaunchAgents/$1.plist" target="${DEST}/automations/launchd/$1.plist"
+  if [ ! -f "${src}" ]; then return 0; fi
+  if is_dry; then log "DRY would capture plist ${label} (HOME-templated)"; return 0; fi
+  mkdir -p "$(dirname "${target}")"
+  sed "s|${HOME}|__HOME__|g" "${src}" > "${target}"
+  log "captured plist ${label} → agent-config/automations/launchd/${label}.plist"
+}
+capture_plist "com.youmd.skillstack-sync"
+capture_plist "com.youmd.identity-sync"
+capture_plist "com.houstongolden.agent-runtime-guard"
+
+if ! is_dry; then
+  mkdir -p "${DEST}/automations"
+  crontab -l 2>/dev/null > "${DEST}/automations/crontab.txt" || true
+  log "captured crontab → agent-config/automations/crontab.txt"
+fi
+
+# ── SECRET-LEAK GUARD — abort if anything captured looks like a live secret ──
+if ! is_dry && [ -d "${DEST}" ]; then
+  # Match real secret token shapes; allow bare key NAMES (KEY=) which are fine.
+  HITS="$(grep -rIlE 'sk-ant-[A-Za-z0-9_-]{20}|sk-[A-Za-z0-9]{32}|ghp_[A-Za-z0-9]{30}|gho_[A-Za-z0-9]{30}|Bearer [A-Za-z0-9._-]{20}|AKIA[0-9A-Z]{16}|xox[baprs]-[A-Za-z0-9-]{10}' "${DEST}" 2>/dev/null || true)"
+  if [ -n "${HITS}" ]; then
+    log "ABORT: possible secret(s) found in captured config — removing capture, nothing committed:"
+    log "${HITS}"
+    rm -rf "${DEST}"
+    exit 1
+  fi
+  log "secret-leak guard: clean (no live secret patterns in captured config)"
+fi
+
+log "=== capture-agent-config DONE ==="