feat: change openclaw upgrade logic

agent/app/service/agents_utils.go

@@ -21,7 +21,6 @@ import (
 	"github.com/1Panel-dev/1Panel/agent/global"
 	"github.com/1Panel-dev/1Panel/agent/utils/common"
 	"github.com/1Panel-dev/1Panel/agent/utils/files"
-	openclawutil "github.com/1Panel-dev/1Panel/agent/utils/openclaw"
 	"github.com/1Panel-dev/1Panel/agent/utils/req_helper"
 	"gorm.io/gorm"
 )
@@ -388,9 +387,6 @@ func migrateOpenclawHTTPSUpgradeWithSystemIP(install *model.AppInstall, fromVers
 		return nil
 	}
 	migrateOpenclawInstallPorts(install)
-	if err := openclawutil.WriteCatchAllCaddyfile(install.GetPath()); err != nil {
-		return err
-	}
 	configPath := path.Join(install.GetPath(), "data", "conf", "openclaw.json")
 	var allowedOrigins []string
 	if conf, err := readOpenclawConfig(configPath); err == nil {
@@ -417,6 +413,35 @@ func migrateOpenclawHTTPSUpgradeWithSystemIP(install *model.AppInstall, fromVers
 	return migrateOpenclawInstallEnv(install, allowedOrigins)
 }
 
+func shouldRewriteOpenclawBundledCaddyfileOnUpgrade(install *model.AppInstall, fromVersion, toVersion string) bool {
+	if install == nil || install.App.Key != constant.AppOpenclaw {
+		return false
+	}
+	if strings.TrimSpace(fromVersion) != openclawHTTPSVersion {
+		return false
+	}
+	return common.CompareVersion(strings.TrimSpace(toVersion), openclawHTTPSVersion)
+}
+
+func rewriteOpenclawBundledCaddyfileOnUpgrade(install *model.AppInstall, fromVersion, toVersion, sourceAppDir string) error {
+	if !shouldRewriteOpenclawBundledCaddyfileOnUpgrade(install, fromVersion, toVersion) {
+		return nil
+	}
+	return copyOpenclawBundledCaddyfile(sourceAppDir, install.GetPath())
+}
+
+func copyOpenclawBundledCaddyfile(sourceAppDir, installPath string) error {
+	sourcePath := path.Join(sourceAppDir, "data", "caddy", "Caddyfile")
+	targetDir := path.Join(installPath, "data", "caddy")
+	fileOp := files.NewFileOp()
+	if !fileOp.Stat(targetDir) {
+		if err := fileOp.CreateDir(targetDir, constant.DirPerm); err != nil {
+			return err
+		}
+	}
+	return fileOp.CopyFile(sourcePath, targetDir)
+}
+
 func migrateOpenclawInstallPorts(install *model.AppInstall) {
 	if install == nil {
 		return

agent/app/service/app_utils.go

@@ -805,6 +805,9 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
 		if err = migrateOpenclawHTTPSUpgrade(&install, oldVersion, detail.Version); err != nil {
 			return err
 		}
+		if err = rewriteOpenclawBundledCaddyfileOnUpgrade(&install, oldVersion, detail.Version, detailDir); err != nil {
+			return err
+		}
 		if req.DockerCompose == "" {
 			newCompose, err = getUpgradeCompose(install, detail)
 			if err != nil {

agent/init/migration/migrate.go

@@ -72,7 +72,6 @@ func InitAgentDB() {
 		migrations.AddAgentTypeForAgents,
 		migrations.NormalizeAgentAccountVerifiedStatus,
 		migrations.NormalizeOllamaAccountAPIType,
-		migrations.RewriteOpenclawBundledCaddyfile,
 		migrations.InitAgentAccountModelPool,
 		migrations.AddHostTable,
 		migrations.AddAITerminalSettings,

agent/init/migration/migrations/init.go

@@ -989,13 +989,6 @@ var NormalizeOllamaAccountAPIType = &gormigrate.Migration{
 	},
 }
 
-var RewriteOpenclawBundledCaddyfile = &gormigrate.Migration{
-	ID: "20260318-rewrite-openclaw-bundled-caddyfile",
-	Migrate: func(tx *gorm.DB) error {
-		return migrationutils.RewriteOpenclawBundledCaddyfile(tx)
-	},
-}
-
 var InitAgentAccountModelPool = &gormigrate.Migration{
 	ID: "20260319-init-agent-account-model-pool",
 	Migrate: func(tx *gorm.DB) error {