devlogs 2.2.6__tar.gz → 2.2.8__tar.gz

{devlogs-2.2.6/src/devlogs.egg-info → devlogs-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devlogs
-Version: 2.2.6
+Version: 2.2.8
 Summary: Developer-focused logging library for Python with OpenSearch integration.
 Author-email: Dan Driscoll <dan@thedandriscoll.org>
 License: MIT License
@@ -62,35 +62,61 @@ If you don't have OpenSearch running and you want to stand one up:
 
 ## Step 2: Copy/paste these instructions into your coding agent
 
+### Python
+
 > Please do the following in this project:
 > 1. Install `devlogs` as a dev dependency (`pip install devlogs` or add it to `requirements-dev.txt`/`pyproject.toml` optional dependencies).
-> 2. Add `DEVLOGS_OPENSEARCH_HOST`, `DEVLOGS_OPENSEARCH_PORT`, `DEVLOGS_OPENSEARCH_USER`, `DEVLOGS_OPENSEARCH_PASS`, and `DEVLOGS_INDEX` to the project `.env` file (or equivalent config). Defaults are `localhost`, `9200`, `admin`, and `devlogs-<projectname>`.
-> 3. Add devlogs hooks at the beginning of the application (main entrypoint/startup module), wrapped in an environment check so it only runs in development:
+> 2. Create a `.env.devlogs` file in the project root with a single `DEVLOGS_URL` variable (devlogs auto-discovers this file). Use the `opensearchs://` scheme for TLS or `opensearch://` for non-TLS:
+>    ```
+>    DEVLOGS_URL=opensearchs://admin:YourPasswordHere@localhost:9200/devlogs-<projectname>
+>    ```
+> 3. Run `devlogs init` (inside the virtualenv if one is set up) and verify the index is healthy.
+> 4. Add devlogs hooks at the beginning of the application (main entrypoint/startup module), wrapped in an environment check so it only runs in development:
 >    ```python
 >    import os
 >    import logging
 >    if os.getenv("ENVIRONMENT") != "production":
 >        from devlogs.handler import DevlogsHandler
+>        from devlogs.opensearch.client import get_opensearch_client
 >        from devlogs.build_info import resolve_build_info
 >
->        # Resolve build info (reads .build.json or generates)
 >        build_info = resolve_build_info(write_if_missing=True)
->
 >        handler = DevlogsHandler(
 >            application="my-app",  # Required: your app name
 >            component="api",       # Required: component name
 >            level=logging.INFO,
+>            opensearch_client=get_opensearch_client(),
 >            version=build_info.build_id,
 >        )
 >        logging.getLogger().addHandler(handler)
 >        logging.getLogger().setLevel(logging.INFO)
->
->        # Log startup
 >        logging.info("App started")
 >    ```
-> 4. Run `devlogs init` (inside the virtualenv if one is set up) and verify the index is healthy.
 > 5. Ask the user if they want MCP set up; if yes, state which agent you are (`copilot`, `claude`, or `codex`) and run `devlogs initmcp <agent>`.
 
+### JavaScript / TypeScript (browser)
+
+> Please do the following in this project:
+> 1. Install the browser package as a dev dependency: `npm install --save-dev devlogs-browser`.
+> 2. Initialize devlogs early in the application entrypoint, wrapped in an environment check so it only runs in development:
+>    ```javascript
+>    import * as devlogs from 'devlogs-browser';
+>
+>    if (process.env.NODE_ENV === 'development') {
+>      devlogs.init({
+>        url: 'https://admin:YourPasswordHere@localhost:9200',
+>        index: 'devlogs-<projectname>',
+>        application: 'my-app',   // Required: your app name
+>        component: 'frontend',   // Required: component name
+>      });
+>    }
+>    ```
+>    After `init()`, all `console.log`, `console.warn`, `console.error`, and `console.debug` calls are automatically forwarded to OpenSearch. The original console output is preserved.
+> 3. Use `devlogs.setArea('dashboard')` and `devlogs.setOperationId('op-123')` to add context to logs. Pass a plain object as the last argument to attach custom fields:
+>    ```javascript
+>    console.log('User action', { userId: 123, action: 'clicked' });
+>    ```
+
 ## Step 3: Use devlogs
 
 1. Run `devlogs initmcp <agent>` to set up the MCP server.
@@ -108,14 +134,28 @@ If you don't have OpenSearch running and you want to stand one up:
 	```sh
 	docker-compose up -d opensearch
 	```
-	Or point `DEVLOGS_OPENSEARCH_*` at an existing cluster.
+	Or point `DEVLOGS_URL` at an existing cluster.
 
-3. **Initialize indices/templates:**
+3. **Configure connection** (choose one):
+
+	Option A — `.env.devlogs` file (auto-discovered):
+	```
+	DEVLOGS_URL=opensearchs://admin:YourPasswordHere@localhost:9200/devlogs-myproject
+	```
+
+	Option B — `--url` flag (no config file needed):
+	```sh
+	devlogs --url 'opensearchs://admin:pass@localhost:9200/devlogs-myproject' init
+	```
+
+	Use `devlogs mkurl` to interactively build a properly URL-encoded connection string (handy for passwords with special characters).
+
+4. **Initialize indices/templates:**
 	```sh
 	devlogs init
 	```
 
-4. **Use in Python code (development only):**
+5. **Use in Python code (development only):**
 	```python
 	import os
 	import logging
@@ -123,15 +163,15 @@ If you don't have OpenSearch running and you want to stand one up:
 	# Only enable devlogs in development
 	if os.getenv("ENVIRONMENT") != "production":
 	    from devlogs.handler import DevlogsHandler
+	    from devlogs.opensearch.client import get_opensearch_client
 	    from devlogs.build_info import resolve_build_info
 
-	    # Get build info (reads .build.json or generates)
 	    build_info = resolve_build_info(write_if_missing=True)
-
 	    handler = DevlogsHandler(
 	        application="my-app",
 	        component="default",
 	        level=logging.DEBUG,
+	        opensearch_client=get_opensearch_client(),
 	        version=build_info.build_id,
 	    )
 	    logging.getLogger().addHandler(handler)
@@ -140,17 +180,38 @@ If you don't have OpenSearch running and you want to stand one up:
 	    logging.info("Hello from devlogs!")
 	```
 
-5. **Tail logs from CLI:**
+6. **Use in JavaScript/TypeScript (browser, development only):**
+	```javascript
+	import * as devlogs from 'devlogs-browser';
+
+	if (process.env.NODE_ENV === 'development') {
+	  devlogs.init({
+	    url: 'https://admin:YourPasswordHere@localhost:9200',
+	    index: 'devlogs-myproject',
+	    application: 'my-app',
+	    component: 'frontend',
+	  });
+	}
+
+	// All console methods are now forwarded to OpenSearch
+	console.log('Hello from devlogs!');
+
+	// Add context
+	devlogs.setArea('dashboard');
+	console.log('User action', { userId: 123, action: 'clicked' });
+	```
+
+7. **Tail logs from CLI:**
 	```sh
 	devlogs tail --area web --follow
 	```
 
-6. **Search logs from CLI:**
+8. **Search logs from CLI:**
 	```sh
 	devlogs search --q "error" --area web
 	```
 
-7. **Run the web UI:**
+9. **Run the web UI:**
 	```sh
 	uvicorn devlogs.web.server:app --port 8088
 	# Then open http://localhost:8088/ui/
@@ -224,7 +285,7 @@ client.emit(
 
 ```bash
 docker build -f Dockerfile.collector -t devlogs-collector .
-docker run -p 8080:8080 -e DEVLOGS_OPENSEARCH_URL=https://admin:pass@opensearch:9200/devlogs devlogs-collector
+docker run -p 8080:8080 -e DEVLOGS_URL=opensearchs://admin:pass@opensearch:9200/devlogs devlogs-collector
 ```
 
 See [HOWTO-COLLECTOR.md](HOWTO-COLLECTOR.md) for complete collector documentation.
@@ -260,7 +321,7 @@ Stream Jenkins build logs to OpenSearch using a standalone binary:
 pipeline {
     agent any
     environment {
-        DEVLOGS_OPENSEARCH_URL = credentials('devlogs-opensearch-url')
+        DEVLOGS_URL = credentials('devlogs-url')
         DEVLOGS_BINARY_URL = credentials('devlogs-binary-url')
     }
     stages {
@@ -284,13 +345,12 @@ Build the binary with `./build-standalone.sh` and host it somewhere accessible.
 
 ### Environment Variables
 
-**Collector Configuration:**
-- `DEVLOGS_URL` - Collector base URL (where apps send logs)
+**Connection (choose one):**
+- `DEVLOGS_URL` - Standard connection URL with auto-detection. OpenSearch URLs (`opensearchs://`, `opensearch://`) connect directly; collector URLs (`http://`, `https://`) use the collector endpoint.
 - `DEVLOGS_FORWARD_URL` - Forward mode: proxy to this upstream URL
 
-**OpenSearch Admin Connection:**
+**OpenSearch (individual variables, alternative to DEVLOGS_URL):**
 - `DEVLOGS_OPENSEARCH_HOST`, `DEVLOGS_OPENSEARCH_PORT`, `DEVLOGS_OPENSEARCH_USER`, `DEVLOGS_OPENSEARCH_PASS`
-- `DEVLOGS_OPENSEARCH_URL` - URL shortcut (e.g., `https://user:pass@host:9200/index`)
 - `DEVLOGS_OPENSEARCH_VERIFY_CERTS`, `DEVLOGS_OPENSEARCH_CA_CERT` - SSL/TLS settings
 
 **Index & Retention:**
@@ -308,7 +368,7 @@ See [.env.example](.env.example) for a complete configuration template.
 Use `--url` to specify connection details without a `.env` file:
 
 ```bash
-devlogs --url 'https://admin:pass@host:9200/myindex' tail
+devlogs --url 'opensearchs://admin:pass@host:9200/myindex' tail
 ```
 
 Use `--env` to load from a specific `.env` file:
@@ -325,7 +385,7 @@ Use `devlogs mkurl` to interactively create a properly URL-encoded connection st
 devlogs mkurl
 # Outputs the URL in three formats:
 # 1. Bare URL (for --url flag)
-# 2. Single DEVLOGS_OPENSEARCH_URL variable
+# 2. Single DEVLOGS_URL variable
 # 3. Individual .env variables
 ```
 

{devlogs-2.2.6 → devlogs-2.2.8}/README.md

@@ -19,35 +19,61 @@ If you don't have OpenSearch running and you want to stand one up:
 
 ## Step 2: Copy/paste these instructions into your coding agent
 
+### Python
+
 > Please do the following in this project:
 > 1. Install `devlogs` as a dev dependency (`pip install devlogs` or add it to `requirements-dev.txt`/`pyproject.toml` optional dependencies).
-> 2. Add `DEVLOGS_OPENSEARCH_HOST`, `DEVLOGS_OPENSEARCH_PORT`, `DEVLOGS_OPENSEARCH_USER`, `DEVLOGS_OPENSEARCH_PASS`, and `DEVLOGS_INDEX` to the project `.env` file (or equivalent config). Defaults are `localhost`, `9200`, `admin`, and `devlogs-<projectname>`.
-> 3. Add devlogs hooks at the beginning of the application (main entrypoint/startup module), wrapped in an environment check so it only runs in development:
+> 2. Create a `.env.devlogs` file in the project root with a single `DEVLOGS_URL` variable (devlogs auto-discovers this file). Use the `opensearchs://` scheme for TLS or `opensearch://` for non-TLS:
+>    ```
+>    DEVLOGS_URL=opensearchs://admin:YourPasswordHere@localhost:9200/devlogs-<projectname>
+>    ```
+> 3. Run `devlogs init` (inside the virtualenv if one is set up) and verify the index is healthy.
+> 4. Add devlogs hooks at the beginning of the application (main entrypoint/startup module), wrapped in an environment check so it only runs in development:
 >    ```python
 >    import os
 >    import logging
 >    if os.getenv("ENVIRONMENT") != "production":
 >        from devlogs.handler import DevlogsHandler
+>        from devlogs.opensearch.client import get_opensearch_client
 >        from devlogs.build_info import resolve_build_info
 >
->        # Resolve build info (reads .build.json or generates)
 >        build_info = resolve_build_info(write_if_missing=True)
->
 >        handler = DevlogsHandler(
 >            application="my-app",  # Required: your app name
 >            component="api",       # Required: component name
 >            level=logging.INFO,
+>            opensearch_client=get_opensearch_client(),
 >            version=build_info.build_id,
 >        )
 >        logging.getLogger().addHandler(handler)
 >        logging.getLogger().setLevel(logging.INFO)
->
->        # Log startup
 >        logging.info("App started")
 >    ```
-> 4. Run `devlogs init` (inside the virtualenv if one is set up) and verify the index is healthy.
 > 5. Ask the user if they want MCP set up; if yes, state which agent you are (`copilot`, `claude`, or `codex`) and run `devlogs initmcp <agent>`.
 
+### JavaScript / TypeScript (browser)
+
+> Please do the following in this project:
+> 1. Install the browser package as a dev dependency: `npm install --save-dev devlogs-browser`.
+> 2. Initialize devlogs early in the application entrypoint, wrapped in an environment check so it only runs in development:
+>    ```javascript
+>    import * as devlogs from 'devlogs-browser';
+>
+>    if (process.env.NODE_ENV === 'development') {
+>      devlogs.init({
+>        url: 'https://admin:YourPasswordHere@localhost:9200',
+>        index: 'devlogs-<projectname>',
+>        application: 'my-app',   // Required: your app name
+>        component: 'frontend',   // Required: component name
+>      });
+>    }
+>    ```
+>    After `init()`, all `console.log`, `console.warn`, `console.error`, and `console.debug` calls are automatically forwarded to OpenSearch. The original console output is preserved.
+> 3. Use `devlogs.setArea('dashboard')` and `devlogs.setOperationId('op-123')` to add context to logs. Pass a plain object as the last argument to attach custom fields:
+>    ```javascript
+>    console.log('User action', { userId: 123, action: 'clicked' });
+>    ```
+
 ## Step 3: Use devlogs
 
 1. Run `devlogs initmcp <agent>` to set up the MCP server.
@@ -65,14 +91,28 @@ If you don't have OpenSearch running and you want to stand one up:
 	```sh
 	docker-compose up -d opensearch
 	```
-	Or point `DEVLOGS_OPENSEARCH_*` at an existing cluster.
+	Or point `DEVLOGS_URL` at an existing cluster.
 
-3. **Initialize indices/templates:**
+3. **Configure connection** (choose one):
+
+	Option A — `.env.devlogs` file (auto-discovered):
+	```
+	DEVLOGS_URL=opensearchs://admin:YourPasswordHere@localhost:9200/devlogs-myproject
+	```
+
+	Option B — `--url` flag (no config file needed):
+	```sh
+	devlogs --url 'opensearchs://admin:pass@localhost:9200/devlogs-myproject' init
+	```
+
+	Use `devlogs mkurl` to interactively build a properly URL-encoded connection string (handy for passwords with special characters).
+
+4. **Initialize indices/templates:**
 	```sh
 	devlogs init
 	```
 
-4. **Use in Python code (development only):**
+5. **Use in Python code (development only):**
 	```python
 	import os
 	import logging
@@ -80,15 +120,15 @@ If you don't have OpenSearch running and you want to stand one up:
 	# Only enable devlogs in development
 	if os.getenv("ENVIRONMENT") != "production":
 	    from devlogs.handler import DevlogsHandler
+	    from devlogs.opensearch.client import get_opensearch_client
 	    from devlogs.build_info import resolve_build_info
 
-	    # Get build info (reads .build.json or generates)
 	    build_info = resolve_build_info(write_if_missing=True)
-
 	    handler = DevlogsHandler(
 	        application="my-app",
 	        component="default",
 	        level=logging.DEBUG,
+	        opensearch_client=get_opensearch_client(),
 	        version=build_info.build_id,
 	    )
 	    logging.getLogger().addHandler(handler)
@@ -97,17 +137,38 @@ If you don't have OpenSearch running and you want to stand one up:
 	    logging.info("Hello from devlogs!")
 	```
 
-5. **Tail logs from CLI:**
+6. **Use in JavaScript/TypeScript (browser, development only):**
+	```javascript
+	import * as devlogs from 'devlogs-browser';
+
+	if (process.env.NODE_ENV === 'development') {
+	  devlogs.init({
+	    url: 'https://admin:YourPasswordHere@localhost:9200',
+	    index: 'devlogs-myproject',
+	    application: 'my-app',
+	    component: 'frontend',
+	  });
+	}
+
+	// All console methods are now forwarded to OpenSearch
+	console.log('Hello from devlogs!');
+
+	// Add context
+	devlogs.setArea('dashboard');
+	console.log('User action', { userId: 123, action: 'clicked' });
+	```
+
+7. **Tail logs from CLI:**
 	```sh
 	devlogs tail --area web --follow
 	```
 
-6. **Search logs from CLI:**
+8. **Search logs from CLI:**
 	```sh
 	devlogs search --q "error" --area web
 	```
 
-7. **Run the web UI:**
+9. **Run the web UI:**
 	```sh
 	uvicorn devlogs.web.server:app --port 8088
 	# Then open http://localhost:8088/ui/
@@ -181,7 +242,7 @@ client.emit(
 
 ```bash
 docker build -f Dockerfile.collector -t devlogs-collector .
-docker run -p 8080:8080 -e DEVLOGS_OPENSEARCH_URL=https://admin:pass@opensearch:9200/devlogs devlogs-collector
+docker run -p 8080:8080 -e DEVLOGS_URL=opensearchs://admin:pass@opensearch:9200/devlogs devlogs-collector
 ```
 
 See [HOWTO-COLLECTOR.md](HOWTO-COLLECTOR.md) for complete collector documentation.
@@ -217,7 +278,7 @@ Stream Jenkins build logs to OpenSearch using a standalone binary:
 pipeline {
     agent any
     environment {
-        DEVLOGS_OPENSEARCH_URL = credentials('devlogs-opensearch-url')
+        DEVLOGS_URL = credentials('devlogs-url')
         DEVLOGS_BINARY_URL = credentials('devlogs-binary-url')
     }
     stages {
@@ -241,13 +302,12 @@ Build the binary with `./build-standalone.sh` and host it somewhere accessible.
 
 ### Environment Variables
 
-**Collector Configuration:**
-- `DEVLOGS_URL` - Collector base URL (where apps send logs)
+**Connection (choose one):**
+- `DEVLOGS_URL` - Standard connection URL with auto-detection. OpenSearch URLs (`opensearchs://`, `opensearch://`) connect directly; collector URLs (`http://`, `https://`) use the collector endpoint.
 - `DEVLOGS_FORWARD_URL` - Forward mode: proxy to this upstream URL
 
-**OpenSearch Admin Connection:**
+**OpenSearch (individual variables, alternative to DEVLOGS_URL):**
 - `DEVLOGS_OPENSEARCH_HOST`, `DEVLOGS_OPENSEARCH_PORT`, `DEVLOGS_OPENSEARCH_USER`, `DEVLOGS_OPENSEARCH_PASS`
-- `DEVLOGS_OPENSEARCH_URL` - URL shortcut (e.g., `https://user:pass@host:9200/index`)
 - `DEVLOGS_OPENSEARCH_VERIFY_CERTS`, `DEVLOGS_OPENSEARCH_CA_CERT` - SSL/TLS settings
 
 **Index & Retention:**
@@ -265,7 +325,7 @@ See [.env.example](.env.example) for a complete configuration template.
 Use `--url` to specify connection details without a `.env` file:
 
 ```bash
-devlogs --url 'https://admin:pass@host:9200/myindex' tail
+devlogs --url 'opensearchs://admin:pass@host:9200/myindex' tail
 ```
 
 Use `--env` to load from a specific `.env` file:
@@ -282,7 +342,7 @@ Use `devlogs mkurl` to interactively create a properly URL-encoded connection st
 devlogs mkurl
 # Outputs the URL in three formats:
 # 1. Bare URL (for --url flag)
-# 2. Single DEVLOGS_OPENSEARCH_URL variable
+# 2. Single DEVLOGS_URL variable
 # 3. Individual .env variables
 ```
 

{devlogs-2.2.6 → devlogs-2.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devlogs"
-version = "2.2.6"
+version = "2.2.8"
 description = "Developer-focused logging library for Python with OpenSearch integration."
 requires-python = ">=3.11"
 readme = "README.md"

{devlogs-2.2.6 → devlogs-2.2.8}/src/devlogs/_version_static.py

@@ -1,2 +1,2 @@
 # AUTO-GENERATED at build time — do not edit or commit
-__version__ = "2.2.5"
+__version__ = "2.2.8"

{devlogs-2.2.6 → devlogs-2.2.8}/src/devlogs/cli.py

@@ -600,14 +600,29 @@ def diagnose(
 		else:
 			_emit("warn", ".env: not found and no DEVLOGS_* settings detected")
 
+	# Plugin / collector mode check
+	if cfg.url_mode == "collector":
+		from .collector.plugins import get_plugin_for_url
+		plugin = get_plugin_for_url(cfg.collector_url, cfg)
+		if plugin:
+			_emit("ok", f"Mode: plugin ({plugin.name})")
+			try:
+				status = plugin.check()
+				_emit("ok", f"Plugin: {status}")
+			except Exception as e:
+				_emit("error", f"Plugin: {e}")
+		else:
+			_emit("ok", f"Mode: collector ({cfg.collector_url})")
+
 	client = None
 	connection_ok = False
+	os_severity = "warn" if cfg.url_mode == "collector" else "error"
 	try:
 		client = get_opensearch_client()
 	except DevlogsDisabledError as exc:
-		_emit("error", f"OpenSearch: {exc}")
+		_emit(os_severity, f"OpenSearch: {exc}")
 	except OpenSearchError as exc:
-		_emit("error", f"OpenSearch: {exc}")
+		_emit(os_severity, f"OpenSearch: {exc}")
 	else:
 		try:
 			check_connection(client)

{devlogs-2.2.6 → devlogs-2.2.8}/src/devlogs/collector/__init__.py

@@ -13,6 +13,7 @@ from .errors import (
     ValidationError,
     ForwardError,
     IngestError,
+    PluginError,
     ConfigurationError,
     error_response,
     map_upstream_error,
@@ -22,8 +23,17 @@ from .errors import (
     ERROR_INVALID_PAYLOAD,
     ERROR_FORWARD_FAILED,
     ERROR_INGEST_FAILED,
+    ERROR_PLUGIN_FAILED,
     ERROR_NOT_CONFIGURED,
 )
+from .plugins import (
+    OutputPlugin,
+    register_plugin,
+    get_plugin_for_url,
+    get_registered_schemes,
+    list_plugins,
+    dict_to_record,
+)
 
 __all__ = [
     "DevlogsRecord",
@@ -34,6 +44,7 @@ __all__ = [
     "ValidationError",
     "ForwardError",
     "IngestError",
+    "PluginError",
     "ConfigurationError",
     "CollectorError",
     "error_response",
@@ -44,5 +55,12 @@ __all__ = [
     "ERROR_INVALID_PAYLOAD",
     "ERROR_FORWARD_FAILED",
     "ERROR_INGEST_FAILED",
+    "ERROR_PLUGIN_FAILED",
     "ERROR_NOT_CONFIGURED",
+    "OutputPlugin",
+    "register_plugin",
+    "get_plugin_for_url",
+    "get_registered_schemes",
+    "list_plugins",
+    "dict_to_record",
 ]

{devlogs-2.2.6 → devlogs-2.2.8}/src/devlogs/collector/auth.py

@@ -15,7 +15,6 @@ from urllib.parse import unquote
 TOKEN_PATTERN = re.compile(r"^.{8,}$")
 
 # Auth header patterns
-DEVLOGS1_PATTERN = re.compile(r"^Devlogs1\s+(\S+)", re.IGNORECASE)
 BEARER_PATTERN = re.compile(r"^Bearer\s+(\S+)", re.IGNORECASE)
 
 # Auth modes
@@ -117,44 +116,54 @@ def is_token_well_formed(token: Optional[str]) -> bool:
     return bool(TOKEN_PATTERN.match(token))
 
 
-def extract_token_from_headers(
+def extract_token(
     authorization: Optional[str] = None,
     x_devlogs_token: Optional[str] = None,
+    url_userinfo: Optional[str] = None,
+    url_query_token: Optional[str] = None,
 ) -> Tuple[Optional[str], str]:
-    """Extract token from request headers with proper precedence.
+    """Extract token from request with proper precedence.
 
-    Precedence: Devlogs1 → Bearer → X-Devlogs-Token
+    Precedence: Bearer header → X-Devlogs-Token header → URL userinfo → ?token= query
 
     Args:
         authorization: The Authorization header value
         x_devlogs_token: The X-Devlogs-Token header value
+        url_userinfo: Username from URL (e.g. token@host)
+        url_query_token: The ?token= query parameter value
 
     Returns:
         Tuple of (token_value, source) where source is one of:
-        'devlogs1', 'bearer', 'x-devlogs-token', or 'none'
+        'bearer', 'x-devlogs-token', 'url-userinfo', 'url-query', or 'none'
     """
     if authorization:
         authorization = authorization.strip()
-
-        # Try Devlogs1 first
-        match = DEVLOGS1_PATTERN.match(authorization)
-        if match:
-            return match.group(1), "devlogs1"
-
-        # Try Bearer
         match = BEARER_PATTERN.match(authorization)
         if match:
             return match.group(1), "bearer"
 
-    # Fall back to X-Devlogs-Token
     if x_devlogs_token:
         token = x_devlogs_token.strip()
         if token:
             return token, "x-devlogs-token"
 
+    if url_userinfo:
+        token = unquote(url_userinfo.strip())
+        if token:
+            return token, "url-userinfo"
+
+    if url_query_token:
+        token = unquote(url_query_token.strip())
+        if token:
+            return token, "url-query"
+
     return None, "none"
 
 
+# Keep old name as alias for backwards compatibility
+extract_token_from_headers = extract_token
+
+
 def parse_token_map_kv(kv_string: Optional[str]) -> Dict[str, TokenMapping]:
     """Parse the DEVLOGS_TOKEN_MAP_KV environment variable.
 

{devlogs-2.2.6 → devlogs-2.2.8}/src/devlogs/collector/cli.py

@@ -67,11 +67,17 @@ def serve(
             fg=typer.colors.YELLOW
         ))
     else:
-        mode_str = "FORWARD" if mode == "forward" else "INGEST"
-        typer.echo(typer.style(f"Starting collector in {mode_str} mode", fg=typer.colors.GREEN))
         if mode == "forward":
-            typer.echo(f"  Forwarding to: {cfg.forward_url}")
+            from .plugins import get_plugin_for_url
+            plugin = get_plugin_for_url(cfg.forward_url, cfg)
+            if plugin:
+                typer.echo(typer.style(f"Starting collector in PLUGIN mode ({plugin.name})", fg=typer.colors.GREEN))
+                typer.echo(f"  {plugin.display_info()}")
+            else:
+                typer.echo(typer.style("Starting collector in FORWARD mode", fg=typer.colors.GREEN))
+                typer.echo(f"  Forwarding to: {cfg.forward_url}")
         else:
+            typer.echo(typer.style("Starting collector in INGEST mode", fg=typer.colors.GREEN))
             typer.echo(f"  OpenSearch: {cfg.opensearch_host}:{cfg.opensearch_port}")
             typer.echo(f"  Index: {cfg.index}")
 
@@ -107,13 +113,20 @@ def check():
     typer.echo()
 
     # Show mode
+    plugin = None
     if mode == "error":
         typer.echo(typer.style("Mode: NOT CONFIGURED", fg=typer.colors.RED))
         typer.echo("  Set DEVLOGS_FORWARD_URL or DEVLOGS_OPENSEARCH_* variables")
         raise typer.Exit(1)
     elif mode == "forward":
-        typer.echo(typer.style("Mode: FORWARD", fg=typer.colors.CYAN))
-        typer.echo(f"  Forward URL: {cfg.forward_url}")
+        from .plugins import get_plugin_for_url
+        plugin = get_plugin_for_url(cfg.forward_url, cfg)
+        if plugin:
+            typer.echo(typer.style(f"Mode: PLUGIN ({plugin.name})", fg=typer.colors.CYAN))
+            typer.echo(f"  {plugin.display_info()}")
+        else:
+            typer.echo(typer.style("Mode: FORWARD", fg=typer.colors.CYAN))
+            typer.echo(f"  Forward URL: {cfg.forward_url}")
     else:
         typer.echo(typer.style("Mode: INGEST", fg=typer.colors.CYAN))
         typer.echo(f"  OpenSearch Host: {cfg.opensearch_host}")
@@ -146,6 +159,14 @@ def check():
         except Exception as e:
             typer.echo(typer.style(f"  OpenSearch: FAILED - {e}", fg=typer.colors.RED))
             raise typer.Exit(1)
+    elif plugin:
+        typer.echo(f"Testing {plugin.name} connectivity...")
+        try:
+            status = plugin.check()
+            typer.echo(typer.style(f"  {status}", fg=typer.colors.GREEN))
+        except Exception as e:
+            typer.echo(typer.style(f"  Plugin check failed: {e}", fg=typer.colors.RED))
+            raise typer.Exit(1)
     else:
         typer.echo("Testing forward URL connectivity...")
         try: