diff --git a/apps/api/src/app.test.ts b/apps/api/src/app.test.ts
index b641e38bb..6555f6b16 100644
--- a/apps/api/src/app.test.ts
+++ b/apps/api/src/app.test.ts
@@ -3,6 +3,15 @@ import { readFileSync } from "node:fs";
 import test from "node:test";
 import { HTTPException } from "hono/http-exception";
 
+import {
+  addApprovalCommentRequestSchema,
+  createApprovalRequestSchema,
+  delegateApprovalRequestSchema,
+  permissionPolicyWriteSchema,
+  respondApprovalRequestSchema,
+  useEvidenceForTaskRequestSchema
+} from "@workhub/contracts";
+
 import app from "./app.js";
 import { httpErrorCodeFor } from "./http-error-codes.js";
 import { jsonObjectMessage, malformedJsonMessage } from "./routes/json-body.js";
@@ -20,6 +29,10 @@ interface ErrorBody {
   };
 }
 
+type ZodRequestObject = {
+  shape: Record<string, { isOptional: () => boolean }>;
+};
+
 const documentedMethods = new Set(["delete", "get", "head", "options", "patch", "post", "put"]);
 const runtimeContractRouteIgnores = new Set(["/", "/openapi.json", "/api/openapi.json"]);
 
@@ -121,6 +134,49 @@ function jsonErrorCodeProperty(
   return error?.properties?.code;
 }
 
+function assertJsonErrorCodes(
+  paths: Record<string, Record<string, unknown>>,
+  path: string,
+  method: string,
+  status: string,
+  codes: string[]
+) {
+  assert.deepEqual(jsonErrorCodeProperty(paths, path, method, status), {
+    type: "string",
+    enum: codes
+  }, `${method.toUpperCase()} ${path} ${status} error codes drifted`);
+}
+
+function zodPropertyNames(schema: ZodRequestObject) {
+  return Object.keys(schema.shape).sort();
+}
+
+function zodRequiredPropertyNames(schema: ZodRequestObject) {
+  return Object.entries(schema.shape)
+    .filter(([, field]) => !field.isOptional())
+    .map(([name]) => name)
+    .sort();
+}
+
+function assertJsonRequestMatchesZodObject(
+  paths: Record<string, Record<string, unknown>>,
+  path: string,
+  method: string,
+  schema: ZodRequestObject
+) {
+  const openApiSchema = jsonRequestSchema(paths, path, method);
+  assert.deepEqual(
+    Object.keys(openApiSchema?.properties ?? {}).sort(),
+    zodPropertyNames(schema),
+    `${method.toUpperCase()} ${path} request properties drifted from zod schema`
+  );
+  assert.deepEqual(
+    [...(openApiSchema?.required ?? [])].sort(),
+    zodRequiredPropertyNames(schema),
+    `${method.toUpperCase()} ${path} required request properties drifted from zod schema`
+  );
+}
+
 function responseObject(
   paths: Record<string, Record<string, unknown>>,
   path: string,
@@ -497,6 +553,22 @@ test("core JSON mutation routes document optional bodies and nested fields accur
   ]);
 });
 
