Merge pull request #57 from xu16601526267/fix/stop-button-backend

Fix deploy.delete compatibility for model-name stop actions

Author: skyguan92

cmd/aima/tooldeps_deploy.go

@@ -451,6 +451,15 @@ func buildDeployDeps(ac *appContext, deps *mcp.ToolDeps,
 
 	deps.DeployDelete = func(ctx context.Context, name string) error {
 		matches := findMatchingDeployments(ctx, name, nil, rt, nativeRt, dockerRt)
+		if len(matches) == 0 {
+			// Backward-compatible fallback: some UI paths pass the model name
+			// instead of the concrete deployment name.
+			suppressRecentlyDeleted := loadDeletedDeploymentSuppressor(ctx, db)
+			modelStatus, statusErr := findDeploymentStatus(ctx, name, suppressRecentlyDeleted, rt, nativeRt, dockerRt)
+			if statusErr == nil && modelStatus != nil && modelStatus.Name != "" {
+				matches = findMatchingDeployments(ctx, modelStatus.Name, nil, rt, nativeRt, dockerRt)
+			}
+		}
 		if len(matches) == 0 {
 			return fmt.Errorf("deployment %q not found", name)
 		}
@@ -472,6 +481,7 @@ func buildDeployDeps(ac *appContext, deps *mcp.ToolDeps,
 		deletedAt := time.Now()
 		tombstoneKeys := []string{name}
 		seenKeys := map[string]struct{}{normalizeDeletedDeploymentKey(name): {}}
+		verificationQueries := []string{name}
 		rememberKey := func(key string) {
 			norm := normalizeDeletedDeploymentKey(key)
 			if norm == "" {
@@ -483,6 +493,18 @@ func buildDeployDeps(ac *appContext, deps *mcp.ToolDeps,
 			seenKeys[norm] = struct{}{}
 			tombstoneKeys = append(tombstoneKeys, key)
 		}
+		rememberVerificationQuery := func(key string) {
+			norm := normalizeDeletedDeploymentKey(key)
+			if norm == "" {
+				return
+			}
+			for _, existing := range verificationQueries {
+				if normalizeDeletedDeploymentKey(existing) == norm {
+					return
+				}
+			}
+			verificationQueries = append(verificationQueries, key)
+		}
 
 		for _, match := range matches {
 			if match.Runtime == nil || match.Status == nil {
@@ -492,11 +514,16 @@ func buildDeployDeps(ac *appContext, deps *mcp.ToolDeps,
 				return fmt.Errorf("delete deployment %q on %s: %w", match.Status.Name, match.Runtime.Name(), err)
 			}
 			rememberKey(match.Status.Name)
-			rememberKey(deploymentModelKey(match.Status))
+			modelKey := deploymentModelKey(match.Status)
+			rememberKey(modelKey)
+			rememberVerificationQuery(match.Status.Name)
+			rememberVerificationQuery(modelKey)
 		}
 
-		if remaining := findMatchingDeployments(ctx, name, nil, rt, nativeRt, dockerRt); len(remaining) > 0 {
-			return fmt.Errorf("delete deployment %q: deployment still active after delete (%s)", name, summarizeMatchedDeployments(remaining))
+		for _, query := range verificationQueries {
+			if remaining := findMatchingDeployments(ctx, query, nil, rt, nativeRt, dockerRt); len(remaining) > 0 {
+				return fmt.Errorf("delete deployment %q: deployment still active after delete (%s)", name, summarizeMatchedDeployments(remaining))
+			}
 		}
 
 		for _, key := range tombstoneKeys {

cmd/aima/uat_chain_test.go

@@ -22,6 +22,7 @@ import (
 type deleteTrackingRuntime struct {
 	name    string
 	status  map[string]*aimaRuntime.DeploymentStatus
+	aliases map[string]string
 	list    []*aimaRuntime.DeploymentStatus
 	delErrs map[string]error
 	deleted []string
@@ -49,6 +50,9 @@ func (r *deleteTrackingRuntime) Delete(_ context.Context, name string) error {
 }
 
 func (r *deleteTrackingRuntime) Status(_ context.Context, name string) (*aimaRuntime.DeploymentStatus, error) {
+	if target, ok := r.aliases[name]; ok {
+		name = target
+	}
 	if s, ok := r.status[name]; ok {
 		return s, nil
 	}
@@ -215,6 +219,102 @@ func TestDeployDeleteFailsWhenDeploymentStillListedAfterDelete(t *testing.T) {
 	}
 }
 
+func TestDeployDeleteFallsBackFromModelNameToResolvedDeploymentName(t *testing.T) {
+	ctx := context.Background()
+	db, err := state.Open(ctx, ":memory:")
+	if err != nil {
+		t.Fatalf("Open: %v", err)
+	}
+	defer db.Close()
+
+	deploy := &aimaRuntime.DeploymentStatus{
+		Name:    "qwen3-6-35b-a3b-sglang",
+		Phase:   "running",
+		Ready:   true,
+		Runtime: "docker",
+	}
+	dockerRt := &deleteTrackingRuntime{
+		name:    "docker",
+		status:  map[string]*aimaRuntime.DeploymentStatus{deploy.Name: deploy},
+		aliases: map[string]string{"qwen3.6-35b-a3b": deploy.Name},
+	}
+
+	deps := &mcp.ToolDeps{}
+	buildDeployDeps(&appContext{
+		db:       db,
+		rt:       dockerRt,
+		dockerRt: dockerRt,
+		proxy:    proxy.NewServer(),
+	}, deps,
+		func(context.Context, string, func(string, string), func(int64, int64)) error { return nil },
+		func(context.Context, string, string, string, map[string]any, bool, func(string, string), func(engine.ProgressEvent), func(int64, int64)) (json.RawMessage, error) {
+			return nil, nil
+		},
+	)
+
+	if err := deps.DeployDelete(ctx, "qwen3.6-35b-a3b"); err != nil {
+		t.Fatalf("DeployDelete: %v", err)
+	}
+	if got := dockerRt.deleted; len(got) != 1 || got[0] != deploy.Name {
+		t.Fatalf("docker delete sequence = %v, want [%s]", got, deploy.Name)
+	}
+}
+
+func TestDeployDeleteFallbackFailsWhenResolvedDeploymentStillActive(t *testing.T) {
+	ctx := context.Background()
+	db, err := state.Open(ctx, ":memory:")
+	if err != nil {
+		t.Fatalf("Open: %v", err)
+	}
+	defer db.Close()
+
+	deploy := &aimaRuntime.DeploymentStatus{
+		Name:    "qwen3-6-35b-a3b-sglang",
+		Phase:   "running",
+		Ready:   true,
+		Runtime: "docker",
+		Labels: map[string]string{
+			"aima.dev/model":  "qwen3-6-35b-a3b",
+			"aima.dev/engine": "sglang",
+		},
+	}
+	dockerRt := &deleteTrackingRuntime{
+		name:    "docker",
+		status:  map[string]*aimaRuntime.DeploymentStatus{deploy.Name: deploy},
+		aliases: map[string]string{"qwen3.6-35b-a3b": deploy.Name},
+		keep:    map[string]bool{deploy.Name: true},
+	}
+
+	deps := &mcp.ToolDeps{}
+	buildDeployDeps(&appContext{
+		db:       db,
+		rt:       dockerRt,
+		dockerRt: dockerRt,
+		proxy:    proxy.NewServer(),
+	}, deps,
+		func(context.Context, string, func(string, string), func(int64, int64)) error { return nil },
+		func(context.Context, string, string, string, map[string]any, bool, func(string, string), func(engine.ProgressEvent), func(int64, int64)) (json.RawMessage, error) {
+			return nil, nil
+		},
+	)
+
+	err = deps.DeployDelete(ctx, "qwen3.6-35b-a3b")
+	if err == nil {
+		t.Fatal("DeployDelete error = nil, want verification failure")
+	}
+	if !strings.Contains(err.Error(), "still active after delete") {
+		t.Fatalf("DeployDelete error = %v, want still-active verification failure", err)
+	}
+
+	tombstones, err := db.ListDeletedDeploymentsSince(ctx, time.Now().Add(-time.Minute))
+	if err != nil {
+		t.Fatalf("ListDeletedDeploymentsSince: %v", err)
+	}
+	if len(tombstones) != 0 {
+		t.Fatalf("deleted deployment tombstones = %v, want empty on failed delete", tombstones)
+	}
+}
+
 func TestDeployListAndStatusExposeTopLevelModelAndEngine(t *testing.T) {
 	ctx := context.Background()
 	db, err := state.Open(ctx, ":memory:")