[lockfile] Fix built-in plugin issues (#2189)

## Summary

Addresses #2187 and other
issues.

Fixes:

* Adding a package with built-in plugin was not triggering file creation
until shell/run. Now we do it on add instead.
* plugin version was not getting added to lockfile on `add` and instead
was getting added on next `ensureState`. Fixed this by ensuring plugin
version added during add.

## How was it tested?

* Installed nodejs, observed plugin version was in lockfile. 
* Installed nginx and observed devbox.s files were created right away

Author: mikeland73

internal/devbox/packages.go

@@ -270,6 +270,16 @@ func (d *Devbox) ensureStateIsUpToDate(ctx context.Context, mode installMode) er
 		ux.Finfo(d.stderr, "Ensuring packages are installed.\n")
 	}
 
+	if mode != ensure {
+		// Reload includes because added/removed packages might change plugins. Cases:
+		// * New package adds built-in plugin. We wanna make sure the plugin is in config.
+		// * Remove built-in plugin that installs multiple packages (e.g. nginx). We wanna clear them
+		// up so they get removed from lockfile in updateLockfile
+		if err = d.cfg.LoadRecursive(d.lockfile); err != nil {
+			return err
+		}
+	}
+
 	if mode == install || mode == update || mode == ensure {
 		if err := d.installPackages(ctx, mode); err != nil {
 			return err
@@ -299,7 +309,7 @@ func (d *Devbox) ensureStateIsUpToDate(ctx context.Context, mode installMode) er
 }
 
 // updateLockfile will ensure devbox.lock is up to date with the current state of the project.update
-// If recomputeState is true, then we will also update the local.lock file.
+// If recomputeState is true, then we will also update the state.json file.
 func (d *Devbox) updateLockfile(recomputeState bool) error {
 	// Ensure we clean out packages that are no longer needed.
 	d.lockfile.Tidy()
@@ -311,6 +321,13 @@ func (d *Devbox) updateLockfile(recomputeState bool) error {
 		}
 	}
 
+	// Update plugin versions in lockfile.
+	for _, pluginConfig := range d.Config().IncludedPluginConfigs() {
+		if err := d.PluginManager().UpdateLockfileVersion(pluginConfig); err != nil {
+			return err
+		}
+	}
+
 	// Save the lockfile at the very end, after all other operations were successful.
 	if err := d.lockfile.Save(); err != nil {
 		return err

internal/plugin/plugin.go

@@ -103,13 +103,20 @@ func (m *Manager) CreateFilesForConfig(cfg *Config) error {
 		if err := m.createFile(pkg, filePath, contentPath, virtenvPath); err != nil {
 			return err
 		}
-
 	}
 
-	if locked != nil {
-		locked.PluginVersion = cfg.Version
-	}
+	return nil
+}
 
+func (m *Manager) UpdateLockfileVersion(cfg *Config) error {
+	pkg := cfg.Source
+	locked := m.lockfile.Packages[pkg.LockfileKey()]
+	// plugins that are not triggered by packages don't have a lockfile entry
+	// this may change if we decide to store all plugins in the lockfile
+	if locked == nil {
+		return nil
+	}
+	locked.PluginVersion = cfg.Version
 	return m.lockfile.Save()
 }