dev_server: Add password

Also fix up the QUICKSTART document for other recent changes made.

Author: malone-at-work

villagesql/dev_server/QUICKSTART.md.template

@@ -25,36 +25,48 @@ brew install openssl
 # 2. Start the server
 ./villagesql start
 
-# 3. Connect to the server
+# 3. Check the server is running
+./villagesql status
+
+# 4. Connect to the server
 ./villagesql connect
 
-# 4. Stop the server (when done)
+# 5. Stop the server (when done)
 ./villagesql stop
 ```
 
-## Installing Extensions
-
-VillageSQL extensions are installed by name. The server searches for `.veb` files in configured directories (default: `lib/veb/`).
+To set a root password, pass `--password` to `init` — you will be prompted interactively:
 
-```sql
--- Install an extension by name (looks for extension_name.veb)
-INSTALL EXTENSION extension_name;
+```bash
+./villagesql init --password
+./villagesql start
 ```
 
-### Example Extensions Included
+The password is stored in `instances/default/my.cnf` (mode 600) and picked up automatically by `connect` and `stop`.
 
-This package includes two example extensions you can try immediately:
+## Managing Extensions
 
-```sql
-INSTALL EXTENSION vsql_simple;
-INSTALL EXTENSION vsql_complex;
-```
+Extension management has two steps: copy the `.veb` file into the instance, then install it in the running server via SQL.
+
+### Adding and removing .veb files
+
+```bash
+# Copy a .veb file into this instance's extension directory
+./villagesql veb add /path/to/my_extension.veb
 
-**Tip:** Place your `.veb` files in `lib/veb/` to make them discoverable by the server.
+# List .veb files available to this instance
+./villagesql veb ls
 
-### Verifying Installation
+# Remove a .veb file from this instance
+./villagesql veb rm my_extension
+```
+
+### Installing extensions in the running server
 
 ```sql
+-- Install an extension (must be in the instance's veb directory)
+INSTALL EXTENSION my_extension;
+
 -- List installed extensions
 SELECT * FROM INFORMATION_SCHEMA.EXTENSIONS;
 
@@ -63,14 +75,22 @@ CREATE TABLE test_table (
     id INT PRIMARY KEY,
     custom_col YOUR_CUSTOM_TYPE
 );
+
+-- Uninstall an extension
+UNINSTALL EXTENSION my_extension;
 ```
 
-### Uninstalling
+### Example Extensions Included
+
+This package includes two example extensions seeded into new instances automatically:
 
 ```sql
-UNINSTALL EXTENSION your_extension_name;
+INSTALL EXTENSION vsql_simple;
+INSTALL EXTENSION vsql_complex;
 ```
 
+**Tip:** `.veb` files placed in `lib/veb/` are automatically copied into new instances when you run `./villagesql init`.
+
 ## Directory Structure
 
 - `bin/` - Server and client binaries
@@ -91,7 +111,7 @@ The helper script uses these defaults:
 - **Port:** 3307 (configurable via `$MYSQL_PORT`)
 - **Bind address:** `127.0.0.1` (localhost only)
 - **Error log:** `<instance-dir>/data/error.log`
-- **Root user:** `root` (no password)
+- **Root user:** `root` (no password by default; set one with `init --password`)
 
 ## Multiple Instances
 
@@ -104,14 +124,24 @@ socket, and PID files don't conflict:
 ./villagesql --dir ./instance-a start
 
 # Instance B on port 3308
-MYSQL_PORT=3308 ./villagesql --dir ./instance-b init
+./villagesql --dir ./instance-b init
 MYSQL_PORT=3308 ./villagesql --dir ./instance-b start
 
 # Connect to each independently
 ./villagesql --dir ./instance-a connect
 ./villagesql --dir ./instance-b connect
 ```
 
+Use `--here` as a shorthand to create an instance in the current directory
+(equivalent to `--dir $(pwd)/.vsql_here`):
+
+```bash
+cd /path/to/my-project
+./villagesql --here init
+./villagesql --here start
+./villagesql --here connect
+```
+
 ## Manual Server Control
 
 If you prefer manual control or need custom options:
@@ -167,12 +197,14 @@ UNINSTALL EXTENSION extension_name;
 
 Check the error log:
 ```bash
