canvas/src/components/WorkspaceNode.tsx

@@ -13,17 +13,20 @@ import { isExternalLikeRuntime } from "@/lib/externalRuntimes";
 
 /** Descendant count for the "N sub" badge — children are first-class nodes
  *  rendered as full cards inside this one via React Flow's native parentId,
- *  so we don't need to subscribe to the actual child list here. */
+ *  so we don't need to subscribe to the actual child list here.
+ *  Selecting `nodes` stably avoids a new selector reference on every store
+ *  update (React error #185 / Zustand + React 19 Object.is strictness). */
 function useDescendantCount(nodeId: string): number {
-  return useCanvasStore(
-    useCallback((s) => countDescendants(nodeId, s.nodes), [nodeId])
-  );
+  const nodes = useCanvasStore((s) => s.nodes);
+  return useMemo(() => countDescendants(nodeId, nodes), [nodeId, nodes]);
 }
 
+/** Boolean flag used to drive min-size and NodeResizer dimensions.
+ *  Selecting `nodes` stably avoids re-render loops (same issue as
+ *  useDescendantCount). */
 function useHasChildren(nodeId: string): boolean {
-  return useCanvasStore(
-    useCallback((s) => s.nodes.some((n) => n.data.parentId === nodeId), [nodeId])
-  );
+  const nodes = useCanvasStore((s) => s.nodes);
+  return useMemo(() => nodes.some((n) => n.data.parentId === nodeId), [nodes, nodeId]);
 }
 
 /** Eject/extract arrow icon — visually distinct from delete ✕ */

canvas/src/components/canvas/DropTargetBadge.tsx

@@ -24,16 +24,20 @@ import {
  */
 export function DropTargetBadge() {
   const dragOverNodeId = useCanvasStore((s) => s.dragOverNodeId);
-  const targetName = useCanvasStore((s) => {
-    if (!s.dragOverNodeId) return null;
-    const n = s.nodes.find((nn) => nn.id === s.dragOverNodeId);
+  // Select nodes stably first — deriving targetName and childCount inside
+  // the same selector creates a new return value on every store mutation
+  // even when neither has changed (React error #185 / Zustand Object.is).
+  const nodes = useCanvasStore((s) => s.nodes);
+  const targetName = (() => {
+    if (!dragOverNodeId) return null;
+    const n = nodes.find((nn) => nn.id === dragOverNodeId);
     return (n?.data as WorkspaceNodeData | undefined)?.name ?? null;
-  });
-  const childCount = useCanvasStore((s) =>
-    !s.dragOverNodeId
+  })();
+  const childCount = (() =>
+    !dragOverNodeId
       ? 0
-      : s.nodes.filter((n) => n.parentId === s.dragOverNodeId).length,
-  );
+      : nodes.filter((n) => n.parentId === dragOverNodeId).length
+  )();
   const { getInternalNode, flowToScreenPosition } = useReactFlow();
   if (!dragOverNodeId || !targetName) return null;
   const internal = getInternalNode(dragOverNodeId);

canvas/src/components/canvas/useCanvasViewport.ts

@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useRef } from "react";
+import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useReactFlow } from "@xyflow/react";
 import { useCanvasStore } from "@/store/canvas";
 import { appendClass, removeClass } from "@/store/classNames";
@@ -153,10 +153,17 @@ export function useCanvasViewport() {
   // fit, the user has to manually pan + zoom to find what they just
   // created. Only fires when TRANSITIONING from some-provisioning to
   // zero-provisioning — not on every re-render.
-  const provisioningCount = useCanvasStore(
-    (s) => s.nodes.filter((n) => n.data.status === "provisioning").length,
+  //
+  // Selecting `nodes` stably (array reference) avoids the
+  // `.filter().length` anti-pattern which creates a new number on every
+  // store update and breaks the wasProvisioning/hasProvisioning
+  // transition detection (React error #185 / Zustand + React 19).
+  const nodes = useCanvasStore((s) => s.nodes);
+  const provisioningCount = useMemo(
+    () => nodes.filter((n) => n.data.status === "provisioning").length,
+    [nodes],
   );
-  const nodeCount = useCanvasStore((s) => s.nodes.length);
+  const nodeCount = nodes.length;
 
   useEffect(() => {
     const hasProvisioning = provisioningCount > 0;

canvas/src/components/mobile/MobileChat.tsx

@@ -5,7 +5,7 @@
 // that the desktop ChatTab uses, but with a slimmer surface: no
 // attachments, no A2A topology overlay, no conversation tracing.
 
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 
 import { api } from "@/lib/api";
 import { useCanvasStore } from "@/store/canvas";
@@ -49,7 +49,10 @@ export function MobileChat({
   onBack: () => void;
 }) {
   const p = usePalette(dark);
-  const node = useCanvasStore((s) => s.nodes.find((n) => n.id === agentId));
+  // Selecting `nodes` stably avoids the `.find()` anti-pattern that
+  // creates a new return value on every store update (React error #185).
+  const nodes = useCanvasStore((s) => s.nodes);
+  const node = useMemo(() => nodes.find((n) => n.id === agentId), [nodes, agentId]);
   // Bootstrap from the canvas store's per-workspace message buffer so the
   // user sees their prior thread on entry. The store is updated by the
   // socket → ChatTab flows the desktop runs; on mobile we read from the

canvas/src/components/mobile/MobileDetail.tsx

@@ -2,7 +2,7 @@
 
 // 03 · Agent detail — pills + tabbed content (Overview/Activity/Config/Memory).
 
-import { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 import { api } from "@/lib/api";
 import { useCanvasStore } from "@/store/canvas";
@@ -32,7 +32,10 @@ export function MobileDetail({
   onChat: () => void;
 }) {
   const p = usePalette(dark);
-  const node = useCanvasStore((s) => s.nodes.find((n) => n.id === agentId));
+  // Selecting `nodes` stably avoids the `.find()` anti-pattern that
+  // creates a new return value on every store update (React error #185).
+  const nodes = useCanvasStore((s) => s.nodes);
+  const node = useMemo(() => nodes.find((n) => n.id === agentId), [nodes, agentId]);
   const [tab, setTab] = useState<TabId>("overview");
 
   if (!node) {

workspace-server/internal/handlers/a2a_queue_test.go

@@ -81,6 +81,54 @@ func TestExtractIdempotencyKey_emptyOnMissing(t *testing.T) {
 	}
 }
 
+// ──────────────────────────────────────────────────────────────────────────────
+// extractExpiresInSeconds
+// ──────────────────────────────────────────────────────────────────────────────
+
+func TestExtractExpiresInSeconds_valid(t *testing.T) {
+	cases := []struct {
+		name string
+		body string
+		want int
+	}{
+		{"positive int", `{"params":{"expires_in_seconds":30}}`, 30},
+		{"zero", `{"params":{"expires_in_seconds":0}}`, 0},
+		{"large TTL", `{"params":{"expires_in_seconds":3600}}`, 3600},
+		{"nested message — not affected", `{"params":{"message":{"role":"user"},"expires_in_seconds":60}}`, 60},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := extractExpiresInSeconds([]byte(tc.body)); got != tc.want {
+				t.Errorf("extractExpiresInSeconds = %d, want %d", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestExtractExpiresInSeconds_invalidOrMissing(t *testing.T) {
+	cases := []struct {
+		name string
+		body string
+		want int
+	}{
+		{"negative → 0", `{"params":{"expires_in_seconds":-5}}`, 0},
+		{"missing expires_in_seconds", `{"params":{"message":{"role":"user"}}}`, 0},
+		{"no params at all", `{"method":"message/send"}`, 0},
+		{"malformed JSON", `not json`, 0},
+		{"empty body", ``, 0},
+		{"null value", `{"params":{"expires_in_seconds":null}}`, 0},
+		{"string value", `{"params":{"expires_in_seconds":"30"}}`, 0},
+		{"float value", `{"params":{"expires_in_seconds":30.5}}`, 30},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := extractExpiresInSeconds([]byte(tc.body)); got != tc.want {
+				t.Errorf("extractExpiresInSeconds(%q) = %d, want %d", tc.body, got, tc.want)
+			}
+		})
+	}
+}
+
 func TestExtractDelegationIDFromBody(t *testing.T) {
 	cases := []struct {
 		name string

workspace-server/internal/handlers/org.go

@@ -271,6 +271,62 @@ func (e EnvRequirement) IsSatisfied(configured map[string]struct{}) bool {
 	return false
 }
 
+// perWorkspaceUnsatisfied records a single unsatisfied RequiredEnv for a
+// specific workspace during org import preflight.
+type perWorkspaceUnsatisfied struct {
+	Workspace   string
+	FilesDir    string
+	Unsatisfied EnvRequirement
+}
+
+// collectPerWorkspaceUnsatisfied walks the workspace tree and returns every
+// RequiredEnv that is neither in `configured` (global secrets) nor resolvable
+// from the org root or workspace-level .env file. An empty orgBaseDir skips
+// the .env walk so all requirements appear unsatisfied (used by tests to
+// isolate the global-only path).
+func collectPerWorkspaceUnsatisfied(
+	workspaces []OrgWorkspace,
+	orgBaseDir string,
+	configured map[string]struct{},
+) []perWorkspaceUnsatisfied {
+	var result []perWorkspaceUnsatisfied
+	for _, ws := range workspaces {
+		result = append(result, checkWorkspaceRequiredEnv(ws, orgBaseDir, configured)...)
+	}
+	return result
+}
+
+func checkWorkspaceRequiredEnv(
+	ws OrgWorkspace,
+	orgBaseDir string,
+	configured map[string]struct{},
+) []perWorkspaceUnsatisfied {
+	var result []perWorkspaceUnsatisfied
+	// Merge in .env vars from the org root and the workspace-specific dir.
+	// Workspace-level vars override org-root vars, just as loadWorkspaceEnv
+	// implements: org root first, then ws dir on top.
+	if orgBaseDir != "" {
+		wsEnv := loadWorkspaceEnv(orgBaseDir, ws.FilesDir)
+		for k, v := range wsEnv {
+			configured[k] = struct{}{}
+			_ = v // value only used for merging into configured map
+		}
+	}
+	for _, req := range ws.RequiredEnv {
+		if !req.IsSatisfied(configured) {
+			result = append(result, perWorkspaceUnsatisfied{
+				Workspace:   ws.Name,
+				FilesDir:    ws.FilesDir,
+				Unsatisfied: req,
+			})
+		}
+	}
+	for _, child := range ws.Children {
+		result = append(result, checkWorkspaceRequiredEnv(child, orgBaseDir, configured)...)
+	}
+	return result
+}
+
 // UnmarshalYAML accepts either a scalar (string → single) or a map
 // with an `any_of` list (→ group).
 func (e *EnvRequirement) UnmarshalYAML(value *yaml.Node) error {

workspace-server/internal/handlers/org_helpers.go

@@ -64,7 +64,9 @@ func resolvePromptRef(inline, fileRef, orgBaseDir, filesDir string) (string, err
 
 // envVarRefPattern matches actual ${VAR} or $VAR references (not literal $).
 // Used to detect unresolved placeholders without false positives like "$5".
-var envVarRefPattern = regexp.MustCompile(`\$\{?[A-Za-z_][A-Za-z0-9_]*\}?`)
+// Requires [a-zA-Z_] as the first char after $ so $100 stays literal.
+// Two capture groups: (1) ${VAR} form, (2) $VAR form.
+var envVarRefPattern = regexp.MustCompile(`\$\{([a-zA-Z_][a-zA-Z0-9_]*)\}|\$([a-zA-Z_][a-zA-Z0-9_]*)`)
 
 // hasUnresolvedVarRef returns true if the original string had a ${VAR} or $VAR
 // reference that the expanded string didn't fully replace (i.e. the var was unset).

workspace-server/internal/handlers/org_helpers_pure_test.go

@@ -589,7 +589,7 @@ func TestRenderCategoryRoutingYAML_SpecialCharactersEscaped(t *testing.T) {
 // ── Additional coverage: appendYAMLBlock ───────────────────────────
 func TestAppendYAMLBlock_BothEmpty(t *testing.T) {
 	result := appendYAMLBlock(nil, "")
-	assert.Nil(t, result)
+	assert.Nil(t, result) // append(nil, []byte("")...) returns nil in Go
 }
 
 func TestAppendYAMLBlock_ExistingHasNewline(t *testing.T) {

workspace-server/internal/handlers/org_import.go

@@ -952,54 +952,6 @@ type PerWorkspaceUnsatisfied struct {
 
 // collectPerWorkspaceUnsatisfied recursively walks workspaces and returns
 // per-workspace RequiredEnv entries that are not covered by (a) a global
-// secret key or (b) a key present in the workspace's .env file(s) (org root
-// .env + per-workspace <files_dir>/.env). This complements
-// collectOrgEnv + loadConfiguredGlobalSecretKeys, which together only
-// validate global-level RequiredEnv against global_secrets. The .env
-// lookup mirrors the runtime resolution in createWorkspaceTree so that
-// the preflight result matches what the container actually receives at
-// start time.
-func collectPerWorkspaceUnsatisfied(workspaces []OrgWorkspace, orgBaseDir string, globalSecrets map[string]struct{}) []PerWorkspaceUnsatisfied {
-	var out []PerWorkspaceUnsatisfied
-	var walk func([]OrgWorkspace)
-	walk = func(wsList []OrgWorkspace) {
-		for _, ws := range wsList {
-			// Build the set of keys available to this workspace from .env.
-			// This is the same three-source stack that createWorkspaceTree
-			// injects into the container:
-			//   1. Org root .env (parseEnvFile, no filesDir)
-			//   2. Workspace <files_dir>/.env (if filesDir is set)
-			//   3. Persona bootstrap env (MOLECULE_PERSONA_ROOT/<filesDir>/env)
-			// Items 1+2 are on-disk and testable; item 3 is host-only and
-			// skipped here (persona env does NOT satisfy required_env —
-			// it carries identity tokens, not workspace LLM keys).
-			envFromFiles := loadWorkspaceEnv(orgBaseDir, ws.FilesDir)
-			// Convert map[string]string (from .env files) to map[string]struct{}
-			// to match IsSatisfied's signature.
-			envSet := make(map[string]struct{}, len(envFromFiles))
-			for k := range envFromFiles {
-				envSet[k] = struct{}{}
-			}
-			for _, req := range ws.RequiredEnv {
-				if req.IsSatisfied(globalSecrets) {
-					continue // covered by a global secret
-				}
-				if req.IsSatisfied(envSet) {
-					continue // covered by a per-workspace .env file
-				}
-				out = append(out, PerWorkspaceUnsatisfied{
-					Workspace:   ws.Name,
-					FilesDir:    ws.FilesDir,
-					Unsatisfied: req,
-				})
-			}
-			walk(ws.Children)
-		}
-	}
-	walk(workspaces)
-	return out
-}
-
 func loadConfiguredGlobalSecretKeys(ctx context.Context) (map[string]struct{}, error) {
 	rows, err := db.DB.QueryContext(ctx,
 		`SELECT key FROM global_secrets WHERE octet_length(encrypted_value) > 0 LIMIT $1`,

workspace-server/internal/handlers/plugins_atomic_test.go

@@ -215,6 +215,9 @@ func TestTarWalk_EmptyDirectory(t *testing.T) {
 	}
 }
 
+// TestTarWalk_NestedDirs is defined in plugins_atomic_tar_test.go to avoid
+// redeclaration. Deeply nested directory walk is tested there.
+
 // TestTarWalk_DirEntryHasTrailingSlash: directory entries must end with '/'
 // per tar format; tar.Header.Typeflag '5' (dir) must produce "name/" not "name".
 func TestTarWalk_DirEntryHasTrailingSlash(t *testing.T) {

workspace-server/internal/handlers/workspace_crud.go

@@ -149,6 +149,19 @@ func (h *WorkspaceHandler) Update(c *gin.Context) {
 		}
 	}
 
+	// Validate workspace_dir early so invalid paths are rejected before the
+	// existence check (consistent with name/role/runtime validation above).
+	if wsDir, ok := body["workspace_dir"]; ok {
+		if wsDir != nil {
+			if dirStr, isStr := wsDir.(string); isStr && dirStr != "" {
+				if err := validateWorkspaceDir(dirStr); err != nil {
+					c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace directory"})
+					return
+				}
+			}
+		}
+	}
+
 	ctx := c.Request.Context()
 
 	// Auth is fully enforced at the router layer (WorkspaceAuth middleware, #680).
@@ -206,15 +219,8 @@ func (h *WorkspaceHandler) Update(c *gin.Context) {
 	}
 	needsRestart := false
 	if wsDir, ok := body["workspace_dir"]; ok {
-		// Allow null to clear workspace_dir
-		if wsDir != nil {
-			if dirStr, isStr := wsDir.(string); isStr && dirStr != "" {
-				if err := validateWorkspaceDir(dirStr); err != nil {
-					c.JSON(http.StatusBadRequest, gin.H{"error": "invalid workspace directory"})
-					return
-				}
-			}
-		}
+		// ValidateWorkspaceDir was already called above before the existence check;
+		// the UPDATE itself is unconditional.
 		if _, err := db.DB.ExecContext(ctx, `UPDATE workspaces SET workspace_dir = $2, updated_at = now() WHERE id = $1`, id, wsDir); err != nil {
 			log.Printf("Update workspace_dir error for %s: %v", id, err)
 		}

workspace-server/internal/handlers/workspace_crud_test.go

@@ -188,16 +188,13 @@ func TestState_QueryError(t *testing.T) {
 
 func TestUpdate_InvalidUUID(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"name": "Test"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/not-a-uuid", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400, got %d: %s", w.Code, w.Body.String())
@@ -206,14 +203,11 @@ func TestUpdate_InvalidUUID(t *testing.T) {
 
 func TestUpdate_InvalidBody(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader([]byte("not json")))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400, got %d", w.Code)
@@ -221,23 +215,19 @@ func TestUpdate_InvalidBody(t *testing.T) {
 }
 
 func TestUpdate_WorkspaceNotFound(t *testing.T) {
-	mock, _ := setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
 	mock.ExpectQuery(`SELECT EXISTS\(SELECT 1 FROM workspaces WHERE id = \$1\)`).
 		WithArgs(wsID).
-		WillReturnRows(sqlmock.NewRows([]string{"exists"}).AddRow(false))
+		WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(0))
 
 	body := map[string]interface{}{"name": "New Name"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/"+wsID, bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusNotFound {
 		t.Errorf("expected 404, got %d: %s", w.Code, w.Body.String())
@@ -246,9 +236,6 @@ func TestUpdate_WorkspaceNotFound(t *testing.T) {
 
 func TestUpdate_NameTooLong(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	longName := make([]byte, 256)
 	for i := range longName {
@@ -259,7 +246,7 @@ func TestUpdate_NameTooLong(t *testing.T) {
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for name too long, got %d: %s", w.Code, w.Body.String())
@@ -268,9 +255,6 @@ func TestUpdate_NameTooLong(t *testing.T) {
 
 func TestUpdate_RoleTooLong(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	longRole := make([]byte, 1001)
 	for i := range longRole {
@@ -281,7 +265,7 @@ func TestUpdate_RoleTooLong(t *testing.T) {
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for role too long, got %d: %s", w.Code, w.Body.String())
@@ -290,16 +274,13 @@ func TestUpdate_RoleTooLong(t *testing.T) {
 
 func TestUpdate_NameWithNewline(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"name": "Name\nwith newline"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for newline in name, got %d: %s", w.Code, w.Body.String())
@@ -308,16 +289,13 @@ func TestUpdate_NameWithNewline(t *testing.T) {
 
 func TestUpdate_NameWithYAMLSpecialChars(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"name": "Name with [brackets]"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for YAML special chars in name, got %d: %s", w.Code, w.Body.String())
@@ -326,16 +304,13 @@ func TestUpdate_NameWithYAMLSpecialChars(t *testing.T) {
 
 func TestUpdate_WorkspaceDirSystemPath(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"workspace_dir": "/etc/my-workspace"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for system path workspace_dir, got %d: %s", w.Code, w.Body.String())
@@ -344,16 +319,13 @@ func TestUpdate_WorkspaceDirSystemPath(t *testing.T) {
 
 func TestUpdate_WorkspaceDirTraversal(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"workspace_dir": "/workspace/../../../etc"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for traversal in workspace_dir, got %d: %s", w.Code, w.Body.String())
@@ -362,16 +334,13 @@ func TestUpdate_WorkspaceDirTraversal(t *testing.T) {
 
 func TestUpdate_WorkspaceDirRelativePath(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.PATCH("/workspaces/:id", h.Update)
 
 	body := map[string]interface{}{"workspace_dir": "relative/path"}
 	b, _ := json.Marshal(body)
 	req, _ := http.NewRequest("PATCH", "/workspaces/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", bytes.NewReader(b))
 	req.Header.Set("Content-Type", "application/json")
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400 for relative workspace_dir, got %d: %s", w.Code, w.Body.String())
@@ -382,13 +351,10 @@ func TestUpdate_WorkspaceDirRelativePath(t *testing.T) {
 
 func TestDelete_InvalidUUID(t *testing.T) {
 	_, _ = setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.DELETE("/workspaces/:id", h.Delete)
 
 	req, _ := http.NewRequest("DELETE", "/workspaces/not-a-uuid", nil)
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusBadRequest {
 		t.Errorf("expected 400, got %d: %s", w.Code, w.Body.String())
@@ -396,10 +362,6 @@ func TestDelete_InvalidUUID(t *testing.T) {
 }
 
 func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
-	mock, _ := setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.DELETE("/workspaces/:id", h.Delete)
 
 	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
@@ -411,7 +373,7 @@ func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
 	req, _ := http.NewRequest("DELETE", "/workspaces/"+wsID, nil)
 	// No ?confirm=true
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusConflict {
 		t.Errorf("expected 409, got %d: %s", w.Code, w.Body.String())
@@ -430,10 +392,6 @@ func TestDelete_HasChildrenWithoutConfirm(t *testing.T) {
 }
 
 func TestDelete_ChildrenCheckQueryError(t *testing.T) {
-	mock, _ := setupWorkspaceCrudTest(t)
-	h := newWorkspaceCrudHandler(t)
-	r2 := gin.New()
-	r2.DELETE("/workspaces/:id", h.Delete)
 
 	wsID := "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
 
@@ -443,7 +401,7 @@ func TestDelete_ChildrenCheckQueryError(t *testing.T) {
 
 	req, _ := http.NewRequest("DELETE", "/workspaces/"+wsID, nil)
 	w := httptest.NewRecorder()
-	r2.ServeHTTP(w, req)
+	r.ServeHTTP(w, req)
 
 	if w.Code != http.StatusInternalServerError {
 		t.Errorf("expected 500, got %d", w.Code)