log stream improvement

packages/meta-sort-core/src/config/EnvConfig.ts

@@ -89,13 +89,6 @@ interface EnvConfig {
     /** Docker network for plugin containers (default: 'meta-network') */
     CONTAINER_NETWORK: string;
 
-    /**
-     * WebDAV URL for plugin file access.
-     * Plugins access /files via this WebDAV endpoint served by meta-sort nginx.
-     * Example: "http://meta-sort-dev/webdav"
-     */
-    PLUGIN_WEBDAV_URL?: string;
-
     /** Docker Compose project name for grouping containers in Docker Desktop (optional). When set, plugin containers appear grouped as a stack. */
     PLUGIN_STACK_NAME?: string;
 
@@ -151,9 +144,8 @@ export const config: EnvConfig = {
     CONTAINER_PLUGINS_CONFIG: process.env.CONTAINER_PLUGINS_CONFIG || '/app/plugins.yml',
     DOCKER_SOCKET_PATH: process.env.DOCKER_SOCKET_PATH || '/var/run/docker.sock',
     CONTAINER_CALLBACK_URL: process.env.CONTAINER_CALLBACK_URL || 'http://meta-sort:8180',
-    CONTAINER_META_CORE_URL: process.env.CONTAINER_META_CORE_URL || 'http://meta-sort:9000',
+    CONTAINER_META_CORE_URL: process.env.CONTAINER_META_CORE_URL || 'http://meta-sort',
     CONTAINER_NETWORK: process.env.CONTAINER_NETWORK || 'meta-network',
-    PLUGIN_WEBDAV_URL: process.env.PLUGIN_WEBDAV_URL,
     PLUGIN_STACK_NAME: process.env.PLUGIN_STACK_NAME,
     PLUGIN_CACHE_HOST_PATH: process.env.PLUGIN_CACHE_HOST_PATH,
 

packages/meta-sort-core/src/container-plugins/ContainerManager.ts

@@ -73,7 +73,7 @@ function getContainerName(pluginId: string, instanceIndex: number): string {
  *     /files/corn     - SMB mounts (mounted by rclone inside meta-sort)
  *
  * WebDAV configuration:
- *   - PLUGIN_WEBDAV_URL: WebDAV endpoint URL (e.g., "http://meta-sort-dev/webdav")
+ *   - webdavUrl: Retrieved from meta-core /urls API via LeaderClient
  *
  * Benefits:
  *   - Works with Docker's overlay filesystem (no NFS file handle issues)
@@ -103,15 +103,16 @@ export class ContainerManager extends EventEmitter {
         private filesPath: string = config.FILES_PATH,
         callbackUrl?: string,
         metaCoreUrl?: string,
+        webdavUrl?: string,
         dockerClient?: DockerClient
     ) {
         super();
         this.dockerClient = dockerClient || new DockerClient(config.DOCKER_SOCKET_PATH);
 
-        // Initialize with env vars as fallback (will be overridden by service discovery)
+        // Initialize with provided values or env vars as fallback
         this.callbackUrl = callbackUrl ?? config.CONTAINER_CALLBACK_URL;
         this.metaCoreUrl = metaCoreUrl ?? config.CONTAINER_META_CORE_URL;
-        this.webdavUrl = config.PLUGIN_WEBDAV_URL;
+        this.webdavUrl = webdavUrl;
 
         // Configure stack name for Docker Desktop grouping
         this.stackName = config.PLUGIN_STACK_NAME;
@@ -119,27 +120,25 @@ export class ContainerManager extends EventEmitter {
 
     /**
      * Discover service URLs from meta-core service discovery file
-     * Explicit env vars (CONTAINER_CALLBACK_URL, PLUGIN_WEBDAV_URL) take priority
+     * WebDAV URL should be passed via constructor (from LeaderClient/meta-core API)
-     * Service discovery is only used as fallback
+     * Service discovery is used for callback URL fallback
      */
     private async discoverServiceUrls(): Promise<void> {
-        // Check if explicit env vars are set - these take priority for container communication
+        // Log WebDAV URL (should be set from meta-core API via LeaderClient)
-        const explicitCallbackUrl = config.CONTAINER_CALLBACK_URL;
+        if (this.webdavUrl) {
-        const explicitWebdavUrl = config.PLUGIN_WEBDAV_URL;
+            console.log(`[ContainerManager] Using WebDAV URL from meta-core: ${this.webdavUrl}`);
+        }
 
+        // Check if callback URL is already set
+        const explicitCallbackUrl = config.CONTAINER_CALLBACK_URL;
         if (explicitCallbackUrl) {
             this.callbackUrl = explicitCallbackUrl;
             console.log(`[ContainerManager] Using explicit callback URL: ${this.callbackUrl}`);
         }
 
-        if (explicitWebdavUrl) {
+        // If both are set, skip service discovery
-            this.webdavUrl = explicitWebdavUrl;
+        if (this.callbackUrl && this.webdavUrl) {
-            console.log(`[ContainerManager] Using explicit WebDAV URL: ${this.webdavUrl}`);
+            console.log('[ContainerManager] All URLs configured, skipping service discovery');
-        }
-
-        // If both are explicitly set, skip service discovery
-        if (explicitCallbackUrl && explicitWebdavUrl) {
-            console.log('[ContainerManager] Using explicit env vars, skipping service discovery');
             return;
         }
 
@@ -154,8 +153,8 @@ export class ContainerManager extends EventEmitter {
             const api = serviceInfo.api;
             const endpoints = serviceInfo.endpoints || {};
 
-            // Only use service discovery if env var not set
+            // Use service discovery for callback URL if not set
-            if (!explicitCallbackUrl) {
+            if (!this.callbackUrl) {
                 if (endpoints.callback) {
                     this.callbackUrl = endpoints.callback;
                     console.log(`[ContainerManager] Discovered callback URL: ${this.callbackUrl}`);
@@ -166,7 +165,8 @@ export class ContainerManager extends EventEmitter {
                 }
             }
 
-            if (!explicitWebdavUrl) {
+            // Use service discovery for WebDAV URL if not set (fallback)
+            if (!this.webdavUrl) {
                 if (endpoints.webdav) {
                     this.webdavUrl = endpoints.webdav;
                     console.log(`[ContainerManager] Discovered WebDAV URL: ${this.webdavUrl}`);
@@ -186,9 +186,9 @@ export class ContainerManager extends EventEmitter {
 
             console.log('[ContainerManager] Service discovery successful');
         } catch (error) {
-            console.warn(`[ContainerManager] Service discovery failed, using env vars: ${error}`);
+            console.warn(`[ContainerManager] Service discovery failed: ${error}`);
-            console.log(`[ContainerManager] Using fallback callback URL: ${this.callbackUrl}`);
+            console.log(`[ContainerManager] Using callback URL: ${this.callbackUrl}`);
-            console.log(`[ContainerManager] Using fallback WebDAV URL: ${this.webdavUrl || 'not set'}`);
+            console.log(`[ContainerManager] Using WebDAV URL: ${this.webdavUrl || 'not set'}`);
         }
     }
 
@@ -429,7 +429,7 @@ export class ContainerManager extends EventEmitter {
 
         // No file mounts needed - plugins access files via WebDAV
         if (!this.webdavUrl) {
-            console.warn(`[ContainerManager] WARNING: WebDAV not configured. Plugin '${pluginId}' won't have access to files. Set PLUGIN_WEBDAV_URL.`);
+            console.warn(`[ContainerManager] WARNING: WebDAV not configured. Plugin '${pluginId}' won't have access to files. Ensure meta-core is running and accessible.`);
         }
 
         // Create container
@@ -1034,7 +1034,8 @@ export class ContainerManager extends EventEmitter {
  */
 export function createContainerManager(
     configPath?: string,
-    network?: string
+    network?: string,
+    webdavUrl?: string
 ): ContainerManager {
-    return new ContainerManager(configPath, network);
+    return new ContainerManager(configPath, network, undefined, undefined, undefined, webdavUrl);
 }

packages/meta-sort-core/src/index.ts

@@ -178,7 +178,23 @@ process.on('SIGINT', async () => {
         if (existsSync(config.CONTAINER_PLUGINS_CONFIG)) {
             console.log('[Startup] Initializing container plugins...');
             try {
-                containerManager = new ContainerManager();
+                // Get webdavUrl from meta-core via LeaderClient
+                const leaderInfo = kvManager?.getLeaderInfo();
+                const webdavUrl = leaderInfo?.webdavUrl;
+                if (webdavUrl) {
+                    console.log(`[Startup] WebDAV URL from meta-core: ${webdavUrl}`);
+                } else {
+                    console.warn('[Startup] WebDAV URL not available from meta-core');
+                }
+
+                containerManager = new ContainerManager(
+                    config.CONTAINER_PLUGINS_CONFIG,
+                    config.CONTAINER_NETWORK,
+                    config.FILES_PATH,
+                    undefined, // callbackUrl - use env var default
+                    undefined, // metaCoreUrl - use env var default
+                    webdavUrl  // webdavUrl from meta-core API
+                );
                 await containerManager.initialize();
 
                 // Connect container manager to plugin manager