youmd 0.7.0 → 0.8.0

package/scripts/skillstack-sync/context-sync.sh

@@ -0,0 +1,344 @@
+#!/usr/bin/env bash
+# context-sync.sh — per-project agent context syncer (cross-machine, code-safe)
+# Compatible: bash 3.2+, macOS BSD coreutils (NO mapfile, NO GNU mktemp flags)
+#
+# WHAT IT DOES
+# ============
+# For each of Houston's own git repos, commits ONLY the agent-context paths
+# (AGENTS.md, CLAUDE.md, project-context/, .claude/) and pull+pushes, so
+# agent context travels across machines without ever touching application code.
+#
+# SAFETY GUARANTEES
+# =================
+# 1. Only stages named context paths — NEVER uses `git add -A` or `git add .`
+# 2. Never stashes, resets, checks out, or cleans anything in the working tree
+# 3. Never touches a repo that is mid-merge or mid-rebase
+# 4. Never touches a repo with no `origin` remote
+# 5. If the working tree has uncommitted non-context changes, commits context
+#    locally but SKIPS pull/push to avoid merge conflicts touching his code;
+#    logs a clear "push manually" warning
+# 6. On pull conflict: aborts merge, skips push, logs loudly — never force
+# 7. Per-repo failures are non-fatal; the loop always continues
+# 8. --dry-run logs intended actions; writes nothing to disk
+#
+# WHAT IS EXCLUDED (by design)
+# =============================
+# - Third-party / fork repos (disler/*, coffeefuelbump/*, etc.) — Houston
+#   doesn't own the remote, so auto-pushing context there is wrong
+# - Repos with no origin remote or push-disabled remotes — detected at runtime
+# - gstack, agent-shared, scistack — covered by sync.sh (skillstack layer)
+#
+# Usage:
+#   ./context-sync.sh              # sync all context repos
+#   ./context-sync.sh --dry-run    # log intended actions only, write nothing
+#
+# Env overrides:
+#   CONTEXT_REPOS   space-separated list of repo DIRECTORY NAMES under
+#                   ~/Desktop/CODE_2025/ (not full paths)
+#   GIT_USER_NAME   commit author name  (default: Houston Golden)
+#   GIT_USER_EMAIL  commit author email (default: houston@bamf.ai)
+
+set -euo pipefail
+
+# ---------------------------------------------------------------------------
+# Config
+# ---------------------------------------------------------------------------
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+LOG_DIR="${HOME}/.youmd/logs"
+LOG_FILE="${LOG_DIR}/context-sync.log"
+
+GIT_USER_NAME="${GIT_USER_NAME:-Houston Golden}"
+GIT_USER_EMAIL="${GIT_USER_EMAIL:-houston@bamf.ai}"
+
+CODE_ROOT="${HOME}/Desktop/CODE_2025"
+
+# Curated list of Houston's OWN repos with rich agent context.
+# These all have houstongolden/* or hubify-projects/* remotes — confirmed safe
+# to push to. Override via env CONTEXT_REPOS (space-separated dir names).
+#
+# Excluded by design:
+#   - disler/*, coffeefuelbump/*, etc.  → not Houston's remote
+#   - repos with no origin              → detected and skipped at runtime
+#   - gstack, agent-shared, scistack    → handled by sync.sh
+DEFAULT_CONTEXT_REPOS="bamfaiapp bigbounce hubify-aios myo hubifycode badapp claws"
+CONTEXT_REPOS="${CONTEXT_REPOS:-${DEFAULT_CONTEXT_REPOS}}"
+
+# The ONLY paths we will ever stage. Nothing else is touched.
+CONTEXT_PATHSPECS="AGENTS.md CLAUDE.md project-context .claude"
+
+DRY_RUN=0
+
+# ---------------------------------------------------------------------------
+# Parse flags
+# ---------------------------------------------------------------------------
+for arg in "$@"; do
+  case "$arg" in
+    --dry-run) DRY_RUN=1 ;;
+    --once)    : ;;   # accepted for explicit invocation parity with sync.sh
+    *) echo "Unknown flag: $arg" >&2; exit 1 ;;
+  esac
+done
+
+# ---------------------------------------------------------------------------
+# Logging
+# ---------------------------------------------------------------------------
+mkdir -p "${LOG_DIR}"
+
+log() {
+  local ts
+  ts="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+  local msg="[${ts}] $*"
+  echo "${msg}"
+  echo "${msg}" >> "${LOG_FILE}"
+}
+
+log_warn() {
+  log "WARN  $*"
+}
+
+log_error() {
+  log "ERROR $*"
+}
+
+log_dry() {
+  log "DRY   $*"
+}
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+hostname_short() {
+  # BSD hostname (no --short flag on macOS)
+  hostname | cut -d. -f1
+}
+
+is_dry() {
+  [ "${DRY_RUN}" -eq 1 ]
+}
+
+# Check if repo is in a mid-merge/rebase state
+repo_is_in_progress() {
+  local repo="$1"
+  if [ -f "${repo}/.git/MERGE_HEAD" ] \
+     || [ -d "${repo}/.git/rebase-merge" ] \
+     || [ -d "${repo}/.git/rebase-apply" ]; then
+    return 0
+  fi
+  return 1
+}
+
+# Collect context pathspecs that actually exist in this repo.
+# Returns a space-separated list (possibly empty).
+existing_context_paths() {
+  local repo="$1"
+  local found=""
+  local p
+  for p in ${CONTEXT_PATHSPECS}; do
+    if [ -e "${repo}/${p}" ]; then
+      if [ -z "${found}" ]; then
+        found="${p}"
+      else
+        found="${found} ${p}"
+      fi
+    fi
+  done
+  echo "${found}"
+}
+
+# ---------------------------------------------------------------------------
+# SYNC ONE REPO
+# Returns 0 on success, 1 on non-fatal failure.
+#
+# Pull/push safety decision (dirty non-context working tree):
+# ============================================================
+# After committing context changes, the working tree may still have untracked
+# or modified files (Houston's WIP code). A `git pull` that brings in remote
+# changes could attempt to merge those dirty files, causing conflicts or
+# accidentally modifying them. The SAFE choice:
+#   - If the working tree has ANY remaining dirty files after the context
+#     commit, SKIP pull/push and log a clear warning.
+#   - The context commit is still made locally, so the changes are preserved
+#     and Houston can push manually when he's ready.
+#   - We never stash, reset, or touch his code.
+# ---------------------------------------------------------------------------
+sync_context_repo() {
+  local repo_name="$1"
+  local repo="${CODE_ROOT}/${repo_name}"
+
+  log "=== Syncing context for: ${repo_name} ==="
+
+  # Guard: directory must exist
+  if [ ! -d "${repo}" ]; then
+    log_warn "Skipping ${repo_name}: directory not found at ${repo}."
+    return 1
+  fi
+
+  # Guard: must be a git repo
+  if [ ! -d "${repo}/.git" ]; then
+    log_warn "Skipping ${repo_name}: not a git repository."
+    return 1
+  fi
+
+  # Guard: must not be mid-merge/rebase
+  if repo_is_in_progress "${repo}"; then
+    log_warn "Skipping ${repo_name}: repository is mid-merge or mid-rebase. Resolve manually first."
+    return 1
+  fi
+
+  # Guard: must have an origin remote
+  if ! git -C "${repo}" remote get-url origin >/dev/null 2>&1; then
+    log_warn "Skipping ${repo_name}: no 'origin' remote configured."
+    return 1
+  fi
+
+  # Determine which context paths exist in this repo
+  local paths
+  paths="$(existing_context_paths "${repo}")"
+
+  if [ -z "${paths}" ]; then
+    log "No context paths found in ${repo_name} (none of: ${CONTEXT_PATHSPECS}). Skipping."
+    return 0
+  fi
+
+  log "Context paths present in ${repo_name}: ${paths}"
+
+  # ---- Stage ONLY the context paths (never git add -A or git add .) --------
+  if is_dry; then
+    log_dry "Would stage in ${repo_name}: ${paths}"
+  else
+    # Build the git add command with only existing paths.
+    # We pass each path as a separate argument — safe because they come from
+    # our controlled CONTEXT_PATHSPECS list, not user input.
+    local add_args=""
+    local p
+    for p in ${paths}; do
+      add_args="${add_args} ${p}"
+    done
+    # shellcheck disable=SC2086
+    git -C "${repo}" add -- ${add_args}
+    log "Staged context paths in ${repo_name}: ${paths}"
+  fi
+
+  # ---- Commit if staged changes exist ---------------------------------------
+  local context_committed=0
+  if is_dry; then
+    log_dry "Would check for staged changes and commit context in ${repo_name} if any"
+    context_committed=1
+  else
+    if ! git -C "${repo}" diff --cached --quiet 2>/dev/null; then
+      local ts host commit_msg
+      ts="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
+      host="$(hostname_short)"
+      commit_msg="context-sync: ${host} ${ts}"
+
+      git -C "${repo}" \
+        -c "user.name=${GIT_USER_NAME}" \
+        -c "user.email=${GIT_USER_EMAIL}" \
+        commit -m "${commit_msg}"
+      log "Committed context changes in ${repo_name}: '${commit_msg}'"
+      context_committed=1
+    else
+      log "No staged context changes in ${repo_name} (already up to date)."
+      context_committed=0
+    fi
+  fi
+
+  # ---- Check for remaining dirty working tree (WIP code) -------------------
+  # After committing context, if there are still dirty files, skip pull/push
+  # to avoid merge conflicts or accidental code modification.
+  if ! is_dry; then
+    local remaining_dirty
+    remaining_dirty="$(git -C "${repo}" status --porcelain 2>/dev/null)"
+    if [ -n "${remaining_dirty}" ]; then
+      log_warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      log_warn "${repo_name} has uncommitted non-context changes (WIP code)."
+      log_warn "Context was committed locally. Skipping pull/push to avoid"
+      log_warn "touching your code. Push manually when your code is ready:"
+      log_warn "  cd ${repo} && git pull --no-rebase && git push"
+      log_warn "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      return 0
+    fi
+  fi
+
+  # ---- Pull (merge, no rebase) ---------------------------------------------
+  if is_dry; then
+    log_dry "Would git pull --no-rebase --no-edit in ${repo_name}"
+  else
+    local pull_log
+    # BSD mktemp: no -p, use /tmp explicitly
+    pull_log="$(mktemp -t context_sync_pull)"
+    local pull_ok=0
+    git -C "${repo}" pull --no-rebase --no-edit >"${pull_log}" 2>&1 || pull_ok=$?
+
+    while IFS= read -r line; do
+      log "pull|${repo_name}: ${line}"
+    done < "${pull_log}"
+    rm -f "${pull_log}"
+
+    if [ "${pull_ok}" -ne 0 ]; then
+      log_error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      log_error "CONFLICT in ${repo_name} — pull failed."
+      log_error "Aborting merge and skipping push."
+      log_error "Manual resolution needed: cd ${repo} && git status"
+      log_error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+      git -C "${repo}" merge --abort 2>/dev/null || true
+      git -C "${repo}" rebase --abort 2>/dev/null || true
+      return 1
+    fi
+    log "Pull succeeded for ${repo_name}."
+  fi
+
+  # ---- Push ----------------------------------------------------------------
+  if is_dry; then
+    log_dry "Would git push in ${repo_name}"
+  else
+    local push_log
+    push_log="$(mktemp -t context_sync_push)"
+    local push_ok=0
+    git -C "${repo}" push >"${push_log}" 2>&1 || push_ok=$?
+
+    while IFS= read -r line; do
+      log "push|${repo_name}: ${line}"
+    done < "${push_log}"
+    rm -f "${push_log}"
+
+    if [ "${push_ok}" -ne 0 ]; then
+      log_error "Push FAILED for ${repo_name}. Check connectivity/auth."
+      return 1
+    fi
+    log "Push succeeded for ${repo_name}."
+  fi
+
+  log "=== Done: ${repo_name} ==="
+  return 0
+}
+
+# ---------------------------------------------------------------------------
+# MAIN
+# ---------------------------------------------------------------------------
+main() {
+  local mode
+  if is_dry; then
+    mode="DRY-RUN"
+  else
+    mode="LIVE"
+  fi
+
+  log "============================================================"
+  log "context-sync START [${mode}] on $(hostname_short)"
+  log "Repos: ${CONTEXT_REPOS}"
+  log "Context paths: ${CONTEXT_PATHSPECS}"
+  log "============================================================"
+
+  local repo_name
+  for repo_name in ${CONTEXT_REPOS}; do
+    sync_context_repo "${repo_name}" || true
+  done
+
+  log "============================================================"
+  log "context-sync DONE [${mode}]"
+  log "============================================================"
+}
+
+main "$@"

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

