@pilio/gemini-watermark-remover 1.0.19 → 1.0.21

package/README.md

@@ -127,11 +127,17 @@ node bin/gwr.mjs remove <input> --output <file>
 gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json]
 ```
 
-If you do not have `gwr` installed globally, use:
-
-```bash
-pnpm dlx @pilio/gemini-watermark-remover remove <input> --output <file>
-```
+If you do not have `gwr` installed globally, use:
+
+```bash
+pnpm dlx @pilio/gemini-watermark-remover remove <input> --output <file>
+```
+
+The default CLI file decoder/encoder uses `sharp`. SDK consumers that only use browser or `ImageData` APIs do not need it. If you use the CLI file path in your own project, install `sharp` alongside this package:
+
+```bash
+pnpm add sharp
+```
 
 ### Can't Remove Your Watermark?
 
@@ -255,11 +261,12 @@ const result = await removeWatermarkFromBuffer(inputBuffer, {
 - TypedArray (`Float32Array`, `Uint8ClampedArray`)
 - for the website copy button: `navigator.clipboard.write(...)` and `ClipboardItem`
 
-### CLI And Skill
-
-- a local Node.js runtime capable of running this package and its dependencies
-- filesystem access for local input/output paths
-- for repo-local usage:
+### CLI And Skill
+
+- a local Node.js runtime capable of running this package
+- `sharp` installed when using the default CLI file decoder/encoder
+- filesystem access for local input/output paths
+- for repo-local usage:
 
 ```bash
 node bin/gwr.mjs remove <input> --output <file>

package/README_zh.md