-tail -50 ./data/error.log
+tail -50 instances/default/data/error.log
+# Or for a custom instance directory:
+tail -50 <instance-dir>/data/error.log
 ```
 
 Common issues:
 - Port 3307 already in use: Set `MYSQL_PORT=3308` before running `./villagesql start`
-- Stale socket file: Remove `mysql.sock` manually
+- Stale socket file: Remove `instances/default/mysql.sock` manually (or `<instance-dir>/mysql.sock`)
 - Permissions: Ensure files are readable/executable
 
 ### Can't Connect

villagesql/dev_server/TEST_DOCS.md.template

@@ -10,26 +10,24 @@ This package includes the mysql-test framework (`mysql-test/`) for extension aut
 When developing an extension, specify your test suite directory and VEB location:
 
 ```bash
-cd mysql-test
-
 # Run all tests in your extension's test suite
-./mysql-test-run.pl --suite=/path/to/your/extension/tests \
-                    --veb-source-dir=/path/to/your/extension/build
+./villagesql mysql-test --suite=/path/to/your/extension/tests \
+                        --veb-source-dir=/path/to/your/extension/build
 
 # Run with parallel execution
-./mysql-test-run.pl --suite=/path/to/your/extension/tests \
-                    --veb-source-dir=/path/to/your/extension/build \
-                    --parallel=auto
+./villagesql mysql-test --suite=/path/to/your/extension/tests \
+                        --veb-source-dir=/path/to/your/extension/build \
+                        --parallel=auto
 
-# Run a specific test (test name as positional argument)
-./mysql-test-run.pl --suite=/path/to/your/extension/tests \
-                    --veb-source-dir=/path/to/your/extension/build \
-                    my_test
+ # Run a specific test
+./villagesql mysql-test --suite=/path/to/your/extension/tests/my_test.test \
+                        --veb-source-dir=/path/to/your/extension/build
+                        my_test
 
 # Record test results (for creating .result files)
-./mysql-test-run.pl --suite=/path/to/your/extension/tests \
-                    --veb-source-dir=/path/to/your/extension/build \
-                    --record
+./villagesql mysql-test --suite=/path/to/your/extension/tests \
+                        --veb-source-dir=/path/to/your/extension/build \
+                        --record
 ```
 
 **Options:**
@@ -41,13 +39,13 @@ cd mysql-test
 ### Test Organization
 
 Create your extension tests in:
-- `mysql-test/suite/my_extension/` - Your test suite
-- `mysql-test/suite/my_extension/t/` - Test files (.test)
-- `mysql-test/suite/my_extension/r/` - Expected results (.result)
+- `tests/` - Your test suite
+- `tests/t/` - Test files (.test)
+- `tests/r/` - Expected results (.result)
 
 Example test file structure:
 ```
-mysql-test/suite/my_extension/
+tests/
 ├── t/
 │   ├── basic.test
 │   └── advanced.test

villagesql/dev_server/villagesql.sh

@@ -36,6 +36,29 @@ done
 cmd_init() {
     set -e
 
+    # Parse init-specific flags
+    local password=""
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --password)
+                read -r -s -p "Password for root: " password
+                echo
+                local confirm
+                read -r -s -p "Confirm password: " confirm
+                echo
+                if [[ "$password" != "$confirm" ]]; then
+                    echo "Error: Passwords do not match"
+                    exit 1
+                fi
+                shift
+                ;;
+            *)
+                echo "Error: Unknown init option: $1"
+                exit 1
+                ;;
+        esac
+    done
+
     # Create the instance directory if it doesn't exist yet
     mkdir -p "$DIR"
 