@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+# restore-agent-config.sh — apply ~/.agent-shared/agent-config/ back onto this machine
+#
+# Mirror-image of capture-agent-config.sh. Takes each item in agent-config/
+# and copies it to its canonical home location, backing up any existing
+# file/dir to <dest>.bak.<UTC-ts> first (unless --force skips the backup).
+#
+# Restored mappings:
+#   agent-config/claude/*                  → ~/.claude/
+#   agent-config/codex/config.toml        → ~/.codex/config.toml
+#   agent-config/warp/*                   → ~/.warp/
+#   agent-config/agents-skills/*          → ~/.agents/skills/
+#   agent-config/automations/launchd/*.plist → ~/Library/LaunchAgents/ (HOME templated back)
+#   agent-config/automations/crontab.txt  → PRINTED ONLY (user must merge manually)
+#
+# bash 3.2 / BSD safe. Idempotent. --dry-run to preview without writing.
+# --force to skip per-file backups (still idempotent, overwrites in place).
+#
+# SECRETS: there should be none in agent-config (the capture script guards
+# against it), but this script never prints file contents — only paths.
+#
+# Usage: bash restore-agent-config.sh [--dry-run] [--force]
+
+set -euo pipefail
+
+AGENT_SHARED="${HOME}/.agent-shared"
+SRC="${AGENT_SHARED}/agent-config"
+LOG_DIR="${HOME}/.youmd/logs"
+LOG_FILE="${LOG_DIR}/restore-agent-config.log"
+
+DRY_RUN=0
+FORCE=0
+for arg in "$@"; do
+  case "$arg" in
+    --dry-run) DRY_RUN=1 ;;
+    --force)   FORCE=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 ]; }
+is_force() { [ "${FORCE}" -eq 1 ]; }
+
+if [ ! -d "${AGENT_SHARED}/.git" ]; then
+  log "ERROR: ${AGENT_SHARED} is not a git repo — run 'youmd machine setup' first."
+  exit 1
+fi
+
+if [ ! -d "${SRC}" ]; then
+  log "ERROR: ${SRC} does not exist — nothing to restore. Run 'youmd machine capture' on the source machine first."
+  exit 1
+fi
+
+log "=== restore-agent-config START ($([ "${DRY_RUN}" -eq 1 ] && echo DRY || echo LIVE) $([ "${FORCE}" -eq 1 ] && echo FORCE || echo SAFE)) ==="
+
+# backup_dest <path>
+#   If the dest exists and --force is not set, back it up.
+backup_dest() {
+  local dest="$1"
+  if [ -e "${dest}" ] && ! is_force; then
+    local ts; ts="$(date -u +"%Y%m%dT%H%M%SZ")"
+    local bak="${dest}.bak.${ts}"
+    if is_dry; then
+      log "DRY would backup ${dest} → ${bak}"
+    else
+      mv "${dest}" "${bak}"
+      log "backed up ${dest} → ${bak}"
+    fi
+  fi
+}
+
+# copy_out <src-relative-to-agent-config> <absolute-dest>
+#   Copy a file or directory from agent-config onto this machine.
+copy_out() {
+  local rel="$1" dest="$2" src
+  src="${SRC}/${rel}"
+  if [ ! -e "${src}" ]; then return 0; fi
+
+  if is_dry; then
+    log "DRY would restore agent-config/${rel} → ${dest}"
+    return 0
+  fi
+
+  mkdir -p "$(dirname "${dest}")"
+  backup_dest "${dest}"
+  if [ -d "${src}" ]; then
+    rsync -a "${src}/" "${dest}/"
+  else
+    cp "${src}" "${dest}"
+  fi
+  log "restored agent-config/${rel} → ${dest}"
+}
+
+# ── Claude config ──────────────────────────────────────────────────────────────
+copy_out "claude/settings.json"               "${HOME}/.claude/settings.json"
+copy_out "claude/settings.local.json"         "${HOME}/.claude/settings.local.json"
+copy_out "claude/commands"                    "${HOME}/.claude/commands"
+copy_out "claude/mcp.json"                    "${HOME}/.claude/mcp.json"
+copy_out "claude/plugins/installed_plugins.json" "${HOME}/.claude/plugins/installed_plugins.json"
+
+# ── Codex config ───────────────────────────────────────────────────────────────
+copy_out "codex/config.toml"                  "${HOME}/.codex/config.toml"
+
+# ── Warp ───────────────────────────────────────────────────────────────────────
+copy_out "warp/settings.toml"                 "${HOME}/.warp/settings.toml"
+copy_out "warp/keybindings.yaml"              "${HOME}/.warp/keybindings.yaml"
+
+# ── Orphaned ~/.agents skills ──────────────────────────────────────────────────
+copy_out "agents-skills/find-skills"          "${HOME}/.agents/skills/find-skills"
+copy_out "agents-skills/ui-ux-pro-max"        "${HOME}/.agents/skills/ui-ux-pro-max"
+
+# ── Automations: launchd plists (HOME-templated → real HOME) ───────────────────
+LAUNCH_AGENTS_DIR="${HOME}/Library/LaunchAgents"
+LAUNCHD_SRC="${SRC}/automations/launchd"
+if [ -d "${LAUNCHD_SRC}" ]; then
+  # BSD-compatible glob: use find to enumerate plists
+  while IFS= read -r plist_src; do
+    name="$(basename "${plist_src}")"
+    dest="${LAUNCH_AGENTS_DIR}/${name}"
+    if is_dry; then
+      log "DRY would restore plist ${name} → ${dest} (with __HOME__ → \$HOME)"
+    else
+      mkdir -p "${LAUNCH_AGENTS_DIR}"
+      backup_dest "${dest}"
+      # Replace __HOME__ placeholder with the real HOME value (BSD sed, no -i extension trick)
+      sed "s|__HOME__|${HOME}|g" "${plist_src}" > "${dest}"
+      log "restored plist ${name} → ${dest}"
+    fi
+    log "NOTE: to load this daemon run: launchctl load -w ${dest}"
+    log "      (or run: youmd stack daemon install — covers the youmd ones)"
+  done < <(find "${LAUNCHD_SRC}" -maxdepth 1 -name "*.plist" 2>/dev/null || true)
+fi
+
+# ── Crontab — PRINT ONLY, never overwrite automatically ────────────────────────
+CRONTAB_SRC="${SRC}/automations/crontab.txt"
+if [ -f "${CRONTAB_SRC}" ]; then
+  log "crontab.txt found — NOT writing automatically (clobbering crontab is destructive)."
+  log "Inspect and merge manually with:  crontab -e"
+  echo ""
+  echo "  ── captured crontab entries (merge manually with 'crontab -e') ──"
+  # Print each line with a leading "  " indent so it's visually distinct.
+  # Use a while-read loop (no cat) to stay shell-safe.
+  while IFS= read -r line; do
+    echo "  ${line}"
+  done < "${CRONTAB_SRC}"
+  echo "  ── end crontab ──"
+  echo ""
+fi
+
+log "=== restore-agent-config DONE ==="

