merge edge

.eslintignore

@@ -12,6 +12,7 @@
 **/CHANGELOG.md
 !api/release-notes.md
 !app-shell/build/release-notes.md
+**/.yarn-cache/**
 
 # components library
 storybook-static

.eslintrc.js

@@ -39,6 +39,7 @@ module.exports = {
     'no-case-declarations': 'warn',
     'prefer-regex-literals': 'warn',
     'react/prop-types': 'warn',
+    'react/jsx-curly-brace-presence': 'warn',
 
     // Enforce notification hooks
     'no-restricted-imports': [
@@ -179,13 +180,32 @@ module.exports = {
       files: ['./protocol-designer/src/**/*.@(ts|tsx)'],
       rules: {
         'opentrons/no-imports-up-the-tree-of-life': 'warn',
+        'opentrons/no-margins-in-css': 'warn',
+        'opentrons/no-margins-inline': 'warn',
       },
     },
     // apply application structure import requirements to app
     {
       files: ['./app/src/**/*.@(ts|tsx)'],
       rules: {
         'opentrons/no-imports-across-applications': 'error',
+        'opentrons/no-margins-in-css': 'warn',
+        'opentrons/no-margins-inline': 'warn',
+      },
+    },
+    {
+      files: ['./opentrons-ai-client/src/**/*.@(ts|tsx)'],
+      rules: {
+        'opentrons/no-imports-up-the-tree-of-life': 'warn',
+        'opentrons/no-margins-in-css': 'warn',
+        'opentrons/no-margins-inline': 'warn',
+      },
+    },
+    {
+      files: ['./components/src/**/*.@(ts|tsx)'],
+      rules: {
+        'opentrons/no-margins-in-css': 'warn',
+        'opentrons/no-margins-inline': 'warn',
       },
     },
   ],

.github/actions/.gitattributes

@@ -0,0 +1 @@
+odd-resource-analysis/dist/* binary

.github/actions/environment/complex-variables/action.yml

@@ -0,0 +1,13 @@
+name: 'Set Complex Environment Variables'
+description: Composite action using github-script to set complex environment variables.
+inputs: {}
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Set complex environment variables'
+      id: set-vars
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const { buildComplexEnvVars } = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/utils.js`)
+          buildComplexEnvVars(core, context)

.github/actions/git/resolve-tag/action.yml

@@ -0,0 +1,17 @@
+name: 'Fix Checkout Tags'
+description: >
+  Composite action to fix actions/checkout odd handling of tags
+  by fetching and checking out the exact tag reference.
+  See https://github.com/actions/checkout/issues/290
+inputs: {}
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Fix actions/checkout odd handling of tags'
+      if: startsWith(github.ref, 'refs/tags')
+      shell: bash
+      env:
+        REF: ${{ github.ref }}
+      run: |
+        git fetch -f origin "${REF}:${REF}"
+        git checkout "${REF}"

.github/actions/js/setup/action.yml

@@ -0,0 +1,28 @@
+name: 'Setup JS Environment'
+description: >
+  Composite action to fix tag handling in checkout,
+  setup Node.js, install udev for USB detection, cache Yarn/NPM caches,
+  and perform JS setup.
+
+inputs: {}
+
+runs:
+  using: 'composite'
+  steps:
+    - uses: ./.github/actions/git/resolve-tag
+    - uses: ./.github/actions/environment/complex-variables
+    - name: 'Setup Node'
+      uses: actions/setup-node@v4
+      with:
+        node-version: '22.11.0'
+        cache: 'yarn'
+
+    - name: 'Install udev for USB-detection'
+      if: runner.os == 'Linux'
+      shell: bash
+      run: sudo apt-get update && sudo apt-get install libudev-dev
+
+    - name: 'Setup JS'
+      shell: bash
+      run: |
+        make setup-js

.github/actions/odd-resource-analysis/.gitignore

@@ -0,0 +1,13 @@
+.DS_Store
+.idea
+*.log
+tmp/
+
+*.tern-port
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+*.tsbuildinfo
+.npm
+.eslintcache

.github/actions/odd-resource-analysis/.prettierignore

@@ -0,0 +1,2 @@
+dist/
+node_modules/

.github/actions/odd-resource-analysis/.prettierrc.js

@@ -0,0 +1,15 @@
+'use strict'
+
+module.exports = {
+  printWidth: 80, // default
+  tabWidth: 2, // default
+  useTabs: false, // default
+  semi: false,
+  singleQuote: true,
+  jsxSingleQuote: false, // default
+  trailingComma: 'es5',
+  bracketSpacing: true, // default
+  jsxBracketSameLine: false, // default
+  arrowParens: 'avoid', // default
+  endOfLine: 'lf',
+}

.github/actions/odd-resource-analysis/action.yml

@@ -0,0 +1,27 @@
+name: 'ODD Memory Usage Analysis'
+description: >-
+  Analyzes memory usage trends across ODD versions using Mixpanel data.
+  Note that only processes with positive correlation or explicitly whitelisted processes are shown.
+
+inputs:
+  mixpanel-user:
+    description: 'Mixpanel service account username'
+    required: true
+  mixpanel-secret:
+    description: 'Mixpanel service account password'
+    required: true
+  mixpanel-project-id:
+    description: 'Mixpanel project ID'
+    required: true
+  previous-version-count:
+    description: 'Number of previous versions to analyze'
+    required: false
+    default: '2'
+
+outputs:
+  analysis-results:
+    description: 'JSON string containing the complete analysis results'
+
+runs:
+  using: 'node16'
+  main: 'dist/index.js'