fix(volumes): resolve env fallback paths for convert-to-file

app/Livewire/Project/Service/FileStorage.php

@@ -17,6 +17,7 @@
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
+use Symfony\Component\Yaml\Yaml;
 
 class FileStorage extends Component
 {
@@ -30,6 +31,8 @@ class FileStorage extends Component
 
     public ?string $workdir = null;
 
+    public ?string $resolvedFromEnvVar = null;
+
     public bool $permanently_delete = true;
 
     public bool $isReadOnly = false;
@@ -64,6 +67,7 @@ public function mount()
         }
 
         $this->isReadOnly = $this->fileStorage->shouldBeReadOnlyInUI();
+        $this->resolvedFromEnvVar = $this->isV6Parser() ? $this->detectEnvVarSource() : null;
         $this->syncData();
     }
 
@@ -86,6 +90,69 @@ public function syncData(bool $toModel = false): void
         }
     }
 
+    private function isV6Parser(): bool
+    {
+        $version = $this->resource instanceof Application
+            ? $this->resource->compose_parsing_version
+            : ($this->resource->service->compose_parsing_version ?? null);
+
+        return (int) $version >= 6;
+    }
+
+    /**
+     * Check the raw docker-compose for env var references in this volume's source.
+     * Returns the variable name if found, null otherwise.
+     */
+    private function detectEnvVarSource(): ?string
+    {
+        try {
+            $resource = $this->resource;
+            $dockerComposeRaw = $resource->service?->docker_compose_raw
+                ?? $resource->docker_compose_raw
+                ?? null;
+
+            if (! $dockerComposeRaw) {
+                return null;
+            }
+
+            $compose = Yaml::parse($dockerComposeRaw);
+
+            if (! isset($compose['services'])) {
+                return null;
+            }
+
+            $mountPath = $this->fileStorage->mount_path;
+
+            // Search all services in the compose for a volume matching this mount path
+            foreach ($compose['services'] as $serviceVolumes) {
+                $volumes = data_get($serviceVolumes, 'volumes', []);
+                foreach ($volumes as $volume) {
+                    $source = null;
+                    $target = null;
+
+                    if (is_string($volume)) {
+                        $parts = explode(':', $volume);
+                        if (count($parts) >= 2) {
+                            $source = $parts[0];
+                            $target = $parts[1];
+                        }
+                    } elseif (is_array($volume)) {
+                        $source = data_get($volume, 'source');
+                        $target = data_get($volume, 'target');
+                    }
+
+                    if ($target === $mountPath && $source && preg_match('/\$\{([a-zA-Z_][a-zA-Z0-9_]*)/', $source, $matches)) {
+                        return $matches[1];
+                    }
+                }
+            }
+        } catch (\Throwable $e) {
+            // Silently fail — this is just a UI hint
+        }
+
+        return null;
+    }
+
     public function convertToDirectory()
     {
         try {

app/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -2,7 +2,9 @@
 
 namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
+use App\Models\Application;
 use App\Models\EnvironmentVariable;
+use App\Models\LocalFileVolume;
 use App\Traits\EnvironmentVariableProtection;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
@@ -38,7 +40,7 @@ public function mount()
         $this->is_env_sorting_enabled = data_get($this->resource, 'settings.is_env_sorting_enabled', false);
         $this->use_build_secrets = data_get($this->resource, 'settings.use_build_secrets', false);
         $this->resourceClass = get_class($this->resource);
-        $resourceWithPreviews = [\App\Models\Application::class];
+        $resourceWithPreviews = [Application::class];
         $simpleDockerfile = filled(data_get($this->resource, 'dockerfile'));
         if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) {
             $this->showPreview = true;
@@ -185,6 +187,9 @@ public function submit($data = null)
 
             $this->updateOrder();
             $this->getDevView();
+
+            // Re-resolve volume paths that reference env vars (e.g., ${VAR:-./path})
+            LocalFileVolume::reResolveVolumePaths($this->resource);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Livewire/Project/Shared/EnvironmentVariable/Show.php

@@ -2,12 +2,17 @@
 
 namespace App\Livewire\Project\Shared\EnvironmentVariable;
 
+use App\Models\Application;
 use App\Models\Environment;
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
+use App\Models\LocalFileVolume;
 use App\Models\Project;
+use App\Models\Server;
+use App\Models\Service;
 use App\Models\SharedEnvironmentVariable;
 use App\Traits\EnvironmentVariableAnalyzer;
 use App\Traits\EnvironmentVariableProtection;
+use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Attributes\Computed;
 use Livewire\Component;
@@ -80,7 +85,7 @@ class Show extends Component
     public function mount()
     {
         $this->syncData();
-        if ($this->env->getMorphClass() === \App\Models\SharedEnvironmentVariable::class) {
+        if ($this->env->getMorphClass() === SharedEnvironmentVariable::class) {
             $this->isSharedVariable = true;
         }
         $this->parameters = get_route_parameters();
@@ -203,6 +208,13 @@ public function submit()
             $this->serialize();
             $this->syncData(true);
             $this->syncData(false);
+
+            // Re-resolve volume paths that reference env vars (e.g., ${VAR:-./path})
+            $resourceable = $this->env->resourceable ?? null;
+            if ($resourceable) {
+                LocalFileVolume::reResolveVolumePaths($resourceable);
+            }
+
             $this->dispatch('success', 'Environment variable updated.');
             $this->dispatch('envsUpdated');
             $this->dispatch('configurationChanged');
@@ -233,7 +245,7 @@ public function availableSharedVariables(): array
             $result['team'] = $team->environment_variables()
                 ->pluck('key')
                 ->toArray();
-        } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+        } catch (AuthorizationException $e) {
             // User not authorized to view team variables
         }
 
@@ -264,12 +276,12 @@ public function availableSharedVariables(): array
                                 $result['environment'] = $environment->environment_variables()
                                     ->pluck('key')
                                     ->toArray();
-                            } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                            } catch (AuthorizationException $e) {
                                 // User not authorized to view environment variables
                             }
                         }
                     }
