Pull upstream work into your branch - which is behind upstream

.dockerignore

@@ -0,0 +1,21 @@
+.idea
+
+.gitattributes
+.gitignore
+.git
+
+.dockerignore
+Dockerfile
+docker-compose.yml
+
+LICENSE.md
+README.md
+
+storage.json
+
+/vendor
+nbproject/
+
+.vagrant
+vagrant
+Vagrantfile

.gitignore

@@ -1,4 +1,6 @@
 .idea
 /vendor
 .vagrant
-nbproject/
+nbproject/
+config.local.php
+review-batches/

AGENTS.md

@@ -0,0 +1,107 @@
+# Beanstalk Console - Agent Instructions & Guidelines
+
+Welcome! This file contains development guidelines, architectural details, and coding standards for the Beanstalk Console project. All AI agents working on this repository must adhere to these rules.
+
+---
+
+## 1. Project Overview
+**Beanstalk Console** is a web-based administration and monitoring console for the [Beanstalkd](https://beanstalkd.github.io/) queue server, written in PHP. 
+
+### Key Features
+- Server management (global config + user-added servers via cookies/environment).
+- Tube statistics and real-time monitoring.
+- Job management (peek, kick, delete, add, move jobs between tubes).
+- Sample jobs storage (saving job templates to a local JSON file).
+- Job search capability.
+
+---
+
+## 2. Architecture & Directory Structure
+
+The project uses a lightweight, custom MVC-like structure without a heavy framework:
+
+- **`public/index.php`**: The main entry point. Handles Basic Authentication, loads configuration, initializes the `Console` controller, and renders the main template.
+- **`config.php`**: Contains default configuration settings. **Do not modify this file for local setup.**
+- **`config.local.php`**: (Git-ignored) User-specific local configuration overrides.
+- **`lib/include.php`**: The core bootstrap file. Contains the custom class autoloader and the `Console` class, which acts as the main controller handling all actions (e.g., `_actionKick`, `_actionAddjob`, `_actionSearch`).
+- **`lib/Pheanstalk/`**: A bundled version of the Pheanstalk library (v2/v1, non-namespaced) used to communicate with the Beanstalkd server.
+- **`lib/tpl/`**: Contains PHP template files (e.g., `main.php`, `allTubes.php`, `currentTube.php`) rendered by the `Console` class.
+- **`src/`**: Contains the core model and utility classes:
+  - `Model.php`: Base model class using magic getters/setters and late static binding.
+  - `Server.php`: Represents a Beanstalkd server instance.
+  - `Settings.php`: Manages UI and user-specific settings.
+  - `Storage.php` / `IStorage.php`: Handles saving and retrieving sample jobs from `storage.json`.
+- **`public/assets/`, `public/css/`, `public/js/`**: Static assets, stylesheet (`customer.css`), and JavaScript logic (`customer.js` + jQuery plugins).
+
+---
+
+## 3. Technology Stack & Compatibility
+
+### Backend (PHP)
+- **PHP Version Compatibility**: The project requires and supports **`PHP 7.0.0` through `PHP 8.5+`** (declared as `"php": ">=7.0.0"` in `composer.json`).
+- **No Namespaces**: Do not use PHP namespaces. All class names must be unique and defined in the global namespace.
+- **Syntax Constraints**:
+  - **Null Coalescing & Arrays**: Use the null coalescing operator (`??`) and short array syntax (`[]`) freely, as they are fully supported in PHP 7.0+.
+  - **Avoid PHP 7.4+ features**: Do not use features like arrow functions `fn()`, typed properties, or null coalescing assignment `??=`.
+  - **Avoid PHP 8.0+ features**: Do not use union types, constructor promotion, match expressions, named arguments, or the nullsafe operator `?->`.
+  - **Array Key Shielding**: Always shield array key accesses (especially on superglobals like `$_GET`, `$_POST`, `$_SERVER`, and `$_COOKIE`) using `??` to prevent `E_WARNING` warnings on PHP 8.0+.
+  - **Variable Initialization**: Always initialize array keys before performing operations like accumulation (e.g., `$arr['total'] = 0` before `$arr['total'] += ...`).
+- **Autoloading**: Do not rely on Composer's autoloader for the project's own classes. The custom autoloader in `lib/include.php` automatically maps class names to filenames in `src/` and `lib/`.
+
+### Frontend
+- **HTML & PHP Templates**: UI markup is mixed with PHP in `lib/tpl/`.
+- **CSS**: Plain, vanilla CSS in `public/css/customer.css`. Avoid adding utility classes or external CSS frameworks unless explicitly requested.
+- **JavaScript**: jQuery-based interactive logic in `public/js/customer.js`.
+
+---
+
+## 4. Coding Guidelines & Best Practices
+
+### Configuration
+- Never commit credentials or local server configurations to `config.php`.
+- When adding a new configuration option, add it to `config.php` with a sensible default, and ensure that the configuration check in `config.php` (which verifies if `config.local.php` is missing any keys) is updated if necessary.
+
+### Modifying Business Logic vs. UI
+- **Controller/Action Logic**: Keep all request handling, Beanstalkd communication, and data preparation inside the `Console` class in `lib/include.php`.
+- **UI/Templates**: Keep the templates in `lib/tpl/` focused purely on rendering. Avoid database/socket communication or complex business logic inside templates.
+- **Sample Jobs**: Sample jobs are stored in `storage.json`. Ensure any modification to storage logic implements `IStorage` and is updated in `src/Storage.php`.
+
+### Code Style
+- Follow the existing style:
+  - 4-space indentation for PHP, JS, and CSS.
+  - `camelCase` for method names (e.g., `getSampleJobs`).
+  - Prefix action methods with an underscore (e.g., `_actionKick`).
+  - Keep comments clean, concise, and in English.
+
+---
+
+## 5. Development & Running the Project
+
+### Running Locally (PHP Built-in Server)
+To run the console locally without Docker or Vagrant, navigate to the project root and run:
+```powershell
+php -S localhost:8080 -t public
+```
+Then open `http://localhost:8080` in your browser.
+
+### Running with Docker
+To build and run the Docker container:
+```powershell
+docker compose up --build
+```
+
+### Running with Vagrant
+To spin up the Vagrant virtual machine:
+```powershell
+vagrant up
+```
+
+---
+
+## 6. Checklist for Changes
+Before finalizing any pull request or change:
+1. **PHP Compatibility**: Ensure the code remains compatible with the PHP 7.0 to PHP 8.5+ range. Do not introduce PHP 7.4+ or PHP 8.0+ syntax.
+2. **PHP 8 Warnings**: Verify that all array key accesses are shielded (e.g. using `??`) and variables are initialized to avoid PHP 8+ `E_WARNING` warnings.
+3. **Local Config**: Verify that `config.local.php` is not tracked by Git.
+4. **Storage Permission**: Ensure that any changes to sample jobs do not break the writability check of `storage.json` in `src/Storage.php`.
+5. **No Console Errors**: Check the browser console to ensure jQuery and `customer.js` run without errors.

Dockerfile

@@ -0,0 +1,21 @@
+FROM php:8.4-apache
+LABEL maintainer="Rion Dooley <dooley@tacc.utexas.edu>"
+
+ENV APACHE_DOCROOT="/var/www"
+
+# Configure Apache to listen on port 8080
+RUN sed -i 's/Listen 80/Listen 8080/g' /etc/apache2/ports.conf
+
+# Add custom default apache virtual host with combined error and access logging to stdout
+COPY docker/apache_vhost /etc/apache2/sites-available/000-default.conf
+COPY docker/php.ini /usr/local/etc/php
+
+WORKDIR "${APACHE_DOCROOT}"
+COPY . ./
+
+# Ensure Apache runtime directories and docroot are owned by www-data
+RUN chown -R www-data:www-data /var/run/apache2 /var/lock/apache2 /var/log/apache2 "${APACHE_DOCROOT}"
+
+USER www-data
+
+CMD ["apache2-foreground"]

README.md

@@ -8,20 +8,34 @@
 
 **Features**
 
-- Common list of servers in config for all users
+- Common list of servers in config for all users + optional Basic Auth
+- Global server list can be set via BEANSTALK_SERVERS environment variable
 - Each user can add its own personal Beanstalkd server
-- Full list of available tubes
 - Complete statistics about jobs in tubes
 - Realtime auto-update with highlighting of changed values
-- You can view jobs in ready/delayed/buried states in every tube
-- You can add/kick/delete jobs in every tube
-- You can select multiple tubes by regExp and clear them
-- You can move jobs between tubes
-- Ability to Pause tubes
-- Saved jobs (store sample jobs as a template, kick/edit them, very useful for development)
-- Customizable UI (code highlighter, choose columns, edit auto refresh seconds, pause tube seconds)
+- View jobs in ready/delayed/buried states in every tube
+- Highlighting of buried jobs for better visibility
+- Add/kick/delete jobs in every tube
+- Select multiple tubes by regular expression and clear them
+- Saved jobs: Store sample jobs as templates, kick/edit them (useful for development)
+- Search within job data fields
+- Move jobs between tubes
+- Pause tubes
+- Prepare review batches by moving jobs into an isolated review tube before moving, duplicating, or deleting them
+- Configurable UI settings (auto-refresh, decoding, pause duration, etc.)
+
+**Review batches**
+
+Review batches help inspect a bounded set of jobs without workers changing them during review. From a tube page, click "Prepare review batch", choose the source state, set how many current jobs to review, and choose the review tube name. Ready and delayed jobs can be reviewed when no clients are watching/waiting or when the tube is paused; the dialog can pause the tube and proceed when needed. Buried jobs can be reviewed directly because workers cannot reserve buried jobs.
+
+The review page uses a destination tube field, prefilled with the source tube. Moving jobs to the source tube returns them; changing the destination moves them elsewhere. Existing tubes are suggested, but new tube names can be typed. Selected jobs or all undecided jobs can also be duplicated to the destination or deleted from the review tube. Duplicated jobs remain available for further review actions until their review copy is moved or deleted. Job bodies can be snapshotted to local JSONL during preparation so they remain visible after review copies are moved or deleted.
+
+Review batch files are console-local support files used for auditing, current-state tracking, exports, and optional body display. They are not automatically removed, so delete completed review batches or disable body snapshots if disk growth is a concern.
+
+**Change log**
+
+Navigate to [Releases](https://github.com/ptrofimov/beanstalk_console/releases).
 
-Change log on [Releases](https://github.com/ptrofimov/beanstalk_console/releases).
 
 **Installation**
 
@@ -37,50 +51,42 @@ Then, use the `create-project` command to generate a new application:
 
 Composer will install the Beanstalk Console and all its dependencies under the `path/to/install` directory.
 
-### Setup using vagrant
-
-Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and [vagrant](http://www.vagrantup.com/downloads.html) then run (from project root):
-
-    vagrant up
-
-After provision beanstalk console will be available at [http://localhost:7654](http://localhost:7654) (port could be configured in Vagrantfile)
-
-### Download an Archive File
+### Run as a Docker container
 
-[Download](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), unzip files to your *wwww* directory and launch from *public* directory, enjoy!
+Install [Docker](https://docs.docker.com/installation/) then build and run with the following command (from project root):
 
+    docker build --rm -t beanstalk_console .
+    docker run -d -p "80:80" --name beanstalk_console beanstalk_console
 
-**Authors:** Petr Trofimov, Sergey Lysenko, Pentium10
+If you would rather just run the existing automated build of this project, run (from project root):
 
---------------------------------------------------
+    docker run -d -p "80:80" -e APACHE_PORT=80 --name beanstalk_console agaveapi/beanstalkd-console
 
-# Beanstalk консоль ![Русская версия](http://upload.wikimedia.org/wikipedia/en/thumb/f/f3/Flag_of_Russia.svg/22px-Flag_of_Russia.svg.png)
+To configure webapp with a custom beanstalk server to load at runtime, set the `BEANSTALKD_HOST` and `BEANSTALKD_PORT` environment variables.
 
-*Административная консоль для сервера очередей [Beanstalk](http://kr.github.com/beanstalkd), написанная на PHP*
+    docker run -d -p 80:80 \
+               --name beanstalk_console \
+               -e 'BEANSTALKD_HOST=beanstalkd' \
+               -e 'BEANSTALKD_PORT=11300' \
+               beanstalk_console
 
-**Возможности**
+To spin up a console with a beanstalkd server all at once, install [Docker Compose](https://docs.docker.com/compose/) and run (from project root):
 
-- Общий список серверов в конфиге для всех пользователей
-- Каждый пользователь может добавить свой персональный сервер
-- Полный список доступных труб
-- Полная статистика тасков в трубах
-- Realtime-обновление с подсветкой изменившихся значений
-- Вы можете просматривать таски в каждой трубе (ready/delayed/buried)
-- Вы можете выполнять операции с тасками в каждой трубе (add/kick/delete)
+    docker-compose up
 
-**Установка**
+### Setup using vagrant
 
-[Скачайте](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), положите распакованные файлы в www папку и наслаждайтесь!
+Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) and [vagrant](http://www.vagrantup.com/downloads.html) then run (from project root):
 
-**Установка с помощью vagrant**
+    vagrant up
 
-Установите [VirtualBox](https://www.virtualbox.org/wiki/Downloads) и [vagrant](http://www.vagrantup.com/downloads.html) затем запустите (в корневой директории проекта):
+After provision beanstalk console will be available at [http://localhost:7654](http://localhost:7654) (port could be configured in Vagrantfile)
 
-    vagrant up
+### Download an Archive File
 
-После завершения провизии консоль будет доступна по адресу [http://localhost:7654](http://localhost:7654) (порт можно сконфигурировать в Vagrantfile)
+[Download](https://github.com/ptrofimov/beanstalk_console/archive/master.zip), unzip files to your *www* directory and launch from *public* directory, enjoy!
 
-**Авторы:** Петр Трофимов, Сергей Лысенко, Pentium10
+**Authors:** Petr Trofimov, Sergey Lysenko, Pentium10
 
 --------------------------------------------------
 

Vagrantfile

@@ -4,8 +4,8 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-	config.vm.box = "precise64"
-	config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+	config.vm.box = "hashicorp/precise64"
+	config.vm.box_url = "https://vagrantcloud.com/hashicorp/boxes/precise64/versions/1.1.0/providers/virtualbox.box"
 
 	# expose ports
 	config.vm.network :forwarded_port, host: 7654, guest: 80

composer.json

@@ -3,14 +3,14 @@
     "description": "Admin console for Beanstalk queue server",
     "keywords": ["beanstalk", "beanstalkd", "queue", "console", "gui", "admin", "web admin", "monitoring", "stats", "interface", "php"],
     "type": "project",
-	"authors": [
+    "authors": [
         {
             "name": "Petr Trofimov"
         },
         {
             "name": "Sergey Lysenko"
         },
-		{
+        {
             "name": "Pentium10"
         }
     ],
@@ -19,7 +19,8 @@
     },
     "license": "MIT",
     "require": {
-        "php": ">=5.2.0",
-        "ext-json": "*"
+        "php": ">=7.0.0",
+        "ext-json": "*",
+        "ext-mbstring": "*"
     }
 }