+test("OpenAPI JSON request bodies stay aligned with zod input contracts", async () => {
+  const response = await app.request("/api/openapi.json");
+  const body = await response.json() as { paths: Record<string, Record<string, unknown>> };
+
+  for (const { path, method, schema } of [
+    { path: "/api/permissions", method: "put", schema: permissionPolicyWriteSchema },
+    { path: "/api/permissions/ask", method: "post", schema: createApprovalRequestSchema },
+    { path: "/api/approvals/{id}/respond", method: "post", schema: respondApprovalRequestSchema },
+    { path: "/api/approvals/{id}/delegate", method: "post", schema: delegateApprovalRequestSchema },
+    { path: "/api/approvals/{id}/comments", method: "post", schema: addApprovalCommentRequestSchema },
+    { path: "/api/workitems/{id}/evidence-bindings", method: "post", schema: useEvidenceForTaskRequestSchema }
+  ] as const) {
+    assertJsonRequestMatchesZodObject(body.paths, path, method, schema);
+  }
+});
+
 test("project and drive OpenAPI routes document runtime path and query parameters", async () => {
   const response = await app.request("/api/openapi.json");
   const body = await response.json() as { paths: Record<string, Record<string, unknown>> };
@@ -1130,7 +1202,12 @@ test("Approval and permission OpenAPI contracts document decision and policy act
     properties?: Record<string, unknown>;
   } | undefined;
   assert.deepEqual(deletePermissionNotFound?.required, ["ok", "error"]);
-  assert.deepEqual(deletePermissionNotFoundError?.properties?.code, { type: "string", enum: ["not_found"] });
+  // Old assertion expected generic not_found. That was wrong because permissions.revokePolicy
+  // returns the domain code permission_policy_not_found, and clients branch on that code.
+  assert.deepEqual(deletePermissionNotFoundError?.properties?.code, {
+    type: "string",
+    enum: ["permission_policy_not_found"]
+  });
 
   assert.deepEqual(jsonRequestSchema(body.paths, "/api/permissions/ask", "post")?.required, ["action_pattern"]);
   assert.deepEqual(Object.keys(jsonRequestProperties(body.paths, "/api/permissions/ask", "post")).sort(), [
@@ -1152,6 +1229,50 @@ test("Approval and permission OpenAPI contracts document decision and policy act
   assert.ok(askData?.properties?.approval, "POST /api/permissions/ask missing pending approval schema");
 });
 
+test("OpenAPI error responses document approval, meeting, and work item mutation status matrices", async () => {
+  const response = await app.request("/api/openapi.json");
+  const body = await response.json() as { paths: Record<string, Record<string, unknown>> };
+
+  assertJsonErrorCodes(body.paths, "/api/workitems", "post", "409", ["workitem_state_conflict"]);
+  assertJsonErrorCodes(body.paths, "/api/permissions/{id}", "delete", "404", ["permission_policy_not_found"]);
+
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/respond", "post", "401", ["not_identified"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/respond", "post", "403", ["invalid_client_token", "forbidden"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/respond", "post", "404", ["not_found"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/respond", "post", "409", ["approval_race"]);
+
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/delegate", "post", "401", ["not_identified"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/delegate", "post", "403", ["invalid_client_token", "forbidden"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/delegate", "post", "404", ["not_found", "delegate_target_not_found"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/delegate", "post", "409", ["approval_race"]);
+  assertJsonErrorCodes(body.paths, "/api/approvals/{id}/delegate", "post", "422", ["delegate_to_requester", "delegate_target_cannot_view"]);
+
+  for (const path of [
+    "/api/meetings/projects/{projectId}/insights/{insightId}/draft",
+    "/api/meetings/projects/{projectId}/insights/{insightId}/dismiss"
+  ] as const) {
+    assertJsonErrorCodes(body.paths, path, "post", "401", ["not_identified"]);
+    assertJsonErrorCodes(body.paths, path, "post", "403", ["invalid_client_token", "meeting_forbidden"]);
+    assertJsonErrorCodes(body.paths, path, "post", "404", ["meeting_not_found", "meeting_insight_not_found"]);
+  }
+
+  assertJsonErrorCodes(body.paths, "/api/meetings/workitems/{workItemId}/proposal-draft", "post", "401", ["not_identified"]);
+  assertJsonErrorCodes(body.paths, "/api/meetings/workitems/{workItemId}/proposal-draft", "post", "403", [
+    "invalid_client_token",
+    "forbidden",
+    "meeting_forbidden"
+  ]);
+  assertJsonErrorCodes(body.paths, "/api/meetings/workitems/{workItemId}/proposal-draft", "post", "404", [
+    "not_found",
+    "meeting_not_found",
+    "meeting_insight_not_found"
+  ]);
+  assertJsonErrorCodes(body.paths, "/api/meetings/workitems/{workItemId}/proposal-draft", "post", "409", [
+    "meeting_draft_source_missing",
+    "meeting_insight_dismissed"
+  ]);
+});
+
 test("Proposal OpenAPI contracts document review, merge, and conflict action payloads", async () => {
   const response = await app.request("/api/openapi.json");
   const body = await response.json() as { paths: Record<string, Record<string, unknown>> };
diff --git a/apps/api/src/openapi.ts b/apps/api/src/openapi.ts
index 152303cb9..d4e487982 100644
--- a/apps/api/src/openapi.ts
+++ b/apps/api/src/openapi.ts
@@ -1544,7 +1544,7 @@ const permissionForbiddenResponse = jsonErrorStatusResponse(
 const permissionPolicyNotFoundResponse = jsonErrorStatusResponse(
   "404",
   "Permission policy was not found",
-  ["not_found"]
+  ["permission_policy_not_found"]
 ).responses["404"];
 const permissionPolicyListResponse = {
   responses: {
@@ -1650,12 +1650,17 @@ const approvalListResponse = {
 const approvalRespondResponse = {
   responses: {
     "200": jsonDataResponse(approvalRespondResultResponseSchema, "Approval decision result").responses["200"],
+    "401": approvalNotIdentifiedResponse,
+    "403": approvalReadForbiddenResponse,
+    "404": approvalNotFoundResponse,
     "409": approvalRaceResponse
   }
 } as const;
 const approvalDelegateResponse = {
   responses: {
     "200": jsonDataResponse(approvalDelegateResultResponseSchema, "Delegated approval result").responses["200"],
+    "401": approvalNotIdentifiedResponse,
+    "403": approvalReadForbiddenResponse,
     "404": approvalDelegateNotFoundResponse,
     "422": approvalDelegateSemanticResponse,
     "409": approvalRaceResponse
@@ -2157,6 +2162,31 @@ const meetingPageResponseSchema = {
   },
   additionalProperties: false
 } as const;
+const meetingMutationNotIdentifiedResponse = jsonErrorStatusResponse(
+  "401",
+  "Meeting mutation requires an authenticated user",
+  ["not_identified"]
+).responses["401"];
+const meetingInsightForbiddenResponse = jsonErrorStatusResponse(
+  "403",
+  "Meeting insight is not visible or mutable by the current user",
+  ["invalid_client_token", "meeting_forbidden"]
+).responses["403"];
+const meetingInsightNotFoundResponse = jsonErrorStatusResponse(
+  "404",
+  "Meeting project or insight was not found",
+  ["meeting_not_found", "meeting_insight_not_found"]
+).responses["404"];
+const meetingDraftProposalForbiddenResponse = jsonErrorStatusResponse(
+  "403",
+  "Meeting-created work item draft is not visible or mutable by the current user",
+  ["invalid_client_token", "forbidden", "meeting_forbidden"]
+).responses["403"];
+const meetingDraftProposalNotFoundResponse = jsonErrorStatusResponse(
+  "404",
+  "Meeting-created work item draft or source insight was not found",
+  ["not_found", "meeting_not_found", "meeting_insight_not_found"]
+).responses["404"];
 const notificationPageItemResponseSchema = {
   type: "object",
   required: ["id", "type", "severity", "status", "inbox_bucket", "title", "created_at", "updated_at"],
@@ -4212,6 +4242,9 @@ export function getOpenApiDocument() {
           ],
           responses: {
             ...jsonOkResponse(meetingPageResponseSchema).responses,
+            "401": meetingMutationNotIdentifiedResponse,
+            "403": meetingInsightForbiddenResponse,
+            "404": meetingInsightNotFoundResponse,
             ...jsonErrorStatusResponse("409", "Meeting insight cannot be converted to a draft in its current state", [
               "meeting_insight_not_pending",
               "meeting_insight_draft_missing",
@@ -4230,6 +4263,9 @@ export function getOpenApiDocument() {
           ],
           responses: {
             ...jsonOkResponse(meetingPageResponseSchema).responses,
+            "401": meetingMutationNotIdentifiedResponse,
+            "403": meetingInsightForbiddenResponse,
+            "404": meetingInsightNotFoundResponse,
             ...jsonErrorStatusResponse("409", "Meeting insight cannot be dismissed in its current state", [
               "meeting_insight_not_pending"
             ]).responses
@@ -4243,6 +4279,9 @@ export function getOpenApiDocument() {
           parameters: [pathUuidParameter("workItemId")],
           responses: {
             ...jsonOkResponse(workItemDetailResponseSchema).responses,
+            "401": meetingMutationNotIdentifiedResponse,
+            "403": meetingDraftProposalForbiddenResponse,
+            "404": meetingDraftProposalNotFoundResponse,
             ...jsonErrorStatusResponse("409", "Meeting insight draft cannot create a proposal in its current state", [
               "meeting_draft_source_missing",
               "meeting_insight_dismissed"
diff --git a/apps/desktop-webview/src/browser.ts b/apps/desktop-webview/src/browser.ts
index 4f0281850..9fdc5c7db 100644
--- a/apps/desktop-webview/src/browser.ts
+++ b/apps/desktop-webview/src/browser.ts
@@ -77,6 +77,7 @@ import {
   resolveDesktopPetWindowBridge
 } from "./pet-window-bridge.js";
 import { parseDesktopShellNavigatePayload } from "./shell-events.js";
+import { handleDesktopSpotlightShellNavigate } from "./spotlight-shell-navigation.js";
 import { appleGlassDesignSystemCss } from "./design-system.js";
 import {
   commandPaletteCss,
@@ -89,11 +90,9 @@ import { glassWindowCss } from "./glass-window.js";
 import {
   mountSpotlight,
   type SpotlightManualDragFn,
-  type SpotlightResizeDirection,
   type SpotlightResizeFn
 } from "./spotlight/controller.js";
 import { spotlightCss } from "./spotlight/css.js";
-import { capabilityForShellRoute, entityIdFromShellRoute } from "./spotlight/state.js";
 import { reviewProposalWithoutMerge } from "./spotlight/views/proposals.js";
 import { isStaleDesktopClientTokenError } from "./auth-recovery.js";
 
@@ -1120,7 +1119,7 @@ const resizeMainWindow: SpotlightResizeFn = (width, height) => {
   }
 };
 
-// 搜索条像系统 Spotlight 一样可拖动，边缘热区可缩放；浏览器开发态无 __TAURI__ → no-op。
+// 搜索条像系统 Spotlight 一样可拖动；浏览器开发态无 __TAURI__ → no-op。
 const dragMainWindow = (): void => {
   const tauri = (globalThis as {
     __TAURI__?: {
@@ -1147,19 +1146,6 @@ const moveMainWindowBy: SpotlightManualDragFn = (deltaX, deltaY): void => {
   }
 };
 
-const resizeMainWindowFromEdge = (direction: SpotlightResizeDirection): void => {
-  const tauri = (globalThis as {
-    __TAURI__?: {
-      core?: { invoke?: (cmd: string, args?: Record<string, unknown>) => Promise<unknown> };
-      invoke?: (cmd: string, args?: Record<string, unknown>) => Promise<unknown>;
-    };
-  }).__TAURI__;
-  const invoke = tauri?.core?.invoke ?? tauri?.invoke;
-  if (typeof invoke === "function") {
-    void invoke("start_main_window_resize_drag", { direction }).catch(() => undefined);
-  }
-};
-
 // M2：launcher 顶层 Esc → 隐藏主窗（关闭盒子），兑现 hello 卡「Esc 关闭」承诺。浏览器开发态无 __TAURI__ → no-op。
 const dismissMainWindow = (): void => {
   const tauri = (globalThis as {
@@ -1252,7 +1238,6 @@ async function bootSpotlight() {
       resize: resizeMainWindow,
       drag: dragMainWindow,
       dragMove: moveMainWindowBy,
-      resizeDrag: resizeMainWindowFromEdge,
       dismiss: dismissMainWindow,
       onActionSettled: () => {
         void refreshApprovalsBadge();
@@ -1264,15 +1249,10 @@ async function bootSpotlight() {
     // 监听它 → 把盒子直接开到对应能力（回 "/" 则回 launcher）。这是 Cuu/外部入口与盒子联动的地基。
     const shellListen = resolveDesktopShellListen();
     void shellListen?.("navigate", (event) => {
-      const parsed = parseDesktopShellNavigatePayload(event.payload);
-      const cap = parsed ? capabilityForShellRoute(parsed.route) : undefined;
-      if (cap && parsed) {
-        // rank13：携带路由里的实体 id，让 workitem/proposals/replay 直接打开该项而非落到列表。
-        const id = entityIdFromShellRoute(parsed.route);
-        spotlight.openCapability(cap, id ? { id, route: parsed.route } : { route: parsed.route });
-      } else {
-        spotlight.reset();
-      }
+      handleDesktopSpotlightShellNavigate(event.payload, {
+        spotlight,
+        saveProjectContextFromRoute: saveDesktopCuuProjectContextFromRoute
+      });
     });
     // rank12：把「待你拍板」实时条数喂给 launcher 审批角标——盒子的核心承诺是一眼看到有几条待决策。
     // 启动拉一次 + 每 30s + 窗口重新聚焦时刷新；best-effort，失败不更新角标、不影响盒子。
diff --git a/apps/desktop-webview/src/liquid-glass-filter.test.ts b/apps/desktop-webview/src/liquid-glass-filter.test.ts
index 7f043c633..ed12e2275 100644
--- a/apps/desktop-webview/src/liquid-glass-filter.test.ts
+++ b/apps/desktop-webview/src/liquid-glass-filter.test.ts
@@ -3,6 +3,7 @@ import test from "node:test";
 
 import {
   liquidGlassFilterCss,
+  liquidGlassFilterHtml,
   rebuildWorkHubLiquidGlassFilters,
   renderWorkHubLiquidGlassLayer
 } from "./liquid-glass-filter.js";
@@ -19,14 +20,17 @@ test("liquid glass layer only refracts at the edge, without a colored backing su
   assert.doesNotMatch(liquidGlassFilterCss, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-refract\{[^}]*backdrop-filter/u);
   assert.doesNotMatch(liquidGlassFilterCss, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-refract\{[^}]*-webkit-backdrop-filter/u);
   assert.doesNotMatch(liquidGlassFilterCss, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-refract\{[^}]*-webkit-backdrop-filter/u);
-  assert.match(liquidGlassFilterCss, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-edge\{backdrop-filter:url\(#workhub-liquid-glass-pet-filter\) blur\(var\(--wh-liquid-frost\)\)/u);
-  assert.match(liquidGlassFilterCss, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-edge\{backdrop-filter:url\(#workhub-liquid-glass-spotlight-filter\) blur\(var\(--wh-liquid-frost\)\)/u);
+  // 3-4: the old assertions pinned SVG url(#workhub-liquid-glass-*) edge filters, but all
+  // active desktop consumers hide those layers; keeping the URLs kept a dead generated-map path alive.
+  assert.doesNotMatch(liquidGlassFilterCss, /url\(#workhub-liquid-glass/u);
+  assert.doesNotMatch(liquidGlassFilterHtml, /<svg|<filter|workhub-liquid-glass-defs/u);
   assert.doesNotMatch(liquidGlassFilterCss, /(?:^|[;{])filter:url\(#workhub-liquid-glass/u);
   assert.doesNotMatch(liquidGlassFilterCss, /--wh-liquid-frost:(?:1[0-9]|[2-9][0-9])px/u);
 });
 
-test("liquid glass filters are not rewritten when surface geometry is unchanged", () => {
+test("liquid glass filter rebuild is a no-op while SVG refraction is disabled", () => {
   let innerHtmlWrites = 0;
+  let canvasCreates = 0;
   const defs = {
     dataset: {} as Record<string, string>,
     _innerHTML: "",
@@ -58,15 +62,16 @@ test("liquid glass filters are not rewritten when surface geometry is unchanged"
   const doc = {
     getElementById: (id: string) => (id === "workhub-liquid-glass-defs" ? defs : null),
     querySelector: () => element,
-    createElement: () => canvas
+    createElement: () => {
+      canvasCreates += 1;
+      return canvas;
+    }
   } as unknown as Document;
 
   rebuildWorkHubLiquidGlassFilters(doc);
   rebuildWorkHubLiquidGlassFilters(doc);
 
-  assert.equal(innerHtmlWrites, 1);
-  assert.match(defs.innerHTML, /result="edge_mask"/u);
-  assert.match(defs.innerHTML, /<feComposite in="displaced_sat" in2="edge_mask" operator="in" result="edge_refracted"/u);
-  assert.match(defs.innerHTML, /<feComposite in="spec_faded" in2="edge_mask" operator="in" result="edge_specular"/u);
-  assert.doesNotMatch(defs.innerHTML, /<feBlend in="displaced_sat" in2="spec_faded"/u);
+  assert.equal(canvasCreates, 0);
+  assert.equal(innerHtmlWrites, 0);
+  assert.equal(defs.innerHTML, "");
 });
diff --git a/apps/desktop-webview/src/liquid-glass-filter.ts b/apps/desktop-webview/src/liquid-glass-filter.ts
index 39e211dc2..615df401a 100644
--- a/apps/desktop-webview/src/liquid-glass-filter.ts
+++ b/apps/desktop-webview/src/liquid-glass-filter.ts
@@ -1,21 +1,14 @@
-export const spotlightLiquidGlassFilterId = "workhub-liquid-glass-spotlight-filter";
-export const petLiquidGlassFilterId = "workhub-liquid-glass-pet-filter";
-const defsId = "workhub-liquid-glass-defs";
-const svgId = "workhub-liquid-glass-svg-defs";
-
-export const liquidGlassFilterHtml =
-  `<svg id="${svgId}" class="wh-liquid-glass-defs" xmlns="http://www.w3.org/2000/svg" width="0" height="0" aria-hidden="true" focusable="false" style="position:absolute;overflow:hidden;pointer-events:none;color-interpolation-filters:sRGB"><defs id="${defsId}"></defs></svg>`;
+// SVG displacement refraction is disabled for R9.3-4. Spotlight and pet surfaces
+// hide this layer, so generating per-size SVG maps only burned CPU without drawing.
+export const liquidGlassFilterHtml = "";
 
 export const liquidGlassFilterCss = [
-  ".wh-liquid-glass-defs{position:absolute!important;width:0!important;height:0!important;overflow:hidden!important;pointer-events:none!important}",
   ".wh-liquid-glass-warp{position:absolute;inset:0;z-index:0;pointer-events:none;border-radius:inherit;background:transparent;overflow:hidden;isolation:isolate;contain:paint;--wh-liquid-frost:.6px;--wh-liquid-saturation:155%;--wh-liquid-contrast:1.04;--wh-liquid-haze:rgba(246,248,252,.38);--wh-liquid-haze-blur:24px}",
   ".wh-liquid-glass-warp--spotlight{--wh-liquid-frost:.7px;--wh-liquid-saturation:160%;--wh-liquid-contrast:1.05;--wh-liquid-edge:14px;--wh-liquid-haze:rgba(246,248,252,.44);--wh-liquid-haze-blur:30px}",
   ".wh-liquid-glass-warp--pet{--wh-liquid-frost:.65px;--wh-liquid-saturation:158%;--wh-liquid-contrast:1.04;--wh-liquid-edge:16px;--wh-liquid-haze:rgba(248,250,252,.40);--wh-liquid-haze-blur:26px}",
   ".wh-liquid-glass-haze{position:absolute;inset:0;pointer-events:none;border-radius:inherit;background:var(--wh-liquid-haze);backdrop-filter:blur(var(--wh-liquid-haze-blur)) saturate(180%) contrast(1.02);-webkit-backdrop-filter:blur(var(--wh-liquid-haze-blur)) saturate(180%) contrast(1.02);box-shadow:inset 0 1px 0 rgba(255,255,255,.36),inset 0 -1px 0 rgba(0,0,0,.05)}",
   ".wh-liquid-glass-refract{position:absolute;inset:0;pointer-events:none;border-radius:inherit;background:transparent;isolation:isolate;filter:none;-webkit-filter:none}",
   ".wh-liquid-glass-edge{position:absolute;pointer-events:none;background:transparent;isolation:isolate;box-shadow:inset 0 1px 0 rgba(255,255,255,.54),inset 0 -1px 0 rgba(0,0,0,.12);filter:none;-webkit-filter:none}",
-  `.wh-liquid-glass-warp--spotlight .wh-liquid-glass-edge{backdrop-filter:url(#${spotlightLiquidGlassFilterId}) blur(var(--wh-liquid-frost)) saturate(var(--wh-liquid-saturation)) contrast(var(--wh-liquid-contrast));-webkit-backdrop-filter:url(#${spotlightLiquidGlassFilterId}) blur(var(--wh-liquid-frost)) saturate(var(--wh-liquid-saturation)) contrast(var(--wh-liquid-contrast))}`,
-  `.wh-liquid-glass-warp--pet .wh-liquid-glass-edge{backdrop-filter:url(#${petLiquidGlassFilterId}) blur(var(--wh-liquid-frost)) saturate(var(--wh-liquid-saturation)) contrast(var(--wh-liquid-contrast));-webkit-backdrop-filter:url(#${petLiquidGlassFilterId}) blur(var(--wh-liquid-frost)) saturate(var(--wh-liquid-saturation)) contrast(var(--wh-liquid-contrast))}`,
   ".wh-liquid-glass-warp--spotlight .wh-liquid-glass-edge{display:none}",
   ".wh-liquid-glass-edge--top{left:0;right:0;top:0;height:var(--wh-liquid-edge,12px);border-top-left-radius:inherit;border-top-right-radius:inherit}",
   ".wh-liquid-glass-edge--right{top:0;right:0;bottom:0;width:var(--wh-liquid-edge,12px);border-top-right-radius:inherit;border-bottom-right-radius:inherit}",
@@ -36,300 +29,10 @@ export function renderWorkHubLiquidGlassLayer(kind: LiquidGlassSurfaceKind): str
   return `<span class="wh-liquid-glass-warp wh-liquid-glass-warp--${kind}" aria-hidden="true"><span class="wh-liquid-glass-haze"></span><span class="wh-liquid-glass-refract"></span>${edges}</span>`;
 }
 
-type LiquidGlassFilterTarget = {
-  id: string;
-  selector: string;
-  radius: number;
-  bezel: number;
-  thickness: number;
-  ior: number;
-  blur: number;
-  scale: number;
-  specularOpacity: number;
-  specularSaturation: number;
-};
-
-const defaultTargets: LiquidGlassFilterTarget[] = [
-  {
-    id: spotlightLiquidGlassFilterId,
-    selector: ".wh-spot",
-    radius: 24,
-    bezel: 18,
-    thickness: 58,
-    ior: 1.32,
-    blur: 0.8,
-    scale: 0.28,
-    specularOpacity: 0.55,
-    specularSaturation: 1.35
-  },
-  {
-    id: petLiquidGlassFilterId,
-    selector: ".wh-pet-bubble",
-    radius: 20,
-    bezel: 15,
-    thickness: 68,
-    ior: 1.36,
-    blur: 0.9,
-    scale: 0.32,
-    specularOpacity: 0.62,
-    specularSaturation: 1.38
-  }
-];
-
-function ensureLiquidGlassSvg(doc: Document): SVGDefsElement | undefined {
-  let svg = doc.getElementById(svgId) as SVGSVGElement | null;
-  if (!svg) {
-    const container = doc.createElement("div");
-    container.innerHTML = liquidGlassFilterHtml;
-    svg = container.firstElementChild as SVGSVGElement | null;
-    if (svg) {
-      doc.body?.prepend(svg);
-    }
-  }
-  return doc.getElementById(defsId) as SVGDefsElement | null ?? undefined;
-}
-
-const surfaceHeight = (x: number) => {
-  const convex = Math.pow(1 - Math.pow(1 - Math.min(x * 2, 1), 4), 0.25);
-  const concave = 1 - Math.sqrt(1 - (1 - x) * (1 - x)) + 0.1;
-  const t = 6 * x ** 5 - 15 * x ** 4 + 10 * x ** 3;
-  return convex * (1 - t) + concave * t;
-};
-
-function calculateRefractionProfile(glassThickness: number, bezelWidth: number, ior: number, samples = 96) {
-  const eta = 1 / ior;
-  const profile = new Float64Array(samples);
-  const refract = (nx: number, ny: number) => {
-    const dot = ny;
-    const k = 1 - eta * eta * (1 - dot * dot);
-    if (k < 0) {
-      return undefined;
-    }
-    const sq = Math.sqrt(k);
-    return [-(eta * dot + sq) * nx, eta - (eta * dot + sq) * ny] as const;
-  };
-
-  for (let i = 0; i < samples; i += 1) {
-    const x = i / samples;
-    const y = surfaceHeight(x);
-    const dx = x < 1 ? 0.0001 : -0.0001;
-    const y2 = surfaceHeight(x + dx);
-    const derivative = (y2 - y) / dx;
-    const magnitude = Math.sqrt(derivative * derivative + 1);
-    const ref = refract(-derivative / magnitude, -1 / magnitude);
-    profile[i] = ref ? ref[0] * ((y * bezelWidth + glassThickness) / ref[1]) : 0;
-  }
-  return profile;
-}
-
-function createCanvas(doc: Document, width: number, height: number) {
-  const canvas = doc.createElement("canvas");
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
-}
-
-function generateDisplacementMap(doc: Document, width: number, height: number, radius: number, bezelWidth: number, profile: Float64Array, maxDisp: number) {
-  const canvas = createCanvas(doc, width, height);
-  const ctx = canvas.getContext("2d");
-  if (!ctx) {
-    return "";
-  }
-  const img = ctx.createImageData(width, height);
-  const data = img.data;
-  for (let i = 0; i < data.length; i += 4) {
-    data[i] = 128;
-    data[i + 1] = 128;
-    data[i + 2] = 128;
-    data[i + 3] = 255;
-  }
-
-  const r = radius;
-  const rSq = r * r;
-  const r1Sq = (r + 1) ** 2;
-  const rBezelSq = Math.max(r - bezelWidth, 0) ** 2;
-  const innerWidth = width - r * 2;
-  const innerHeight = height - r * 2;
-  const samples = profile.length;
-
-  for (let y = 0; y < height; y += 1) {
-    for (let x = 0; x < width; x += 1) {
-      const edgeX = x < r ? x - r : x >= width - r ? x - r - innerWidth : 0;
-      const edgeY = y < r ? y - r : y >= height - r ? y - r - innerHeight : 0;
-      const distanceSq = edgeX * edgeX + edgeY * edgeY;
-      if (distanceSq > r1Sq || distanceSq < rBezelSq) {
-        continue;
-      }
-      const distance = Math.sqrt(distanceSq);
-      const fromSide = r - distance;
-      const opacity = distanceSq < rSq ? 1 : 1 - (distance - Math.sqrt(rSq)) / (Math.sqrt(r1Sq) - Math.sqrt(rSq));
-      if (opacity <= 0 || distance === 0) {
-        continue;
-      }
-      const profileIndex = Math.min(((fromSide / bezelWidth) * samples) | 0, samples - 1);
-      const displacement = profile[profileIndex] || 0;
-      const dx = (-(edgeX / distance) * displacement) / maxDisp;
-      const dy = (-(edgeY / distance) * displacement) / maxDisp;
-      const idx = (y * width + x) * 4;
-      const red = (128 + dx * 127 * opacity + 0.5) | 0;
-      const green = (128 + dy * 127 * opacity + 0.5) | 0;
-      data[idx] = red;
-      data[idx + 1] = green;
-      data[idx + 2] = green;
-    }
-  }
-  ctx.putImageData(img, 0, 0);
-  return canvas.toDataURL();
-}
-
-function generateSpecularMap(doc: Document, width: number, height: number, radius: number, bezelWidth: number) {
-  const canvas = createCanvas(doc, width, height);
-  const ctx = canvas.getContext("2d");
-  if (!ctx) {
-    return "";
-  }
-  const img = ctx.createImageData(width, height);
-  const data = img.data;
-  data.fill(0);
-  const r = radius;
-  const rSq = r * r;
-  const r1Sq = (r + 1) ** 2;
-  const rBezelSq = Math.max(r - bezelWidth, 0) ** 2;
-  const innerWidth = width - r * 2;
-  const innerHeight = height - r * 2;
-  const light = [Math.cos(Math.PI / 3), Math.sin(Math.PI / 3)] as const;
-
-  for (let y = 0; y < height; y += 1) {
-    for (let x = 0; x < width; x += 1) {
-      const edgeX = x < r ? x - r : x >= width - r ? x - r - innerWidth : 0;
-      const edgeY = y < r ? y - r : y >= height - r ? y - r - innerHeight : 0;
-      const distanceSq = edgeX * edgeX + edgeY * edgeY;
-      if (distanceSq > r1Sq || distanceSq < rBezelSq) {
-        continue;
-      }
-      const distance = Math.sqrt(distanceSq);
-      const fromSide = r - distance;
-      const opacity = distanceSq < rSq ? 1 : 1 - (distance - Math.sqrt(rSq)) / (Math.sqrt(r1Sq) - Math.sqrt(rSq));
-      if (opacity <= 0 || distance === 0) {
-        continue;
-      }
-      const dot = Math.abs((edgeX / distance) * light[0] + (-edgeY / distance) * light[1]);
-      const edge = Math.sqrt(Math.max(0, 1 - (1 - fromSide) ** 2));
-      const coeff = dot * edge;
-      const col = (255 * coeff) | 0;
-      const alpha = (col * coeff * opacity) | 0;
-      const idx = (y * width + x) * 4;
-      data[idx] = col;
-      data[idx + 1] = col;
-      data[idx + 2] = col;
-      data[idx + 3] = alpha;
-    }
-  }
-  ctx.putImageData(img, 0, 0);
-  return canvas.toDataURL();
-}
-
-function generateEdgeMaskMap(doc: Document, width: number, height: number, radius: number, bezelWidth: number) {
-  const canvas = createCanvas(doc, width, height);
-  const ctx = canvas.getContext("2d");
-  if (!ctx) {
-    return "";
-  }
-  const img = ctx.createImageData(width, height);
-  const data = img.data;
-  data.fill(0);
-  const r = radius;
-  const rSq = r * r;
-  const r1Sq = (r + 1) ** 2;
-  const rBezelSq = Math.max(r - bezelWidth, 0) ** 2;
-  const innerWidth = width - r * 2;
-  const innerHeight = height - r * 2;
-
-  for (let y = 0; y < height; y += 1) {
-    for (let x = 0; x < width; x += 1) {
-      const edgeX = x < r ? x - r : x >= width - r ? x - r - innerWidth : 0;
-      const edgeY = y < r ? y - r : y >= height - r ? y - r - innerHeight : 0;
-      const distanceSq = edgeX * edgeX + edgeY * edgeY;
-      if (distanceSq > r1Sq || distanceSq < rBezelSq) {
-        continue;
-      }
-      const distance = Math.sqrt(distanceSq);
-      const fromSide = r - distance;
-      const outerOpacity = distanceSq < rSq ? 1 : 1 - (distance - Math.sqrt(rSq)) / (Math.sqrt(r1Sq) - Math.sqrt(rSq));
-      const innerFade = Math.max(0, Math.min(1, 1 - fromSide / bezelWidth));
-      const alpha = Math.round(255 * outerOpacity * Math.pow(innerFade, 0.72));
-      const idx = (y * width + x) * 4;
-      data[idx] = 255;
-      data[idx + 1] = 255;
-      data[idx + 2] = 255;
-      data[idx + 3] = alpha;
-    }
-  }
-  ctx.putImageData(img, 0, 0);
-  return canvas.toDataURL();
-}
-
-function filterMarkup(target: LiquidGlassFilterTarget, width: number, height: number, doc: Document) {
-  const radius = Math.min(target.radius, Math.floor(Math.min(width, height) / 2) - 1);
-  const bezel = Math.max(2, Math.min(target.bezel, radius - 1));
-  const profile = calculateRefractionProfile(target.thickness, bezel, target.ior);
-  const maxDisp = Math.max(...Array.from(profile).map(Math.abs)) || 1;
-  const dispUrl = generateDisplacementMap(doc, width, height, radius, bezel, profile, maxDisp);
-  const specUrl = generateSpecularMap(doc, width, height, radius, bezel * 2.5);
-  const edgeMaskUrl = generateEdgeMaskMap(doc, width, height, radius, bezel * 2.25);
-  const scale = maxDisp * target.scale;
-
-  return `<filter id="${target.id}" x="0%" y="0%" width="100%" height="100%" color-interpolation-filters="sRGB">
-    <feGaussianBlur in="SourceGraphic" stdDeviation="${target.blur}" result="blurred_source" />
-    <feImage href="${dispUrl}" x="0" y="0" width="${width}" height="${height}" result="disp_map" preserveAspectRatio="none" />
-    <feDisplacementMap in="blurred_source" in2="disp_map" scale="${scale}" xChannelSelector="R" yChannelSelector="G" result="displaced" />
-    <feColorMatrix in="displaced" type="saturate" values="${target.specularSaturation}" result="displaced_sat" />
-    <feImage href="${edgeMaskUrl}" x="0" y="0" width="${width}" height="${height}" result="edge_mask" preserveAspectRatio="none" />
-    <feComposite in="displaced_sat" in2="edge_mask" operator="in" result="edge_refracted" />
-    <feImage href="${specUrl}" x="0" y="0" width="${width}" height="${height}" result="spec_layer" preserveAspectRatio="none" />
-    <feComponentTransfer in="spec_layer" result="spec_faded"><feFuncA type="linear" slope="${target.specularOpacity}" /></feComponentTransfer>
-    <feComposite in="spec_faded" in2="edge_mask" operator="in" result="edge_specular" />
-    <feBlend in="edge_refracted" in2="edge_specular" mode="screen" />
-  </filter>`;
-}
-
-export function rebuildWorkHubLiquidGlassFilters(doc?: Document): void {
-  if (!doc) {
-    return;
-  }
-  const defs = ensureLiquidGlassSvg(doc);
-  if (!defs) {
-    return;
-  }
-  const targets = defaultTargets.flatMap((target) => {
-    const el = doc.querySelector<HTMLElement>(target.selector);
-    if (!el) {
-      return [];
-    }
-    const rect = el.getBoundingClientRect();
-    const width = Math.max(80, Math.round(rect.width || el.offsetWidth || 240));
-    const height = Math.max(48, Math.round(rect.height || el.offsetHeight || 80));
-    return [{ target, width, height }];
-  });
-  const cacheKey = targets.map(({ target, width, height }) => `${target.id}:${width}x${height}`).join("|");
-  if (!cacheKey || defs.dataset.workhubLiquidGlassKey === cacheKey) {
-    return;
-  }
-  const markup = targets.map(({ target, width, height }) => filterMarkup(target, width, height, doc)).join("");
-  if (markup) {
-    defs.innerHTML = markup;
-    defs.dataset.workhubLiquidGlassKey = cacheKey;
-  }
+export function rebuildWorkHubLiquidGlassFilters(_doc?: Document): void {
+  // Intentionally inert while SVG refraction is disabled.
 }
 
-export function scheduleWorkHubLiquidGlassFilterRebuild(doc?: Document): void {
-  if (!doc) {
-    return;
-  }
-  const win = doc.defaultView;
-  if (!win?.requestAnimationFrame) {
-    rebuildWorkHubLiquidGlassFilters(doc);
-    return;
-  }
-  win.requestAnimationFrame(() => rebuildWorkHubLiquidGlassFilters(doc));
+export function scheduleWorkHubLiquidGlassFilterRebuild(_doc?: Document): void {
+  // Intentionally inert while SVG refraction is disabled.
 }
diff --git a/apps/desktop-webview/src/main.test.ts b/apps/desktop-webview/src/main.test.ts
index 214bcbc29..76f973f60 100644
--- a/apps/desktop-webview/src/main.test.ts
+++ b/apps/desktop-webview/src/main.test.ts
@@ -733,17 +733,9 @@ test("R4.21 desktop browser uses the shared web runtime helpers", () => {
   assert.doesNotMatch(source, /function updateLineEditorPanelPayload/u);
 });
 
-test("desktop browser saves project context so Cuu can ask about project drive files", () => {
-  const source = readFileSync(new URL("./browser.ts", import.meta.url), "utf8");
-  const activateStart = source.indexOf("const activateRoute = (route: string) => {");
-  const activateEnd = source.indexOf("const activateFromHash", activateStart);
-  assert.notEqual(activateStart, -1);
-  assert.notEqual(activateEnd, -1);
-  const activateSource = source.slice(activateStart, activateEnd);
-
-  assert.match(source, /saveDesktopCuuProjectContextFromRoute/u);
-  assert.match(activateSource, /saveDesktopCuuProjectContextFromRoute\(route\)/u);
-});
+// The old project-context assertion was wrong: it grepped deprecated gold-path
+// activateRoute text while the production desktop shell is bootSpotlight().
+// Production behavior is covered by spotlight-shell-navigation.test.ts.
 
 test("desktop browser proposal review action confirms only and leaves merge as a second step", () => {
   const source = readFileSync(new URL("./browser.ts", import.meta.url), "utf8");
@@ -771,10 +763,12 @@ test("Spotlight exposes native move and resize gestures instead of a fixed top s
   const source = readFileSync(new URL("./spotlight/controller.ts", import.meta.url), "utf8");
   const browserSource = readFileSync(new URL("./browser.ts", import.meta.url), "utf8");
 
+  // 3-1: the old assertions required invisible resize handles, but those handles were not backed by
+  // durable resize state and render-driven auto-resize could overwrite the user's dragged size.
   assert.match(source, /export type SpotlightManualDragFn = \(deltaX: number, deltaY: number\) => void/u);
   assert.match(source, /drag\?: \(\) => void/u);
   assert.match(source, /dragMove\?: SpotlightManualDragFn/u);
-  assert.match(source, /resizeDrag\?: \(direction: SpotlightResizeDirection\) => void/u);
+  assert.doesNotMatch(source, /resizeDrag\?:/u);
   assert.match(source, /renderWorkHubLiquidGlassLayer\("spotlight"\)/u);
   assert.match(source, /class="wh-spot ds-anim-spring-in"/u);
   // 盒子自己在 css.ts 里持有液态玻璃(渐变白底 + backdrop blur)，不再借用扁平的 ds-glass-strong 工具类。
@@ -783,14 +777,15 @@ test("Spotlight exposes native move and resize gestures instead of a fixed top s
   assert.match(source, /class="wh-spot-drag-sheet" data-spot-drag-sheet/u);
   assert.match(source, /class="wh-spot-field" type="search" data-spot-input role="combobox"/u);
   assert.doesNotMatch(source, /data-tauri-drag-region/u);
-  assert.match(source, /data-spot-resize="south-east"/u);
+  assert.doesNotMatch(source, /data-spot-resize/u);
   assert.match(source, /focusSearch\(\{ expand: false \}\)/u);
   assert.match(source, /suppressNextFocusExpansion = !options\.expand/u);
   assert.match(source, /if \(suppressNextFocusExpansion \|\| nowMs\(\) < suppressSearchFocusUntil\) \{\s*suppressNextFocusExpansion = false;\s*\}/u);
-  assert.match(source, /const dragExcludedSelector = "button,a,select,\[contenteditable=true\],\[data-spot-resize\]"/u);
-  assert.match(source, /Boolean\(target\.closest\(dragExcludedSelector\)\)/u);
-  assert.doesNotMatch(source, /dragExcludedSelector = "input,textarea,button/u);
-  assert.match(source, /let userResizeAutoUnlockAt = 0/u);
+  // 3-2: the old selector assertion omitted input/textarea, but that let text selection in the
+  // search box or composers start a window drag instead of selecting editable text.
+  assert.match(source, /const DRAG_EXCLUDED_SELECTOR = "input,textarea,button,a,select,\[contenteditable=true\]"/u);
+  assert.match(source, /Boolean\(target\.closest\(DRAG_EXCLUDED_SELECTOR\)\)/u);
+  assert.doesNotMatch(source, /userResizeAutoUnlockAt/u);
   assert.match(source, /let suppressSearchFocusUntil = 0/u);
   assert.match(source, /let suppressSearchClickUntil = 0/u);
   assert.match(source, /const resetLauncher = \(\) => \{/u);
@@ -803,7 +798,6 @@ test("Spotlight exposes native move and resize gestures instead of a fixed top s
   assert.match(source, /reset: \(\) => \{\s*resetLauncher\(\);\s*\}/u);
   assert.match(source, /nowMs\(\) < suppressSearchFocusUntil/u);
   assert.match(source, /nowMs\(\) < suppressSearchClickUntil/u);
-  assert.match(source, /userResizeAutoUnlockAt = nowMs\(\) \+ 1600/u);
   assert.match(source, /suppressSearchFocusUntil = nowMs\(\) \+ 700/u);
   assert.match(source, /suppressSearchClickUntil = nowMs\(\) \+ 900/u);
   assert.match(source, /suppressSearchClickUntil = nowMs\(\) \+ 700/u);
@@ -829,11 +823,8 @@ test("Spotlight exposes native move and resize gestures instead of a fixed top s
   assert.notEqual(pointerMoveStart, -1);
   const pointerDownSource = source.slice(pointerDownStart, pointerMoveStart);
   assert.doesNotMatch(pointerDownSource, /input\.drag\(\)/u);
-  assert.match(source, /if \(now < userResizeAutoUnlockAt\) \{\s*userResizeAutoUnlockAt = now \+ 700;\s*return;\s*\}/u);
   assert.match(source, /input\.drag\?\.\(\)/u);
-  assert.match(source, /input\.resizeDrag\?\.\(direction\)/u);
-  assert.match(source, /const requestResizeFromWindowResize = \(\) => \{\s*scheduleWorkHubLiquidGlassFilterRebuild\(doc\);\s*const now = nowMs\(\);/u);
-  assert.match(source, /input\.resizeDrag\?\.\(direction\);\s*scheduleWorkHubLiquidGlassFilterRebuild\(doc\);/u);
+  assert.match(source, /const requestResizeFromWindowResize = \(\) => \{\s*scheduleWorkHubLiquidGlassFilterRebuild\(doc\);\s*requestResize\(\);\s*\};/u);
   const mouseMoveStart = source.indexOf('"mousemove"');
   const mouseUpStart = source.indexOf('"mouseup"', mouseMoveStart);
   assert.notEqual(mouseMoveStart, -1);
@@ -854,7 +845,7 @@ test("Spotlight exposes native move and resize gestures instead of a fixed top s
   assert.match(browserSource, /const moveMainWindowBy: SpotlightManualDragFn = \(deltaX, deltaY\): void =>/u);
   assert.match(browserSource, /invoke\("move_main_window_by", \{ deltaX, deltaY \}\)/u);
   assert.match(browserSource, /invoke\("start_main_window_drag"\)/u);
-  assert.match(browserSource, /invoke\("start_main_window_resize_drag", \{ direction \}\)/u);
+  assert.doesNotMatch(browserSource, /start_main_window_resize_drag/u);
 });
 
 test("desktop offline settings edit the API base locally instead of navigating to a dead settings route", () => {
diff --git a/apps/desktop-webview/src/pet-surface.test.ts b/apps/desktop-webview/src/pet-surface.test.ts
index 8421bdfba..f624c8d52 100644
--- a/apps/desktop-webview/src/pet-surface.test.ts
+++ b/apps/desktop-webview/src/pet-surface.test.ts
@@ -149,7 +149,9 @@ test("desktop pet bubble is a real frosted-white glass card with dark text", ()
   assert.match(desktopPetSurfaceCss, /\.wh-liquid-glass-refract\{[^}]*filter:none;-webkit-filter:none/u);
   assert.doesNotMatch(desktopPetSurfaceCss, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-refract\{[^}]*backdrop-filter/u);
   assert.doesNotMatch(desktopPetSurfaceCss, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-refract\{[^}]*-webkit-backdrop-filter/u);
-  assert.match(desktopPetSurfaceCss, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-edge\{backdrop-filter:url\(#workhub-liquid-glass-pet-filter\) blur\(var\(--wh-liquid-frost\)\)/u);
+  // 3-4: the old assertion pinned a hidden SVG edge filter; pet bubbles hide the warp/rim,
+  // so the generated-map filter could never be seen and should not stay in the CSS.
+  assert.doesNotMatch(desktopPetSurfaceCss, /url\(#workhub-liquid-glass-pet-filter/u);
   assert.doesNotMatch(desktopPetSurfaceCss, /(?:^|[;{])filter:url\(#workhub-liquid-glass/u);
   assert.doesNotMatch(desktopPetSurfaceCss, /--wh-liquid-frost:(?:1[0-9]|[2-9][0-9])px/u);
   assert.match(desktopPetSurfaceCss, /\.wh-liquid-glass-warp\{[^}]*background:transparent[^}]*overflow:hidden/u);
@@ -842,7 +844,8 @@ test("pet surface renders only the Live2D cat runtime without main shell or fall
   assert.match(idle.css, /\.wh-pet-bubble\{[^}]*border-radius:24px;[^}]*background:linear-gradient\(135deg,rgba\(255,255,255,\.82\),rgba\(255,255,255,\.52\)\)/u);
   assert.doesNotMatch(idle.css, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-refract\{[^}]*backdrop-filter/u);
   assert.doesNotMatch(idle.css, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-refract\{[^}]*-webkit-backdrop-filter/u);
-  assert.match(idle.css, /\.wh-liquid-glass-warp--pet \.wh-liquid-glass-edge\{backdrop-filter:url\(#workhub-liquid-glass-pet-filter\) blur\(var\(--wh-liquid-frost\)\)/u);
+  // 3-4: same as the static CSS assertion above; hidden pet warp should not keep SVG filters alive.
+  assert.doesNotMatch(idle.css, /url\(#workhub-liquid-glass-pet-filter/u);
   assert.doesNotMatch(idle.css, /(?:^|[;{])filter:url\(#workhub-liquid-glass/u);
   assert.match(idle.css, /\.wh-pet-menu\{[^}]*right:88px;[^}]*width:164px;[^}]*overflow:hidden/u);
   assert.match(idle.css, /\.wh-pet-menu\{[^}]*border-radius:14px;[^}]*background:rgba\(255,255,255,\.92\);[^}]*backdrop-filter:blur\(30px\) saturate\(180%\)/u);
@@ -1905,7 +1908,8 @@ test("pet surface renders merge conflicts as proposal conflict choices instead o
         assert.equal(merge.defaultPrevented, true);
         assert.match(root.innerHTML, /变更撞车了/u);
         assert.match(root.innerHTML, /保留正式版/u);
-        assert.match(root.innerHTML, /采纳这次版本/u);
+        // 旧断言继续接受「采纳这次版本」；Cuu proposal 卡片已统一 merge 动词为「合入」，否则同一卡内会混用两套口径。
+        assert.match(root.innerHTML, /合入这次版本/u);
         assert.doesNotMatch(root.innerHTML, /这次启动没有成功|重新开始/u);
       } finally {
         await runtime.dispose();
diff --git a/apps/desktop-webview/src/spotlight-shell-navigation.test.ts b/apps/desktop-webview/src/spotlight-shell-navigation.test.ts
new file mode 100644
index 000000000..a40f1617f
--- /dev/null
+++ b/apps/desktop-webview/src/spotlight-shell-navigation.test.ts
@@ -0,0 +1,34 @@
+import { strict as assert } from "node:assert";
+import { test } from "node:test";
+
+import { handleDesktopSpotlightShellNavigate } from "./spotlight-shell-navigation.js";
+
+test("production Spotlight shell navigate saves project context before opening a capability", () => {
+  const projectId = "10000000-0000-4000-8000-000000000002";
+  const route = `/drive?project_id=${projectId}`;
+  const savedRoutes: string[] = [];
+  const opened: Array<{ id: string; target?: { id?: string; route?: string } }> = [];
+  let resetCount = 0;
+
+  const result = handleDesktopSpotlightShellNavigate(
+    { route },
+    {
+      saveProjectContextFromRoute: (nextRoute) => {
+        savedRoutes.push(nextRoute);
+      },
+      spotlight: {
+        openCapability(id, target) {
+          opened.push(target ? { id, target } : { id });
+        },
+        reset() {
+          resetCount += 1;
+        }
+      }
+    }
+  );
+
+  assert.deepEqual(savedRoutes, [route]);
+  assert.deepEqual(opened, [{ id: "drive", target: { id: projectId, route } }]);
+  assert.equal(resetCount, 0);
+  assert.equal(result.kind, "open");
+});
diff --git a/apps/desktop-webview/src/spotlight-shell-navigation.ts b/apps/desktop-webview/src/spotlight-shell-navigation.ts
new file mode 100644
index 000000000..fad45fc63
--- /dev/null
+++ b/apps/desktop-webview/src/spotlight-shell-navigation.ts
@@ -0,0 +1,35 @@
+import type { CommandId } from "./command-palette.js";
+import { parseDesktopShellNavigatePayload } from "./shell-events.js";
+import type { SpotlightHandle } from "./spotlight/controller.js";
+import { capabilityForShellRoute, entityIdFromShellRoute } from "./spotlight/state.js";
+import type { SpotlightTarget } from "./spotlight/view-context.js";
+
+export type DesktopSpotlightProjectContextSaver = (route: string) => unknown;
+
+export type DesktopSpotlightShellNavigationResult =
+  | { kind: "open"; route: string; capability: CommandId; target: SpotlightTarget }
+  | { kind: "reset"; route?: string };
+
+export function handleDesktopSpotlightShellNavigate(
+  payload: unknown,
+  input: {
+    spotlight: Pick<SpotlightHandle, "openCapability" | "reset">;
+    saveProjectContextFromRoute?: DesktopSpotlightProjectContextSaver | undefined;
+  }
+): DesktopSpotlightShellNavigationResult {
+  const parsed = parseDesktopShellNavigatePayload(payload);
+  if (parsed) {
+    input.saveProjectContextFromRoute?.(parsed.route);
+  }
+
+  const capability = parsed ? capabilityForShellRoute(parsed.route) : undefined;
+  if (capability && parsed) {
+    const id = entityIdFromShellRoute(parsed.route);
+    const target = id ? { id, route: parsed.route } : { route: parsed.route };
+    input.spotlight.openCapability(capability, target);
+    return { kind: "open", route: parsed.route, capability, target };
+  }
+
+  input.spotlight.reset();
+  return parsed ? { kind: "reset", route: parsed.route } : { kind: "reset" };
+}
diff --git a/apps/desktop-webview/src/spotlight/controller-drag.test.ts b/apps/desktop-webview/src/spotlight/controller-drag.test.ts
new file mode 100644
index 000000000..9b6776c78
--- /dev/null
+++ b/apps/desktop-webview/src/spotlight/controller-drag.test.ts
@@ -0,0 +1,110 @@
+import assert from "node:assert/strict";
+import { afterEach, test } from "node:test";
+
+import { isSpotlightDragExcludedPointer, isSpotlightDragExcludedTarget } from "./controller.js";
+
+const originalElement = globalThis.Element;
+
+class FakeElement {
+  constructor(
+    private readonly tagName: string,
+    private readonly rect?: { left: number; top: number; right: number; bottom: number }
+  ) {}
+
+  closest(selector: string): FakeElement | null {
+    const selectors = selector.split(",").map((item) => item.trim());
+    return selectors.includes(this.tagName) ? this : null;
+  }
+
+  getBoundingClientRect(): { left: number; top: number; right: number; bottom: number } {
+    return this.rect ?? { left: 0, top: 0, right: 0, bottom: 0 };
+  }
+}
+
+afterEach(() => {
+  Object.defineProperty(globalThis, "Element", {
+    configurable: true,
+    value: originalElement
+  });
+});
+
+test("Spotlight drag target classifier excludes text editing controls from window dragging", () => {
+  Object.defineProperty(globalThis, "Element", {
+    configurable: true,
+    value: FakeElement
+  });
+
+  assert.equal(isSpotlightDragExcludedTarget(new FakeElement("input") as unknown as EventTarget), true);
+  assert.equal(isSpotlightDragExcludedTarget(new FakeElement("textarea") as unknown as EventTarget), true);
+  assert.equal(isSpotlightDragExcludedTarget(new FakeElement("button") as unknown as EventTarget), true);
+  assert.equal(isSpotlightDragExcludedTarget(new FakeElement("div") as unknown as EventTarget), false);
+});
+
+test("Spotlight drag target classifier excludes focused text controls by pointer bounds", () => {
+  Object.defineProperty(globalThis, "Element", {
+    configurable: true,
+    value: FakeElement
+  });
+
+  const input = new FakeElement("input", { left: 20, top: 10, right: 180, bottom: 36 });
+  const wrapper = new FakeElement("div");
+
+  assert.equal(
+    isSpotlightDragExcludedPointer({
+      target: wrapper as unknown as EventTarget,
+      clientX: 80,
+      clientY: 24,
+      activeElement: input as unknown as Element
+    }),
+    true
+  );
+  assert.equal(
+    isSpotlightDragExcludedPointer({
+      target: wrapper as unknown as EventTarget,
+      clientX: 260,
+      clientY: 24,
+      activeElement: input as unknown as Element
+    }),
+    false
+  );
+});
+
+test("Spotlight drag target classifier excludes text controls by hit-tested pointer element", () => {
+  Object.defineProperty(globalThis, "Element", {
+    configurable: true,
+    value: FakeElement
+  });
+
+  const input = new FakeElement("input");
+  const wrapper = new FakeElement("div");
+
+  assert.equal(
+    isSpotlightDragExcludedPointer({
+      target: wrapper as unknown as EventTarget,
+      clientX: 80,
+      clientY: 24,
+      elementAtPoint: input as unknown as Element
+    }),
+    true
+  );
+});
+
+test("Spotlight drag target classifier excludes known text-control bounds when event retargeting is unreliable", () => {
+  Object.defineProperty(globalThis, "Element", {
+    configurable: true,
+    value: FakeElement
+  });
+
+  const input = new FakeElement("input", { left: 54, top: 12, right: 690, bottom: 38 });
+  const wrapper = new FakeElement("div");
+
+  assert.equal(
+    isSpotlightDragExcludedPointer({
+      target: wrapper as unknown as EventTarget,
+      clientX: 72,
+      clientY: 24,
+      excludedElements: [input as unknown as Element]
+    }),
+    true
+  );
+});
diff --git a/apps/desktop-webview/src/spotlight/controller.ts b/apps/desktop-webview/src/spotlight/controller.ts
index b9b37ad88..74fed1a3c 100644
--- a/apps/desktop-webview/src/spotlight/controller.ts
+++ b/apps/desktop-webview/src/spotlight/controller.ts
@@ -20,7 +20,6 @@ import type { SpotlightApiClient, SpotlightTarget, SpotlightViewContext } from "
 
 export type SpotlightResizeFn = (width: number, height: number) => void;
 export type SpotlightManualDragFn = (deltaX: number, deltaY: number) => void;
-export type SpotlightResizeDirection = "east" | "south" | "south-east";
 
 export type MountSpotlightInput = {
   host: HTMLElement;
@@ -33,7 +32,6 @@ export type MountSpotlightInput = {
   // 顶栏拖动/边缘缩放（browser.ts 注入 → 原生 frameless 窗口手势）。浏览器开发态可为空（no-op）。
   drag?: () => void;
   dragMove?: SpotlightManualDragFn;
-  resizeDrag?: (direction: SpotlightResizeDirection) => void;
   // 关闭/隐藏盒子（browser.ts 注入 → invoke hide_main_window）。M2：让 launcher 顶层 Esc 真正关闭盒子，
   // 兑现 hello 卡「Esc 关闭」的承诺。浏览器开发态可为空（no-op）。
   dismiss?: () => void;
@@ -56,6 +54,41 @@ const SEARCH_ICON =
   '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="11" cy="11" r="6"/><path d="M20 20l-4.3-4.3"/></svg>';
 const BACK_ICON =
   '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M15 6l-6 6 6 6"/></svg>';
+const DRAG_EXCLUDED_SELECTOR = "input,textarea,button,a,select,[contenteditable=true]";
+
+export function isSpotlightDragExcludedTarget(target: EventTarget | null): boolean {
+  return target instanceof Element && Boolean(target.closest(DRAG_EXCLUDED_SELECTOR));
+}
+
+function pointerInsideExcludedElement(element: Element | null | undefined, clientX: number, clientY: number): boolean {
+  if (!(element instanceof Element) || !element.closest(DRAG_EXCLUDED_SELECTOR)) {
+    return false;
+  }
+  const rect = element.getBoundingClientRect();
+  return clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom;
+}
+
+export function isSpotlightDragExcludedPointer(input: {
+  target: EventTarget | null;
+  clientX: number;
+  clientY: number;
+  elementAtPoint?: Element | null;
+  activeElement?: Element | null;
+  // 发布版 Tauri 窗内事件 retarget 不可靠（mousedown target/elementFromPoint 可能落到拖拽层），
+  // 兜底用已知文本控件的几何范围判定指针是否落在输入区。
+  excludedElements?: readonly Element[];
+}): boolean {
+  if (isSpotlightDragExcludedTarget(input.target)) {
+    return true;
+  }
+  if (input.elementAtPoint && isSpotlightDragExcludedTarget(input.elementAtPoint)) {
+    return true;
+  }
+  if (pointerInsideExcludedElement(input.activeElement, input.clientX, input.clientY)) {
+    return true;
+  }
+  return (input.excludedElements ?? []).some((element) => pointerInsideExcludedElement(element, input.clientX, input.clientY));
+}
 
 function renderLauncherGrid(
   matches: CommandMatch[],
@@ -135,9 +168,6 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
         </div>
         <div class="wh-spot-body" data-spot-body></div>
       </div>
-      <button type="button" aria-hidden="true" tabindex="-1" class="wh-spot-resize wh-spot-resize--e" data-spot-resize="east"></button>
-      <button type="button" aria-hidden="true" tabindex="-1" class="wh-spot-resize wh-spot-resize--s" data-spot-resize="south"></button>
-      <button type="button" aria-hidden="true" tabindex="-1" class="wh-spot-resize wh-spot-resize--se" data-spot-resize="south-east"></button>
     </div>`;
 
   const box = host.querySelector<HTMLElement>("[data-spot-box]")!;
@@ -155,7 +185,6 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
   let resizeRaf = 0;
   let lastSentW = 0;
   let lastSentH = 0;
-  let userResizeAutoUnlockAt = 0;
   const nowMs = () => window.performance.now();
   const focusSearch = (options: { expand: boolean }) => {
     if (options.expand) {
@@ -206,11 +235,6 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
   };
   const requestResizeFromWindowResize = () => {
     scheduleWorkHubLiquidGlassFilterRebuild(doc);
-    const now = nowMs();
-    if (now < userResizeAutoUnlockAt) {
-      userResizeAutoUnlockAt = now + 700;
-      return;
-    }
     requestResize();
   };
 
@@ -436,8 +460,6 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
     dispatch({ type: "back" });
   });
 
-  const dragExcludedSelector = "button,a,select,[contenteditable=true],[data-spot-resize]";
-  const isDragExcludedTarget = (target: EventTarget | null) => target instanceof Element && Boolean(target.closest(dragExcludedSelector));
   let manualDrag:
     | {
         startClientX: number;
@@ -450,7 +472,17 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
   topEl.addEventListener(
     "mousedown",
     (event) => {
-      if (event.button !== 0 || isDragExcludedTarget(event.target)) {
+      if (
+        event.button !== 0 ||
+        isSpotlightDragExcludedPointer({
+          target: event.target,
+          clientX: event.clientX,
+          clientY: event.clientY,
+          elementAtPoint: doc.elementFromPoint(event.clientX, event.clientY),
+          activeElement: doc.activeElement,
+          excludedElements: Array.from(topEl.querySelectorAll(DRAG_EXCLUDED_SELECTOR))
+        })
+      ) {
         return;
       }
       manualDrag = {
@@ -606,7 +638,16 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
     if (event.button !== 0) {
       return;
     }
-    if (isDragExcludedTarget(event.target)) {
+    if (
+      isSpotlightDragExcludedPointer({
+        target: event.target,
+        clientX: event.clientX,
+        clientY: event.clientY,
+        elementAtPoint: doc.elementFromPoint(event.clientX, event.clientY),
+        activeElement: doc.activeElement,
+        excludedElements: Array.from(topEl.querySelectorAll(DRAG_EXCLUDED_SELECTOR))
+      })
+    ) {
       return;
     }
     if (input.dragMove) {
@@ -644,19 +685,6 @@ export function mountSpotlight(input: MountSpotlightInput): SpotlightHandle {
   topEl.addEventListener("pointerup", clearDragStart);
   topEl.addEventListener("pointercancel", clearDragStart);
 
-  host.querySelectorAll<HTMLElement>("[data-spot-resize]").forEach((handle) => {
-    handle.addEventListener("pointerdown", (event) => {
-      event.preventDefault();
-      event.stopPropagation();
-      const direction = handle.dataset.spotResize as SpotlightResizeDirection | undefined;
-      if (direction) {
-        userResizeAutoUnlockAt = nowMs() + 1600;
-        input.resizeDrag?.(direction);
-        scheduleWorkHubLiquidGlassFilterRebuild(doc);
-      }
-    });
-  });
-
   body.addEventListener("click", (event) => {
     const target = event.target;
     if (!(target instanceof HTMLElement)) {
diff --git a/apps/desktop-webview/src/spotlight/css.test.ts b/apps/desktop-webview/src/spotlight/css.test.ts
index d63334236..817e40083 100644
--- a/apps/desktop-webview/src/spotlight/css.test.ts
+++ b/apps/desktop-webview/src/spotlight/css.test.ts
@@ -50,7 +50,9 @@ test("Spotlight shell keeps a translucent liquid-glass surface", () => {
   assert.match(css, /\.wh-liquid-glass-refract\{[^}]*filter:none;-webkit-filter:none/u);
   assert.doesNotMatch(css, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-refract\{[^}]*backdrop-filter/u);
   assert.doesNotMatch(css, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-refract\{[^}]*-webkit-backdrop-filter/u);
-  assert.match(css, /\.wh-liquid-glass-warp--spotlight \.wh-liquid-glass-edge\{backdrop-filter:url\(#workhub-liquid-glass-spotlight-filter\) blur\(var\(--wh-liquid-frost\)\)/u);
+  // 3-4: the old assertion pinned a hidden SVG edge filter; Spotlight hides the warp/rim, so
+  // generating and referencing that filter only burned CPU without contributing pixels.
+  assert.doesNotMatch(css, /url\(#workhub-liquid-glass-spotlight-filter/u);
   assert.doesNotMatch(css, /(?:^|[;{])filter:url\(#workhub-liquid-glass/u);
   assert.doesNotMatch(css, /--wh-liquid-frost:(?:1[0-9]|[2-9][0-9])px/u);
   assert.match(css, /\.wh-liquid-glass-warp\{[^}]*background:transparent[^}]*overflow:hidden/u);
@@ -67,13 +69,16 @@ test("Spotlight shell keeps a translucent liquid-glass surface", () => {
   assert.match(css, /\.wh-spot>\.wh-liquid-glass-content\{display:flex;flex-direction:column/u);
   assert.match(css, /\.wh-spot-top\{[^}]*-webkit-app-region:no-drag;cursor:grab/u);
   assert.match(css, /\.wh-spot-top:active\{cursor:grabbing\}/u);
-  assert.match(css, /\.wh-spot-back,\.wh-spot-resize,\.wh-spot button,\.wh-spot a,\.wh-spot select,\.wh-spot textarea,\.wh-spot \[contenteditable=true\]\{-webkit-app-region:no-drag\}/u);
+  // 3-1: the old assertion included `.wh-spot-resize`, but that pinned a fake manual-resize affordance
+  // whose dragged size could be overwritten by render-driven auto-resize.
+  assert.match(css, /\.wh-spot-back,\.wh-spot button,\.wh-spot a,\.wh-spot select,\.wh-spot textarea,\.wh-spot \[contenteditable=true\]\{-webkit-app-region:no-drag\}/u);
   assert.doesNotMatch(css, /\.wh-spot-top>\*\{-webkit-app-region:no-drag\}/u);
-  assert.doesNotMatch(css, /\.wh-spot-field\{[^}]*-webkit-app-region/u);
+  // 3-2: the old assertion required `.wh-spot-field` to omit app-region, but the release
+  // Tauri window still treated text-selection drags inside the search input as window drags.
+  assert.match(css, /\.wh-spot-field\{[^}]*-webkit-app-region:no-drag/u);
   assert.match(css, /\.wh-spot-drag-sheet\{position:absolute;inset:0;display:none;z-index:3;border:0;background:transparent;cursor:grab/u);
   assert.match(css, /\.wh-spot\[data-mode="launcher"\]\[data-collapsed="true"\] \.wh-spot-drag-sheet\{display:block\}/u);
   assert.match(css, /\.wh-spot-drag-sheet:active\{cursor:grabbing\}/u);
-  assert.match(css, /\.wh-spot-resize\{position:absolute;z-index:4;pointer-events:auto;background:transparent;border:0;padding:0;-webkit-app-region:no-drag\}/u);
   assert.match(css, /input\.wh-spot-field:focus\{outline:0!important;box-shadow:none!important\}/u);
   assert.doesNotMatch(css, /\.wh-spot-back\{[^}]*background:var\(--ds-glass\)/u);
   assert.doesNotMatch(
@@ -87,6 +92,11 @@ test("Spotlight shell keeps a translucent liquid-glass surface", () => {
   assert.doesNotMatch(css, /\.wh-spot \.wh-conflict-head,[^{]+\{[^}]*backdrop-filter/u);
 });
 
+test("Spotlight shell does not expose manual resize hit zones without durable resize state", () => {
+  assert.doesNotMatch(css, /\.wh-spot-resize/u);
+  assert.doesNotMatch(css, /cursor:(?:ew|ns|nwse)-resize/u);
+});
+
 test("Spotlight launcher cards stay glassy instead of white tiles", () => {
   assert.match(css, /\.wh-spot\[data-mode="launcher"\] \.wh-spot-cap\{[^}]*background:transparent/u);
   assert.match(css, /\.wh-spot\[data-mode="launcher"\] \.wh-spot-cap:hover\{[^}]*background:transparent/u);
diff --git a/apps/desktop-webview/src/spotlight/css.ts b/apps/desktop-webview/src/spotlight/css.ts
index 7293d755b..30b19e4b8 100644
--- a/apps/desktop-webview/src/spotlight/css.ts
+++ b/apps/desktop-webview/src/spotlight/css.ts
@@ -27,14 +27,10 @@ export const spotlightCss = [
   ".wh-spot[data-mode=\"launcher\"][data-collapsed=\"true\"] .wh-spot-body{display:none}",
   ".wh-spot[data-mode=\"launcher\"][data-collapsed=\"true\"] .wh-spot-top{border-bottom:0}",
   ".wh-spot[data-mode=\"launcher\"][data-collapsed=\"true\"]{height:auto;min-height:0}",
-  ".wh-spot-resize{position:absolute;z-index:4;pointer-events:auto;background:transparent;border:0;padding:0;-webkit-app-region:no-drag}",
-  ".wh-spot-resize--e{top:18px;right:0;bottom:18px;width:10px;cursor:ew-resize}",
-  ".wh-spot-resize--s{left:18px;right:18px;bottom:0;height:10px;cursor:ns-resize}",
-  ".wh-spot-resize--se{right:0;bottom:0;width:18px;height:18px;cursor:nwse-resize}",
   // 顶栏：搜索/标题 + 面包屑返回。搜索条本身也是原生 drag region；只有真实按钮/表单控件退出拖动。
   ".wh-spot-top{position:relative;display:flex;align-items:center;gap:10px;padding:12px 14px;border-bottom:1px solid var(--ds-glass-hairline);-webkit-app-region:no-drag;cursor:grab}",
   ".wh-spot-top:active{cursor:grabbing}",
-  ".wh-spot-back,.wh-spot-resize,.wh-spot button,.wh-spot a,.wh-spot select,.wh-spot textarea,.wh-spot [contenteditable=true]{-webkit-app-region:no-drag}",
+  ".wh-spot-back,.wh-spot button,.wh-spot a,.wh-spot select,.wh-spot textarea,.wh-spot [contenteditable=true]{-webkit-app-region:no-drag}",
   ".wh-spot-drag-sheet{position:absolute;inset:0;display:none;z-index:3;border:0;background:transparent;cursor:grab;padding:0;-webkit-app-region:no-drag}",
   ".wh-spot[data-mode=\"launcher\"][data-collapsed=\"true\"] .wh-spot-drag-sheet{display:block}",
   ".wh-spot-drag-sheet:active{cursor:grabbing}",
@@ -44,7 +40,7 @@ export const spotlightCss = [
   // 搜索框（launcher 屏）。
   ".wh-spot-field-wrap{display:flex;align-items:center;gap:10px;flex:1 1 auto;min-width:0}",
   ".wh-spot-field-icon{display:inline-flex;width:18px;height:18px;flex:0 0 auto;color:var(--ds-ink-muted)}.wh-spot-field-icon svg{width:18px;height:18px}",
-  ".wh-spot-field{flex:1 1 auto;min-width:0;border:0;background:transparent;outline:none;box-shadow:none;-webkit-appearance:none;appearance:none;font:500 16px/1.3 var(--ds-font);color:var(--ds-ink)}",
+  ".wh-spot-field{flex:1 1 auto;min-width:0;border:0;background:transparent;outline:none;box-shadow:none;-webkit-appearance:none;appearance:none;-webkit-app-region:no-drag;font:500 16px/1.3 var(--ds-font);color:var(--ds-ink)}",
   "input.wh-spot-field:focus{outline:0!important;box-shadow:none!important}",
   ".wh-spot-field::placeholder{color:var(--ds-ink-faint)}",
   // 能力标题（capability 屏）。
diff --git a/client-tauri/src-tauri/capabilities/default.json b/client-tauri/src-tauri/capabilities/default.json
index 0a47a8826..5b8d9bc39 100644
--- a/client-tauri/src-tauri/capabilities/default.json
+++ b/client-tauri/src-tauri/capabilities/default.json
@@ -5,7 +5,6 @@
   "windows": ["main", "pet"],
   "permissions": [
     "core:default",
-    "core:window:allow-start-dragging",
-    "core:window:allow-start-resize-dragging"
+    "core:window:allow-start-dragging"
   ]
 }
diff --git a/client-tauri/src-tauri/gen/schemas/capabilities.json b/client-tauri/src-tauri/gen/schemas/capabilities.json
index 91aa34001..cf5490131 100644
--- a/client-tauri/src-tauri/gen/schemas/capabilities.json
+++ b/client-tauri/src-tauri/gen/schemas/capabilities.json
@@ -1 +1 @@
-{"default":{"identifier":"default","description":"Default capability for the WorkHub main shell and Cuu pet window.","local":true,"windows":["main","pet"],"permissions":["core:default","core:window:allow-start-dragging","core:window:allow-start-resize-dragging"]}}
\ No newline at end of file
+{"default":{"identifier":"default","description":"Default capability for the WorkHub main shell and Cuu pet window.","local":true,"windows":["main","pet"],"permissions":["core:default","core:window:allow-start-dragging"]}}
\ No newline at end of file
diff --git a/client-tauri/src-tauri/src/main.rs b/client-tauri/src-tauri/src/main.rs
index b1ad22ca9..2cfaf8c06 100644
--- a/client-tauri/src-tauri/src/main.rs
+++ b/client-tauri/src-tauri/src/main.rs
@@ -42,7 +42,6 @@ use tauri::{
     Emitter, LogicalPosition as TauriLogicalPosition, LogicalSize, Manager,
     PhysicalPosition as TauriPhysicalPosition, State, WebviewUrl, WebviewWindowBuilder,
 };
-use tauri_runtime::ResizeDirection;
 use tauri_plugin_deep_link::DeepLinkExt;
 
 #[cfg(target_os = "macos")]
@@ -525,15 +524,6 @@ fn set_spotlight_size(app: tauri::AppHandle, width: f64, height: f64) -> Result<
     Ok(())
 }
 
-fn main_window_resize_direction_from_label(direction: &str) -> Option<ResizeDirection> {
-    match direction {
-        "east" => Some(ResizeDirection::East),
-        "south" => Some(ResizeDirection::South),
-        "south-east" => Some(ResizeDirection::SouthEast),
-        _ => None,
-    }
-}
-
 #[tauri::command]
 fn start_main_window_drag(window: tauri::Window) -> Result<(), String> {
     if window.label() != "main" {
@@ -571,21 +561,6 @@ fn move_main_window_by(app: tauri::AppHandle, delta_x: f64, delta_y: f64) -> Res
         .map_err(|error| format!("failed to move main window: {error}"))
 }
 
-#[tauri::command]
-fn start_main_window_resize_drag(
-    window: tauri::Window,
-    direction: String,
-) -> Result<(), String> {
-    if window.label() != "main" {
-        return Err("main window resize can only be started from the main window".to_string());
-    }
-    let direction = main_window_resize_direction_from_label(&direction)
-        .ok_or_else(|| format!("unknown main window resize direction: {direction}"))?;
-    window
-        .start_resize_dragging(direction)
-        .map_err(|error| format!("failed to start main window resize dragging: {error}"))
-}
-
 // 若窗口底边超出当前显示器工作区，则上移使其落回区内（不小于工作区顶）。失败不致命。
 fn keep_window_bottom_in_work_area(window: &tauri::WebviewWindow, height_logical: f64) {
     let monitor = match window.current_monitor() {
@@ -818,7 +793,9 @@ fn execute_window_control(
     }
 
     if plan.label == "main" {
-        configure_main_window_chrome(&window)?;
+        if let Err(error) = configure_main_window_chrome(&window) {
+            eprintln!("failed to configure main window chrome; continuing window control: {error}");
+        }
         if let Some(route) = &plan.route {
             app.emit("navigate", route.clone())
                 .map_err(|error| format!("failed to emit main window navigation: {error}"))?;
@@ -1040,15 +1017,25 @@ fn keep_pet_window_above_desktop(window: &tauri::WebviewWindow) -> Result<(), St
 }
 
 fn configure_main_window_chrome(window: &tauri::WebviewWindow) -> Result<(), String> {
-    window
-        .set_background_color(Some(Color(0, 0, 0, 1)))
-        .map_err(|error| format!("failed to make main window background transparent: {error}"))?;
+    configure_main_window_hit_surface(window)?;
     window
         .set_ignore_cursor_events(false)
         .map_err(|error| format!("failed to keep main window pointer events enabled: {error}"))?;
     configure_main_window_native_drag(window)
 }
 
+#[cfg(target_os = "macos")]
+fn configure_main_window_hit_surface(window: &tauri::WebviewWindow) -> Result<(), String> {
+    window
+        .set_background_color(Some(Color(0, 0, 0, 1)))
+        .map_err(|error| format!("failed to make main window hit surface opaque: {error}"))
+}
+
+#[cfg(not(target_os = "macos"))]
+fn configure_main_window_hit_surface(_window: &tauri::WebviewWindow) -> Result<(), String> {
+    Ok(())
+}
+
 #[cfg(target_os = "macos")]
 fn configure_main_window_native_drag(window: &tauri::WebviewWindow) -> Result<(), String> {
     let ns_window = window
@@ -1467,7 +1454,6 @@ fn main() {
             set_spotlight_size,
             start_main_window_drag,
             move_main_window_by,
-            start_main_window_resize_drag,
             show_main_window,
             hide_main_window,
             focus_main_route,
@@ -1525,23 +1511,6 @@ mod tests {
         assert_eq!(clamp_spotlight_size(f64::NAN, f64::INFINITY), (720.0, 480.0));
     }
 
-    #[test]
-    fn main_window_resize_direction_accepts_spotlight_edges_only() {
-        assert_eq!(
-            main_window_resize_direction_from_label("east"),
-            Some(ResizeDirection::East)
-        );
-        assert_eq!(
-            main_window_resize_direction_from_label("south"),
-            Some(ResizeDirection::South)
-        );
-        assert_eq!(
-            main_window_resize_direction_from_label("south-east"),
-            Some(ResizeDirection::SouthEast)
-        );
-        assert_eq!(main_window_resize_direction_from_label("north"), None);
-    }
-
     #[test]
     fn tray_quit_dry_run_env_accepts_truthy_values_only() {
         for value in ["1", "true", "TRUE", "yes", "on", " on "] {
diff --git a/client-tauri/src-tauri/tests/tauri_scaffold.rs b/client-tauri/src-tauri/tests/tauri_scaffold.rs
index a8b4941cf..3e48e4b30 100644
--- a/client-tauri/src-tauri/tests/tauri_scaffold.rs
+++ b/client-tauri/src-tauri/tests/tauri_scaffold.rs
@@ -117,9 +117,15 @@ fn macos_main_window_receives_pointer_events_with_a_native_one_alpha_hit_surface
     let raw = fs::read_to_string(&main_rs_path)
         .unwrap_or_else(|error| panic!("failed to read {}: {error}", main_rs_path.display()));
 
+    // 旧断言只查全局存在 Color(0, 0, 0, 1)，这会允许 Windows/Linux 也套用一像素黑底；
+    // 3-5 的目标是只在 macOS 透明主窗上补 native hit surface，避免其他平台主窗变纯黑。
     assert!(
-        raw.contains("Color(0, 0, 0, 1)"),
-        "macOS transparent windows need a native one-alpha hit surface; CSS zero-alpha centers still click through"
+        raw.contains("#[cfg(target_os = \"macos\")]\nfn configure_main_window_hit_surface"),
+        "macOS transparent windows need a gated native one-alpha hit surface; CSS zero-alpha centers still click through"
+    );
+    assert!(
+        raw.contains("#[cfg(not(target_os = \"macos\"))]\nfn configure_main_window_hit_surface"),
+        "non-macOS main windows must not receive the one-alpha black hit surface"
     );
     assert!(
         raw.contains(".set_ignore_cursor_events(false)"),
@@ -193,13 +199,11 @@ fn default_capability_is_local_and_window_scoped() {
 
     assert_eq!(capability["identifier"], "default");
     assert_eq!(windows, HashSet::from(["main", "pet"]));
+    // 旧断言把 allow-start-resize-dragging 视为默认权限；3-1 已删除可见 resize 控件，
+    // 继续授予无人调用的 capability 只会扩大桌面运行时权限面。
     assert_eq!(
         permissions,
-        HashSet::from([
-            "core:default",
-            "core:window:allow-start-dragging",
-            "core:window:allow-start-resize-dragging"
-        ])
+        HashSet::from(["core:default", "core:window:allow-start-dragging"])
     );
     assert!(permissions.iter().all(|permission| {
         !permission.starts_with("fs:")
@@ -207,3 +211,43 @@ fn default_capability_is_local_and_window_scoped() {
             && !permission.starts_with("process:")
     }));
 }
+
+#[test]
+fn main_window_control_logs_chrome_configuration_failures_without_blocking_navigation() {
+    let main_rs_path = manifest_dir().join("src/main.rs");
+    let raw = fs::read_to_string(&main_rs_path)
+        .unwrap_or_else(|error| panic!("failed to read {}: {error}", main_rs_path.display()));
+
+    assert!(
+        !raw.contains("configure_main_window_chrome(&window)?"),
+        "tray/deep-link navigation must continue when chrome configuration is unavailable"
+    );
+    assert!(
+        raw.contains("if let Err(error) = configure_main_window_chrome(&window)"),
+        "main chrome configuration failures should be handled locally"
+    );
+    assert!(
+        raw.contains("failed to configure main window chrome; continuing window control"),
+        "the fallback must leave a diagnostic for real-device follow-up"
+    );
+    assert!(
+        raw.contains("app.emit(\"navigate\", route.clone())"),
+        "route navigation still needs to run after a chrome fallback"
+    );
+}
+
+#[test]
+fn unused_main_resize_drag_runtime_entry_is_retired() {
+    let main_rs_path = manifest_dir().join("src/main.rs");
+    let raw = fs::read_to_string(&main_rs_path)
+        .unwrap_or_else(|error| panic!("failed to read {}: {error}", main_rs_path.display()));
+
+    assert!(
+        !raw.contains("start_main_window_resize_drag"),
+        "3-1 removed the Spotlight resize handles, so the unused resize command should not stay registered"
+    );
+    assert!(
+        !raw.contains("start_resize_dragging"),
+        "no remaining Rust path should require the retired start-resize-dragging permission"
+    );
+}
diff --git a/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/rust-system-i18n-report.json b/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/rust-system-i18n-report.json
index ba76d6ea2..b53382ec1 100644
--- a/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/rust-system-i18n-report.json
+++ b/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/rust-system-i18n-report.json
@@ -1,14 +1,14 @@
 {
-  "generated_at": "2026-06-28T14:09:33.792Z",
+  "generated_at": "2026-07-02T15:16:58.830Z",
   "module": "R4.6 Rust system-string i18n",
-  "output_dir": "/Users/apple/Desktop/开发项目/WorkHub/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n",
+  "output_dir": "/private/tmp/workhub-r9-codex/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n",
   "cargo_mode": "executed",
   "commands": [
     {
-      "command": "cargo test --manifest-path /Users/apple/Desktop/开发项目/WorkHub/client-tauri/src-tauri/Cargo.toml",
+      "command": "cargo test --manifest-path /private/tmp/workhub-r9-codex/client-tauri/src-tauri/Cargo.toml",
       "exitCode": 0,
-      "stdoutTail": "se::tests::plans_contract_stream_paths_without_copying_domain_logic ... ok\ntest sse::tests::status_payloads_use_the_dedicated_sse_status_channel ... ok\ntest sse::tests::startup_targets_subscribe_to_the_per_user_stream_not_the_admin_only_global ... ok\ntest sse::tests::worker_plan_keeps_retry_policy_and_subscription_headers ... ok\ntest sse_worker::tests::byte_pump_holds_partial_frames_until_the_blank_line_arrives ... ok\ntest sse_worker::tests::byte_pump_preserves_multibyte_utf8_split_across_chunks ... ok\ntest sse_worker::tests::default_reconnect_delay_is_small_enough_for_desktop_feedback ... ok\ntest sse_worker::tests::frame_boundary_end_recognizes_every_blank_line_encoding ... ok\ntest sse_worker::tests::reconnect_backoff_is_base_when_healthy_and_caps_at_60s ... ok\ntest tray::tests::keeps_tray_ids_stable_and_unique ... ok\ntest tray::tests::maps_tray_window_actions_to_existing_window_control_contract ... ok\ntest tray::tests::opens_inbox_through_a_safe_main_route ... ok\ntest tray::tests::localizes_user_visible_tray_labels_without_changing_ids ... ok\ntest tray::tests::opens_settings_through_a_safe_main_route ... ok\ntest tray::tests::quit_action_does_not_claim_business_window_control ... ok\ntest tray::tests::restore_pet_interaction_shows_cuu_without_stealing_focus ... ok\ntest window_controls::tests::command_names_match_the_tauri_runtime_entry ... ok\ntest window_controls::tests::hidden_windows_do_not_carry_stale_routes ... ok\ntest window_controls::tests::main_window_controls_show_and_focus_known_routes ... ok\ntest window_controls::tests::pet_window_controls_do_not_steal_focus ... ok\ntest window_controls::tests::rejects_unsafe_deep_link_routes ... ok\ntest window_controls::tests::serializes_for_tauri_command_payloads ... ok\ntest windows::tests::default_window_plan_has_main_and_pet_labels ... ok\ntest windows::tests::main_window_is_a_resizable_spotlight_shell ... ok\ntest windows::tests::pet_window_contract_matches_cuu_desktop_concept ... ok\ntest windows::tests::window_plans_serialize_with_tauri_style_field_names ... ok\n\ntest result: ok. 78 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 12 tests\ntest tests::cuu_qa_preferences_env_accepts_qa_capture_scenarios ... ok\ntest tests::cuu_qa_preferences_env_accepts_window_settings ... ok\ntest tests::cuu_qa_preferences_env_enables_dom_report_when_path_is_present ... ok\ntest tests::cuu_qa_preferences_env_ignores_invalid_settings ... ok\ntest tests::main_window_resize_direction_accepts_spotlight_edges_only ... ok\ntest tests::cuu_qa_preferences_env_accepts_hide_on_hover_truthy_values ... ok\ntest tests::spotlight_size_clamp_allows_idle_search_bar_height ... ok\ntest tests::sse_disable_env_accepts_explicit_truthy_values ... ok\ntest tests::pet_initialization_script_can_inject_qa_preferences ... ok\ntest tests::cuu_qa_dom_report_writer_writes_pretty_json_to_the_env_owned_path ... ok\ntest tests::sse_disable_env_ignores_missing_and_falsey_values ... ok\ntest tests::tray_quit_dry_run_env_accepts_truthy_values_only ... ok\n\ntest result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 9 tests\ntest default_capability_is_local_and_window_scoped ... ok\ntest tauri_bundle_targets_are_platform_native_not_windows_only ... ok\ntest tauri_windows_match_the_shell_window_contract ... ok\ntest macos_info_plist_overrides_legacy_carbon_requirement ... ok\ntest tauri_build_points_at_the_desktop_webview_surface ... ok\ntest macos_main_window_receives_pointer_events_with_a_native_one_alpha_hit_surface ... ok\ntest transparent_windows_declare_a_fully_transparent_webview_background ... ok\ntest macos_main_window_exposes_manual_drag_fallback_for_transparent_search_center ... ok\ntest macos_main_window_restores_native_vibrancy_for_real_frosted_glass ... ok\n\ntest result: ok. 9 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 0 tests\n\ntest result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n",
-      "stderrTail": "    Finished `test` profile [unoptimized + debuginfo] target(s) in 0.25s\n     Running unittests src/lib.rs (client-tauri/src-tauri/target/debug/deps/workhub_client_tauri-280f635369cc5546)\n     Running unittests src/main.rs (client-tauri/src-tauri/target/debug/deps/workhub_client_tauri-068f30fa3eb9fc06)\n     Running tests/tauri_scaffold.rs (client-tauri/src-tauri/target/debug/deps/tauri_scaffold-aedc7444f6e91615)\n   Doc-tests workhub_client_tauri\n"
+      "stdoutTail": "se::tests::startup_targets_subscribe_to_the_per_user_stream_not_the_admin_only_global ... ok\ntest sse::tests::status_payloads_use_the_dedicated_sse_status_channel ... ok\ntest sse::tests::worker_plan_keeps_retry_policy_and_subscription_headers ... ok\ntest sse_worker::tests::byte_pump_holds_partial_frames_until_the_blank_line_arrives ... ok\ntest sse_worker::tests::byte_pump_preserves_multibyte_utf8_split_across_chunks ... ok\ntest sse_worker::tests::default_reconnect_delay_is_small_enough_for_desktop_feedback ... ok\ntest sse_worker::tests::frame_boundary_end_recognizes_every_blank_line_encoding ... ok\ntest sse_worker::tests::reconnect_backoff_is_base_when_healthy_and_caps_at_60s ... ok\ntest tray::tests::keeps_tray_ids_stable_and_unique ... ok\ntest tray::tests::localizes_user_visible_tray_labels_without_changing_ids ... ok\ntest tray::tests::maps_tray_window_actions_to_existing_window_control_contract ... ok\ntest tray::tests::opens_inbox_through_a_safe_main_route ... ok\ntest tray::tests::opens_settings_through_a_safe_main_route ... ok\ntest tray::tests::quit_action_does_not_claim_business_window_control ... ok\ntest tray::tests::restore_pet_interaction_shows_cuu_without_stealing_focus ... ok\ntest window_controls::tests::command_names_match_the_tauri_runtime_entry ... ok\ntest window_controls::tests::hidden_windows_do_not_carry_stale_routes ... ok\ntest window_controls::tests::main_window_controls_show_and_focus_known_routes ... ok\ntest window_controls::tests::pet_window_controls_do_not_steal_focus ... ok\ntest window_controls::tests::rejects_unsafe_deep_link_routes ... ok\ntest window_controls::tests::serializes_for_tauri_command_payloads ... ok\ntest windows::tests::default_window_plan_has_main_and_pet_labels ... ok\ntest windows::tests::main_window_is_a_resizable_spotlight_shell ... ok\ntest windows::tests::pet_window_contract_matches_cuu_desktop_concept ... ok\ntest windows::tests::window_plans_serialize_with_tauri_style_field_names ... ok\n\ntest result: ok. 78 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 11 tests\ntest tests::cuu_qa_preferences_env_accepts_hide_on_hover_truthy_values ... ok\ntest tests::cuu_qa_preferences_env_enables_dom_report_when_path_is_present ... ok\ntest tests::cuu_qa_preferences_env_accepts_window_settings ... ok\ntest tests::cuu_qa_preferences_env_ignores_invalid_settings ... ok\ntest tests::spotlight_size_clamp_allows_idle_search_bar_height ... ok\ntest tests::sse_disable_env_accepts_explicit_truthy_values ... ok\ntest tests::sse_disable_env_ignores_missing_and_falsey_values ... ok\ntest tests::pet_initialization_script_can_inject_qa_preferences ... ok\ntest tests::cuu_qa_preferences_env_accepts_qa_capture_scenarios ... ok\ntest tests::tray_quit_dry_run_env_accepts_truthy_values_only ... ok\ntest tests::cuu_qa_dom_report_writer_writes_pretty_json_to_the_env_owned_path ... ok\n\ntest result: ok. 11 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 11 tests\ntest default_capability_is_local_and_window_scoped ... ok\ntest macos_info_plist_overrides_legacy_carbon_requirement ... ok\ntest tauri_bundle_targets_are_platform_native_not_windows_only ... ok\ntest tauri_windows_match_the_shell_window_contract ... ok\ntest transparent_windows_declare_a_fully_transparent_webview_background ... ok\ntest main_window_control_logs_chrome_configuration_failures_without_blocking_navigation ... ok\ntest tauri_build_points_at_the_desktop_webview_surface ... ok\ntest macos_main_window_receives_pointer_events_with_a_native_one_alpha_hit_surface ... ok\ntest macos_main_window_restores_native_vibrancy_for_real_frosted_glass ... ok\ntest macos_main_window_exposes_manual_drag_fallback_for_transparent_search_center ... ok\ntest unused_main_resize_drag_runtime_entry_is_retired ... ok\n\ntest result: ok. 11 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n\nrunning 0 tests\n\ntest result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s\n\n",
+      "stderrTail": "    Finished `test` profile [unoptimized + debuginfo] target(s) in 0.20s\n     Running unittests src/lib.rs (client-tauri/src-tauri/target/debug/deps/workhub_client_tauri-280f635369cc5546)\n     Running unittests src/main.rs (client-tauri/src-tauri/target/debug/deps/workhub_client_tauri-068f30fa3eb9fc06)\n     Running tests/tauri_scaffold.rs (client-tauri/src-tauri/target/debug/deps/tauri_scaffold-aedc7444f6e91615)\n   Doc-tests workhub_client_tauri\n"
     }
   ],
   "gates": {
diff --git a/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/smoke-summary.md b/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/smoke-summary.md
index 95fd33511..ec46251b5 100644
--- a/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/smoke-summary.md
+++ b/docs/workhub/05-clients/assets/audit/2026-06-11-r4-rust-system-i18n/smoke-summary.md
@@ -1,6 +1,6 @@
 # R4.6 Rust System I18n Smoke
 
-- generated_at: 2026-06-28T14:09:33.792Z
+- generated_at: 2026-07-02T15:16:58.830Z
 - cargo_mode: executed
 - cargo_tests_passed: true
 - all_gates_passed: true
diff --git a/docs/workhub/06-roadmap/r9-iteration-plan-2026-07-02.md b/docs/workhub/06-roadmap/r9-iteration-plan-2026-07-02.md
index 7f307ac70..dbcbdb34a 100644
--- a/docs/workhub/06-roadmap/r9-iteration-plan-2026-07-02.md
+++ b/docs/workhub/06-roadmap/r9-iteration-plan-2026-07-02.md
@@ -72,6 +72,18 @@
 | 5-2 | openapi.ts：修 4 处已知漂移；建「从 zod 契约派生或 CI 比对」机制，不再手维护 4500 行 | openapi-1..4 |
 | 5-3 | 快照/替换所有被迁就的测试断言（以 git log -p 原断言为准逐个复核） | test-integrity-1 |
 
+### 5-3 断言复核记录（2026-07-02）
+
+`test-integrity` JSON 清单只有两条已确认项：`test-integrity-2` 是 DB 源码 grep 伪测试债，已由 5-1 改成行为测试；`test-integrity-1` 是桌宠玻璃约束测试被改写迁就实现。
+
+以 `git log -p` 逐项复核后，当前约束为：
+
+- `32d2efb7` 的批次 0 止血已经把 `apps/desktop-webview/src/pet-surface.test.ts` 中被削弱的桌宠气泡断言恢复到 `.wh-pet-bubble` 白底 `rgba(255,255,255,.82/.52)`，并恢复入场淡入动画；当前实现 `apps/desktop-webview/src/pet-surface.ts` 同步保持 `.82/.52`。
+- 后续 `a2ef86e3` 只改掉隐藏 SVG filter 相关断言，且在 `pet-surface.test.ts`、`spotlight/css.test.ts`、`liquid-glass-filter.test.ts` 中逐条写明旧断言为什么错：这些 `url(#workhub-liquid-glass-*)` 层在生产消费方被隐藏，继续钉住它们只会保留死的生成贴图路径。
+- 后续 `b2fb61cf` 改掉 Spotlight 手动 resize 命中区相关断言，已写明旧断言为什么错：旧断言钉住了没有持久 resize 状态支撑的假 affordance。
+
+复核命令：`pnpm exec node --import tsx --test src/pet-surface.test.ts src/liquid-glass-filter.test.ts src/spotlight/css.test.ts`（`apps/desktop-webview`）通过 `56/56`。5-3 不再替换额外断言，只保留这份可回溯记录。
+
 ## 流程红线（写进协作规范，防复发）
 
 1. **无人值守 agent 产出必须过对抗式审查才能进 main**——本轮 84 真发现即为代价证明。
diff --git a/packages/cuu/src/cards.test.ts b/packages/cuu/src/cards.test.ts
index f8d48e09c..f8f35cc73 100644
--- a/packages/cuu/src/cards.test.ts
+++ b/packages/cuu/src/cards.test.ts
@@ -360,7 +360,7 @@ test("reviewed proposal attention cards say merge instead of asking for approval
     priority: "normal",
     work_item_id: workItemId,
     source_ref: { entity_type: "proposal", entity_id: "proposal-reviewed" },
-    title: "Cuu 等你确认变更",
+    title: "周报草稿变更申请",
     summary_text: "已确认通过，只差合入交付物。",
     reason_text: "接下来可以合入交付物。",
     actions: [
@@ -374,11 +374,12 @@ test("reviewed proposal attention cards say merge instead of asking for approval
   const card = cardFromAttentionItem(attention);
   const english = cardFromAttentionItem(attention, { locale: "en-US" });
 
-  assert.equal(card.title, "Cuu 等你合入变更");
+  // 旧断言只钉通用「Cuu 等你合入变更」；真实队列里多张 reviewed proposal 并列时会看不出是哪份变更。
+  assert.equal(card.title, "「周报草稿变更申请」待合入");
   assert.doesNotMatch(card.title, /确认|拍板/u);
   assert.equal(card.sections?.find((section) => section.id === "next_step")?.lines[0], "已确认通过，下一步合入交付物。");
   assert.deepEqual(card.actions.map((action) => action.id), ["open_proposal", "merge"]);
-  assert.equal(english.title, "Cuu is ready to merge the change");
+  assert.equal(english.title, '"周报草稿变更申请" is ready to merge');
 });
 
 test("proposal cards replace model self-narration titles with public review copy", () => {
@@ -473,7 +474,8 @@ test("proposal cards replace model self-narration titles with public review copy
   assert.equal(fileNarrationCard.title, "Cuu 等你确认变更");
   assert.equal(chineseAttentionCard.title, "Cuu 等你确认变更");
   assert.equal(chineseProposalCard.title, "Cuu 等你确认变更");
-  assert.equal(chineseAttentionCard.message, "变更申请已生成。先看总结和改动，再决定是否采纳。");
+  // 旧断言继续使用「采纳」；proposal 流程其它状态/action 已用「合入」，Cuu 卡片里再混用会误导用户。
+  assert.equal(chineseAttentionCard.message, "变更申请已生成。先看总结和改动，再决定是否合入。");
   assert.equal(chineseAttentionCard.sections?.[0]?.title, "总结");
   assert.equal(chineseAttentionCard.sections?.[1]?.title, "下一步");
   assert.equal(chineseAttentionCard.sections?.[1]?.lines[0], "先看总结和改动，再确认通过或打回修改。");
@@ -593,6 +595,16 @@ test("proposal conflicts become option-first Cuu cards with merge payloads", ()
     conflict_resolution: { accept_incoming_target_keys: ["drive_item:docs/weekly-report.md"] }
   });
   assert.equal(card.actions.find((action) => action.id === "ai_fusion")?.label, "采用 AI 融合稿");
+  // 旧断言允许「采纳这次版本」漏到 Cuu 冲突卡；这里统一 proposal merge 动作为「合入」。
+  assert.equal(card.actions.find((action) => action.id === "accept_incoming")?.label, "合入这次版本");
+  assert.doesNotMatch(
+    [
+      card.message,
+      ...(card.sections ?? []).flatMap((section) => section.lines),
+      ...card.actions.map((action) => action.label)
+    ].join(" "),
+    /采纳/u
+  );
   assert.equal(
     card.actions.find((action) => action.id === "ai_fusion")?.href,
     "/api/merge-proposals/10000000-0000-4000-8000-000000000309/apply"
diff --git a/packages/cuu/src/cards.ts b/packages/cuu/src/cards.ts
index 6782ebd2e..9d9a3cfc0 100644
--- a/packages/cuu/src/cards.ts
+++ b/packages/cuu/src/cards.ts
@@ -173,9 +173,21 @@ function publicProposalTitle(title: string, options: CuuLocaleOptions = {}) {
   return isModelSelfNarrationTitle(compact) ? cuuT(options.locale, "proposal.reviewTitle") : compact;
 }
 
+function normalizeProposalMergeVerb(text: string, options: CuuLocaleOptions = {}) {
+  if (options.locale === "en-US") {
+    return text;
+  }
+  return text
+    .replaceAll("采纳这次版本", "合入这次版本")
+    .replaceAll("正式采纳", "正式合入")
+    .replaceAll("是否采纳", "是否合入");
+}
+
 function publicProposalSummary(text: string | undefined, options: CuuLocaleOptions = {}) {
   const compact = truncate(stripProposalOpenedPrefix(text ?? ""), 180);
-  return !compact || isModelSelfNarrationTitle(compact) ? cuuT(options.locale, "proposal.summaryFallback") : compact;
+  return !compact || isModelSelfNarrationTitle(compact)
+    ? cuuT(options.locale, "proposal.summaryFallback")
+    : normalizeProposalMergeVerb(compact, options);
 }
 
 function proposalNextStepForStatus(status: ProposalDetailVM["status"], options: CuuLocaleOptions = {}) {
@@ -222,10 +234,17 @@ function stateForAttentionItem(item: AttentionItem): CuuState {
 }
 
 function publicProposalAttentionTitle(item: AttentionItem, message: string, options: CuuLocaleOptions = {}) {
+  const title = publicProposalTitle(item.title, options);
   if (attentionHasAction(item, "merge")) {
-    return cuuT(options.locale, "proposal.mergeTitle");
+    if (
+      title === message
+      || title === cuuT(options.locale, "proposal.reviewTitle")
+      || title === cuuT(options.locale, "proposal.mergeTitle")
+    ) {
+      return cuuT(options.locale, "proposal.mergeTitle");
+    }
+    return cuuFormat(options.locale, "proposal.mergeTitleNamed", { title });
   }
-  const title = publicProposalTitle(item.title, options);
   return title === message ? cuuT(options.locale, "proposal.reviewTitle") : title;
 }
 
@@ -776,7 +795,7 @@ export function cardFromProposalConflict(conflict: ProposalConflict, options: Cu
     {
       id: "versions",
       title: cuuT(options.locale, "proposal.conflictVersionSection"),
-      lines: conflict.options.map((option) => option.summary_text)
+      lines: conflict.options.map((option) => normalizeProposalMergeVerb(option.summary_text, options))
     }
   ];
   const actions = [
@@ -795,7 +814,7 @@ export function cardFromProposalConflict(conflict: ProposalConflict, options: Cu
     kind: "proposal",
     state: "asking_approval",
     title: cuuT(options.locale, "proposal.conflictTitle"),
-    message: truncate(conflict.summary_text),
+    message: truncate(normalizeProposalMergeVerb(conflict.summary_text, options)),
     priority: "high",
     actions,
     chips: [
diff --git a/packages/cuu/src/i18n.ts b/packages/cuu/src/i18n.ts
index 832647a83..333cd9988 100644
--- a/packages/cuu/src/i18n.ts
+++ b/packages/cuu/src/i18n.ts
@@ -34,6 +34,7 @@ export type CuuCopyKey =
   | "proposal.changesSection"
   | "proposal.reviewTitle"
   | "proposal.mergeTitle"
+  | "proposal.mergeTitleNamed"
   | "proposal.mergeStatus"
   | "proposal.summarySection"
   | "proposal.summaryFallback"
@@ -238,9 +239,10 @@ const cuuCopy = {
     "proposal.changesSection": "这次改了什么",
     "proposal.reviewTitle": "Cuu 等你确认变更",
     "proposal.mergeTitle": "Cuu 等你合入变更",
+    "proposal.mergeTitleNamed": "「{title}」待合入",
     "proposal.mergeStatus": "有变更待合入",
     "proposal.summarySection": "总结",
-    "proposal.summaryFallback": "变更申请已生成。先看总结和改动，再决定是否采纳。",
+    "proposal.summaryFallback": "变更申请已生成。先看总结和改动，再决定是否合入。",
     "proposal.nextStepSection": "下一步",
     "proposal.nextStepOpenReview": "点「查看变更申请」会打开变更详情，里面有总结、改动和确认按钮。",
     "proposal.nextStepOpened": "先看总结和改动，再确认通过或打回修改。",
@@ -257,7 +259,7 @@ const cuuCopy = {
     "proposal.conflictTitle": "变更撞车了",
     "proposal.conflictOpenProposal": "查看变更申请",
     "proposal.conflictKeepCurrent": "保留正式版",
-    "proposal.conflictAcceptIncoming": "采纳这次版本",
+    "proposal.conflictAcceptIncoming": "合入这次版本",
     "proposal.conflictAiFusion": "AI 融合建议",
     "proposal.conflictApplyAiFusion": "采用 AI 融合稿",
     "proposal.conflictTargetSection": "撞车对象",
@@ -441,6 +443,7 @@ const cuuCopy = {
     "proposal.changesSection": "What changed",
     "proposal.reviewTitle": "Cuu has a change for review",
     "proposal.mergeTitle": "Cuu is ready to merge the change",
+    "proposal.mergeTitleNamed": "\"{title}\" is ready to merge",
     "proposal.mergeStatus": "Change ready to merge",
     "proposal.summarySection": "Summary",
     "proposal.summaryFallback": "The change request is ready. Review the summary and changes before deciding.",
diff --git a/packages/db/src/audit-repository.test.ts b/packages/db/src/audit-repository.test.ts
index bbc4e5210..db1ef48cf 100644
--- a/packages/db/src/audit-repository.test.ts
+++ b/packages/db/src/audit-repository.test.ts
@@ -1,9 +1,10 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
 import { AUDIT_LOGS_FOR_WORK_ITEM_LIMIT } from "./repositories/audit.js";
+import { createAuditLogRepository } from "./repositories/audit.js";
+import { auditLogs } from "./schema/index.js";
+import { createQueryRecorder, queryParamValues, queryReferences, queryTextFragments } from "./test-query-recorder.js";
 
 // db-repos-7: listAuditLogsForWorkItem 曾经无 limit 对 audit_logs 做无界扫描；这里断言真实
 // 导出的常量而不是把数字写死在测试里，常量一改这条测试就跟着体现新值——防止两处漂移。
@@ -15,24 +16,30 @@ test("listAuditLogsForWorkItem exports a bounded default row limit", () => {
   );
 });
 
-test("work item audit timeline includes proposal and deliverable logs anchored by detail work_item_id, capped and narrowed by entity type", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "audit.ts"), "utf8");
-  const start = source.indexOf("async listAuditLogsForWorkItem");
-  const end = source.indexOf("async markAuditLogUndone", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+// Old assertions matched repositories/audit.ts text. That was wrong because the risk is the
+// repository issuing an unbounded or broad audit timeline query, not the source containing words.
+test("work item audit timeline returns capped logs through narrowed audit predicates", async () => {
+  const rows = [
+    { id: "audit-1", entityType: "work_item", entityId: "work-item-1", action: "work_item.updated" },
+    { id: "audit-2", entityType: "approval_request", entityId: "approval-1", action: "approval.approved" }
+  ];
+  const { db, queries } = createQueryRecorder([rows]);
+  const repository = createAuditLogRepository(db);
 
-  // 主路径仍走 (entity_type, entity_id) 索引。
-  assert.match(body, /eq\(auditLogs\.entityType,\s*"work_item"\)/u);
-  assert.match(body, /eq\(auditLogs\.entityId,\s*workItemId\)/u);
-  // 补充路径必须先收窄 entityType 到会写 work_item_id 到 detailJson 的那两类，
-  // 而不是对整表做 JSON 提取（db-repos-7 的核心修复点）。
-  assert.match(body, /entityType.*in\s*\(\s*'approval_request',\s*'agent_run'\s*\)/u);
-  assert.match(body, /auditLogs\.detailJson/u);
-  assert.match(body, /work_item_id/u);
-  assert.match(body, /or\(/u);
-  // 必须有上限，且默认用导出的常量而不是魔法数字。
-  assert.match(body, /\.limit\(limit\)/u);
-  assert.match(body, /AUDIT_LOGS_FOR_WORK_ITEM_LIMIT/u);
+  const result = await repository.listAuditLogsForWorkItem("work-item-1", { limit: 3 });
+
+  assert.deepEqual(result, rows);
+  const [query] = queries;
+  assert.equal(query?.fromTable, auditLogs);
+  assert.equal(query?.limit, 3);
+  assert.ok(queryReferences(query?.where, auditLogs.entityType));
+  assert.ok(queryReferences(query?.where, auditLogs.entityId));
+  assert.ok(queryReferences(query?.where, auditLogs.detailJson));
+  assert.ok(queryParamValues(query?.where).includes("work_item"));
+  assert.ok(queryParamValues(query?.where).includes("work-item-1"));
+  const fragments = queryTextFragments(query?.where).join(" ");
+  assert.match(fragments, /approval_request/u);
+  assert.match(fragments, /agent_run/u);
+  assert.match(fragments, /work_item_id/u);
+  assert.ok((query?.orderBy.length ?? 0) > 0);
 });
diff --git a/packages/db/src/meeting-path.test.ts b/packages/db/src/meeting-path.test.ts
index a9cf58a8e..ec1e527f1 100644
--- a/packages/db/src/meeting-path.test.ts
+++ b/packages/db/src/meeting-path.test.ts
@@ -1,32 +1,82 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
-test("meeting insightToDraft locks the source insight before checking for an existing draft", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "meetings.ts"), "utf8");
-  const start = source.indexOf("async insightToDraft");
-  const end = source.indexOf("const allocation = await allocateProjectCode", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+import { createMeetingRepository } from "./repositories/meetings.js";
+import { auditLogs, meetingInsights, meetingRecords, projects, workItems } from "./schema/index.js";
+import { createQueryRecorder, queryReferences } from "./test-query-recorder.js";
 
-  assert.match(
-    body,
-    /from\(meetingInsights\)[\s\S]*\.where\(and\([\s\S]*eq\(meetingInsights\.id,\s*input\.insightId\)[\s\S]*eq\(meetingRecords\.projectId,\s*input\.projectId\)[\s\S]*\.for\("update"\)[\s\S]*const source = rows\[0\][\s\S]*if \(source\.insight\.createdWorkItemId\)[\s\S]*if \(source\.insight\.status !== "pending"\)/u
-  );
+// Old assertions read repositories/meetings.ts and matched statement order. That was wrong
+// because the idempotency path must prove the repository actually locks before follow-up reads.
+test("meeting insightToDraft locks the source insight before checking an existing draft", async () => {
+  const project = { id: "project-1", workspaceId: "workspace-1", archived: false, deletedAt: null };
+  const insight = {
+    id: "insight-1",
+    meetingId: "meeting-1",
+    createdWorkItemId: "work-item-1",
+    status: "pending",
+    title: "Draft title",
+    description: "Draft description",
+    confidenceReason: "Enough evidence"
+  };
+  const meeting = { id: "meeting-1", projectId: "project-1", title: "Weekly" };
+  const workItem = { id: "work-item-1", deletedAt: null, title: "Existing draft" };
+  const { db, queries } = createQueryRecorder([
+    [project],
+    [{ insight, meeting }],
+    [workItem]
+  ]);
+  const repository = createMeetingRepository(db);
+
+  const result = await repository.insightToDraft({
+    actorKind: "human",
+    actorUserId: "user-1",
+    projectId: "project-1",
+    insightId: "insight-1"
+  });
+
+  assert.equal(result?.created, false);
+  assert.equal(result?.workItem, workItem);
+  const insightIndex = queries.findIndex((query) => query.fromTable === meetingInsights);
+  const draftIndex = queries.findIndex((query) => query.fromTable === workItems);
+  const insightQuery = queries[insightIndex];
+  assert.equal(queries[0]?.fromTable, projects);
+  assert.ok(insightIndex > -1 && draftIndex > insightIndex);
+  assert.equal(insightQuery?.lock, "update");
+  assert.ok(queryReferences(insightQuery?.where, meetingInsights.id));
+  assert.ok(queryReferences(insightQuery?.where, meetingRecords.projectId));
 });
 
-test("meeting recordDraftProposal locks the source insight before the idempotency audit gate", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "meetings.ts"), "utf8");
-  const start = source.indexOf("async recordDraftProposal");
-  const end = source.indexOf("const existingAudit = await tx", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+test("meeting recordDraftProposal locks the source insight before the audit idempotency gate", async () => {
+  const project = { id: "project-1", workspaceId: "workspace-1", archived: false, deletedAt: null };
+  const insight = {
+    id: "insight-1",
+    meetingId: "meeting-1",
+    createdWorkItemId: "work-item-1",
+    status: "pending",
+    title: "Draft title",
+    description: "Draft description",
+    confidenceReason: "Enough evidence"
+  };
+  const meeting = { id: "meeting-1", projectId: "project-1", title: "Weekly" };
+  const { db, queries } = createQueryRecorder([
+    [{ insight, meeting }],
+    [project],
+    [{ id: "audit-1" }]
+  ]);
+  const repository = createMeetingRepository(db);
+
+  const result = await repository.recordDraftProposal({
+    actorKind: "human",
+    actorUserId: "user-1",
+    workItemId: "work-item-1",
+    proposalId: "proposal-1"
+  });
 
-  assert.match(
-    body,
-    /from\(meetingInsights\)[\s\S]*\.where\(eq\(meetingInsights\.createdWorkItemId,\s*input\.workItemId\)\)[\s\S]*\.for\("update"\)[\s\S]*const source = rows\[0\]/u
-  );
+  assert.equal(result?.created, false);
+  const insightIndex = queries.findIndex((query) => query.fromTable === meetingInsights);
+  const auditIndex = queries.findIndex((query) => query.fromTable === auditLogs);
+  const insightQuery = queries[insightIndex];
+  assert.ok(insightIndex > -1 && auditIndex > insightIndex);
+  assert.equal(insightQuery?.lock, "update");
+  assert.ok(queryReferences(insightQuery?.where, meetingInsights.createdWorkItemId));
 });
diff --git a/packages/db/src/project-health.test.ts b/packages/db/src/project-health.test.ts
index f46c73a33..6b99c0166 100644
--- a/packages/db/src/project-health.test.ts
+++ b/packages/db/src/project-health.test.ts
@@ -1,37 +1,99 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
-test("project health repository applies actor visibility before source limits", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "project-health.ts"), "utf8");
-  const start = source.indexOf("async readProjectHealthSources");
-  assert.notEqual(start, -1);
-  const body = source.slice(start);
+import { createProjectHealthRepository } from "./repositories/project-health.js";
+import {
+  agentRuns,
+  approvalRequests,
+  projects,
+  workItemAssignments,
+  workItems
+} from "./schema/index.js";
+import { createQueryRecorder, queryParamValues, queryReferences } from "./test-query-recorder.js";
 
-  assert.match(body, /where\(and\(\.\.\.projectScopeConditions\(input\.actor\)\)\)/u);
-  assert.match(body, /workItemScopeConditions\(input\.actor\)/u);
-  assert.match(body, /eq\(approvalRequests\.routedToUserId,\s*input\.actor\.userId\)/u);
-  assert.match(source, /notInArray\(workItems\.status,\s*privateWorkItemStatuses\)/u);
-  assert.match(source, /from \$\{workItemAssignments\}/u);
-});
+// Old assertions read repository source text. That was wrong because source regexes can pass
+// while the called repository returns unscoped rows or skips assignment enrichment at runtime.
+test("project health repository applies actor visibility before bounded source reads", async () => {
+  const project = {
+    id: "project-1",
+    workspaceId: "workspace-1",
+    ownerUserId: "owner-1",
+    archived: false,
+    deletedAt: null,
+    updatedAt: new Date("2026-07-02T08:00:00.000Z")
+  };
+  const openWorkItem = {
+    workItem: { id: "work-item-open", status: "spec_ready", updatedAt: new Date("2026-07-02T08:01:00.000Z") },
+    project,
+    projectOrgId: "org-1"
+  };
+  const pendingApproval = {
+    approval: { id: "approval-1", routedToUserId: "actor-1", status: "pending" },
+    workItem: { id: "work-item-approval", status: "reviewing" },
+    project,
+    projectOrgId: "org-1"
+  };
+  const failedRun = {
+    run: { id: "run-1", workItemId: "work-item-run", status: "failed", createdAt: new Date("2026-07-02T08:02:00.000Z") },
+    workItem: { id: "work-item-run", status: "running" },
+    project,
+    projectOrgId: "org-1"
+  };
+  const pendingInsight = {
+    insight: { id: "insight-1", status: "pending" },
+    meeting: { id: "meeting-1", projectId: "project-1" },
+    project,
+    projectOrgId: "org-1"
+  };
+  const { db, queries } = createQueryRecorder([
+    [{ project, orgId: "org-1" }],
+    [openWorkItem],
+    [pendingApproval],
+    [failedRun],
+    [pendingInsight],
+    [{ workItemId: "work-item-open", userId: "actor-1", role: "reviewer" }],
+    [{ workItemId: "work-item-approval", userId: "approver-1", role: "approver" }],
+    [{ workItemId: "work-item-run", userId: "runner-1", role: "owner" }]
+  ]);
+
+  const repository = createProjectHealthRepository(db);
+  const result = await repository.readProjectHealthSources({
+    actor: { workspaceId: "workspace-1", userId: "actor-1" },
+    failedRunsSince: new Date("2026-07-01T00:00:00.000Z"),
+    limit: 2
+  });
+
+  assert.deepEqual(result.projects, [{ ...project, orgId: "org-1" }]);
+  assert.deepEqual(result.openWorkItems[0]?.assignments, [
+    { userId: "actor-1", role: "reviewer" }
+  ]);
+  assert.deepEqual(result.pendingApprovals[0]?.workItemAssignments, [
+    { userId: "approver-1", role: "approver" }
+  ]);
+  assert.deepEqual(result.failedRuns[0]?.workItemAssignments, [
+    { userId: "runner-1", role: "owner" }
+  ]);
 
-test("project health repository scopes work-item signal sources by project before limits", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "project-health.ts"), "utf8");
-  const start = source.indexOf("async readProjectHealthSources");
-  assert.notEqual(start, -1);
-  const body = source.slice(start);
+  const [projectQuery, openQuery, approvalQuery, failedRunQuery, insightQuery, ...assignmentQueries] = queries;
+  assert.equal(projectQuery?.fromTable, projects);
+  assert.equal(projectQuery?.limit, 2);
+  assert.equal(openQuery?.fromTable, workItems);
+  assert.equal(openQuery?.limit, 2);
+  assert.ok(openQuery && openQuery.steps.indexOf("where") < openQuery.steps.indexOf("limit"));
+  assert.ok(queryReferences(openQuery?.where, workItems.deletedAt));
+  assert.ok(queryReferences(openQuery?.where, workItems.status));
+  assert.ok(queryReferences(openQuery?.where, projects.archived));
+  assert.ok(queryReferences(openQuery?.where, projects.deletedAt));
+  assert.ok(queryReferences(openQuery?.where, workItemAssignments.workItemId));
+  assert.ok(queryParamValues(openQuery?.where).includes("workspace-1"));
+  assert.ok(queryParamValues(openQuery?.where).includes("actor-1"));
 
-  assert.match(
-    body,
-    /notInArray\(workItems\.status,\s*doneWorkItemStatuses\),\s*\.\.\.projectScopeConditions\(input\.actor\),\s*\.\.\.workItemScopeConditions\(input\.actor\)/su
-  );
-  assert.match(
-    body,
-    /eq\(approvalRequests\.status,\s*"pending"\),\s*isNotNull\(workItems\.id\),\s*isNull\(workItems\.deletedAt\),\s*\.\.\.projectScopeConditions\(input\.actor\),\s*\.\.\.workItemScopeConditions\(input\.actor\)/su
-  );
-  assert.match(
-    body,
-    /gte\(agentRuns\.createdAt,\s*input\.failedRunsSince\),\s*isNotNull\(workItems\.id\),\s*isNull\(workItems\.deletedAt\),\s*notInArray\(workItems\.status,\s*doneWorkItemStatuses\),\s*\.\.\.projectScopeConditions\(input\.actor\),\s*\.\.\.workItemScopeConditions\(input\.actor\)/su
-  );
+  assert.equal(approvalQuery?.fromTable, approvalRequests);
+  assert.ok(queryReferences(approvalQuery?.where, approvalRequests.routedToUserId));
+  assert.ok(queryParamValues(approvalQuery?.where).includes("actor-1"));
+  assert.equal(failedRunQuery?.fromTable, agentRuns);
+  assert.ok(queryReferences(failedRunQuery?.where, agentRuns.status));
+  assert.ok(queryReferences(failedRunQuery?.where, agentRuns.createdAt));
+  assert.equal(insightQuery?.limit, 2);
+  assert.ok(assignmentQueries.every((query) => query.fromTable === workItemAssignments));
 });
diff --git a/packages/db/src/proposals-repository.test.ts b/packages/db/src/proposals-repository.test.ts
index 6b1e0b268..d270db45a 100644
--- a/packages/db/src/proposals-repository.test.ts
+++ b/packages/db/src/proposals-repository.test.ts
@@ -1,31 +1,59 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
-test("proposal review queue skips deleted work items and inactive projects", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "proposals.ts"), "utf8");
-  const start = source.indexOf("async listReviewable");
-  const end = source.indexOf("async listConflictsByWorkItem", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+import { createProposalRepository } from "./repositories/proposals.js";
+import { projects, proposals, workItems } from "./schema/index.js";
+import { createQueryRecorder, queryParamValues, queryReferences } from "./test-query-recorder.js";
 
-  assert.match(body, /innerJoin\(projects,\s*eq\(projects\.id,\s*workItems\.projectId\)\)/u);
-  assert.match(body, /isNull\(workItems\.deletedAt\)/u);
-  assert.match(body, /eq\(projects\.archived,\s*false\)/u);
-  assert.match(body, /isNull\(projects\.deletedAt\)/u);
+// Old assertions regexed repositories/proposals.ts. That was wrong because the queue must
+// prove the public repository method actually returns scoped rows and builds live-entity guards.
+test("proposal review queue refuses non-admin reads without an actor", async () => {
+  const { db, queries } = createQueryRecorder();
+  const repository = createProposalRepository(db);
+
+  const rows = await repository.listReviewable({ includeAll: false });
+
+  assert.deepEqual(rows, []);
+  assert.equal(queries.length, 0);
 });
 
-test("proposal review queue stays scoped to the actor workspace", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "proposals.ts"), "utf8");
-  const start = source.indexOf("async listReviewable");
-  const end = source.indexOf("async listConflictsByWorkItem", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+test("proposal review queue joins live work items and projects under workspace scope", async () => {
+  const row = {
+    id: "proposal-1",
+    workItemId: "work-item-1",
+    title: "Reviewable proposal",
+    status: "opened",
+    createdAt: new Date("2026-07-02T08:00:00.000Z")
+  };
+  const { db, queries } = createQueryRecorder([[row]]);
+  const repository = createProposalRepository(db);
+
+  const rows = await repository.listReviewable({
+    includeAll: false,
+    submitterUserId: "user-1",
+    workspaceId: "workspace-1",
+    limit: 7
+  });
 
-  assert.match(body, /input\.workspaceId/u);
-  assert.match(body, /eq\(workItems\.workspaceId,\s*input\.workspaceId\)/u);
-  assert.match(body, /eq\(projects\.workspaceId,\s*input\.workspaceId\)/u);
+  assert.deepEqual(rows, [row]);
+  const [query] = queries;
+  assert.equal(query?.fromTable, proposals);
+  assert.deepEqual(query?.joins.map((join) => [join.kind, join.table]), [
+    ["inner", workItems],
+    ["inner", projects]
+  ]);
+  assert.equal(query?.limit, 7);
+  assert.ok(query && query.steps.indexOf("where") < query.steps.indexOf("limit"));
+  assert.ok(queryReferences(query?.where, proposals.status));
+  assert.ok(queryReferences(query?.where, workItems.deletedAt));
+  assert.ok(queryReferences(query?.where, projects.archived));
+  assert.ok(queryReferences(query?.where, projects.deletedAt));
+  assert.ok(queryReferences(query?.where, workItems.workspaceId));
+  assert.ok(queryReferences(query?.where, projects.workspaceId));
+  assert.ok(queryReferences(query?.where, workItems.submitterUserId));
+  const params = queryParamValues(query?.where).flatMap((value) => Array.isArray(value) ? value : [value]);
+  assert.ok(params.includes("opened"));
+  assert.ok(params.includes("reviewed"));
+  assert.ok(params.includes("workspace-1"));
+  assert.ok(params.includes("user-1"));
 });
diff --git a/packages/db/src/work-items-access.test.ts b/packages/db/src/work-items-access.test.ts
index 5e621b5d6..436ab232a 100644
--- a/packages/db/src/work-items-access.test.ts
+++ b/packages/db/src/work-items-access.test.ts
@@ -1,17 +1,58 @@
 import assert from "node:assert/strict";
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import test from "node:test";
 
-test("findWorkItemAccessRecord carries project org id for scoped permission checks", () => {
-  const source = readFileSync(join(process.cwd(), "src", "repositories", "work-items.ts"), "utf8");
-  const start = source.indexOf("async findWorkItemAccessRecord");
-  const end = source.indexOf("async findProjectById", start);
-  assert.notEqual(start, -1);
-  assert.notEqual(end, -1);
-  const body = source.slice(start, end);
+import { createWorkItemRepository } from "./repositories/work-items.js";
+import { projects, workItemAssignments, workItems, workspaces } from "./schema/index.js";
+import { createQueryRecorder, queryReferences } from "./test-query-recorder.js";
 
-  assert.match(body, /leftJoin\(workspaces,\s*eq\(projects\.workspaceId,\s*workspaces\.id\)\)/u);
-  assert.match(body, /projectOrgId:\s*workspaces\.orgId/u);
-  assert.match(body, /orgId:\s*row\.projectOrgId/u);
+// Old assertions inspected the work-items source text. That was wrong because permission
+// callers need the repository result to carry orgId and assignments after the joins run.
+test("findWorkItemAccessRecord returns project org id and assignment rows", async () => {
+  const accessRow = {
+    id: "work-item-1",
+    status: "spec_ready",
+    submitterUserId: "submitter-1",
+    claimedByUserId: "claimer-1",
+    workspaceId: "workspace-item",
+    projectArchived: false,
+    projectDeletedAt: null,
+    projectOwnerUserId: "owner-1",
+    projectWorkspaceId: "workspace-project",
+    projectOrgId: "org-1"
+  };
+  const assignments = [
+    { userId: "reviewer-1", role: "reviewer" },
+    { userId: "owner-1", role: "owner" }
+  ];
+  const { db, queries } = createQueryRecorder([[accessRow], assignments]);
+  const repository = createWorkItemRepository(db);
+
+  const result = await repository.findWorkItemAccessRecord("work-item-1");
+
+  assert.deepEqual(result, {
+    id: "work-item-1",
+    status: "spec_ready",
+    submitterUserId: "submitter-1",
+    claimedByUserId: "claimer-1",
+    workspaceId: "workspace-item",
+    project: {
+      archived: false,
+      deletedAt: null,
+      ownerUserId: "owner-1",
+      workspaceId: "workspace-project",
+      orgId: "org-1"
+    },
+    assignments
+  });
+
+  const [accessQuery, assignmentQuery] = queries;
+  assert.equal(accessQuery?.fromTable, workItems);
+  assert.deepEqual(accessQuery?.joins.map((join) => [join.kind, join.table]), [
+    ["inner", projects],
+    ["left", workspaces]
+  ]);
+  assert.equal(accessQuery?.limit, 1);
+  assert.ok(queryReferences(accessQuery?.where, workItems.id));
+  assert.equal(assignmentQuery?.fromTable, workItemAssignments);
+  assert.ok(queryReferences(assignmentQuery?.where, workItemAssignments.workItemId));
 });