Dev/main to Main (#75)

jmaddington · web-flow · commit 2f2ad631b64c · 2025-04-16T11:27:47.000-04:00
* feat: add VS Code extensions in devcontainer for improved development experience * feat: enhance devcontainer by installing Claude Code and configuring sudo for vscode user * feat: update docker-compose and .gitignore for Claude Code configuration * fix: fix clean.sh to more closely resemble main LibreChat dev instructions See https://www.librechat.ai/docs/development/get_started * fix: update branch patterns in workflow files to include all subdirectories under dev * chore: taking files from 12f4dbb and bringing them to our branch w/o merging * fix: remove node_modules in sub-dirs * fix: enhance build-local.sh for improved build validation and cleanup * chore: add our fork's dependencies * chore: change workflow timeouts to 15 minutes Some were running over this, which they shouldn't * fix: update promote-admin script to include force option and enhance argument parsing * Dev/merge/rename workflows (#74) chore: Updates workflow names for consistency in Github UI. * chore: update workflow branch filters to avoid duplicate runs
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -4,20 +4,7 @@
   "workspaceFolder": "/workspaces",
   "customizations": {
     "vscode": {
-      "extensions": [
-        "saoudrizwan.claude-dev",
-        "RooVeterinaryInc.roo-cline",
-        "ms-edgedevtools.vscode-edge-devtools",
-        "dbaeumer.vscode-eslint",
-        "mhutchie.git-graph",
-        "donjayamanne.githistory",
-        "github.vscode-github-actions",
-        "me-dutour-mathieu.vscode-github-actions",
-        "GitHub.copilot",
-        "GitHub.copilot-chat",
-        "GitHub.vscode-pull-request-github",
-        "ms-azuretools.vscode-docker"
-      ],
+      "extensions": [],
       "settings": {
         "terminal.integrated.profiles.linux": {
           "bash": null
diff --git a/.github/workflows/jm-assign-copilot-reviewer.yml b/.github/workflows/jm-assign-copilot-reviewer.yml
@@ -29,4 +29,4 @@ jobs:
               console.error('Error assigning GitHub Copilot as a reviewer:', error);
               // Continue workflow even if reviewer assignment fails
               return;
-            }
+            }
diff --git a/.github/workflows/jm-backend-review.yml b/.github/workflows/jm-backend-review.yml
@@ -1,30 +1,20 @@
-name: Backend Unit Tests
+name: JM - Backend Unit Tests
+
 on:
   pull_request:
-    branches:
-      - main
-      - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
 
   push:
     branches:
       - main
       - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
+      - 'dev/main'
 
   workflow_dispatch:
-    # Allow manual triggering
     
 jobs:
   tests_Backend:
     name: Run Backend unit tests
-    timeout-minutes: 60
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     env:
       MONGO_URI: ${{ secrets.MONGO_URI }}
diff --git a/.github/workflows/jm-build-only.yml b/.github/workflows/jm-build-only.yml
@@ -2,27 +2,12 @@ name: Docker Build Only
 
 on:
   pull_request:
-      branches:
-          - main
-          - main-upstream
-          - upstream-main
-          - dev/**
-          - release/*
-          - feat/*
-          - tmp/**
-          - tracking/**
 
   push:
-      branches:
-          - main
-          - main-upstream
-          - upstream-main
-          - dev/**
-          - release/*
-          - feat/*
-          - tmp/**
-          - tracking/**
-
+    branches:
+      - main
+      - main-upstream
+      - 'dev/main'
 
   # Allow manual triggering with custom parameters
   workflow_dispatch:
@@ -52,6 +37,7 @@ on:
           
 jobs:
   build-docker-image:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout GitHub Action'
diff --git a/.github/workflows/jm-deploy.yml b/.github/workflows/jm-deploy.yml
@@ -1,4 +1,4 @@
-name: Docker Build and Push to GHCR
+name: JM - Docker Build and Push to GHCR
 
 on:
   # Allow manual triggering with custom parameters
@@ -27,6 +27,7 @@ on:
 
 jobs:
   deploy-gh-runner-aci:
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout GitHub Action'
diff --git a/.github/workflows/jm-eslint-ci.yml b/.github/workflows/jm-eslint-ci.yml
@@ -1,30 +1,20 @@
-name: ESLint Code Quality Checks
+name: JM - ESLint Code Quality Checks
 
 on:
   pull_request:
-    branches:
-      - main
-      - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
-      
-  workflow_dispatch:
-    # Allow manual triggering
 
   push:
     branches:
       - main
       - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
+      - 'dev/main'
+      
+  workflow_dispatch:
 
 jobs:
   eslint_checks:
     name: Run ESLint Linting
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/.github/workflows/jm-frontend-review.yml b/.github/workflows/jm-frontend-review.yml
@@ -1,31 +1,20 @@
-name: Frontend Unit Tests
+name: JM - Frontend Unit Tests
 
 on:
   pull_request:
-    branches: 
-      - main
-      - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
-
-  workflow_dispatch:
-    # Allow manual triggering
 
   push:
     branches:
       - main
       - main-upstream
-      - dev/**
-      - release/**
-      - 'tracking/**'
-      - 'feature/**'
+      - 'dev/main'
+      
+  workflow_dispatch:
 
 jobs:
   tests_frontend_ubuntu:
     name: Run frontend unit tests on Ubuntu
-    timeout-minutes: 60
+    timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -47,7 +36,7 @@ jobs:
 
   tests_frontend_windows:
     name: Run frontend unit tests on Windows
-    timeout-minutes: 60
+    timeout-minutes: 15
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/jm-sync-with-upstream.yml b/.github/workflows/jm-sync-with-upstream.yml
diff --git a/.github/workflows/jm-upstream-sync.yml b/.github/workflows/jm-upstream-sync.yml
@@ -1,4 +1,4 @@
-name: Upstream Sync
+name: JM - Upstream Sync
 
 on:
   # Run on a daily schedule
diff --git a/README.md b/README.md
@@ -25,6 +25,28 @@ This fork is a personal project to add a few features to LibreChat and integrate
 - ✅ MERGED UPSTREAM - Flux AI plugin added to the tools list.
 
 
+## Merge Instructions
+
+To merge with upstream ensure that the `main-upstream` branch is up to date with the upstream `main` branch. Then run the following commands:
+
+Then, create a new tracking branch from it, `tracking/YYYY/MM/DD-XX` and begin a merge from `dev/main` or `main` into the new tracking branch.
+
+Most of the files should be taken from upstream. verbatim. The following files should be taken from out fork:
+
+ - `.github/workflows/jm*.yml` - These are the CI/CD workflows for this fork.
+ - `.devcontainer/*` - This is the devcontainer for this fork.
+ - `api/app/clients/tools/structured/E2BCode.js`
+ - `api/app/clients/tools/structured/E2BCode.md`
+ - `api/app/clients/tools/structured/WebNavigator.js`
+ - `api/app/clients/tools/structured/TimeAPI.js`
+ - `api/app/clients/tools/structured/QuickChart.js`
+
+These files need to be merged:
+
+- `api/app/clients/tools/manifest.json`
+- `api/app/clients/tools/index.js`
+- `api/app/clients/tools/util/handleTools.js`
+
 ### Why E2B?
 LibreChat recently introduced their own code interpreter service. It's affordable, integrates seamlessly with their platform, and provides a viable revenue stream. So why not use it?
 
diff --git a/api/package.json b/api/package.json
@@ -55,8 +55,6 @@
     "@waylaidwanderer/fetch-event-source": "^3.0.1",
     "axios": "^1.8.2",
     "bcryptjs": "^2.4.3",
-    "better-sqlite3": "^11.9.1",
-    "cheerio": "^1.0.0",
     "cohere-ai": "^7.9.1",
     "compression": "^1.7.4",
     "connect-redis": "^7.1.0",
diff --git a/clean.sh b/clean.sh
@@ -1,14 +1,12 @@
-echo "Removing node_modules and package-lock.json"
-rm -rf node_modules/
-rm package-lock.json
+echo "Removing node_modules"
+find ./ -type d -name node_modules -exec rm -rf {} \;
 
 echo "Installing primary dependencies"
 
 npm ci
 
 echo "Installing our fork-specific dependencies"
-cd api/
-npm install cheerio @e2b/code-interpreter better-sqlite3
+npm install cheerio @e2b/code-interpreter better-sqlite3 --save
 
 echo "Running frontend"
 npm run frontend
diff --git a/config/promote-admin.js b/config/promote-admin.js
@@ -7,7 +7,10 @@ const connect = require('./connect');
 
 /**
  * Script to promote a user to administrator status
- * Usage: npm run promote-admin <email>
+ * Usage: npm run promote-admin <email> [-f|--force]
+ * 
+ * Options:
+ *   -f, --force    Skip confirmation prompt
  */
 (async () => {
   await connect();
@@ -17,10 +20,15 @@ const connect = require('./connect');
   console.purple('---------------------------');
 
   let email = '';
+  let force = false;
 
   // Parse command line arguments
-  if (process.argv.length >= 3) {
-    email = process.argv[2];
+  for (let i = 2; i < process.argv.length; i++) {
+    if (process.argv[i] === '-f' || process.argv[i] === '--force') {
+      force = true;
+    } else if (!email && process.argv[i].includes('@')) {
+      email = process.argv[i];
+    }
   }
 
   if (!email) {
@@ -45,14 +53,18 @@ const connect = require('./connect');
     silentExit(0);
   }
 
-  // Confirm the promotion
-  const confirmation = await askQuestion(
-    `Are you sure you want to promote ${email} to administrator? (y/N): `,
-  );
+  // Confirm the promotion unless force flag is used
+  if (!force) {
+    const confirmation = await askQuestion(
+      `Are you sure you want to promote ${email} to administrator? (y/N): `,
+    );
 
-  if (confirmation.toLowerCase() !== 'y') {
-    console.orange('Operation cancelled.');
-    silentExit(0);
+    if (confirmation.toLowerCase() !== 'y') {
+      console.orange('Operation cancelled.');
+      silentExit(0);
+    }
+  } else {
+    console.yellow(`Promoting ${email} to administrator without confirmation...`);
   }
 
   try {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Upstream Sync`
	`1`	`+name: JM - Upstream Sync`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`# Run on a daily schedule`