@@ -133,6 +133,12 @@ gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json]
 pnpm dlx @pilio/gemini-watermark-remover remove <input> --output <file>
 ```
 
+默认 CLI 文件解码/编码路径使用 `sharp`。只使用浏览器或 `ImageData` SDK 的消费者不需要它。如果你在自己的项目里使用 CLI 文件处理，请同时安装 `sharp`：
+
+```bash
+pnpm add sharp
+```
+
 ### 去不掉的水印？
 
 本工具专门针对 Gemini 可见水印（右下角半透明 Logo）。如果你的图片水印不属于 Gemini 已知格式，或需要去除其他类型的图片水印，可以试试通用 AI 去水印工具：
@@ -257,7 +263,8 @@ const result = await removeWatermarkFromBuffer(inputBuffer, {
 
 ### CLI 与 Skill
 
-- 能运行本包及其依赖的本地 Node.js 环境
+- 能运行本包的本地 Node.js 环境
+- 使用默认 CLI 文件解码/编码路径时需要安装 `sharp`
 - 可读写本地输入/输出路径的文件系统环境
 - 在仓库内可直接使用：
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pilio/gemini-watermark-remover",
   "description": "Automatically removes watermarks from Gemini AI generated images",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "author": "GargantuaX",
   "sideEffects": false,
   "files": [
@@ -45,6 +45,10 @@
       "types": "./src/sdk/node.d.ts",
       "import": "./src/sdk/node.js"
     },
+    "./video": {
+      "types": "./src/sdk/video.d.ts",
+      "import": "./src/sdk/video.js"
+    },
     "./runtime-browser": {
       "types": "./src/runtime/browser.d.ts",
       "import": "./src/runtime/browser.js"
@@ -54,15 +58,25 @@
       "import": "./src/runtime/userscript.js"
     }
   },
-  "dependencies": {
+  "peerDependencies": {
     "sharp": "^0.34.5"
   },
+  "peerDependenciesMeta": {
+    "sharp": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@types/node": "^24.6.0",
     "esbuild": "^0.24.0",
+    "onnxruntime-web": "^1.26.0",
     "playwright": "^1.58.2",
+    "sharp": "^0.34.5",
     "typescript": "^5.9.3"
   },
+  "dependencies": {
+    "mediabunny": "^1.46.0"
+  },
   "scripts": {
     "dev": "node build.js",
     "build": "node build.js --prod",
@@ -78,12 +92,69 @@
     "probe:real-page:compare": "node scripts/real-page-pixel-compare.js",
     "benchmark:samples": "node scripts/sample-benchmark.js",
     "benchmark:userscript": "node scripts/userscript-benchmark.js",
+    "compare:allenk-v2": "node scripts/create-allenk-v2-comparison-report.js",
+    "release:readiness": "node scripts/create-release-readiness-report.js",
+    "release:quality-gate": "pnpm compare:allenk-v2 -- --fail-on-incomplete && pnpm release:readiness -- --fail-on-not-ready",
+    "release:goal-audit": "node scripts/create-release-goal-audit-report.js",
+    "release:preflight": "pnpm test && pnpm build && pnpm package:extension && pnpm release:quality-gate && pnpm release:goal-audit -- --fail-on-incomplete",
+    "visible-residual:loop": "node scripts/run-visible-residual-loop.js",
+    "visible-residual:verify": "node scripts/verify-visible-residual-loop.js",
+    "visible-residual:validate-human-review": "node scripts/validate-visible-residual-human-review.js",
+    "visible-residual:create-gold-manifest": "node scripts/create-visible-residual-gold-manifest.js",
+    "visible-residual:review-status": "node scripts/report-visible-residual-review-progress.js",
+    "visible-residual:apply-focused-batch": "node scripts/apply-visible-residual-focused-review-batch.js",
+    "visible-residual:review-worksheet": "node scripts/create-visible-residual-review-worksheet.js",
+    "visible-residual:admission-report": "node scripts/create-visible-residual-admission-report.js",
+    "visible-residual:goal-audit": "node scripts/create-visible-residual-goal-audit-report.js",
+    "visible-residual:cluster-report": "node scripts/create-visible-residual-cluster-report.js",
+    "visible-residual:geometry-audit": "node scripts/audit-visible-residual-geometry.js",
     "scan:sample-watermarks": "node scripts/scan-sample-watermarks.js",
     "render:skipped-crops": "node scripts/render-skipped-candidate-crops.js",
+    "render:video-crops": "node scripts/render-video-crop-sheet.js",
+    "analyze:video-residual": "node scripts/analyze-video-residual.js",
+    "benchmark:video-crops": "node scripts/video-crop-benchmark.js",
+    "report:video-crops": "node scripts/report-video-crop-benchmark.js",
+    "diagnose:video-lowbody": "node scripts/diagnose-video-lowbody-regression.js",
+    "lab:video-frames": "node scripts/run-video-frame-backend-lab.js",
+    "lab:allenk-fdncnn-onnx-frames": "node scripts/run-allenk-fdncnn-onnx-frame-lab.js",
+    "lab:video-alpha-profile": "node scripts/run-video-alpha-profile-lab.js",
+    "lab:video-temporal-residual": "node scripts/run-video-temporal-residual-lab.js",
+    "fit:video-alpha-shape": "node scripts/fit-video-alpha-shape.js",
+    "gate:video-alpha-shape": "node scripts/gate-video-alpha-shape-candidates.js",
+    "gate:video-denoise": "node scripts/gate-video-denoise-candidates.js",
+    "gate:video-delivery": "node scripts/run-video-delivery-gate.js",
+    "report:video-alpha-policy-evidence": "node scripts/create-video-alpha-policy-evidence-report.js",
+    "report:video-frame-lab": "node scripts/report-video-frame-lab-sweep.js",
+    "report:video-review-pack": "node scripts/create-video-review-pack.js",
+    "report:video-review-index": "node scripts/create-video-review-index.js",
+    "report:video-review-screenshot": "node scripts/create-video-review-screenshot.js",
+    "report:video-review-thumbnail-sheet": "node scripts/create-video-review-thumbnail-sheet.js",
+    "report:video-dashboard-screenshot": "node scripts/create-video-review-screenshot.js --html .artifacts/video-delivery-dashboard/latest-video-dashboard.html --output .artifacts/video-delivery-dashboard/latest-video-dashboard.png --report .artifacts/video-delivery-dashboard/latest-video-dashboard-screenshot.json",
+    "report:video-review-decision": "node scripts/create-video-review-decision-report.js",
+    "report:video-acceptance-quickstart": "node scripts/create-video-acceptance-quickstart.js",
+    "report:video-pending-review-decision": "node scripts/create-video-pending-review-decision.js",
+    "report:video-alpha-policy-review-pack": "node scripts/create-video-alpha-policy-review-pack.js",
+    "report:video-light-polish-review-pack": "node scripts/create-video-light-polish-review-pack.js",
+    "report:video-polish-sweep-review-pack": "node scripts/create-video-polish-sweep-review-pack.js",
+    "report:video-delivery-dashboard": "node scripts/create-video-delivery-dashboard.js",
+    "report:video-goal-status": "node scripts/create-video-goal-status-report.js",
+    "report:video-delivery-bundle": "node scripts/create-video-delivery-bundle.js",
+    "verify:video-delivery-bundle": "node scripts/verify-video-delivery-bundle.js",
+    "export:video-backend": "node scripts/export-video-backend-variant.js",
+    "export:allenk-fdncnn-onnx-video": "node scripts/export-allenk-fdncnn-onnx-video.js",
+    "export:allenk-fdncnn-onnx-frame-video": "node scripts/export-allenk-fdncnn-onnx-frame-video.js",
+    "report:allenk-fdncnn-onnx-video-evidence": "node scripts/create-allenk-fdncnn-onnx-video-evidence.js",
+    "export:video-ui-preset": "node scripts/export-video-ui-preset.js",
+    "render:video-comparison-grid": "node scripts/render-video-comparison-grid.js",
     "package:extension": "node scripts/package-extension-release.js",
     "cli:smoke": "node bin/gwr.mjs --help",
     "serve": "pnpm dlx serve dist",
     "export:samples": "node scripts/export-fixed-samples.js",
-    "calibrate:preview-alpha": "node scripts/calibrate-preview-alpha.js"
+    "calibrate:preview-alpha": "node scripts/calibrate-preview-alpha.js",
+    "extract:allenk-fdncnn": "node scripts/extract-allenk-fdncnn-model.js",
+    "export:allenk-fdncnn-onnx": "node scripts/export-allenk-fdncnn-onnx.js",
+    "smoke:allenk-fdncnn-onnx-runtime": "node scripts/smoke-allenk-fdncnn-onnx-runtime.js",
+    "report:allenk-fdncnn-browser-spike": "node scripts/create-allenk-fdncnn-browser-spike-report.js",
+    "report:allenk-fdncnn-runtime-seam": "node scripts/create-allenk-fdncnn-runtime-seam-report.js"
   }
 }

package/src/cli/gwrCli.js

@@ -2,7 +2,7 @@ import { runRemoveCommand } from './gwrRemoveCommand.js';
 
 export async function main(argv, io) {
   if (argv.length === 0 || argv[0] === '--help' || argv[0] === '-h') {
-    io.stdout.write('Usage: gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json]\n');
+    io.stdout.write('Usage: gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json] [--video-page <url-or-file>]\n');
     return 0;
   }
 

package/src/cli/gwrRemoveCommand.js

@@ -1,10 +1,16 @@
 import path from 'node:path';
 import { mkdir, readdir, stat } from 'node:fs/promises';
 
-import { inferMimeTypeFromPath, removeWatermarkFromFile } from '../sdk/node.js';
+import {
+  inferMimeTypeFromPath,
+  inferVideoMimeTypeFromPath,
+  isVideoMimeType,
+  removeVideoWatermarkFromFile,
+  removeWatermarkFromFile
+} from '../sdk/node.js';
 
 const REMOVE_USAGE =
-  'Usage: gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json]';
+  'Usage: gwr remove <input> [--output <file> | --out-dir <dir>] [--overwrite] [--json] [--video-page <url-or-file>]';
 
 export async function runRemoveCommand(argv, io) {
   if (argv.length === 0 || argv[0] === '--help' || argv[0] === '-h') {
@@ -18,15 +24,7 @@ export async function runRemoveCommand(argv, io) {
     return 2;
   }
 
-  const codec = await resolveCodecOptions(options).catch((error) => {
-    io.stderr.write(`${error.message}\n`);
-    return null;
-  });
-  if (!codec) {
-    return 2;
-  }
-
-  const commandOptions = { ...options, codec };
+  const commandOptions = { ...options, imageCodecPromise: null };
   const inputStats = await stat(commandOptions.input).catch(() => null);
   if (!inputStats) {
     io.stderr.write(`Input not found: ${commandOptions.input}\n`);
@@ -64,7 +62,11 @@ function parseRemoveArgs(argv) {
     overwrite: false,
     json: false,
     decoder: null,
-    encoder: null
+    encoder: null,
+    videoPage: null,
+    videoDenoiseBackend: null,
+    videoTimeoutMs: null,
+    allowLowConfidence: false
   };
 
   let parseOptions = true;
@@ -116,6 +118,30 @@ function parseRemoveArgs(argv) {
       continue;
     }
 
+    if (token === '--video-page') {
+      const parsed = parseOptionValue(argv, index, '--video-page');
+      if (!parsed.ok) return parsed;
+      options.videoPage = parsed.value;
+      index = parsed.index;
+      continue;
+    }
+
+    if (token === '--video-denoise-backend') {
+      const parsed = parseOptionValue(argv, index, '--video-denoise-backend');
+      if (!parsed.ok) return parsed;
+      options.videoDenoiseBackend = parsed.value;
+      index = parsed.index;
+      continue;
+    }
+
+    if (token === '--video-timeout-ms') {
+      const parsed = parseOptionValue(argv, index, '--video-timeout-ms');
+      if (!parsed.ok) return parsed;
+      options.videoTimeoutMs = Number(parsed.value);
+      index = parsed.index;
+      continue;
+    }
+
     if (token === '--overwrite') {
       options.overwrite = true;
       continue;
@@ -126,6 +152,11 @@ function parseRemoveArgs(argv) {
       continue;
     }
 
+    if (token === '--allow-low-confidence') {
+      options.allowLowConfidence = true;
+      continue;
+    }
+
     return { ok: false, error: `Unknown option: ${token}` };
   }
 
@@ -145,6 +176,10 @@ function parseRemoveArgs(argv) {
     return { ok: false, error: '--decoder and --encoder must be used together.' };
   }
 
+  if (options.videoTimeoutMs !== null && (!Number.isFinite(options.videoTimeoutMs) || options.videoTimeoutMs <= 0)) {
+    return { ok: false, error: '--video-timeout-ms must be a positive number.' };
+  }
+
   return options;
 }
 
@@ -301,17 +336,50 @@ async function processOneFile(inputPath, outputPath, options) {
   }
 
   await mkdir(path.dirname(outputPath), { recursive: true });
+  if (isVideoPath(inputPath) || isVideoPath(outputPath)) {
+    const result = await removeVideoWatermarkFromFile(inputPath, {
+      outputPath,
+      mimeType: inferVideoMimeTypeFromPath(outputPath || inputPath),
+      pagePath: options.videoPage || undefined,
+      denoiseBackend: options.videoDenoiseBackend || undefined,
+      timeoutMs: Number.isFinite(options.videoTimeoutMs) && options.videoTimeoutMs > 0
+        ? options.videoTimeoutMs
+        : undefined,
+      allowLowConfidence: options.allowLowConfidence
+    });
+
+    return {
+      input: inputPath,
+      output: outputPath,
+      kind: 'video',
+      meta: result.meta
+    };
+  }
+
+  const codec = await getImageCodec(options);
   const mimeType = inferMimeTypeFromPath(outputPath);
   const result = await removeWatermarkFromFile(inputPath, {
     outputPath,
     mimeType,
-    decodeImageData: options.codec.decodeImageData,
-    encodeImageData: options.codec.encodeImageData
+    decodeImageData: codec.decodeImageData,
+    encodeImageData: codec.encodeImageData
   });
 
   return {
     input: inputPath,
     output: outputPath,
+    kind: 'image',
     meta: result.meta
   };
 }
+
+function isVideoPath(filePath) {
+  return isVideoMimeType(inferVideoMimeTypeFromPath(filePath));
+}
+
+async function getImageCodec(options) {
+  if (!options.imageCodecPromise) {
+    options.imageCodecPromise = resolveCodecOptions(options);
+  }
+  return options.imageCodecPromise;
+}

package/src/core/adaptiveDetector.js

@@ -7,6 +7,8 @@ import { resolveGeminiWatermarkSearchConfigs } from './geminiSizeCatalog.js';
 
 const DEFAULT_THRESHOLD = 0.35;
 const EPSILON = 1e-8;
+const REFERENCE_WATERMARK_SIZE = 96;
+const MIN_COARSE_ADJUSTED_SCORE = 0.08;
 
 const clamp = (v, min, max) => Math.max(min, Math.min(max, v));
 
@@ -172,6 +174,23 @@ function createScaleList(minSize, maxSize) {
     return [...set].sort((a, b) => a - b);
 }
 
+export function computeSizeAdjustedConfidence(confidence, size, referenceSize = REFERENCE_WATERMARK_SIZE) {
+    if (
+        !Number.isFinite(confidence) ||
+        !Number.isFinite(size) ||
+        !Number.isFinite(referenceSize) ||
+        size <= 0 ||
+        referenceSize <= 0
+    ) {
+        return 0;
+    }
+
+    // NCC tends to favor tiny templates. A cube-root penalty keeps that bias in
+    // check without crushing legitimate preview-tier watermarks.
+    const sizeWeight = Math.min(1, Math.cbrt(size / referenceSize));
+    return confidence * sizeWeight;
+}
+
 function buildSeedConfigs(width, height, defaultConfig) {
     // Start adaptive search from both the coarse default anchor and any
     // catalog-projected anchors for official or near-official Gemini sizes.
@@ -407,7 +426,7 @@ export function detectAdaptiveWatermarkRegion({
             size: seedCandidate.size,
             x: seedCandidate.x,
             y: seedCandidate.y,
-            adjustedScore: seedCandidate.confidence * Math.min(1, Math.sqrt(seedCandidate.size / 96))
+            adjustedScore: computeSizeAdjustedConfidence(seedCandidate.confidence, seedCandidate.size)
         });
     }
 
@@ -424,8 +443,8 @@ export function detectAdaptiveWatermarkRegion({
                 if (!score) continue;
 
                 // Prefer sizes close to known watermark scales to avoid tiny-template bias.
-                const adjustedScore = score.confidence * Math.min(1, Math.sqrt(size / 96));
-                if (adjustedScore < 0.08) continue;
+                const adjustedScore = computeSizeAdjustedConfidence(score.confidence, size);
+                if (adjustedScore < MIN_COARSE_ADJUSTED_SCORE) continue;
 
                 pushTopK({
                     size,