package/scripts/skillstack-sync/sync.sh

@@ -30,12 +30,15 @@ SCISTACK="${HOME}/.claude/scistack"
 LOOSE_SKILLS="agent-runtime-guard agent-stack-sync continue skill-governor"
 
 # Repos to sync (space-separated absolute paths; override via env).
-# v1 default is agent-shared ONLY — it's purpose-built for sync and safe to
-# auto-commit. scistack is intentionally NOT auto-synced by default: it holds
-# protected learning-loop IP where auto-committing WIP on a timer is undesirable.
-# To opt scistack (or other repos) in, set:
-#   SKILLSTACK_REPOS="$HOME/.agent-shared $HOME/.claude/scistack"
-DEFAULT_REPOS="${AGENT_SHARED}"
+# Houston's agent skill/stack layer syncs by DEFAULT:
+#   - ~/.agent-shared  → shared agent config + loose skills (houstongolden/agent-shared)
+#   - ~/.claude/scistack → ALL science skills (Hubify-Projects/scistack): 68 skill
+#     symlink targets under hubstack/ + astrostack/ + extensions/, incl. the
+#     learning-loop IP. Conflict-safe (commit→merge-pull→push, abort on conflict),
+#     so auto-syncing his own repo is exactly the cross-machine behavior intended.
+# gstack is NOT here (upstream garrytan/gstack, reinstalled via gstack-upgrade).
+# Add more repos by setting SKILLSTACK_REPOS to a space-separated path list.
+DEFAULT_REPOS="${AGENT_SHARED} ${SCISTACK}"
 SKILLSTACK_REPOS="${SKILLSTACK_REPOS:-${DEFAULT_REPOS}}"
 
 DRY_RUN=0
@@ -291,6 +294,17 @@ main() {
   log "skillstack-sync START [${mode}] on $(hostname_short)"
   log "============================================================"
 
+  # Step 0: Capture non-secret agent config (claude/codex/warp settings, slash
+  # commands, plugin list, orphan skills, automations) into agent-shared so it
+  # travels with the sync. Secret-leak-guarded; never blocks the sync on failure.
+  if [ -x "${SCRIPT_DIR}/capture-agent-config.sh" ]; then
+    if is_dry; then
+      bash "${SCRIPT_DIR}/capture-agent-config.sh" --dry-run || log_warn "capture-agent-config dry-run failed (non-fatal)"
+    else
+      bash "${SCRIPT_DIR}/capture-agent-config.sh" || log_warn "capture-agent-config failed (non-fatal — continuing sync)"
+    fi
+  fi
+
   # Step 1: Mirror loose skills into agent-shared BEFORE syncing it
   mirror_loose_skills_to_repo