@@ -67,6 +90,16 @@ cmd_init() {
         --datadir="$datadir" \
         --log-error-verbosity=3
 
+    if [[ -n "$password" ]]; then
+        # Write SQL to set the root password; applied by cmd_start on first boot.
+        # Use a subshell with umask 077 so the file is created 600 from the start.
+        local escaped="${password//\'/\'\'}"
+        (umask 077; printf "ALTER USER 'root'@'localhost' IDENTIFIED BY '%s';\n" "$escaped" > "$DIR/init_password.sql")
+
+        # Write per-instance client config so connect/stop pick up credentials automatically.
+        (umask 077; printf '[client]\nuser=root\npassword=%s\n' "$password" > "$DIR/my.cnf")
+    fi
+
     echo ""
     echo "✓ Database initialized successfully!"
     echo ""
@@ -117,6 +150,11 @@ cmd_start() {
     echo "  Log: $logfile"
     echo ""
 
+    local init_file_args=()
+    if [[ -f "$DIR/init_password.sql" ]]; then
+        init_file_args=("--init-file=$DIR/init_password.sql")
+    fi
+
     "$BASEDIR/bin/mysqld" \
         --no-defaults \
         --basedir="$BASEDIR" \
@@ -127,13 +165,15 @@ cmd_start() {
         --bind-address=127.0.0.1 \
         --pid-file="$pidfile" \
         --log-error="$logfile" \
-        --log-error-verbosity=3 &
+        --log-error-verbosity=3 \
+        "${init_file_args[@]}" &
 
     local server_pid=$!
     echo "Server starting (PID: $server_pid)..."
 
     for i in {1..30}; do
         if "$BASEDIR/bin/mysqladmin" --socket="$socket" ping >/dev/null 2>&1; then
+            rm -f "$DIR/init_password.sql"
             echo ""
             echo "✓ Server is ready!"
             echo ""
@@ -167,7 +207,10 @@ cmd_connect() {
         exit 1
     fi
 
-    exec "$BASEDIR/bin/mysql" --socket="$socket" -u root "$@"
+    local auth_args=(-u root)
+    [[ -f "$DIR/my.cnf" ]] && auth_args=("--defaults-file=$DIR/my.cnf")
+
+    exec "$BASEDIR/bin/mysql" "${auth_args[@]}" --socket="$socket" "$@"
 }
 
 cmd_status() {
@@ -228,8 +271,11 @@ cmd_stop() {
         exit 1
     fi
 
+    local auth_args=(-u root)
+    [[ -f "$DIR/my.cnf" ]] && auth_args=("--defaults-file=$DIR/my.cnf")
+
     echo "Stopping VillageSQL server (PID: $pid)..."
-    "$BASEDIR/bin/mysqladmin" --socket="$socket" -u root shutdown 2>/dev/null || true
+    "$BASEDIR/bin/mysqladmin" "${auth_args[@]}" --socket="$socket" shutdown 2>/dev/null || true
 
     for i in {1..30}; do
         if ! kill -0 "$pid" 2>/dev/null; then
@@ -336,7 +382,7 @@ cmd_help() {
     echo "Usage: villagesql [--dir <path>] <command> [args]"
     echo ""
     echo "Commands:"
-    echo "  init        Initialize the database (run once before first use)"
+    echo "  init [--password]  Initialize the database (run once before first use)"
     echo "  start       Start the VillageSQL server"
     echo "  connect     Connect to the running server (extra args passed to mysql)"
     echo "  stop        Stop the VillageSQL server"
@@ -357,6 +403,7 @@ cmd_help() {
     echo ""
     echo "Examples:"
     echo "  ./villagesql init && ./villagesql start"
+    echo "  ./villagesql init --password && ./villagesql start"
     echo "  ./villagesql --dir /tmp/test-instance init"
     echo "  ./villagesql --dir /tmp/test-instance start"
     echo "  MYSQL_PORT=3308 ./villagesql --dir ./second start"
@@ -371,7 +418,7 @@ case "$DIR_FLAG" in
 esac
 
 case "$1" in
-    init)    cmd_init ;;
+    init)    shift; cmd_init "$@" ;;
     start)   cmd_start ;;
     connect) shift; cmd_connect "$@" ;;
     stop)    cmd_stop ;;