lib/ai/rmbg/service.ts

@@ -8,7 +8,6 @@ import { executeConfiguredVip98kTask } from "@/lib/ai/vip98k-runtime";
 import { db } from "@/lib/db";
 import { generatedImage } from "@/lib/db/schema";
 import { createLogger } from "@/lib/observability/logger";
-import { trackRuntimeWork } from "@/lib/observability/active-work";
 import { uploadFile } from "@/lib/storage/service";
 
 const logger = createLogger("rmbg-service");
@@ -655,12 +654,6 @@ export async function fetchImageBufferFromUrl(imageUrl: string): Promise<Buffer>
 
 export async function executeRmbgJob(
   params: ExecuteRmbgJobParams
-): Promise<ExecuteRmbgJobResult> {
-  return trackRuntimeWork(() => runRmbgJob(params));
-}
-
-async function runRmbgJob(
-  params: ExecuteRmbgJobParams
 ): Promise<ExecuteRmbgJobResult> {
   const {
     requestId = crypto.randomUUID(),

lib/canvas/capabilities/headless-executor.ts

@@ -1,4 +1,3 @@
-import { executeBoxCutoutJob } from "@/lib/ai/box-cutout/service";
 import { executeExtendJob } from "@/lib/ai/extend/service";
 import { executeLayerSplitJob } from "@/lib/ai/layer-split/service";
 import { executeResizeJob } from "@/lib/ai/resize/service";
@@ -187,31 +186,25 @@ async function executeForTarget(
   }
 
   if (command.capabilityId === "image.box_cutout") {
-    const job = {
-      imageUrl: target.sourceImageUrl,
-      sourceNodeId: target.nodeId,
-      cropRect: {
-        x: asFiniteNumber(command.args.x),
-        y: asFiniteNumber(command.args.y),
-        width: asFiniteNumber(command.args.width),
-        height: asFiniteNumber(command.args.height),
-      },
-      paddingRatio: asFiniteNumber(command.args.paddingRatio),
-      prompt: prompt || "框选抠图",
-    };
-    let result;
-    if (command.source === "toolbar") {
-      const response = await executeBoxCutoutPOST(new Request(params.requestUrl, {
-        method: "POST",
-        headers: { "Content-Type": "application/json", "X-Request-ID": command.requestId },
-        body: JSON.stringify(job),
-      }), params.userId);
-      result = await response.json();
-      if (!response.ok || !result.success) {
-        throw new RmbgServiceError(result.detail || result.message || result.error || "框选抠图未能完成", response.status);
-      }
-    } else {
-      result = await executeBoxCutoutJob({ ...job, requestId: command.requestId, userId: params.userId });
+    const response = await executeBoxCutoutPOST(new Request(params.requestUrl, {
+      method: "POST",
+      headers: { "Content-Type": "application/json", "X-Request-ID": command.requestId },
+      body: JSON.stringify({
+        imageUrl: target.sourceImageUrl,
+        sourceNodeId: target.nodeId,
+        cropRect: {
+          x: asFiniteNumber(command.args.x),
+          y: asFiniteNumber(command.args.y),
+          width: asFiniteNumber(command.args.width),
+          height: asFiniteNumber(command.args.height),
+        },
+        paddingRatio: asFiniteNumber(command.args.paddingRatio),
+        prompt: prompt || "框选抠图",
+      }),
+    }), params.userId);
+    const result = await response.json();
+    if (!response.ok || !result.success) {
+      throw new RmbgServiceError(result.detail || result.message || result.error || "框选抠图未能完成", response.status);
     }
     return [{
       ...common,

tests/routes/canvas-agent-runtime-image-preferences.test.ts

@@ -102,7 +102,7 @@ test("mixed-model batches bill and label only the delivered images using their a
 test("headless image features cannot substitute their default when a pinned model disappears", async () => {
   let generated = 0;
   const mocks: Record<string, any> = {
-    "@/lib/canvas/operations/box-cutout": {}, "@/lib/ai/box-cutout/service": {}, "@/lib/ai/extend/service": {}, "@/lib/ai/layer-split/service": {}, "@/lib/ai/resize/service": {}, "@/lib/ai/rmbg/service": {},
+    "@/lib/canvas/operations/box-cutout": {}, "@/lib/ai/extend/service": {}, "@/lib/ai/layer-split/service": {}, "@/lib/ai/resize/service": {}, "@/lib/ai/rmbg/service": {},
     "@/lib/canvas/capabilities/internal-endpoint": {}, "@/lib/client/long-task": {},
     "@/lib/canvas/generate-image": { generateCanvasImage: async () => { generated++; return { images: [] }; } },
     "@/lib/style-pro/model-options": { getStyleProImageModelEntries: async () => [{ model: { id: "default", modelId: "default", isDefault: true } }], sortStyleProImageModelEntries: (entries: any[]) => entries, findStyleProImageModelByRef: () => null },

tests/routes/rmbg-delivery.test.ts

@@ -68,7 +68,6 @@ test("headless box cutout keeps its task identity, pixel bounds and input-reject
   let rejectInput = false;
   const bounds = { left: 20, top: 30, width: 200, height: 300 };
   const executor = serverLoader({
-    "@/lib/ai/box-cutout/service": {},
     "@/lib/canvas/operations/box-cutout": { executeBoxCutoutPOST: async (request: Request, userId: string) => {
       calls++;
       expect(userId).toBe("user-a");
@@ -82,7 +81,7 @@ test("headless box cutout keeps its task identity, pixel bounds and input-reject
     "@/lib/canvas/capabilities/internal-endpoint": {}, "@/lib/client/long-task": {},
     "@/lib/canvas/generate-image": {}, "@/lib/style-pro/model-options": {},
   })("lib/canvas/capabilities/headless-executor.ts");
-  const params = { userId: "user-a", requestUrl: "https://example.com/api/canvas/project-a/capabilities", requestHeaders: new Headers(), command: { requestId: "box-a", capabilityId: "image.box_cutout", source: "toolbar", args: { x: 0.1, y: 0.2, width: 0.3, height: 0.4, paddingRatio: 0.08 } }, targets: [{ nodeId: "source", title: "原图", sourceImageUrl: `${cdn}/original.png` }] };
+  const params = { userId: "user-a", requestUrl: "https://example.com/api/canvas/project-a/capabilities", requestHeaders: new Headers(), command: { requestId: "box-a", capabilityId: "image.box_cutout", args: { x: 0.1, y: 0.2, width: 0.3, height: 0.4, paddingRatio: 0.08 } }, targets: [{ nodeId: "source", title: "原图", sourceImageUrl: `${cdn}/original.png` }] };
   const results = await executor.executeCanvasCapabilityHeadlessly(params);
   expect(calls).toBe(1);
   expect(results).toMatchObject([{ sourceNodeId: "source", url: `${cdn}/cutout.png`, metadata: { editMode: "box-cutout", paddedCropRectPixels: bounds } }]);
@@ -91,32 +90,12 @@ test("headless box cutout keeps its task identity, pixel bounds and input-reject
   expect(calls).toBe(2);
 });
 
-test("Agent and MCP box cutouts retain their existing billing path", async () => {
-  let jobs = 0, featureCharges = 0;
-  const executor = serverLoader({
-    "@/lib/ai/box-cutout/service": { executeBoxCutoutJob: async (params: any) => {
-      jobs++;
-      expect(params).toMatchObject({ userId: "user-a", requestId: "box-agent", sourceNodeId: "source" });
-      return { original_url: `${cdn}/cutout.png` };
-    } },
-    "@/lib/canvas/operations/box-cutout": { executeBoxCutoutPOST: async () => { featureCharges++; throw new Error("Unexpected toolbar charge"); } },
-    "@/lib/ai/extend/service": {}, "@/lib/ai/layer-split/service": {}, "@/lib/ai/resize/service": {}, "@/lib/ai/rmbg/service": {},
-    "@/lib/canvas/capabilities/internal-endpoint": {}, "@/lib/client/long-task": {},
-    "@/lib/canvas/generate-image": {}, "@/lib/style-pro/model-options": {},
-  })("lib/canvas/capabilities/headless-executor.ts");
-  for (const source of ["agent", "mcp", "system"]) {
-    await executor.executeCanvasCapabilityHeadlessly({ userId: "user-a", command: { requestId: "box-agent", capabilityId: "image.box_cutout", source, args: { x: 0, y: 0, width: 0.5, height: 0.5 } }, targets: [{ nodeId: "source", title: "原图", sourceImageUrl: `${cdn}/source.png` }] });
-  }
-  expect({ jobs, featureCharges }).toEqual({ jobs: 3, featureCharges: 0 });
-});
-
 function rmbgLoader(fetch: typeof globalThis.fetch, timer?: typeof setTimeout) {
   return serverLoader({
     "@/lib/db/queries": { getSystemSetting: async () => ({ value: { provider: "aoscdn", aosApiKey: "test-key" } }) },
     "@/lib/db": { db: {} },
     "@/lib/db/schema": { generatedImage: {} },
     "@/lib/storage/service": { uploadFile: async (name: string) => ({ url: `${cdn}/${name}` }) },
-    "@/lib/observability/active-work": { trackRuntimeWork: async (execute: () => unknown) => execute() },
     fetch,
     setTimeout: timer || ((callback: () => void, ms: number) => setTimeout(callback, ms <= 2000 ? 0 : ms)),
   }, { NEXT_PUBLIC_CANVAS_CDN_ORIGIN: cdn })("lib/ai/rmbg/service.ts");

tests/routes/runtime-active-work.test.ts

@@ -28,24 +28,3 @@ test("durable archive handoff is separate from unfinished original generation",
   complete(); await original;
   expect(records.at(-1)).toMatchObject({ active: 0, durable: 0 });
 });
-
-test("direct matting stays visible to release draining until the provider attempt fails", async () => {
-  const counts: number[] = [];
-  let rejectProvider!: (error: Error) => void;
-  let providerStarted!: () => void;
-  const started = new Promise<void>(resolve => { providerStarted = resolve; });
-  const service = serverLoader({
-    "node:fs": { writeFileSync: (_path: string, value: string) => counts.push(JSON.parse(value).active), unlinkSync() {} },
-    "@/lib/db/queries": { getSystemSetting: async () => ({ value: { provider: "rmbg", apiUrl: "https://provider.example/remove", apiKey: "test" } }) },
-    "@/lib/db": { db: {} }, "@/lib/db/schema": { generatedImage: {} },
-    "@/lib/storage/service": {},
-    fetch: async () => { providerStarted(); return new Promise<Response>((_resolve, reject) => { rejectProvider = reject; }); },
-  })("lib/ai/rmbg/service.ts");
-  const pending = service.executeRmbgJob({ userId: "user-a", imageBuffer: Buffer.from("image"), skipGallerySave: true });
-  const assertion = expect(pending).rejects.toThrow();
-  await started;
-  expect(counts).toEqual([1]);
-  rejectProvider(new Error("provider unavailable"));
-  await assertion;
-  expect(counts).toEqual([1, 0]);
-});