-                } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                } catch (AuthorizationException $e) {
                     // User not authorized to view project variables
                 }
             }
@@ -279,7 +291,7 @@ public function availableSharedVariables(): array
         $serverUuid = data_get($this->parameters, 'server_uuid');
         if ($serverUuid) {
             // If we have a specific server_uuid, show variables for that server
-            $server = \App\Models\Server::where('team_id', $team->id)
+            $server = Server::where('team_id', $team->id)
                 ->where('uuid', $serverUuid)
                 ->first();
 
@@ -289,15 +301,15 @@ public function availableSharedVariables(): array
                     $result['server'] = $server->environment_variables()
                         ->pluck('key')
                         ->toArray();
-                } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                } catch (AuthorizationException $e) {
                     // User not authorized to view server variables
                 }
             }
         } else {
             // For application environment variables, try to use the application's destination server
             $applicationUuid = data_get($this->parameters, 'application_uuid');
             if ($applicationUuid) {
-                $application = \App\Models\Application::whereRelation('environment.project.team', 'id', $team->id)
+                $application = Application::whereRelation('environment.project.team', 'id', $team->id)
                     ->where('uuid', $applicationUuid)
                     ->with('destination.server')
                     ->first();
@@ -308,15 +320,15 @@ public function availableSharedVariables(): array
                         $result['server'] = $application->destination->server->environment_variables()
                             ->pluck('key')
                             ->toArray();
-                    } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                    } catch (AuthorizationException $e) {
                         // User not authorized to view server variables
                     }
                 }
             } else {
                 // For service environment variables, try to use the service's server
                 $serviceUuid = data_get($this->parameters, 'service_uuid');
                 if ($serviceUuid) {
-                    $service = \App\Models\Service::whereRelation('environment.project.team', 'id', $team->id)
+                    $service = Service::whereRelation('environment.project.team', 'id', $team->id)
                         ->where('uuid', $serviceUuid)
                         ->with('server')
                         ->first();
@@ -327,7 +339,7 @@ public function availableSharedVariables(): array
                             $result['server'] = $service->server->environment_variables()
                                 ->pluck('key')
                                 ->toArray();
-                        } catch (\Illuminate\Auth\Access\AuthorizationException $e) {
+                        } catch (AuthorizationException $e) {
                             // User not authorized to view server variables
                         }
                     }
@@ -354,7 +366,14 @@ public function delete()
                 }
             }
 
+            $resourceable = $this->env->resourceable ?? null;
             $this->env->delete();
+
+            // Re-resolve volume paths that reference env vars (e.g., ${VAR:-./path})
+            if ($resourceable) {
+                LocalFileVolume::reResolveVolumePaths($resourceable);
+            }
+
             $this->dispatch('environmentVariableDeleted');
             $this->dispatch('success', 'Environment variable deleted successfully.');
         } catch (\Exception $e) {

app/Models/Application.php

@@ -116,7 +116,7 @@ class Application extends BaseModel
 {
     use ClearsGlobalSearchCache, HasConfiguration, HasFactory, HasMetrics, HasSafeStringAttribute, SoftDeletes;
 
-    private static $parserVersion = '5';
+    private static $parserVersion = '6';
 
     protected $fillable = [
         'name',