first pass of merging in warp (doesn't build)

script/run

@@ -19,9 +19,13 @@ cd "${REPO_ROOT}"
 OS_TYPE="$(uname -s)"
 
 FEATURES="gui"
+INSTALL_COMMON_SKILLS=1
+FORCE_COMMON_SKILLS=0
+COMMON_SKILLS_TARGET="${WARP_COMMON_SKILLS_INSTALL_TARGET:-}"
 
 ./script/install_channel_config || echo "Skipping internal channel config installation (no repo access)."
 
+
 # If warp_channel_config is on PATH, build the Local channel binary; otherwise build the OSS channel.
 if command -v warp-channel-config &>/dev/null; then
     WARP_BIN_NAME="galaxy-local"
@@ -63,6 +67,10 @@ while (( "$#" )); do
         exit 1
       fi
       ;;
+    --install-common-skills)
+      FORCE_COMMON_SKILLS=1
+      shift
+      ;;
     --release)
       CARGO_PARAMS+=("$1")
       MAC_ARGS+=("$1")
@@ -87,6 +95,33 @@ while (( "$#" )); do
   esac
 done
 
+install_common_skills_or_continue() {
+  if ! ./script/resolve_common_skills install_common_skills -- --repo-root "${REPO_ROOT}" "$@"; then
+    echo "error: unable to install common skills; continuing without them." >&2
+  fi
+}
+if [[ "$INSTALL_COMMON_SKILLS" -eq 1 ]]; then
+  COMMON_SKILLS_ARGS=()
+  if [[ "${COMMON_SKILLS_TARGET}" = "project" || "${COMMON_SKILLS_TARGET}" = "global" ]]; then
+    COMMON_SKILLS_ARGS=("--${COMMON_SKILLS_TARGET}")
+  fi
+  if [[ "${WARP_SKIP_COMMON_SKILLS_INSTALL:-}" = "1" ]]; then
+    :
+  elif [[ "$FORCE_COMMON_SKILLS" -eq 1 ]]; then
+    if [[ "${#COMMON_SKILLS_ARGS[@]}" -gt 0 ]]; then
+      install_common_skills_or_continue "${COMMON_SKILLS_ARGS[@]}" --force
+    else
+      install_common_skills_or_continue --force --prompt-for-target
+    fi
+  else
+    if [[ "${#COMMON_SKILLS_ARGS[@]}" -gt 0 ]]; then
+      install_common_skills_or_continue "${COMMON_SKILLS_ARGS[@]}" --if-needed --quiet
+    else
+      install_common_skills_or_continue --if-needed --prompt-for-target --quiet
+    fi
+  fi
+fi
+
 # These cargo features were removed and replaced by environment variables read
 # by warp-channel-config. Intercept them here so that existing --features
 # invocations keep working.