src/lib/99-upstream-sync.sh - main - AlexandrNarbaev/opencode_initializer

src/lib/99-upstream-sync.sh

42 строки2 KB

Alexandr Narbaev

v3.0.0: M5 complete — stub modules (41-46) + remaining fixes

08 авг 2026, 14:39

08 авг 2026, 14:39d8dfada

#!/usr/bin/env bash
# lib/99-upstream-sync.sh — Sync upstream git submodules & version pins
set -euo pipefail

if ([ "$MODE" = "full" ] || [ "$MODE" = "reinit" ] || [ "$MODE" = "update" ]) && _gate "INTERACTIVE_DO_UPSTREAM_SYNC"; then
  section "Upstream Sync (submodules + version pins)"

  # ── 1. Configure git merge strategy (3-way with conflict resolution) ───
  if [ -d "$SCRIPT_DIR/.git" ]; then
    info "Configuring git merge strategy..."
    # Use 3-way merge with patience diff for better conflict resolution
    git -C "$SCRIPT_DIR" config merge.conflictstyle diff3 2>/dev/null || true
    git -C "$SCRIPT_DIR" config pull.rebase false 2>/dev/null || true
    git -C "$SCRIPT_DIR" config merge.tool vimdiff 2>/dev/null || true
    log "Git: diff3 conflict style, patience merge"
  fi

  # ── 2. Initialize git submodules ──────────────────────────────────────────
  if [ -f "$SCRIPT_DIR/.gitmodules" ] && [ -d "$SCRIPT_DIR/.git" ]; then
    info "Syncing upstream git submodules..."
    git -C "$SCRIPT_DIR" submodule update --init --recursive --depth 1 2>&1 | tail -5 || \
      warn "Some submodules failed to initialize (non-fatal)"
    log "Upstream submodules synced"
  else
    info "No .gitmodules or not a git checkout — skipping submodule sync"
  fi

  # ── 2. Refresh pinned versions from npm/GitHub ──────────────────────────
  info "Checking upstream versions..."
  if [ -f "$SCRIPT_DIR/src/lib/version-check.sh" ]; then
    bash "$SCRIPT_DIR/src/lib/version-check.sh" 2>&1 | tail -10 || \
      warn "version-check.sh reported issues"
  fi

  # ── 4. Ensure best-practices skills are installed ───────────────────────
  if [ "${BEST_PRACTICES_ENABLED:-true}" != "false" ] && [ -f "$SCRIPT_DIR/src/lib/40-best-practices.sh" ]; then
    info "Best practices skills: enabled (default)"
    bash "$SCRIPT_DIR/src/lib/40-best-practices.sh" 2>&1 | tail -5 || true
  fi

  _step_done step_upstream_sync
fi