Merge branch 'develop' into sp-reaction

.claude/commands/harness-audit.md

@@ -35,7 +35,7 @@ Misskey リポジトリの `.claude/` 構成を 7 カテゴリで採点し、改
 | 2 | Context Efficiency | frontmatter description の冗長度、SKILL.md の長さ分布、重複情報、CLAUDE.md の肥大化 |
 | 3 | Quality Gates | Stop / PreToolUse / PostToolUse hook の整備、`/quality-gate` 等の完了前ゲートの有無、自動 lint/typecheck |
 | 4 | Memory Persistence | `.claude/skills/*/SKILL.md` と `references/` の同期状態を評価。プロジェクト側 `.claude/memory/` は未採用方針 (auto-memory はユーザーホーム側で自動運用) のため、ここを採点起点にせず既定 5/10 から開始する |
-| 5 | Eval Coverage | `working-on-backend` / `working-on-frontend` の testing リファレンス (backend-testing.md / frontend-testing.md) の網羅、Misskey 固有の e2e/fed/Storybook/Playwright 適用ガイド |
+| 5 | Eval Coverage | `working-on-backend` / `working-on-frontend` の testing リファレンス (backend-testing.md / frontend-testing.md) の網羅、Misskey 固有の e2e/fed/Storybook/Cypress 適用ガイド |
 | 6 | Security Guardrails | SPDX 規約適用、migration 不変性ルール、ja-JP.yml 限定編集ルール、secrets 検出 |
 | 7 | Cost Efficiency | enabledPlugins の重複・過剰、context-budget の整備、MCP 過剰登録なし |
 

.claude/commands/quality-gate.md

@@ -21,7 +21,7 @@ note: 元 ECC 版は言語自動判定 + format/lint/type のジェネリック
 
 `/quality-gate [scope]`
 
-完了前の **軽量** 品質チェック。重い E2E / 連合テスト (test:e2e / test:fed / Playwright) は CI 側で実行されるため、本コマンドには含めない。
+完了前の **軽量** 品質チェック。重い E2E / 連合テスト (test:e2e / test:fed / Cypress) は CI 側で実行されるため、本コマンドには含めない。
 
 ## Scope
 
@@ -120,4 +120,4 @@ Frontend ut: PASS  (87/87)
 
 - ジェネリックな言語自動判定を排除し、Misskey 固定 pipeline に。
 - formatter フェーズなし (Misskey は ESLint --fix のみ採用)。
-- e2e / federation / Playwright は重いため除外し CI 側に委譲。
+- e2e / federation / Cypress は重いため除外し CI 側に委譲。

.claude/skills/working-on-backend/references/knowledge/backend-testing.md

@@ -26,7 +26,7 @@ cp .github/misskey/test.yml .config/test.yml
 
 補足:
 
-- ルートの `pnpm start:test` (Playwright 用にテストサーバーを起動するコマンド) を使う経路では実行時に `ncp` で自動コピーされる ([package.json](../../../../../package.json))。それ以外で backend テストを直接走らせる時は上記の手動コピーが必要
+- ルートの `pnpm start:test` (Cypress 用にテストサーバーを起動するコマンド) を使う経路では実行時に `ncp` で自動コピーされる ([package.json](../../../../../package.json))。それ以外で backend テストを直接走らせる時は上記の手動コピーが必要
 - すでに `.config/test.yml` があれば各テストスクリプトの内部 `compile-config` で十分なので、追加で `pnpm --filter backend compile-config` を叩く必要はない
 - `pnpm start:test` は backend e2e テスト (`pnpm --filter backend test:e2e`) の前提ではない (ポート競合の元になるため使わないこと)
 

.claude/skills/working-on-frontend/SKILL.md

@@ -27,7 +27,7 @@ SKILL.md 本体は references への索引だけ。具体的な手順や規約
 - SCSS Modules / `--MI_THEME-*` `--MI-*` CSS 変数 / グローバル utility class (`_button` 等) → [references/knowledge/scss-modules.md](references/knowledge/scss-modules.md)
 - `os.alert` / `os.confirm` / `os.popup` 等 UI ヘルパー (ブラウザ標準 `alert()` 直呼びは禁止) → [references/knowledge/os-api.md](references/knowledge/os-api.md)
 - `*.stories.impl.ts` 併設規則 + 複数 story / argTypes / layout / action パターン → [references/knowledge/storybook.md](references/knowledge/storybook.md)
-- frontend Vitest / Playwright E2E の書き方と前提 → [references/knowledge/frontend-testing.md](references/knowledge/frontend-testing.md)
+- frontend Vitest / Cypress E2E の書き方と前提 → [references/knowledge/frontend-testing.md](references/knowledge/frontend-testing.md)
 
 ## 必ず最後に通る場所
 

.claude/skills/working-on-frontend/references/knowledge/frontend-testing.md

@@ -1,4 +1,4 @@
-# Frontend テスト (Vitest / Playwright)
+# Frontend テスト (Vitest / Cypress)
 
 Misskey frontend のテスト構成。
 
@@ -13,11 +13,11 @@ pnpm --filter frontend test-and-coverage   # カバレッジ付き
 
 - 主な配置: `packages/frontend/test/*.test.ts` (例: `i18n.test.ts`, `theme.test.ts`, `is-birthday.test.ts`)
 - ビルドツール周りなど対象コードと隣接させた方が分かりやすいテストは、コードと同じディレクトリに `*.test.ts` として置く (例: [packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts](../../../../../packages/frontend/lib/rollup-plugin-unwind-css-module-class-name.test.ts))
-- 共有コンポーネント (`MkX.vue`) のユニットテストは現状少なく、`*.spec.ts` / `__tests__/` 形式は採用していない (Storybook + Playwright でカバー)
+- 共有コンポーネント (`MkX.vue`) のユニットテストは現状少なく、`*.spec.ts` / `__tests__/` 形式は採用していない (Storybook + Cypress でカバー)
 
-## Playwright E2E
+## Cypress E2E
 
-Playwright は **起動済みのテストサーバー** に対して走るため、unit より前提が多い。[.github/workflows/test-frontend.yml](../../../../../.github/workflows/test-frontend.yml) の `e2e` ジョブと同じ手順をローカルで踏む:
+Cypress は **起動済みのテストサーバー** に対して走るため、unit より前提が多い。[.github/workflows/test-frontend.yml](../../../../../.github/workflows/test-frontend.yml) の `e2e` ジョブと同じ手順をローカルで踏む:
 
 ```bash
 # 1. テスト用 DB / Redis を起動 (テスト用ポート。開発用の compose.local-db.yml ではない)
@@ -29,14 +29,15 @@ cp .github/misskey/test.yml .config/test.yml
 # 3. 全体ビルド
 pnpm build
 
-# 4. テストサーバー起動 + Playwright 実行 (いずれもルートから)
-pnpm e2e                # 内部で pnpm start:test を起動し http://localhost:61812 を待って Playwright を実行
+# 4. テストサーバー起動 + Cypress 実行 (いずれもルートから)
+pnpm e2e                # 内部で pnpm start:test を起動し http://localhost:61812 を待って Cypress run
+pnpm cy:open            # 対話的に開く (サーバーは別途 pnpm start:test で起動しておく)
 ```
 
-- 設定: ルート [packages/frontend/playwright.config.ts](../../../../../packages/frontend/playwright.config.ts) で、`packages/frontend/test/e2e/` 配下の `*.spec.ts` を対象にする
-- テスト本体は [packages/frontend/test/e2e/](../../../../../packages/frontend/test/e2e/) 配下に配置する。
+- 設定: ルート [cypress.config.ts](../../../../../cypress.config.ts)
+- テスト本体は [cypress/](../../../../../cypress/) 配下
 
-新規 frontend 機能の E2E は Playwright に書くのが基本。ただし対象は主要 UI フロー (login / post / drive etc) に限定し、細かい単位テストは Vitest または Storybook で代替する慣習。
+新規 frontend 機能の E2E は Cypress に書くのが基本。ただし対象は主要 UI フロー (login / post / drive etc) に限定し、細かい単位テストは Vitest または Storybook で代替する慣習。
 
 ## Storybook (視覚確認 + Chromatic 視覚回帰)
 
@@ -54,6 +55,6 @@ pnpm --filter frontend build-storybook    # 静的ビルド
 frontend のテスト種別で DB / Redis の要否が違う:
 
 - **Vitest (unit)** — DB 不要。ロジック / コンポーネント単体のテストで backend に繋がない (CI の `vitest` ジョブにも `services:` は無い)
-- **Playwright (E2E)** — テストサーバー (`pnpm start:test`) 経由で backend に繋ぐため DB / Redis が必要。**テスト用ポートの [packages/backend/test/compose.yml](../../../../../packages/backend/test/compose.yml)** を使う (上記 Playwright E2E の手順を参照)
+- **Cypress (E2E)** — テストサーバー (`pnpm start:test`) 経由で backend に繋ぐため DB / Redis が必要。**テスト用ポートの [packages/backend/test/compose.yml](../../../../../packages/backend/test/compose.yml)** を使う (上記 Cypress E2E の手順を参照)
 
 開発用の `compose.local-db.yml` (db `5432` / redis `6379`) は **テストには使わない**。テスト用の `packages/backend/test/compose.yml` (`54312` / `56312`) とはポートが異なり、混同すると接続できない。

.config/example.yml

@@ -303,31 +303,8 @@ id: 'aidx'
 
 #sentryForBackend:
 #  enableNodeProfiling: true
-#  # Specify Sentry integration names to disable individual auto-instrumentation.
-#  # The names are integration .name values, not factory function names.
-#  # To check enabled names, set `options.debug: true` and see
-#  # "Integration installed: <name>" in the Sentry logs.
-#  #
-#  # As of 2026-07-07 / @sentry/node 10.62.0, useful names for Misskey include:
-#  #   Postgres  ... DB queries (when pg is externalized)
-#  #   Redis     ... ioredis commands
-#  #   Fastify   ... inbound HTTP routes
-#  #   Http      ... inbound/outbound HTTP; disabling this can also affect request isolation
-#  #   NodeFetch ... fetch/undici requests
-#  disabledIntegrations: ['Postgres']
 #  options:
 #    dsn: 'https://examplePublicKey@o0.ingest.sentry.io/0'
-#    # By default, Misskey prevents Sentry trace headers (`sentry-trace` and
-#    # `baggage`) from being sent to remote ActivityPub/Webhook/etc. hosts.
-#    # To intentionally propagate distributed traces to trusted internal services,
-#    # list only those internal URL patterns here.
-#    # Avoid broad patterns that match remote servers unless you intentionally
-#    # want to restore Sentry's legacy behavior of propagating traces to all
-#    # outbound HTTP requests.
-#    #tracePropagationTargets: []
-#    # Internal allowlist example:
-#    #tracePropagationTargets:
-#    #  - 'internal-service.example'
 
 #sentryForFrontend:
 #  vueIntegration:

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "22.23.1"
+			"version": "22.15.0"
 		},
 		"ghcr.io/devcontainers-extra/features/pnpm:2": {
 			"version": "10.10.0"

.devcontainer/init.sh

@@ -12,4 +12,4 @@ pnpm install --frozen-lockfile
 cp .devcontainer/devcontainer.yml .config/default.yml
 pnpm build
 pnpm migrate
-pnpm --filter frontend exec playwright install --with-deps chromium
+pnpm exec cypress install

.github/dependabot.yml

@@ -37,3 +37,6 @@ updates:
     typescript-eslint:
       patterns:
         - "@typescript-eslint/*"
+    tensorflow:
+      patterns:
+        - "@tensorflow/*"

.github/labeler.yml

@@ -16,7 +16,7 @@
 'packages/frontend:test':
 - any:
   - changed-files:
-    - any-glob-to-any-file: ['packages/frontend/test/**/*']
+    - any-glob-to-any-file: ['cypress/**/*']
 
 'packages/sw':
 - any:

.github/min.node-version

@@ -1 +1 @@
-22.22.2
+22.15.0

.github/scripts/backend-js-footprint.mjs

@@ -23,6 +23,7 @@ const [repoDirArg, outputFileArg] = process.argv.slice(2);
 const STARTUP_TIMEOUT = util.readIntegerEnv('MK_JS_FOOTPRINT_STARTUP_TIMEOUT_MS', 120000, 1);
 const SETTLE_TIME = util.readIntegerEnv('MK_JS_FOOTPRINT_SETTLE_TIME_MS', 10000, 0);
 const REQUEST_COUNT = util.readIntegerEnv('MK_JS_FOOTPRINT_REQUEST_COUNT', 10, 0);
+const MAX_TABLE_ITEMS = util.readIntegerEnv('MK_JS_FOOTPRINT_MAX_ITEMS', 20, 1);
 
 const repoDir = resolve(repoDirArg);
 const outputFile = resolve(outputFileArg);
@@ -41,6 +42,10 @@ function isInside(parent, child) {
 	return rel === '' || (!rel.startsWith('..') && !rel.includes(`..${sep}`));
 }
 
+function normalizePath(filePath) {
+	return filePath.split(sep).join('/');
+}
+
 function bytesToKiB(value) {
 	return Math.round(value / 1024);
 }
@@ -123,7 +128,7 @@ async function stopServer(serverProcess) {
 }
 
 function getPackageNameFromPath(filePath) {
-	const normalized = util.normalizePath(filePath);
+	const normalized = normalizePath(filePath);
 	const marker = '/node_modules/';
 	const index = normalized.lastIndexOf(marker);
 	if (index === -1) return null;
@@ -243,7 +248,7 @@ function readFileMetrics(filePath) {
 	const packageInfo = readPackageInfo(filePath);
 	const metric = {
 		path: filePath,
-		displayPath: util.normalizePath(relative(repoDir, filePath)),
+		displayPath: normalizePath(relative(repoDir, filePath)),
 		sourceBytes: source.byteLength,
 		gzipBytes: gzipSync(source).byteLength,
 		...astMetrics,
@@ -388,7 +393,7 @@ function summarizeRecords(records, phase) {
 			stringLiteralKiB: bytesToKiB(totals.stringLiteralBytes),
 		},
 		packages: [...packages.values()].toSorted((a, b) => b.sourceBytes - a.sourceBytes),
-		modules: modules.toSorted((a, b) => b.sourceBytes - a.sourceBytes),
+		modules: modules.toSorted((a, b) => b.sourceBytes - a.sourceBytes).slice(0, MAX_TABLE_ITEMS),
 	};
 }
 

.github/scripts/backend-memory-report.mts

@@ -5,7 +5,6 @@
 
 import { readFile, writeFile } from 'node:fs/promises';
 import * as util from './utility.mts';
-import * as heapSnapshotUtil from './heap-snapshot-util.mts';
 import type { MemoryReport } from './measure-backend-memory-comparison.mts';
 
 const [baseFile, headFile, outputFile, baseJsFootprintFile, headJsFootprintFile] = process.argv.slice(2);
@@ -52,9 +51,31 @@ const metrics = [
 	'External',
 ] as const;
 
+const heapSnapshotCategoriesColors = {
+	'Total': 'gray',
+	'Code': 'orange',
+	'Strings': 'red',
+	'JS arrays': 'cyan',
+	'Typed arrays': 'green',
+	'System objects': 'yellow',
+	'Other JS objects': 'violet',
+	'Other non-JS objects': 'pink',
+} as const;
+
+const heapSnapshotCategoriesColorsHex = {
+	'Total': '#888888',
+	'Code': '#f28e2c',
+	'Strings': '#e15759',
+	'JS arrays': '#76b7b2',
+	'Typed arrays': '#59a14f',
+	'System objects': '#edc949',
+	'Other JS objects': '#af7aa1',
+	'Other non-JS objects': '#ff9da7',
+} as const;
+
 function formatMemoryMb(valueKiB: number | null | undefined) {
 	if (valueKiB == null) return '-';
-	return `${util.formatNumber(valueKiB / 1000)} MB`;
+	return `${util.formatNumber(valueKiB / 1024)} MB`;
 }
 
 function getMemoryValue(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
@@ -73,25 +94,62 @@ function getSampleSpread(report: MemoryReport, phase: typeof memoryReportPhases[
 	return util.median(values.map(value => Math.abs(value - center)));
 }
 
+function getSamplesByRound(report: MemoryReport) {
+	const samplesByRound = new Map<number, MemoryReport['samples'][number]>();
+	if (!Array.isArray(report.samples)) return samplesByRound;
+
+	for (const sample of report.samples) {
+		if (sample.round <= 0) continue;
+		samplesByRound.set(sample.round, sample);
+	}
+
+	return samplesByRound;
+}
+
+function formatDeltaMemory(diffKiB: number) {
+	return util.formatColoredDelta(formatMemoryMb(Math.abs(diffKiB)), diffKiB);
+}
+
+function pairedDeltaSummary(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
+	const baseSamplesByRound = getSamplesByRound(base);
+	const headSamplesByRound = getSamplesByRound(head);
+	const values = [];
+
+	for (const [round, baseSample] of baseSamplesByRound) {
+		const headSample = headSamplesByRound.get(round);
+		if (headSample == null) continue;
+
+		const baseValue = getMemoryValueFromSample(baseSample, phase, metric);
+		const headValue = getMemoryValueFromSample(headSample, phase, metric);
+		if (baseValue == null || headValue == null) continue;
+
+		values.push(headValue - baseValue);
+	}
+
+	return {
+		median: util.median(values),
+		mad: util.mad(values),
+		min: Math.min(...values),
+		max: Math.max(...values),
+		samples: values.length,
+	};
+}
+
 function renderMainTableForPhase(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key']) {
 	const lines = [
 		'| Metric | Base | Head | Δ median | Δ MAD | Δ min | Δ max |',
 		'| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
 	];
 
-	function formatDeltaMemory(deltaKiB: number) {
-		return util.formatColoredDelta(deltaKiB, v => formatMemoryMb(v), 100); // 0.1 MB threshold
-	}
-
 	for (const metric of metrics) {
 		const baseValue = getMemoryValue(base, phase, metric);
 		const headValue = getMemoryValue(head, phase, metric);
 
 		const baseSpread = getSampleSpread(base, phase, metric);
 		const headSpread = getSampleSpread(head, phase, metric);
-		const summary = util.pairedDeltaSummary(base.samples, head.samples, (sample) => getMemoryValueFromSample(sample, phase, metric));
+		const summary = pairedDeltaSummary(base, head, phase, metric);
 		const percent = summary.median * 100 / baseValue;
-		const deltaMedian = summary == null ? '-' : `${formatDeltaMemory(summary.median)}<br>${util.formatDeltaPercent(percent, 0.1).replaceAll('\\%', '\\\\%')}`;
+		const deltaMedian = summary == null ? '-' : `${formatDeltaMemory(summary.median)}<br>${util.formatDeltaPercent(percent)}`;
 
 		lines.push(`| **${metric}** | ${formatMemoryMb(baseValue)} <br> ± ${formatMemoryMb(baseSpread)} | ${formatMemoryMb(headValue)} <br> ± ${formatMemoryMb(headSpread)} | ${deltaMedian} | ${summary?.mad == null ? '-' : formatMemoryMb(summary.mad)} | ${summary == null ? '-' : formatDeltaMemory(summary.min)} | ${summary == null ? '-' : formatDeltaMemory(summary.max)} |`);
 	}
@@ -99,6 +157,14 @@ function renderMainTableForPhase(base: MemoryReport, head: MemoryReport, phase:
 	return lines.join('\n');
 }
 
+function getDiffPercent(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
+	const baseValue = getMemoryValue(base, phase, metric);
+	const headValue = getMemoryValue(head, phase, metric);
+	if (baseValue == null || headValue == null || baseValue <= 0) return null;
+
+	return ((headValue - baseValue) * 100) / baseValue;
+}
+
 /*
 function measurementSummary(base, head) {
 	const baseCount = base?.sampleCount;
@@ -116,24 +182,214 @@ function measurementSummary(base, head) {
 }
 */
 
+function formatPlainDelta(baseValue: number, headValue: number, formatter = util.formatNumber) {
+	const delta = headValue - baseValue;
+	if (delta === 0) return formatter(0);
+
+	const sign = delta > 0 ? '+' : '-';
+	return `${sign}${formatter(Math.abs(delta))}`;
+}
+
+function getHeapSnapshotCategoryValue(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], category: typeof util.heapSnapshotCategories[number]) {
+	const value = report.summary[phase]?.heapSnapshot?.categories?.[category];
+	return Number.isFinite(value) ? value : null;
+}
+
+function getHeapSnapshotCategoryValueFromSample(sample: MemoryReport['samples'][number], phase: typeof memoryReportPhases[number]['key'], category: typeof util.heapSnapshotCategories[number]) {
+	const value = sample.phases[phase]?.heapSnapshot?.categories?.[category];
+	return Number.isFinite(value) ? value : null;
+}
+
+const heapSnapshotSankeyChildMinRatio = 0.3;
+const heapSnapshotSankeyParentMinPercent = 10;
+
+function escapeCsvValue(value: string) {
+	return `"${String(value).replaceAll('"', '""')}"`;
+}
+
+function formatSankeyPercentValue(value: number) {
+	const rounded = Math.round(value * 100) / 100;
+	if (rounded === 0 && value > 0) return '0.01';
+	if (Number.isInteger(rounded)) return String(rounded);
+	return rounded.toFixed(2).replace(/0+$/, '').replace(/\.$/, '');
+}
+
+function formatHeapSnapshotSankeyChildLabel(label: string) {
+	return String(label).replace(/^[^:]+:\s*/, '');
+}
+
+function renderHeapSnapshotSankey(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], title: string) {
+	const total = getHeapSnapshotCategoryValue(report, phase, 'Total');
+	if (total == null || total <= 0) return null;
+
+	function getHeapSnapshotBreakdownEntries(category: typeof util.heapSnapshotCategories[number]) {
+		const breakdown = report.summary[phase].heapSnapshot?.breakdowns?.[category];
+		if (breakdown == null || typeof breakdown !== 'object') return [];
+
+		return Object.entries(breakdown)
+			.filter(([, value]) => Number.isFinite(value) && value > 0)
+			.toSorted((a, b) => b[1] - a[1]);
+	}
+
+	const categories = util.heapSnapshotCategories
+		.filter(category => category !== 'Total')
+		.map(category => {
+			const value = getHeapSnapshotCategoryValue(report, phase, category);
+			if (value == null || value <= 0) return null;
+			const breakdownEntries = getHeapSnapshotBreakdownEntries(category);
+			const breakdownTotal = breakdownEntries.reduce((sum, [, childValue]) => sum + childValue, 0);
+			const percent = (value * 100) / total;
+			const childEntries = [];
+			let otherPercent = 0;
+
+			if (breakdownTotal > 0 && percent > heapSnapshotSankeyParentMinPercent) {
+				for (const [childName, childValue] of breakdownEntries) {
+					const childRatio = childValue / breakdownTotal;
+					const childPercent = percent * childRatio;
+					if (childRatio >= heapSnapshotSankeyChildMinRatio) {
+						childEntries.push([formatHeapSnapshotSankeyChildLabel(childName), childPercent]);
+					} else {
+						otherPercent += childPercent;
+					}
+				}
+
+				if (childEntries.length > 0 && otherPercent > 0) {
+					childEntries.push(['Other', otherPercent]);
+				}
+			}
+
+			return {
+				category,
+				percent,
+				childEntries,
+			};
+		})
+		.filter(value => value != null);
+
+	if (categories.length === 0) return null;
+
+	const nodeColors = {
+		[title]: heapSnapshotCategoriesColorsHex.Total,
+	} as Record<string, string>;
+	for (const { category, childEntries } of categories) {
+		const categoryColor = heapSnapshotCategoriesColorsHex[category] ?? heapSnapshotCategoriesColorsHex.Total;
+		nodeColors[category] = categoryColor;
+
+		for (const [childName] of childEntries) {
+			nodeColors[childName] = categoryColor;
+		}
+	}
+
+	const lines = [
+		`<details><summary>${title} heap snapshot composition</summary>`,
+		'',
+		'```mermaid',
+		`%%{init: ${JSON.stringify({
+			sankey: {
+				showValues: false,
+				linkColor: 'target',
+				labelStyle: 'outlined',
+				nodeAlignment: 'center',
+				nodePadding: 10,
+				nodeColors: {
+					...nodeColors,
+					'Other': '#888888',
+				},
+			},
+		})}}%%`,
+		'sankey-beta',
+	];
+
+	for (const { category, percent, childEntries } of categories) {
+		lines.push(`${escapeCsvValue(title)},${escapeCsvValue(category)},${formatSankeyPercentValue(percent)}`);
+
+		for (const [childName, childPercent] of childEntries) {
+			lines.push(`${escapeCsvValue(category)},${escapeCsvValue(childName)},${formatSankeyPercentValue(childPercent)}`);
+		}
+	}
+
+	lines.push('```');
+	lines.push('');
+	lines.push('</details>');
+
+	return lines.join('\n');
+}
+
+function pairedHeapSnapshotDeltaSummary(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], category: typeof util.heapSnapshotCategories[number]) {
+	const baseSamplesByRound = getSamplesByRound(base);
+	const headSamplesByRound = getSamplesByRound(head);
+	const values = [] as number[];
+
+	for (const [round, baseSample] of baseSamplesByRound) {
+		const headSample = headSamplesByRound.get(round);
+		if (headSample == null) continue;
+
+		const baseValue = getHeapSnapshotCategoryValueFromSample(baseSample, phase, category);
+		const headValue = getHeapSnapshotCategoryValueFromSample(headSample, phase, category);
+		if (baseValue == null || headValue == null) continue;
+
+		values.push(headValue - baseValue);
+	}
+
+	return {
+		median: util.median(values),
+		mad: util.mad(values),
+		min: Math.min(...values),
+		max: Math.max(...values),
+		samples: values.length,
+	};
+}
+
+function renderHeapSnapshotTable(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key']) {
+	const lines = [
+		'| Metric | Base | Head | Δ median | Δ MAD | Δ min | Δ max |',
+		'| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
+	];
+	const baseTotal = getHeapSnapshotCategoryValue(base, phase, 'Total');
+	const headTotal = getHeapSnapshotCategoryValue(head, phase, 'Total');
+
+	function formatHeapSnapshotCategoryLabel(category: typeof heapSnapshotCategories[number], baseValue: number, headValue: number, baseTotal: number, headTotal: number) {
+		if (category === 'Total' || baseTotal == null || headTotal == null || baseTotal <= 0 || headTotal <= 0) return `**${category}**`;
+
+		const basePercent = util.formatPercent((baseValue * 100) / baseTotal);
+		const headPercent = util.formatPercent((headValue * 100) / headTotal);
+		return `**${category}**<br>${basePercent} → ${headPercent}`;
+	}
+
+	function getHeapSnapshotSampleSpread(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], category: typeof util.heapSnapshotCategories[number]) {
+		const values = report.samples
+			.map(sample => getHeapSnapshotCategoryValueFromSample(sample, phase, category))
+			.filter(value => Number.isFinite(value)) as number[];
+		if (values.length < 2) return null;
+
+		const center = util.median(values);
+		return util.median(values.map(value => Math.abs(value - center)));
+	}
+
+	for (const category of util.heapSnapshotCategories) {
+		const baseValue = getHeapSnapshotCategoryValue(base, phase, category);
+		const headValue = getHeapSnapshotCategoryValue(head, phase, category);
+		if (baseValue == null || headValue == null) continue;
+
+		const baseSpread = getHeapSnapshotSampleSpread(base, phase, category);
+		const headSpread = getHeapSnapshotSampleSpread(head, phase, category);
+		const summary = pairedHeapSnapshotDeltaSummary(base, head, phase, category);
+		const percent = summary.median * 100 / baseValue;
+		const deltaMedian = summary == null ? '-' : `${util.formatDeltaBytes(summary.median)}<br>${util.formatDeltaPercent(percent)}`;
+		const categoryLabel = formatHeapSnapshotCategoryLabel(category, baseValue, headValue, baseTotal, headTotal);
+
+		lines.push(`| $\\color{${heapSnapshotCategoriesColors[category]}}{\\rule{8pt}{8pt}}$ ${categoryLabel} | ${util.formatBytes(baseValue)} <br> ± ${baseSpread == null ? '-' : util.formatBytes(baseSpread)} | ${util.formatBytes(headValue)} <br> ± ${headSpread == null ? '-' : util.formatBytes(headSpread)} | ${deltaMedian} | ${summary?.mad == null ? '-' : util.formatBytes(summary.mad)} | ${summary == null ? '-' : util.formatDeltaBytes(summary.min)} | ${summary == null ? '-' : util.formatDeltaBytes(summary.max)} |`);
+		if (category === 'Total') {
+			lines.push('| | | | | | | |');
+		}
+	}
+
+	if (lines.length === 2) return null;
+	return lines.join('\n');
+}
+
 function renderHeapSnapshotSection(base: MemoryReport, head: MemoryReport) {
-	const baseHeapSnapshotReport = {
-		summary: base.summary.afterGc.heapSnapshot!,
-		samples: base.samples.map(sample => ({
-			round: sample.round,
-			data: sample.phases.afterGc.heapSnapshot!,
-		})),
-	};
-
-	const headHeapSnapshotReport = {
-		summary: head.summary.afterGc.heapSnapshot!,
-		samples: head.samples.map(sample => ({
-			round: sample.round,
-			data: sample.phases.afterGc.heapSnapshot!,
-		})),
-	};
-
-	const table = heapSnapshotUtil.renderHeapSnapshotTable(baseHeapSnapshotReport, headHeapSnapshotReport);
+	const table = renderHeapSnapshotTable(base, head, 'afterGc');
 	if (table == null) return null;
 
 	const lines = [
@@ -144,8 +400,8 @@ function renderHeapSnapshotSection(base: MemoryReport, head: MemoryReport) {
 	];
 
 	for (const graph of [
-		//heapSnapshotUtil.renderHeapSnapshotSankey(baseHeapSnapshotReport, 'Base'),
-		heapSnapshotUtil.renderHeapSnapshotSankey(headHeapSnapshotReport, 'Head'),
+		renderHeapSnapshotSankey(base, 'afterGc', 'Base'),
+		renderHeapSnapshotSankey(head, 'afterGc', 'Head'),
 	]) {
 		if (graph == null) continue;
 		lines.push(graph);
@@ -183,7 +439,7 @@ function renderJsFootprintMetricTable(base: RuntimeLoadedJsFootprintReport, head
 		const headValue = getJsFootprintValue(head, 'afterRequest', key);
 		if (baseValue == null || headValue == null) continue;
 
-		lines.push(`| **${title}** | ${formatter(baseValue)} | ${formatter(headValue)} | ${util.formatColoredDelta(headValue - baseValue, v => formatter(v))} | ${util.calcAndFormatDeltaPercent(baseValue, headValue).replaceAll('\\%', '\\\\%')} |`);
+		lines.push(`| **${title}** | ${formatter(baseValue)} | ${formatter(headValue)} | ${formatPlainDelta(baseValue, headValue, formatter)} | ${util.calcAndFormatDeltaPercent(baseValue, headValue)} |`);
 	}
 
 	return lines.join('\n');
@@ -278,7 +534,7 @@ function renderLargestPackageIncreases(base: RuntimeLoadedJsFootprintReport, hea
 	];
 
 	for (const packageSummary of increases) {
-		lines.push(`| ${packageDisplayName(packageSummary)} | ${util.formatBytes(packageSummary.baseSourceBytes)} | ${util.formatBytes(packageSummary.sourceBytes)} | ${util.formatColoredDelta(packageSummary.sourceBytes - packageSummary.baseSourceBytes, v => util.formatBytes(v))} | ${util.formatColoredDelta(packageSummary.modules - packageSummary.baseModules, v => util.formatNumber(v))} |`);
+		lines.push(`| ${packageDisplayName(packageSummary)} | ${util.formatBytes(packageSummary.baseSourceBytes)} | ${util.formatBytes(packageSummary.sourceBytes)} | ${formatPlainDelta(packageSummary.baseSourceBytes, packageSummary.sourceBytes, util.formatBytes)} | ${formatPlainDelta(packageSummary.baseModules, packageSummary.modules)} |`);
 	}
 
 	return lines.join('\n');
@@ -374,10 +630,6 @@ if (heapSnapshotSection != null) {
 	lines.push('');
 }
 
-const artifactUrl = process.env.MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_HEAD!.trim();
-lines.push(`[Download representative V8 heap snapshot (head)](${artifactUrl})`);
-lines.push('');
-
 const jsFootprintSection = renderJsFootprintSection(baseJsFootprint, headJsFootprint);
 if (jsFootprintSection != null) {
 	lines.push(jsFootprintSection);
@@ -393,28 +645,20 @@ function getWarningMetric(base: MemoryReport, head: MemoryReport) {
 	return null;
 }
 
-function getDiffPercent(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
-	const baseValue = getMemoryValue(base, phase, metric);
-	const headValue = getMemoryValue(head, phase, metric);
-	if (baseValue == null || headValue == null || baseValue <= 0) return null;
-
-	return ((headValue - baseValue) * 100) / baseValue;
-}
-
 function isBeyondSampleNoise(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
 	const baseValue = getMemoryValue(base, phase, metric);
 	const headValue = getMemoryValue(head, phase, metric);
 	if (baseValue == null || headValue == null) return false;
 
-	const delta = headValue - baseValue;
-	if (delta <= 0) return false;
+	const diff = headValue - baseValue;
+	if (diff <= 0) return false;
 
 	const baseSpread = getSampleSpread(base, phase, metric);
 	const headSpread = getSampleSpread(head, phase, metric);
 	if (baseSpread == null || headSpread == null) return true;
 
 	const combinedSpread = Math.hypot(baseSpread, headSpread);
-	return delta > combinedSpread * 3;
+	return diff > combinedSpread * 3;
 }
 
 const warningMetric = getWarningMetric(base, head);
@@ -424,6 +668,6 @@ if (warningMetric != null && warningDiffPercent != null && warningDiffPercent >
 	lines.push('');
 }
 
-//lines.push(`[See workflow logs for details](https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID})`);
+lines.push(`[See workflow logs for details](https://github.com/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID})`);
 
 await writeFile(outputFile, `${lines.join('\n')}\n`);

.github/scripts/frontend-js-size.mts

@@ -299,13 +299,13 @@ function renderVisualizerSummaryTable(before: ReturnType<typeof collectVisualize
 		`<tr><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>`,
 		`<tr>`,
 		`<th><b>Δ</b></th>`,
-		...summary.map((key) => `<td>${util.calcAndFormatDeltaNumber(before.summary[key], after.summary[key], 0)}</td>`),
-		...metrics.map((key) => `<td>${util.calcAndFormatDeltaBytes(before.metrics[key], after.metrics[key], 1000)}</td>`),
+		...summary.map((key) => `<td>${util.calcAndFormatDeltaNumber(before.summary[key], after.summary[key])}</td>`),
+		...metrics.map((key) => `<td>${util.calcAndFormatDeltaBytes(before.metrics[key], after.metrics[key])}</td>`),
 		`</tr>`,
 		`<tr>`,
 		`<th><b>Δ (%)</b></th>`,
-		...summary.map((key) => `<td>${util.calcAndFormatDeltaPercent(before.summary[key], after.summary[key], 0.1)}</td>`),
-		...metrics.map((key) => `<td>${util.calcAndFormatDeltaPercent(before.metrics[key], after.metrics[key], 0.1)}</td>`),
+		...summary.map((key) => `<td>${util.calcAndFormatDeltaPercent(before.summary[key], after.summary[key])}</td>`),
+		...metrics.map((key) => `<td>${util.calcAndFormatDeltaPercent(before.metrics[key], after.metrics[key])}</td>`),
 		`</tr>`,
 		`</tbody>`,
 		`</table>`,
@@ -357,16 +357,16 @@ function chunkMarkdownTable(rows: ReturnType<typeof getChunkComparisonRows>, tot
 		'| --- | ---: | ---: | ---: | ---: |',
 	];
 	if (total != null) {
-		lines.push(`| (total) | ${util.formatBytes(total.beforeSize)} | ${util.formatBytes(total.afterSize)} | ${util.calcAndFormatDeltaBytes(total.beforeSize, total.afterSize, 1000)} | ${util.calcAndFormatDeltaPercent(total.beforeSize, total.afterSize, 0.1).replaceAll('\\%', '\\\\%')} |`);
+		lines.push(`| (total) | ${util.formatBytes(total.beforeSize)} | ${util.formatBytes(total.afterSize)} | ${util.calcAndFormatDeltaBytes(total.beforeSize, total.afterSize)} | ${util.calcAndFormatDeltaPercent(total.beforeSize, total.afterSize).replaceAll('\\%', '\\\\%')} |`);
 		lines.push('| | | | | |');
 	}
 	for (const row of rows) {
 		if (row.changeType === 'added') {
-			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize, 1000)} | $\\color{orange}{\\text{( + )}}$ |`);
+			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize)} | $\\color{orange}{\\text{(+)}}$ |`);
 		} else if (row.changeType === 'removed') {
-			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize, 1000)} | $\\color{green}{\\text{( - )}}$ |`);
+			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize)} | $\\color{green}{\\text{(-)}}$ |`);
 		} else {
-			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize, 1000)} | ${util.calcAndFormatDeltaPercent(row.beforeSize, row.afterSize, 0.1).replaceAll('\\%', '\\\\%')} |`);
+			lines.push(`| <details><summary>\`${escapeCell(row.name)}\`</summary> \`${escapeCell(row.chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize)} | ${util.calcAndFormatDeltaPercent(row.beforeSize, row.afterSize).replaceAll('\\%', '\\\\%')} |`);
 		}
 	}
 	return lines.join('\n');
@@ -476,6 +476,67 @@ function renderFrontendBundleReport(before: ReturnType<typeof collectVisualizerR
 	return lines.join('\n');
 }
 
+const visualizerTreemapLimit = 50;
+
+function mermaidTreemapLabel(value: string) {
+	const label = String(value)
+		.replaceAll('\\', '/')
+		.replaceAll('"', "'")
+		.replaceAll('`', "'")
+		.replaceAll('\r', ' ')
+		.replaceAll('\n', ' ')
+		.trim();
+	return label === '' ? '(unknown)' : label;
+}
+
+function mermaidTreemapModuleLabel(id: string) {
+	const normalizedId = String(id).replaceAll('\\', '/');
+	const filePath = normalizedId.split(/[?#]/, 1)[0];
+	const fileName = path.posix.basename(filePath);
+	return mermaidTreemapLabel(fileName || normalizedId);
+}
+
+function renderVisualizerTreemap(label: string, report: ReturnType<typeof collectVisualizerReport>) {
+	const rows = report.hotModules
+		.filter((row) => row.renderedLength > 0)
+		.slice(0, visualizerTreemapLimit);
+	const topRendered = rows.reduce((sum, row) => sum + row.renderedLength, 0);
+	const otherRendered = Math.max(0, report.metrics.renderedLength - topRendered);
+	const lines = [
+		'```mermaid',
+		`%%{init: ${JSON.stringify({
+			treemap: {
+				diagramPadding: 0,
+				padding: 0,
+				nodeHeight: 70,
+			},
+		})}}%%`,
+		'treemap-beta',
+		`"${mermaidTreemapLabel(label)}"`,
+	];
+
+	for (const row of rows) {
+		lines.push(`  "${mermaidTreemapModuleLabel(row.id)}": ${Math.round(row.renderedLength)}`);
+	}
+	if (otherRendered > 0) {
+		lines.push(`  "Other": ${Math.round(otherRendered)}`);
+	}
+
+	lines.push('```');
+	return lines.join('\n');
+}
+
+function renderVisualizerTreemapDetails(label: string, report: ReturnType<typeof collectVisualizerReport>, open = false) {
+	return [
+		`<details${open ? ' open' : ''}>`,
+		`<summary>${label} rendered size treemap (top ${visualizerTreemapLimit} + Other)</summary>`,
+		'',
+		renderVisualizerTreemap(label, report),
+		'',
+		'</details>',
+	].join('\n');
+}
+
 const args = process.argv.slice(2);
 const [beforeDir, afterDir, beforeStatsFile, afterStatsFile, outFile] = args;
 const before = await collectReport(beforeDir);
@@ -484,7 +545,7 @@ const beforeStats = JSON.parse(await fs.readFile(beforeStatsFile, 'utf8')) as Vi
 const afterStats = JSON.parse(await fs.readFile(afterStatsFile, 'utf8')) as VisualizerReport;
 const beforeVisualizerReport = collectVisualizerReport(beforeStats);
 const afterVisualizerReport = collectVisualizerReport(afterStats);
-const visualizerArtifactLink = `[Open treemap HTML](${process.env.FRONTEND_BUNDLE_REPORT_ARTIFACT_URL})`;
+const visualizerArtifactLink = `[Open detailed HTML](${process.env.FRONTEND_BUNDLE_REPORT_ARTIFACT_URL})`;
 
 const body = [
 	marker,
@@ -497,6 +558,10 @@ const body = [
 	'',
 	renderFrontendBundleReport(beforeVisualizerReport, afterVisualizerReport),
 	'',
+	renderVisualizerTreemapDetails('Before', beforeVisualizerReport),
+	'',
+	renderVisualizerTreemapDetails('After', afterVisualizerReport),
+	'',
 	visualizerArtifactLink,
 ].join('\n');
 

.github/scripts/heap-snapshot-util.mts

@@ -1,200 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-// NOTE: このファイルはworkflow上でバックエンドからも参照されるため、side effectがあってはならない
-
-import * as util from './utility.mts';
-
-export const heapSnapshotCategory = {
-	total: { label: 'Total', color: 'gray', colorHex: '#888888' },
-	code: { label: 'Code', color: 'orange', colorHex: '#f28e2c' },
-	strings: { label: 'Strings', color: 'red', colorHex: '#e15759' },
-	jsArrays: { label: 'JS arrays', color: 'cyan', colorHex: '#76b7b2' },
-	typedArrays: { label: 'Typed arrays', color: 'green', colorHex: '#59a14f' },
-	systemObjects: { label: 'System objects', color: 'yellow', colorHex: '#edc949' },
-	otherJsObjects: { label: 'Other JS objs', color: 'violet', colorHex: '#af7aa1' },
-	otherNonJsObjects: { label: 'Other non-JS objs', color: 'pink', colorHex: '#ff9da7' },
-} as const satisfies Record<string, { label: string; color: string; colorHex: string }>;
-
-export type HeapSnapshotData = {
-	categories: Record<keyof typeof heapSnapshotCategory, number>;
-	nodeCounts: Record<keyof typeof heapSnapshotCategory, number>;
-	breakdowns?: Record<keyof typeof heapSnapshotCategory, Record<string, number>>;
-};
-
-export type HeapSnapshotReport = {
-	summary: HeapSnapshotData;
-	samples: {
-		round: number;
-		data: HeapSnapshotData;
-	}[];
-};
-
-function getHeapSnapshotCategoryValue(report: HeapSnapshotReport, category: keyof typeof heapSnapshotCategory) {
-	return report.summary.categories[category];
-}
-
-export function renderHeapSnapshotTable(base: HeapSnapshotReport, head: HeapSnapshotReport) {
-	const lines = [
-		'| Metric | Base | Head | Δ median | Δ MAD | Δ min | Δ max |',
-		'| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
-	];
-	const baseTotal = getHeapSnapshotCategoryValue(base, 'total');
-	const headTotal = getHeapSnapshotCategoryValue(head, 'total');
-
-	function getHeapSnapshotSampleSpread(report: HeapSnapshotReport, category: keyof typeof heapSnapshotCategory) {
-		const values = report.samples
-			.map(sample => sample.data.categories[category])
-			.filter(value => Number.isFinite(value)) as number[];
-		if (values.length < 2) throw new Error(`Not enough samples for category ${category}`);
-
-		const center = util.median(values);
-		return util.median(values.map(value => Math.abs(value - center)));
-	}
-
-	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
-		const baseValue = getHeapSnapshotCategoryValue(base, category);
-		const headValue = getHeapSnapshotCategoryValue(head, category);
-		const baseSpread = getHeapSnapshotSampleSpread(base, category);
-		const headSpread = getHeapSnapshotSampleSpread(head, category);
-		const summary = util.pairedDeltaSummary(base.samples, head.samples, (sample) => sample.data.categories[category]);
-		const percent = summary.median * 100 / baseValue;
-
-		if (category === 'total') {
-			const deltaMedian = `${util.formatDeltaBytes(summary.median, 100000)}<br>${util.formatDeltaPercent(percent, 0.1).replaceAll('\\%', '\\\\%')}`;
-			const baseText = `${util.formatBytes(baseValue)} <br> ± ${util.formatBytes(baseSpread)}`;
-			const headText = `${util.formatBytes(headValue)} <br> ± ${util.formatBytes(headSpread)}`;
-			const metricText = `$\\color{${heapSnapshotCategory[category].color}}{\\rule{8pt}{8pt}}$ **${heapSnapshotCategory[category].label}**`;
-			lines.push(`| ${metricText} | ${baseText} | ${headText} | ${deltaMedian} | ${util.formatBytes(summary.mad)} | ${util.formatDeltaBytes(summary.min, 100000)} | ${util.formatDeltaBytes(summary.max, 100000)} |`);
-			lines.push('| | | | | | | |');
-		} else {
-			const deltaMedian = util.formatDeltaBytes(summary.median, 100000);
-			const baseText = util.formatBytes(baseValue);
-			const headText = util.formatBytes(headValue);
-			const basePercent = util.formatPercent((baseValue * 100) / baseTotal);
-			const headPercent = util.formatPercent((headValue * 100) / headTotal);
-			const metricText = `<details><summary>$\\color{${heapSnapshotCategory[category].color}}{\\rule{8pt}{8pt}}$ **${heapSnapshotCategory[category].label}**</summary>${basePercent} → ${headPercent}</details>`;
-			lines.push(`| ${metricText} | ${baseText} | ${headText} | ${deltaMedian} | ${util.formatBytes(summary.mad)} | ${util.formatDeltaBytes(summary.min, 100000)} | ${util.formatDeltaBytes(summary.max, 100000)} |`);
-		}
-	}
-
-	if (lines.length === 2) return null;
-	return lines.join('\n');
-}
-
-const heapSnapshotSankeyChildMinRatio = 0.3;
-const heapSnapshotSankeyParentMinPercent = 10;
-
-function escapeCsvValue(value: string) {
-	return `"${String(value).replaceAll('"', '""')}"`;
-}
-
-export function renderHeapSnapshotSankey(report: HeapSnapshotReport, title: string) {
-	const total = getHeapSnapshotCategoryValue(report, 'total');
-	if (total == null || total <= 0) return null;
-
-	function getHeapSnapshotBreakdownEntries(category: keyof typeof heapSnapshotCategory) {
-		const breakdown = report.summary.breakdowns?.[category];
-		if (breakdown == null || typeof breakdown !== 'object') return [];
-
-		return Object.entries(breakdown)
-			.filter(([, value]) => Number.isFinite(value) && value > 0)
-			.toSorted((a, b) => b[1] - a[1]);
-	}
-
-	function formatHeapSnapshotSankeyChildLabel(label: string) {
-		return String(label).replace(/^[^:]+:\s*/, '');
-	}
-
-	function formatSankeyPercentValue(value: number) {
-		const rounded = Math.round(value * 100) / 100;
-		if (rounded === 0 && value > 0) return '0.01';
-		if (Number.isInteger(rounded)) return String(rounded);
-		return rounded.toFixed(2).replace(/0+$/, '').replace(/\.$/, '');
-	}
-
-	const categories = (Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[])
-		.filter(category => category !== 'total')
-		.map(category => {
-			const value = getHeapSnapshotCategoryValue(report, category);
-			if (value == null || value <= 0) return null;
-			const breakdownEntries = getHeapSnapshotBreakdownEntries(category);
-			const breakdownTotal = breakdownEntries.reduce((sum, [, childValue]) => sum + childValue, 0);
-			const percent = (value * 100) / total;
-			const childEntries = [];
-			let otherPercent = 0;
-
-			if (breakdownTotal > 0 && percent > heapSnapshotSankeyParentMinPercent) {
-				for (const [childName, childValue] of breakdownEntries) {
-					const childRatio = childValue / breakdownTotal;
-					const childPercent = percent * childRatio;
-					if (childRatio >= heapSnapshotSankeyChildMinRatio) {
-						childEntries.push([formatHeapSnapshotSankeyChildLabel(childName), childPercent]);
-					} else {
-						otherPercent += childPercent;
-					}
-				}
-
-				if (childEntries.length > 0 && otherPercent > 0) {
-					childEntries.push(['Other', otherPercent]);
-				}
-			}
-
-			return {
-				category,
-				percent,
-				childEntries,
-			};
-		})
-		.filter(value => value != null);
-
-	if (categories.length === 0) return null;
-
-	const nodeColors = {
-		[title]: heapSnapshotCategory.total.colorHex,
-	} as Record<string, string>;
-	for (const { category, childEntries } of categories) {
-		const categoryColor = heapSnapshotCategory[category].colorHex;
-		nodeColors[category] = categoryColor;
-
-		for (const [childName] of childEntries) {
-			nodeColors[childName] = categoryColor;
-		}
-	}
-
-	const lines = [
-		`<details><summary>${title} heap snapshot composition</summary>`,
-		'',
-		'```mermaid',
-		`%%{init: ${JSON.stringify({
-			sankey: {
-				showValues: false,
-				linkColor: 'target',
-				labelStyle: 'outlined',
-				nodeAlignment: 'center',
-				nodePadding: 10,
-				nodeColors: {
-					...nodeColors,
-					'Other': '#888888',
-				},
-			},
-		})}}%%`,
-		'sankey-beta',
-	];
-
-	for (const { category, percent, childEntries } of categories) {
-		lines.push(`${escapeCsvValue(title)},${escapeCsvValue(heapSnapshotCategory[category].label)},${formatSankeyPercentValue(percent)}`);
-
-		for (const [childName, childPercent] of childEntries) {
-			lines.push(`${escapeCsvValue(heapSnapshotCategory[category].label)},${escapeCsvValue(childName)},${formatSankeyPercentValue(childPercent)}`);
-		}
-	}
-
-	lines.push('```');
-	lines.push('');
-	lines.push('</details>');
-
-	return lines.join('\n');
-}

.github/scripts/measure-backend-memory-comparison.mts

@@ -4,10 +4,9 @@
  */
 
 import { createRequire } from 'node:module';
-import { copyFile, rm, writeFile } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import * as util from './utility.mts';
-import * as heapSnapshotUtil from './heap-snapshot-util.mts';
 import type { MemoryReportRaw } from '../../packages/backend/scripts/measure-memory.mts';
 
 const phases = ['afterGc'] as const;
@@ -29,7 +28,11 @@ export type MemoryReport = {
 	};
 	summary: Record<typeof phases[number], {
 		memoryUsage: Record<string, number>;
-		heapSnapshot?: heapSnapshotUtil.HeapSnapshotData;
+		heapSnapshot?: {
+			categories: Record<typeof util.heapSnapshotCategories[number], number>;
+			nodeCounts: Record<typeof util.heapSnapshotCategories[number], number>;
+			breakdowns?: Record<typeof util.heapSnapshotCategories[number], Record<string, number>>;
+		};
 	}>;
 	samples: (MemoryReportRaw['samples'][number] & {
 		round: number;
@@ -39,8 +42,6 @@ export type MemoryReport = {
 const [baseDirArg, headDirArg, baseOutputArg, headOutputArg] = process.argv.slice(2);
 
 const HEAP_SNAPSHOT_BREAKDOWN_TOP_N = util.readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', 6, 1);
-const HEAD_HEAP_SNAPSHOT_WORK_DIR = resolve('head-heap-snapshots');
-const HEAD_HEAP_SNAPSHOT_OUTPUT_PATH = resolve('head-heap-snapshot.heapsnapshot');
 
 async function resetState(repoDir: string) {
 	const require = createRequire(join(repoDir, 'packages/backend/package.json'));
@@ -71,10 +72,10 @@ async function resetState(repoDir: string) {
 }
 
 function summarizeHeapSnapshotBreakdowns(samples: MemoryReport['samples'], phase: typeof phases[number]) {
-	const breakdowns = {} as Record<keyof typeof heapSnapshotUtil.heapSnapshotCategory, Record<string, number>>;
+	const breakdowns = {} as Record<typeof util.heapSnapshotCategories[number], Record<string, number>>;
 
-	for (const category of Object.keys(heapSnapshotUtil.heapSnapshotCategory) as (keyof typeof heapSnapshotUtil.heapSnapshotCategory)[]) {
-		if (category === 'total') continue;
+	for (const category of util.heapSnapshotCategories) {
+		if (category === 'Total') continue;
 
 		const childKeys = new Set<string>();
 		for (const sample of samples) {
@@ -87,7 +88,7 @@ function summarizeHeapSnapshotBreakdowns(samples: MemoryReport['samples'], phase
 		for (const childKey of childKeys) {
 			const values = samples
 				.map(sample => sample.phases[phase].heapSnapshot?.breakdowns?.[category]?.[childKey])
-				.filter(value => Number.isFinite(value)) as number[];
+				.filter(value => Number.isFinite(value));
 
 			if (values.length > 0) categoryBreakdown[childKey] = util.median(values);
 		}
@@ -135,8 +136,8 @@ function summarizeSamples(samples: MemoryReport['samples']) {
 			summary[phase].memoryUsage[key] = util.median(values);
 		}
 
-		const heapSnapshotCategoryValues = {} as Record<keyof typeof heapSnapshotUtil.heapSnapshotCategory, number>;
-		for (const category of Object.keys(heapSnapshotUtil.heapSnapshotCategory) as (keyof typeof heapSnapshotUtil.heapSnapshotCategory)[]) {
+		const heapSnapshotCategoryValues = {} as Record<typeof util.heapSnapshotCategories[number], number>;
+		for (const category of util.heapSnapshotCategories) {
 			const values = samples
 				.map(sample => sample.phases[phase].heapSnapshot?.categories?.[category])
 				.filter(value => Number.isFinite(value)) as number[];
@@ -144,8 +145,8 @@ function summarizeSamples(samples: MemoryReport['samples']) {
 			if (values.length > 0) heapSnapshotCategoryValues[category] = util.median(values);
 		}
 
-		const heapSnapshotNodeCountValues = {} as Record<keyof typeof heapSnapshotUtil.heapSnapshotCategory, number>;
-		for (const category of Object.keys(heapSnapshotUtil.heapSnapshotCategory) as (keyof typeof heapSnapshotUtil.heapSnapshotCategory)[]) {
+		const heapSnapshotNodeCountValues = {} as Record<typeof util.heapSnapshotCategories[number], number>;
+		for (const category of util.heapSnapshotCategories) {
 			const values = samples
 				.map(sample => sample.phases[phase].heapSnapshot?.nodeCounts?.[category])
 				.filter(value => Number.isFinite(value)) as number[];
@@ -167,7 +168,7 @@ function summarizeSamples(samples: MemoryReport['samples']) {
 	return summary;
 }
 
-async function measureRepo(label: string, repoDir: string, round: number, options: { heapSnapshotSavePath?: string } = {}) {
+async function measureRepo(label: string, repoDir: string, round: number) {
 	process.stderr.write(`[${label}] Resetting database and Redis\n`);
 	await resetState(repoDir);
 
@@ -184,7 +185,6 @@ async function measureRepo(label: string, repoDir: string, round: number, option
 		MK_MEMORY_SAMPLE_COUNT: '1',
 	} as NodeJS.ProcessEnv;
 	if (round <= 0) measureEnv.MK_MEMORY_HEAP_SNAPSHOT = '0';
-	if (options.heapSnapshotSavePath != null) measureEnv.MK_MEMORY_HEAP_SNAPSHOT_SAVE_PATH = options.heapSnapshotSavePath;
 
 	const stdout = await util.run('node', ['packages/backend/scripts/measure-memory.mts'], {
 		cwd: repoDir,
@@ -197,40 +197,6 @@ async function measureRepo(label: string, repoDir: string, round: number, option
 	return sample;
 }
 
-function headHeapSnapshotPath(round: number) {
-	return join(HEAD_HEAP_SNAPSHOT_WORK_DIR, `round-${round}.heapsnapshot`);
-}
-
-function selectRepresentativeHeadHeapSnapshotRound(samples: MemoryReport['samples'], summary: MemoryReport['summary']) {
-	const medianTotal = summary.afterGc.heapSnapshot?.categories?.total;
-	if (medianTotal == null || !Number.isFinite(medianTotal)) return null;
-
-	let selected: { round: number; distance: number } | null = null;
-	for (const sample of samples) {
-		const total = sample.phases.afterGc.heapSnapshot?.categories?.total;
-		if (total == null || !Number.isFinite(total)) continue;
-
-		const distance = Math.abs(total - medianTotal);
-		if (selected == null || distance < selected.distance || (distance === selected.distance && sample.round < selected.round)) {
-			selected = {
-				round: sample.round,
-				distance,
-			};
-		}
-	}
-
-	return selected?.round ?? null;
-}
-
-async function saveRepresentativeHeadHeapSnapshot(samples: MemoryReport['samples'], summary: MemoryReport['summary']) {
-	const round = selectRepresentativeHeadHeapSnapshotRound(samples, summary);
-	if (round == null) return;
-
-	await copyFile(headHeapSnapshotPath(round), HEAD_HEAP_SNAPSHOT_OUTPUT_PATH);
-	process.stderr.write(`Selected head heap snapshot round ${round} for artifact\n`);
-	await rm(HEAD_HEAP_SNAPSHOT_WORK_DIR, { recursive: true, force: true });
-}
-
 async function main() {
 	const baseDir = resolve(baseDirArg);
 	const headDir = resolve(headDirArg);
@@ -240,9 +206,6 @@ async function main() {
 	const warmupRounds = util.readIntegerEnv('MK_MEMORY_COMPARE_WARMUP_ROUNDS', 1, 0);
 	const startedAt = new Date().toISOString();
 
-	await rm(HEAD_HEAP_SNAPSHOT_WORK_DIR, { recursive: true, force: true });
-	await rm(HEAD_HEAP_SNAPSHOT_OUTPUT_PATH, { force: true });
-
 	const reports = {
 		base: {
 			dir: baseDir,
@@ -265,12 +228,8 @@ async function main() {
 		const order = round % 2 === 1 ? ['base', 'head'] as const : ['head', 'base'] as const;
 		process.stderr.write(`Starting measurement round ${round}/${rounds}: ${order.join(' -> ')}\n`);
 
-		for (const label of order) {
-			const shouldSaveHeadHeapSnapshot = label === 'head';
-			const options = shouldSaveHeadHeapSnapshot
-				? { heapSnapshotSavePath: headHeapSnapshotPath(round) }
-				: {};
-			const sample = await measureRepo(label, reports[label].dir, round, options);
+		for (const [orderIndex, label] of order.entries()) {
+			const sample = await measureRepo(label, reports[label].dir, round);
 			reports[label].samples.push({
 				...sample,
 				round,
@@ -278,12 +237,6 @@ async function main() {
 		}
 	}
 
-	const summaries = {
-		base: summarizeSamples(reports.base.samples),
-		head: summarizeSamples(reports.head.samples),
-	};
-	await saveRepresentativeHeadHeapSnapshot(reports.head.samples, summaries.head);
-
 	for (const label of ['base', 'head'] as const) {
 		const report = {
 			timestamp: new Date().toISOString(),
@@ -295,7 +248,7 @@ async function main() {
 				warmupRounds,
 				startedAt,
 			},
-			summary: summaries[label],
+			summary: summarizeSamples(reports[label].samples),
 			samples: reports[label].samples,
 		};
 

.github/scripts/utility.mts

@@ -3,12 +3,21 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-// NOTE: このファイルはworkflow上でバックエンドからも参照されるため、side effectがあってはならない
-
 import { spawn } from 'node:child_process';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 
+export const heapSnapshotCategories = [
+	'Total',
+	'Code',
+	'Strings',
+	'JS arrays',
+	'Typed arrays',
+	'System objects',
+	'Other JS objects',
+	'Other non-JS objects',
+] as const;
+
 export function median(values: number[]) {
 	const sorted = values.toSorted((a, b) => a - b);
 	const center = Math.floor(sorted.length / 2);
@@ -17,46 +26,12 @@ export function median(values: number[]) {
 }
 
 export function mad(values: number[]) {
-	if (values.length < 2) throw new Error('Not enough samples to calculate MAD');
+	if (values.length < 2) return null;
 
 	const center = median(values);
 	return median(values.map(value => Math.abs(value - center)));
 }
 
-function getSamplesByRound<T extends { round: number; }[]>(samples: T) {
-	const samplesByRound = new Map<number, T[number]>();
-	for (const sample of samples) {
-		if (sample.round <= 0) continue;
-		samplesByRound.set(sample.round, sample);
-	}
-	return samplesByRound;
-}
-
-export function pairedDeltaSummary<T extends { round: number; }[]>(baseSamples: T, headSamples: T, getValue: (sample: T[number]) => number | null) {
-	const baseSamplesByRound = getSamplesByRound(baseSamples);
-	const headSamplesByRound = getSamplesByRound(headSamples);
-	const values = [];
-
-	for (const [round, baseSample] of baseSamplesByRound) {
-		const headSample = headSamplesByRound.get(round);
-		if (headSample == null) continue;
-
-		const baseValue = getValue(baseSample);
-		const headValue = getValue(headSample);
-		if (baseValue == null || headValue == null) continue;
-
-		values.push(headValue - baseValue);
-	}
-
-	return {
-		median: median(values),
-		mad: mad(values),
-		min: Math.min(...values),
-		max: Math.max(...values),
-		samples: values.length,
-	};
-}
-
 export function normalizePath(filePath: string) {
 	return filePath.split(path.sep).join('/');
 }
@@ -94,12 +69,11 @@ export function escapeLatex(text: string) {
 		.replaceAll('%', '\\%');
 }
 
-export function formatColoredDelta(delta: number, text: (value: number) => string, colorThreshold = 0) {
-	if (delta === 0) return text(0);
-	const sign = delta > 0 ? '+' : '-';
-	if (Math.abs(delta) < colorThreshold) return `$\\text{${sign}${escapeLatex(text(Math.abs(delta)))}}$`;
+export function formatColoredDelta(text: string, delta: number) {
+	if (delta === 0) return text;
 	const color = delta > 0 ? 'orange' : 'green';
-	return `$\\color{${color}}{\\text{${sign}${escapeLatex(text(Math.abs(delta)))}}}$`;
+	const sign = delta > 0 ? '+' : '-';
+	return `$\\color{${color}}{\\text{${sign}${escapeLatex(text)}}}$`;
 }
 
 const numberFormatter = new Intl.NumberFormat('en-US', {
@@ -112,11 +86,11 @@ export function formatNumber(value: number) {
 
 export function formatBytes(value: number) {
 	if (value === 0) return '0 B';
-	const units = ['B', 'KB', 'MB', 'GB'];
+	const units = ['B', 'KiB', 'MiB', 'GiB'];
 	let unitIndex = 0;
 	let size = value;
-	while (size >= 1000 && unitIndex < units.length - 1) {
-		size /= 1000;
+	while (size >= 1024 && unitIndex < units.length - 1) {
+		size /= 1024;
 		unitIndex += 1;
 	}
 
@@ -124,34 +98,35 @@ export function formatBytes(value: number) {
 	return `${numberFormatter.format(Number(size.toFixed(maximumFractionDigits)))} ${units[unitIndex]}`;
 }
 
-export function calcAndFormatDeltaNumber(before: number, after: number, colorThreshold = 0) {
+export function calcAndFormatDeltaNumber(before: number, after: number) {
 	if (before == null || after == null) return '-';
 	const delta = after - before;
-	return formatColoredDelta(delta, v => formatNumber(v), colorThreshold);
+	return formatColoredDelta(formatNumber(Math.abs(delta)), delta);
 }
 
-export function formatDeltaBytes(deltaBytes: number, colorThreshold = 0) {
-	return formatColoredDelta(deltaBytes, v => formatBytes(v), colorThreshold);
+export function formatDeltaBytes(deltaBytes: number) {
+	return formatColoredDelta(formatBytes(Math.abs(deltaBytes)), deltaBytes);
 }
 
-export function calcAndFormatDeltaBytes(before: number, after: number, colorThreshold = 0) {
+export function calcAndFormatDeltaBytes(before: number, after: number) {
 	if (before == null || after == null) return '-';
 	const delta = after - before;
-	return formatDeltaBytes(delta, colorThreshold);
+	return formatDeltaBytes(delta);
 }
 
 export function formatPercent(value: number) {
 	return `${formatNumber(value)}%`;
 }
 
-export function formatDeltaPercent(deltaPercent: number, colorThreshold = 0) {
-	return formatColoredDelta(deltaPercent, v => formatPercent(v), colorThreshold);
+export function formatDeltaPercent(deltaPercent: number) {
+	if (deltaPercent === 0) return '0%';
+	return formatColoredDelta(formatPercent(Math.abs(deltaPercent)), deltaPercent);
 }
 
-export function calcAndFormatDeltaPercent(before: number, after: number, colorThreshold = 0) {
+export function calcAndFormatDeltaPercent(before: number, after: number) {
 	if (before == null || before === 0 || after == null || after === 0) return '-';
 	const delta = after - before;
-	return formatDeltaPercent(delta / before * 100, colorThreshold);
+	return formatDeltaPercent(delta / before * 100);
 }
 
 export function commandName(command: string) {

.github/workflows/api-misskey-js.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
 
       - name: Setup Node.js
         uses: actions/setup-node@v6.4.0

.github/workflows/changelog-check.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout head
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
       - name: Setup Node.js
         uses: actions/setup-node@v6.4.0
         with:

.github/workflows/check-misskey-js-autogen.yml

@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
         with:
           submodules: true
           persist-credentials: false
@@ -66,7 +66,7 @@ jobs:
     if: ${{ github.event.pull_request.mergeable == null || github.event.pull_request.mergeable == true }}
     steps:
       - name: checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
         with:
           submodules: true
           persist-credentials: false

.github/workflows/check-misskey-js-version.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
       - name: Check version
         run: |
           if [ "$(jq -r '.version' package.json)" != "$(jq -r '.version' packages/misskey-js/package.json)" ]; then

.github/workflows/check-spdx-license-id.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
       - name: Check
         run: |
           counter=0
@@ -44,6 +44,7 @@ jobs:
           }
 
           directories=(
+            "cypress/e2e"
             "packages/backend/migration"
             "packages/backend/src"
             "packages/backend/test"

.github/workflows/check_copyright_year.yml

@@ -10,7 +10,7 @@ jobs:
   check_copyright_year:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
     - run: |
         if [ "$(grep Copyright COPYING | sed -e 's/.*2014-\([0-9]*\) .*/\1/g')" -ne "$(date +%Y)" ]; then
           echo "Please change copyright year!"

.github/workflows/deploy-test-environment.yml

@@ -27,6 +27,9 @@ jobs:
       pr-ref: ${{ steps.get-ref.outputs.pr-ref }}
       wait_time: ${{ steps.get-wait-time.outputs.wait_time }}
     steps:
+      - name: Checkout
+        uses: actions/checkout@v6.0.2
+
       - name: Check allowed users
         id: check-allowed-users
         env:

.github/workflows/docker-develop.yml

@@ -27,7 +27,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       - name: Log in to Docker Hub

.github/workflows/docker.yml

@@ -32,7 +32,7 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
       - name: Check out the repo
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
       - name: Docker meta

.github/workflows/dockle.yml

@@ -17,7 +17,7 @@ jobs:
       DOCKLE_VERSION: 0.4.15
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6.0.2
 
       - name: Download and install dockle v${{ env.DOCKLE_VERSION }}
         run: |

.github/workflows/frontend-bundle-report.yml

@@ -41,7 +41,7 @@ jobs:
       FRONTEND_JS_SIZE_LOCALE: ja-JP
     steps:
       - name: Checkout base
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
         with:
           repository: ${{ github.event.pull_request.base.repo.full_name }}
           ref: ${{ github.event.pull_request.base.sha }}
@@ -49,7 +49,7 @@ jobs:
           submodules: true
 
       - name: Checkout pull request
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.event.pull_request.head.sha }}
@@ -69,7 +69,7 @@ jobs:
 
       - name: Setup pnpm
         if: steps.check-base-visualizer.outputs.supported == 'true'
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
         with:
           package_json_file: after/package.json
 

.github/workflows/get-api-diff.yml

@@ -25,12 +25,12 @@ jobs:
             ref: refs/pull/${{ github.event.number }}/merge
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         ref: ${{ matrix.ref }}
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:

.github/workflows/get-backend-memory.yml

@@ -39,19 +39,19 @@ jobs:
 
     steps:
     - name: Checkout base
-      uses: actions/checkout@v6.0.3
+      uses: actions/checkout@v6.0.2
       with:
         ref: ${{ github.base_ref }}
         path: base
         submodules: true
     - name: Checkout head
-      uses: actions/checkout@v6.0.3
+      uses: actions/checkout@v6.0.2
       with:
         ref: refs/pull/${{ github.event.number }}/merge
         path: head
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
       with:
         package_json_file: head/package.json
     - name: Use Node.js
@@ -96,13 +96,6 @@ jobs:
         MK_MEMORY_COMPARE_WARMUP_ROUNDS: 1
         MK_MEMORY_HEAP_SNAPSHOT: 1
       run: node head/.github/scripts/measure-backend-memory-comparison.mts base head memory-base.json memory-head.json
-    - name: Upload head heap snapshot
-      uses: actions/upload-artifact@v7
-      with:
-        name: backend-memory-head-heap-snapshot
-        path: head-heap-snapshot.heapsnapshot
-        if-no-files-found: error
-        retention-days: 7
     - name: Measure backend loaded JS footprint
       run: |
         node head/.github/scripts/backend-js-footprint.mjs base js-footprint-base.json

.github/workflows/lint.yml

@@ -17,9 +17,7 @@ on:
       - packages/misskey-bubble-game/**
       - packages/misskey-reversi/**
       - packages/shared/eslint.config.js
-      - scripts/check-dts*.mjs
       - .github/workflows/lint.yml
-      - package.json
   pull_request:
     paths:
       - packages/backend/**
@@ -33,19 +31,17 @@ on:
       - packages/misskey-bubble-game/**
       - packages/misskey-reversi/**
       - packages/shared/eslint.config.js
-      - scripts/check-dts*.mjs
       - .github/workflows/lint.yml
-      - package.json
 jobs:
   pnpm_install:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         fetch-depth: 0
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - uses: actions/setup-node@v6.4.0
       with:
         node-version-file: '.node-version'
@@ -73,12 +69,12 @@ jobs:
       eslint-cache-version: v1
       eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         fetch-depth: 0
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - uses: actions/setup-node@v6.4.0
       with:
         node-version-file: '.node-version'
@@ -104,25 +100,6 @@ jobs:
         - sw
         - misskey-js
     steps:
-    - uses: actions/checkout@v6.0.3
-      with:
-        fetch-depth: 0
-        submodules: true
-    - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
-    - uses: actions/setup-node@v6.4.0
-      with:
-        node-version-file: '.node-version'
-        cache: 'pnpm'
-    - run: pnpm i --frozen-lockfile
-    - run: pnpm --filter "${{ matrix.workspace }}^..." run build
-    - run: pnpm --filter ${{ matrix.workspace }} run typecheck
-
-  check-dts:
-    needs: [pnpm_install]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
     - uses: actions/checkout@v6.0.2
       with:
         fetch-depth: 0
@@ -134,5 +111,5 @@ jobs:
         node-version-file: '.node-version'
         cache: 'pnpm'
     - run: pnpm i --frozen-lockfile
-    - run: node --test scripts/check-dts.test.mjs
-    - run: pnpm check-dts
+    - run: pnpm --filter "${{ matrix.workspace }}^..." run build
+    - run: pnpm --filter ${{ matrix.workspace }} run typecheck

.github/workflows/locale.yml

@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
           submodules: true
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
       - uses: actions/setup-node@v6.4.0
         with:
           node-version-file: ".node-version"

.github/workflows/on-release-created.yml

@@ -16,11 +16,11 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6.0.2
         with:
           submodules: true
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
       - name: Use Node.js
         uses: actions/setup-node@v6.4.0
         with:

.github/workflows/report-api-diff.yml

@@ -11,26 +11,44 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     permissions:
-      actions: read
       pull-requests: write
 
 # api-artifact
     steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v8
+      - name: Download artifact
+        uses: actions/github-script@v9
         with:
-          pattern: api-artifact-*
-          path: artifacts
-          merge-multiple: true
-          github-token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Check artifacts
-        run: ls -lh artifacts/
+          script: |
+            const fs = require('fs');
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name.startsWith("api-artifact-") || artifact.name == "api-artifact"
+            });
+            await Promise.all(matchArtifacts.map(async (artifact) => {
+              let download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id,
+                archive_format: 'zip',
+              });
+              await fs.promises.writeFile(`${process.env.GITHUB_WORKSPACE}/${artifact.name}.zip`, Buffer.from(download.data));
+            }));
+      - name: Extract all artifacts
+        run: |
+          find . -mindepth 1 -maxdepth 1 -type f -name '*.zip' -exec unzip {} -d artifacts ';'
+          ls -la
       - name: Load PR Number
         id: load-pr-num
         run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
 
+      - name: Output base
+        run: cat ./artifacts/api-base.json
+      - name: Output head
+        run: cat ./artifacts/api-head.json
       - name: Arrange json files
         run: |
           jq '.' ./artifacts/api-base.json > ./api-base.json
@@ -39,6 +57,8 @@ jobs:
         run: diff -u --label=base --label=head ./api-base.json ./api-head.json | cat > api.json.diff
       - name: Get full diff
         run: diff --label=base --label=head --new-line-format='+%L' --old-line-format='-%L' --unchanged-line-format=' %L' ./api-base.json ./api-head.json | cat > api-full.json.diff
+      - name: Echo full diff
+        run: cat ./api-full.json.diff
       - name: Upload full diff to Artifact
         uses: actions/upload-artifact@v7
         with:

.github/workflows/report-backend-memory.yml

@@ -17,42 +17,48 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
 
-      - name: Download artifacts
-        uses: actions/download-artifact@v8
+      - name: Download artifact
+        uses: actions/github-script@v9
         with:
-          pattern: memory-artifact-*
-          path: artifacts
-          merge-multiple: true
-          github-token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Check artifacts
-        run: ls -lh artifacts/
+          script: |
+            const fs = require('fs');
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifacts = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name.startsWith("memory-artifact-") || artifact.name == "memory-artifact"
+            });
+            await Promise.all(matchArtifacts.map(async (artifact) => {
+              let download = await github.rest.actions.downloadArtifact({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                artifact_id: artifact.id,
+                archive_format: 'zip',
+              });
+              await fs.promises.writeFile(`${process.env.GITHUB_WORKSPACE}/${artifact.name}.zip`, Buffer.from(download.data));
+            }));
+      - name: Extract all artifacts
+        run: |
+          find . -mindepth 1 -maxdepth 1 -type f -name '*.zip' -exec unzip {} -d artifacts ';'
+          ls -la artifacts/
       - name: Load PR Number
         id: load-pr-num
         run: echo "pr-number=$(cat artifacts/pr_number)" >> "$GITHUB_OUTPUT"
-      - name: Find head heap snapshot artifact
-        id: find-heap-snapshot-artifact
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const run_id = context.payload.workflow_run.id;
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
-              owner,
-              repo,
-              run_id,
-            });
-            const artifact = artifacts.find(artifact => artifact.name === 'backend-memory-head-heap-snapshot');
-            if (artifact == null) return;
-            core.setOutput('url', `https://github.com/${owner}/${repo}/actions/runs/${run_id}/artifacts/${artifact.id}`);
 
+      - name: Output base
+        run: cat ./artifacts/memory-base.json
+      - name: Output head
+        run: cat ./artifacts/memory-head.json
+      - name: Output base JS footprint
+        run: cat ./artifacts/js-footprint-base.json
+      - name: Output head JS footprint
+        run: cat ./artifacts/js-footprint-head.json
       - id: build-comment
         name: Build memory comment
-        env:
-          MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_HEAD: ${{ steps.find-heap-snapshot-artifact.outputs.url }}
         run: node .github/scripts/backend-memory-report.mts ./artifacts/memory-base.json ./artifacts/memory-head.json ./output.md ./artifacts/js-footprint-base.json ./artifacts/js-footprint-head.json
       - uses: thollander/actions-comment-pull-request@v3
         with:

.github/workflows/storybook.yml

@@ -22,12 +22,12 @@ jobs:
       NODE_OPTIONS: "--max_old_space_size=7168"
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       if: github.event_name != 'pull_request_target'
       with:
         fetch-depth: 0
         submodules: true
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       if: github.event_name == 'pull_request_target'
       with:
         fetch-depth: 0
@@ -37,7 +37,7 @@ jobs:
       if: github.event_name == 'pull_request_target'
       run: git checkout "$(git rev-list --parents -n1 HEAD | cut -d" " -f3)"
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:

.github/workflows/test-backend.yml

@@ -43,7 +43,7 @@ jobs:
         ports:
           - 56312:6379
       meilisearch:
-        image: getmeili/meilisearch:v1.48.1
+        image: getmeili/meilisearch:v1.42.1
         ports:
           - 57712:7700
         env:
@@ -51,11 +51,11 @@ jobs:
           MEILI_ENV: development
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Install FFmpeg
       run: |
         sudo apt install -y ffmpeg
@@ -103,11 +103,11 @@ jobs:
           - 56312:6379
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6.0.2
         with:
           submodules: true
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
       - name: Use Node.js
         uses: actions/setup-node@v6.4.0
         with:
@@ -147,11 +147,11 @@ jobs:
           POSTGRES_HOST_AUTH_METHOD: trust
 
     steps:
-      - uses: actions/checkout@v6.0.3
+      - uses: actions/checkout@v6.0.2
         with:
           submodules: true
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
       - name: Get current date
         id: current-date
         run: echo "today=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

.github/workflows/test-federation.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           submodules: true
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
       - name: Install FFmpeg
         run: |
           sudo apt install -y ffmpeg

.github/workflows/test-frontend.yml

@@ -28,11 +28,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:
@@ -57,6 +57,11 @@ jobs:
     name: E2E tests (frontend)
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: [chrome]
+
     services:
       postgres:
         image: postgres:18
@@ -71,11 +76,17 @@ jobs:
           - 56312:6379
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         submodules: true
+    # https://github.com/cypress-io/cypress-docker-images/issues/150
+    #- name: Install mplayer for FireFox
+    #  run: sudo apt install mplayer -y
+    #  if: ${{ matrix.browser == 'firefox' }}
+    #- uses: browser-actions/setup-firefox@latest
+    #  if: ${{ matrix.browser == 'firefox' }}
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:
@@ -86,14 +97,29 @@ jobs:
       run: cp .github/misskey/test.yml .config
     - name: Build
       run: pnpm build
-    - name: Playwright install
-      working-directory: packages/frontend
-      run: pnpm exec playwright install --with-deps chromium
-    - name: Test
-      run: pnpm start-server-and-test start:test http://localhost:61812 "pnpm --filter frontend test:e2e"
+    # https://github.com/cypress-io/cypress/issues/4351#issuecomment-559489091
+    - name: ALSA Env
+      run: echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
+    # XXX: This tries reinstalling Cypress if the binary is not cached
+    # Remove this when the cache issue is fixed
+    - name: Cypress install
+      run: pnpm exec cypress install
+    - name: Cypress run
+      uses: cypress-io/github-action@v7.1.9
       timeout-minutes: 15
+      with:
+        install: false
+        start: pnpm start:test
+        wait-on: 'http://localhost:61812'
+        headed: true
+        browser: ${{ matrix.browser }}
     - uses: actions/upload-artifact@v7
       if: failure()
       with:
-        name: playwright-e2e-artifacts
-        path: packages/frontend/test/e2e/artifacts
+        name: ${{ matrix.browser }}-cypress-screenshots
+        path: cypress/screenshots
+    - uses: actions/upload-artifact@v7
+      if: always()
+      with:
+        name: ${{ matrix.browser }}-cypress-videos
+        path: cypress/videos

.github/workflows/test-misskey-js.yml

@@ -22,10 +22,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v6.0.2
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6.0.9
+        uses: pnpm/action-setup@v6.0.3
 
       - name: Setup Node.js
         uses: actions/setup-node@v6.4.0

.github/workflows/test-production.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:

.github/workflows/validate-api-json.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v6.0.2
       with:
         submodules: true
     - name: Setup pnpm
-      uses: pnpm/action-setup@v6.0.9
+      uses: pnpm/action-setup@v6.0.3
     - name: Use Node.js
       uses: actions/setup-node@v6.4.0
       with:

.gitignore

@@ -23,8 +23,9 @@ packages/sw/.yarn/cache
 # pnpm
 .pnpm-store
 
-# Playwright
-packages/frontend/test/e2e/artifacts
+# Cypress
+cypress/screenshots
+cypress/videos
 
 # Coverage
 coverage
@@ -34,7 +35,7 @@ coverage
 !/.config/example.yml
 !/.config/docker_example.yml
 !/.config/docker_example.env
-!/.config/playwright-devcontainer.yml
+!/.config/cypress-devcontainer.yml
 docker-compose.yml
 ./compose.yml
 .devcontainer/compose.yml

.node-version

@@ -1 +1 @@
-26.4.0
+22.18.0

CHANGELOG.md

@@ -1,50 +1,14 @@
-## 2026.7.0
-
-### Note
-
-**今回のリリースではMisskeyの各種動作要件が変更されます。必ずアップグレード前にお使いの環境をご確認ください。**
-
-- センシティブメディアの判定 (NSFW検出) が、本体に内蔵された nsfwjs による推論から、外部サービス [sensitive-detector](https://github.com/misskey-dev/sensitive-detector) への HTTP 呼び出し方式に変更されました。
-	- これに伴い、本体から `nsfwjs` / `@tensorflow/tfjs` / `@tensorflow/tfjs-node` および同梱の NSFW 判定モデルが削除され、インストール要件 (ネイティブ ML スタック) が緩和されました。
-	- **センシティブ判定機能を利用しているサーバーは対応が必要です。** 別途 [sensitive-detector](https://github.com/misskey-dev/sensitive-detector) サービスを立ち上げ、コントロールパネルの「モデレーション > センシティブなメディアの検出」で接続先 URL を設定してください。接続先が未設定の場合、センシティブ判定は行われません (すべて非センシティブ扱い)。
-	- 画像の正規化・動画フレームの抽出・しきい値判定・集約は引き続き本体側で行われ、外部サービスには正規化済み画像の推論のみを委譲します。
-- Node.js v24, v26 をサポートしました。**Node.js v22 でも動作しますが、今後のリリースで v22 のサポートを終了する予定**ですので、Node.js のアップデートをご検討ください。
-  - Node.js のセキュリティアップデートに伴い、最低動作バージョンを 22.22.2 / 24.17.0 / 26.4.0 に引き上げました。
-  - Docker Image は Node.js 26.4.0-trixie に更新されています。
-- バックエンドで画像処理に用いているライブラリ sharp のシステム要件の変更により、**SSE4.2 命令セットをサポートしていない x86_64 CPU では Misskey が正しく動作しなくなります**。仮想マシンに Misskey をデプロイしている場合や、古いハードウェアをお使いの場合は、アップデート前にお使いの環境をご確認ください。なお、ARM64 など x86_64 ではない環境においてはこの変更による影響はありません。
+## Unreleased
 
 ### General
-- Feat: コントロールパネルから二要素認証を解除できるように
-- Feat: 条件に一致したURLプレビューのサムネイルを隠すことができるように  
-  (Based on https://github.com/MisskeyIO/misskey/pull/214)
+-
 
 ### Client
-- 2025.4.0 以前の設定情報の移行処理が削除されました
-	- 2025.4.0 から直接 2026.6.0 以上にアップデートする場合は設定が移行されませんので注意してください。移行したい場合は一度 2026.5.1 を経由してください。
-- Enhance: 画像ビューワーを独自実装に変更・動画プレイヤーを統合
-  - 操作性の改善
-  - ビューワーとMisskeyの各種機能との統合を強化
-  - パフォーマンスの向上
-  - Enhance: マウスホイールで拡大縮小できるように
-  - Fix: 幅が狭い画面で動画の再生が困難な問題を修正
-  - Fix: 一部の画像のみセンシティブなとき、ビューワー内で画像を切り替えるとセンシティブな画像がそのまま表示される問題を修正
-  - Fix: 一部の画像をビューワーで読み込んだ際に正しく表示されない問題を修正
-- Fix: 「画像を新しいタブで開く」が機能しなくなっていた問題を修正
-- Fix: デバイスタイプをスマートフォンに固定している状態で画面幅が広いとき、画面左上のアイコンが表示されない問題を修正
-- Fix: チャットでIMEの変換を確定するEnterでメッセージが送信されてしまうことがある問題を修正
-- Fix: 自分へのメンションに対する色分けで、判定が大文字/小文字を区別していた問題を修正
-- Fix: いくつかのイベントリスナーが正しく解除されない問題を修正（メモリ使用量の改善）
+-
 
 ### Server
-- Enhance: センシティブメディアの判定を外部サービス ([sensitive-detector](https://github.com/misskey-dev/sensitive-detector)) に分離し、`nsfwjs` / `@tensorflow/tfjs(-node)` の同梱と NSFW 判定モデルを廃止 (#16804)
-- Enhance: Sentry バックエンドの自動計装を `sentryForBackend.disabledIntegrations` で個別に無効化できるように
-- Enhance: Node.js 22.23.0以降、24.17.0以降、26.4.0以降をサポートするように
-- Enhance: Docker Image の Node.js を 26.4.0 に、Debian を trixie (v13) に更新
-- Enhance: URLプレビューの結果を内部でキャッシュするように
-- Fix: `/stats` API のレスポンス型が正しくない問題を修正
-- Fix: ハッシュタグに関連するデータを更新する際のエラーハンドリングを修正
-- Fix: Sentry 使用環境下にて、Misskey が発行した SQL クエリが span に含まれない問題を修正
-- Fix: Sentry 使用環境下にて、外部送信リクエストへ `sentry-trace` / `baggage` ヘッダーが既定で付与されないように
+-
+
 
 ## 2026.6.0
 

CONTRIBUTING.md

@@ -600,90 +600,6 @@ TypeScriptでjsonをimportすると、tscでコンパイルするときにその
 コンポーネント自身がmarginを設定するのは問題の元となることはよく知られている
 marginはそのコンポーネントを使う側が設定する
 
-### 命名規則
-
-本来それが略称であっても、通常それでひとつのワードとして用いられるものは、略称として扱わない。
-
-#### 例: IP address
-
-Good: `ipAddress` / `IpAddress`
-
-Bad: `IPAddress`
-
-#### 例: User ID
-
-Good: `userId` / `UserId`
-
-Bad: `userID` / `UserID`
-
-#### 例: XMLなHTTPのRequest
-
-Good: `xmlHttpRequest` / `XmlHttpRequest`
-
-Bad: `XMLHttpRequest` / `XMLHTTPRequest`
-
-### 関数化の基準
-
-汎用性が低く(例えばそれを関数化したとしてもその呼び出しが元の場所一か所しか存在しない)、内容も短い処理(例えば10行以下)は、かえって読みにくくなるため、関数化しない。
-
-また、関数化する場合でも、呼び出しがある特定のスコープに限られる場合は、そのスコープ内に閉じ込めた方が分かりやすく簡潔になる場合がある(ただし本来その処理に不要であっても、構造上親のスコープにある関係のない変数や引数にもアクセスできるようになるため、必ずしもそうすれば設計上綺麗になるというわけでもない。状況に応じて判断すべし)。
-
-Bad:
-
-``` ts
-function withBrankets(x) {
-	return `(${x})`;
-}
-
-function formatPercent(x) {
-	return `${x}%`;
-}
-
-function formatValue(x) {
-	return withBrankets(formatPercent(x));
-}
-
-function showData(a, b) {
-	console.log(formatValue(a));
-	console.log(formatValue(b));
-}
-```
-
-Good:
-
-``` ts
-function formatValue(x) {
-	return `(${x}%)`;
-}
-
-function showData(a, b) {
-	console.log(formatValue(a));
-	console.log(formatValue(b));
-}
-```
-
-or
-
-``` ts
-function showData(a, b) {
-	function formatValue(x) {
-		return `(${x}%)`;
-	}
-
-	console.log(formatValue(a));
-	console.log(formatValue(b));
-}
-```
-
-or
-
-``` ts
-function showData(a, b) {
-	console.log(`(${a}%)`);
-	console.log(`(${b}%)`);
-}
-```
-
 ## その他
 ### HTMLのクラス名で follow という単語は使わない
 広告ブロッカーで誤ってブロックされる

Dockerfile

@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.23
 
-ARG NODE_VERSION=26.4.0-trixie
+ARG NODE_VERSION=22.22.2-bookworm
 
 # build assets & compile TypeScript
 

cypress.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from 'cypress'
+
+export default defineConfig({
+  e2e: {
+    baseUrl: 'http://localhost:61812',
+  },
+})

cypress/e2e/basic.cy.ts

@@ -0,0 +1,265 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+describe('Before setup instance', () => {
+	beforeEach(() => {
+		cy.resetState();
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visitHome();
+  });
+
+	it('setup instance', () => {
+    cy.visitHome();
+
+		cy.intercept('POST', '/api/admin/accounts/create').as('signup');
+
+		cy.get('[data-cy-admin-initial-password] input').type('example_password_please_change_this_or_you_will_get_hacked');
+		cy.get('[data-cy-admin-username] input').type('admin');
+		cy.get('[data-cy-admin-password] input').type('admin1234');
+		cy.get('[data-cy-admin-ok]').click();
+
+		// なぜか動かない
+		//cy.wait('@signup').should('have.property', 'response.statusCode');
+		cy.wait('@signup');
+
+		cy.intercept('POST', '/api/admin/update-meta').as('update-meta');
+
+		cy.get('[data-cy-next]').click();
+		cy.get('[data-cy-server-name] input').type('Testskey');
+		cy.get('[data-cy-server-setup-wizard-apply]').click();
+
+		cy.wait('@update-meta');
+  });
+});
+
+describe('After setup instance', () => {
+	beforeEach(() => {
+		cy.resetState();
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visitHome();
+  });
+
+	it('signup', () => {
+		cy.visitHome();
+
+		cy.intercept('POST', '/api/signup').as('signup');
+
+		cy.get('[data-cy-signup]').click();
+		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
+		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
+		cy.get('[data-cy-modal-dialog-ok]').click();
+		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
+		cy.get('[data-cy-signup-rules-continue]').click();
+
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+		cy.get('[data-cy-signup-username] input').type('alice');
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+		cy.get('[data-cy-signup-password] input').type('alice1234');
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+		cy.get('[data-cy-signup-invitation-code] input').type('test-invitation-code');
+		cy.get('[data-cy-signup-submit]').should('not.be.disabled');
+		cy.get('[data-cy-signup-submit]').click();
+
+		cy.wait('@signup');
+  });
+
+  it('signup with duplicated username', () => {
+		cy.registerUser('alice', 'alice1234');
+
+		cy.visitHome();
+
+		// ユーザー名が重複している場合の挙動確認
+		cy.get('[data-cy-signup]').click();
+		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
+		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
+		cy.get('[data-cy-modal-dialog-ok]').click();
+		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
+		cy.get('[data-cy-signup-rules-continue]').click();
+
+		cy.get('[data-cy-signup-username] input').type('alice');
+		cy.get('[data-cy-signup-password] input').type('alice1234');
+		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
+		cy.get('[data-cy-signup-submit]').should('be.disabled');
+  });
+});
+
+describe('After user signup', () => {
+	beforeEach(() => {
+		cy.resetState();
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+
+		// ユーザー作成
+		cy.registerUser('alice', 'alice1234');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+    cy.visitHome();
+  });
+
+	it('signin', () => {
+		cy.visitHome();
+
+		cy.intercept('POST', '/api/signin-flow').as('signin');
+
+		cy.get('[data-cy-signin]').click();
+
+		cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
+		// Enterキーで続行できるかの確認も兼ねる
+		cy.get('[data-cy-signin-username] input').type('alice{enter}');
+
+		cy.get('[data-cy-signin-page-password]').should('be.visible', { timeout: 10000 });
+		// Enterキーで続行できるかの確認も兼ねる
+		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+
+		cy.wait('@signin');
+  });
+
+	it('suspend', function() {
+		cy.request('POST', '/api/admin/suspend-user', {
+			i: this.admin.token,
+			userId: this.alice.id,
+		});
+
+		cy.visitHome();
+
+		cy.get('[data-cy-signin]').click();
+
+		cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
+		cy.get('[data-cy-signin-username] input').type('alice{enter}');
+
+		// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
+		cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);
+	});
+});
+
+describe('After user signed in', () => {
+	beforeEach(() => {
+		cy.resetState();
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+
+		// ユーザー作成
+		cy.registerUser('alice', 'alice1234');
+
+		cy.login('alice', 'alice1234');
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('successfully loads', () => {
+		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
+		cy.get('[data-cy-user-setup-continue]', { timeout: 30000 }).should('be.visible');
+  });
+
+	it('account setup wizard', () => {
+		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
+		cy.get('[data-cy-user-setup-continue]', { timeout: 30000 }).click();
+
+		cy.get('[data-cy-user-setup-user-name] input').type('ありす');
+		cy.get('[data-cy-user-setup-user-description] textarea').type('ほげ');
+		// TODO: アイコン設定テスト
+
+		cy.get('[data-cy-user-setup-continue]').click();
+
+		// プライバシー設定
+
+		cy.get('[data-cy-user-setup-continue]').click();
+
+		// フォローはスキップ
+
+		cy.get('[data-cy-user-setup-continue]').click();
+
+		// プッシュ通知設定はスキップ
+
+		cy.get('[data-cy-user-setup-continue]').click();
+
+		cy.get('[data-cy-user-setup-continue]').click();
+  });
+});
+
+describe('After user setup', () => {
+	beforeEach(() => {
+		cy.resetState();
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+
+		// ユーザー作成
+		cy.registerUser('alice', 'alice1234');
+
+		cy.login('alice', 'alice1234');
+
+		// アカウント初期設定ウィザード
+		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
+		cy.get('[data-cy-user-setup] [data-cy-modal-window-close]', { timeout: 30000 }).click();
+		cy.get('[data-cy-modal-dialog-ok]').click();
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+	it('note', () => {
+		cy.get('[data-cy-open-post-form]').should('be.visible');
+		cy.get('[data-cy-open-post-form]').click();
+		cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
+		cy.get('[data-cy-open-post-form-submit]').click();
+
+		cy.contains('Hello, Misskey!', { timeout: 15000 });
+  });
+
+	it('open note form with hotkey', () => {
+		// Wait until the page loads
+		cy.get('[data-cy-open-post-form]').should('be.visible');
+		// Use trigger() to give different `code` to test if hotkeys also work on non-QWERTY keyboards.
+		cy.document().trigger("keydown", { eventConstructor: 'KeyboardEvent', key: "n", code: "KeyL" });
+		// See if the form is opened
+		cy.get('[data-cy-post-form-text]').should('be.visible');
+		// Close it
+		cy.focused().trigger("keydown", { eventConstructor: 'KeyboardEvent', key: "Escape", code: "Escape" });
+		// See if the form is closed
+		cy.get('[data-cy-post-form-text]').should('not.be.visible');
+  });
+});
+
+// TODO: 投稿フォームの公開範囲指定のテスト
+// TODO: 投稿フォームのファイル添付のテスト
+// TODO: 投稿フォームのハッシュタグ保持フィールドのテスト

cypress/e2e/router.cy.ts

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+describe('Router transition', () => {
+	describe('Redirect', () => {
+		// サーバの初期化。ルートのテストに関しては各describeごとに1度だけ実行で十分だと思う（使いまわした方が早い）
+		before(() => {
+			cy.resetState();
+
+			// インスタンス初期セットアップ
+			cy.registerUser('admin', 'pass', true);
+
+			// ユーザー作成
+			cy.registerUser('alice', 'alice1234');
+
+			cy.login('alice', 'alice1234');
+
+			// アカウント初期設定ウィザード
+			// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
+			cy.get('[data-cy-user-setup] [data-cy-modal-window-close]', { timeout: 30000 }).click();
+			cy.wait(500);
+			cy.get('[data-cy-modal-dialog-ok]').click();
+		});
+
+		it('redirect to user profile', () => {
+			// テストのためだけに用意されたリダイレクト用ルートに飛ぶ
+			cy.visit('/redirect-test');
+
+			// プロフィールページのURLであることを確認する
+			cy.url().should('include', '/@alice')
+		});
+	});
+});

cypress/e2e/widgets.cy.ts

@@ -0,0 +1,76 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/* flaky
+describe('After user signed in', () => {
+	beforeEach(() => {
+		cy.resetState();
+		cy.viewport('macbook-16');
+
+		// インスタンス初期セットアップ
+		cy.registerUser('admin', 'pass', true);
+
+		// ユーザー作成
+		cy.registerUser('alice', 'alice1234');
+
+		cy.login('alice', 'alice1234');
+
+		// アカウント初期設定ウィザード
+		cy.get('[data-cy-user-setup] [data-cy-modal-window-close]').click();
+		cy.get('[data-cy-modal-dialog-ok]').click();
+	});
+
+	afterEach(() => {
+		// テスト終了直前にページ遷移するようなテストケース(例えばアカウント作成)だと、たぶんCypressのバグでブラウザの内容が次のテストケースに引き継がれてしまう(例えばアカウントが作成し終わった段階からテストが始まる)。
+		// waitを入れることでそれを防止できる
+		cy.wait(1000);
+	});
+
+  it('widget edit toggle is visible', () => {
+		cy.get('[data-cy-widget-edit]').should('be.visible');
+  });
+
+	it('widget select should be visible in edit mode', () => {
+		cy.get('[data-cy-widget-edit]').click();
+		cy.get('[data-cy-widget-select]').should('be.visible');
+  });
+
+	it('first widget should be removed', () => {
+		cy.get('[data-cy-widget-edit]').click();
+		cy.get('[data-cy-customize-container]:first-child [data-cy-customize-container-remove]._button').click();
+		cy.get('[data-cy-customize-container]').should('have.length', 2);
+	});
+
+	function buildWidgetTest(widgetName) {
+		it(`${widgetName} widget should get added`, () => {
+			cy.get('[data-cy-widget-edit]').click();
+			cy.get('[data-cy-widget-select] select').select(widgetName, { force: true });
+			cy.get('[data-cy-bg]._modalBg[data-cy-transparent]').click({ multiple: true, force: true });
+			cy.get('[data-cy-widget-add]').click({ force: true });
+			cy.get(`[data-cy-mkw-${widgetName}]`).should('exist');
+		});
+	}
+
+	buildWidgetTest('memo');
+	buildWidgetTest('notifications');
+	buildWidgetTest('timeline');
+	buildWidgetTest('calendar');
+	buildWidgetTest('rss');
+	buildWidgetTest('trends');
+	buildWidgetTest('clock');
+	buildWidgetTest('activity');
+	buildWidgetTest('photos');
+	buildWidgetTest('digitalClock');
+	buildWidgetTest('federation');
+	buildWidgetTest('postForm');
+	buildWidgetTest('slideshow');
+	buildWidgetTest('serverMetric');
+	buildWidgetTest('onlineUsers');
+	buildWidgetTest('jobQueue');
+	buildWidgetTest('button');
+	buildWidgetTest('aiscript');
+	buildWidgetTest('aichan');
+});
+*/

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/support/commands.ts

@@ -0,0 +1,67 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
+
+Cypress.Commands.add('visitHome', () => {
+	cy.visit('/');
+	cy.get('button', { timeout: 30000 }).should('be.visible');
+})
+
+Cypress.Commands.add('resetState', () => {
+	// iframe.contentWindow.indexedDB.deleteDatabase() がchromeのバグで使用できないため、indexedDBを無効化している。
+	// see https://github.com/misskey-dev/misskey/issues/13605#issuecomment-2053652123
+	/*
+	cy.window().then(win => {
+		win.indexedDB.deleteDatabase('keyval-store');
+	});
+	 */
+	cy.request('POST', '/api/reset-db', {}).as('reset');
+	cy.get('@reset').its('status').should('equal', 204);
+	cy.reload(true);
+});
+
+Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
+	const route = isAdmin ? '/api/admin/accounts/create' : '/api/signup';
+
+	cy.request('POST', route, {
+		username: username,
+		password: password,
+		...(isAdmin ? { setupPassword: 'example_password_please_change_this_or_you_will_get_hacked' } : {}),
+	}).its('body').as(username);
+});
+
+Cypress.Commands.add('login', (username, password) => {
+	cy.visitHome();
+
+	cy.intercept('POST', '/api/signin-flow').as('signin');
+
+	cy.get('[data-cy-signin]').click();
+	cy.get('[data-cy-signin-page-input]').should('be.visible', { timeout: 1000 });
+	cy.get('[data-cy-signin-username] input').type(`${username}{enter}`);
+	cy.get('[data-cy-signin-page-password]').should('be.visible', { timeout: 10000 });
+	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
+
+	cy.wait('@signin').as('signedIn');
+});

cypress/support/e2e.ts

@@ -0,0 +1,34 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+
+Cypress.on('uncaught:exception', (err, runnable) => {
+	if ([
+		'The source image cannot be decoded',
+
+		// Chrome
+		'ResizeObserver loop limit exceeded',
+
+		// Firefox
+		'ResizeObserver loop completed with undelivered notifications',
+	].some(msg => err.message.includes(msg))) {
+		return false;
+	}
+});

cypress/support/index.ts

@@ -0,0 +1,19 @@
+declare global {
+	namespace Cypress {
+		interface Chainable {
+			login(username: string, password: string): Chainable<void>;
+
+			registerUser(
+				username: string,
+				password: string,
+				isAdmin?: boolean
+			): Chainable<void>;
+
+			resetState(): Chainable<void>;
+
+			visitHome(): Chainable<void>;
+		}
+	}
+}
+
+export {}

cypress/tsconfig.json

@@ -0,0 +1,8 @@
+{
+	"compilerOptions": {
+		"lib": ["dom"],
+		"target": "esnext",
+		"types": ["cypress", "node"]
+	},
+	"include": ["./**/*.ts"]
+}

locales/ja-JP.yml

@@ -619,8 +619,6 @@ output: "出力"
 script: "スクリプト"
 disablePagesScript: "Pagesのスクリプトを無効にする"
 updateRemoteUser: "リモートユーザー情報の更新"
-unsetMfa: "二要素認証を解除"
-unsetMfaConfirm: "二要素認証を解除しますか？"
 unsetUserAvatar: "アイコンを解除"
 unsetUserAvatarConfirm: "アイコンを解除しますか？"
 unsetUserBanner: "バナーを解除"
@@ -1363,11 +1361,14 @@ information: "情報"
 chat: "チャット"
 directMessage: "ダイレクトメッセージ"
 directMessage_short: "メッセージ"
+migrateOldSettings: "旧設定情報を移行"
+migrateOldSettings_description: "通常これは自動で行われていますが、何らかの理由により上手く移行されなかった場合は手動で移行処理をトリガーできます。現在の設定情報は上書きされます。"
 compress: "圧縮"
 right: "右"
 bottom: "下"
 top: "上"
 embed: "埋め込み"
+settingsMigrating: "設定を移行しています。しばらくお待ちください... (後ほど、設定→その他→旧設定情報を移行 で手動で移行することもできます)"
 readonly: "読み取り専用"
 goToDeck: "デッキへ戻る"
 federationJobs: "連合ジョブ"
@@ -1419,8 +1420,6 @@ addToEmojiPalette: "絵文字パレットに追加"
 emojiPaletteAlreadyAddedConfirm: "この絵文字はすでにこの絵文字パレットに含まれています。追加しなおしますか？"
 append: "末尾に追加"
 prepend: "先頭に追加"
-urlPreviewSensitiveList: "サムネイルの表示を制限するURL"
-urlPreviewSensitiveListDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、サムネイルが表示されなくなります。"
 
 _imageEditing:
   _vars:
@@ -1791,6 +1790,12 @@ _serverSettings:
   entrancePageStyle: "エントランスページのスタイル"
   showTimelineForVisitor: "タイムラインを表示する"
   showActivitiesForVisitor: "アクティビティを表示する"
+  features: "機能"
+
+  _spReactions:
+    enable: "スペシャルリアクションを有効にする"
+    description1: "通常のリアクションより目立つ「スペシャルリアクション」をノートに送れる機能です。"
+    description2: "有効にする場合、ロールポリシーで、毎月送ることのできる最大数を設定してください。"
 
   _userGeneratedContentsVisibilityForVisitor:
     all: "全て公開"
@@ -2178,15 +2183,6 @@ _sensitiveMediaDetection:
   setSensitiveFlagAutomaticallyDescription: "この設定をオフにしても内部的に判定結果は保持されます。"
   analyzeVideos: "動画の解析を有効化"
   analyzeVideosDescription: "静止画に加えて動画も解析するようにします。サーバーの負荷が少し増えます。"
-  externalServiceInfo: "センシティブメディアの判定は外部サービス (sensitive-detector) に分離されました。この機能を利用するには、別途サイドカーサービスをセットアップし、下記の接続先を設定する必要があります。接続先が未設定の場合、判定は行われません (非センシティブ扱い)。"
-  apiUrl: "判定サービスの接続先URL"
-  apiUrlDescription: "sensitive-detector サービスのベースURL (例: http://localhost:3009)。プライベートネットワーク上のサービスに接続する場合は、設定ファイルの allowedPrivateNetworks で接続先ネットワークを許可してください。プロキシを使用している場合は、proxyBypassHosts も設定してください。空欄の場合、センシティブ判定は行われません。"
-  apiKey: "APIキー"
-  apiKeyDescription: "判定サービス側で認証 (Bearerトークン) を設定している場合に入力します。設定していない場合は空欄のままにしてください。"
-  timeout: "タイムアウト (ミリ秒)"
-  timeoutDescription: "判定リクエスト1回あたりのタイムアウト時間です。"
-  maxImagesPerRequest: "1リクエストあたりの最大画像数"
-  maxImagesPerRequestDescription: "動画など複数フレームを判定する際、1回のリクエストにまとめて送る画像の最大枚数です。これを超える分は分割して順次送信されます。sensitive-detector 側の maxParts 設定（デフォルト: 10）を超えないように設定してください。超えた場合、そのチャンクは全件非センシティブ扱いとなります。"
 
 _emailUnavailable:
   used: "既に使用されています"
@@ -2527,7 +2523,6 @@ _permissions:
   "read:admin:show-moderation-log": "モデレーションログを見る"
   "read:admin:show-user": "ユーザーのプライベートな情報を見る"
   "write:admin:suspend-user": "ユーザーを凍結する"
-  "write:admin:unset-mfa": "ユーザーの二要素認証を解除する"
   "write:admin:unset-user-avatar": "ユーザーのアバターを削除する"
   "write:admin:unset-user-banner": "ユーザーのバーナーを削除する"
   "write:admin:unsuspend-user": "ユーザーの凍結を解除する"
@@ -2915,6 +2910,7 @@ _notification:
     renote: "リノート"
     quote: "引用"
     reaction: "リアクション"
+    spReaction: "スペシャルリアクション"
     pollEnded: "アンケートが終了"
     scheduledNotePosted: "予約投稿が成功した"
     scheduledNotePostFailed: "予約投稿が失敗した"
@@ -3073,7 +3069,6 @@ _moderationLogTypes:
   createAvatarDecoration: "アイコンデコレーションを作成"
   updateAvatarDecoration: "アイコンデコレーションを更新"
   deleteAvatarDecoration: "アイコンデコレーションを削除"
-  unsetMfa: "ユーザーの二要素認証を解除"
   unsetUserAvatar: "ユーザーのアイコンを解除"
   unsetUserBanner: "ユーザーのバナーを解除"
   createSystemWebhook: "SystemWebhookを作成"

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2026.7.0-alpha.3",
+	"version": "2026.6.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@11.9.0",
+	"packageManager": "pnpm@11.5.2",
 	"workspaces": [
 		"packages/misskey-js",
 		"packages/i18n",
@@ -39,10 +39,11 @@
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"watch": "pnpm dev",
 		"dev": "node scripts/dev.mjs",
-		"check-dts": "node scripts/check-dts.mjs",
-		"lint": "pnpm --no-bail -r lint && pnpm check-dts",
-		"e2e": "pnpm start-server-and-test start:test http://localhost:61812 \"pnpm --filter frontend test:e2e\"",
-		"e2e-dev-container": "ncp ./.config/playwright-devcontainer.yml ./.config/test.yml && pnpm start-server-and-test start:test http://localhost:61812 \"pnpm --filter frontend test:e2e\"",
+		"lint": "pnpm --no-bail -r lint",
+		"cy:open": "pnpm cypress open --config-file=cypress.config.ts",
+		"cy:run": "pnpm cypress run",
+		"e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run",
+		"e2e-dev-container": "ncp ./.config/cypress-devcontainer.yml ./.config/test.yml && pnpm start-server-and-test start:test http://localhost:61812 cy:run",
 		"backend-unit-test": "cd packages/backend && pnpm test",
 		"backend-unit-test-and-coverage": "cd packages/backend && pnpm test-and-coverage",
 		"test": "pnpm -r test",
@@ -52,25 +53,33 @@
 		"cleanall": "pnpm clean-all"
 	},
 	"dependencies": {
+		"cssnano": "8.0.1",
 		"esbuild": "0.28.1",
 		"execa": "9.6.1",
-		"ignore-walk": "9.0.0",
-		"js-yaml": "5.2.0",
-		"tar": "7.5.19"
+		"ignore-walk": "8.0.0",
+		"js-yaml": "4.2.0",
+		"postcss": "8.5.15",
+		"tar": "7.5.16",
+		"terser": "5.48.0"
 	},
 	"devDependencies": {
 		"@eslint/js": "9.39.4",
 		"@misskey-dev/eslint-plugin": "2.1.0",
-		"@types/node": "26.0.1",
-		"@typescript-eslint/eslint-plugin": "8.62.0",
-		"@typescript-eslint/parser": "8.62.0",
+		"@types/js-yaml": "4.0.9",
+		"@types/node": "24.13.1",
+		"@typescript-eslint/eslint-plugin": "8.61.0",
+		"@typescript-eslint/parser": "8.61.0",
 		"@typescript/native-preview": "7.0.0-dev.20260426.1",
 		"cross-env": "10.1.0",
+		"cypress": "15.17.0",
 		"eslint": "9.39.4",
-		"globals": "17.7.0",
+		"globals": "17.6.0",
 		"ncp": "2.0.0",
-		"pnpm": "11.9.0",
-		"start-server-and-test": "3.0.11",
+		"pnpm": "11.5.2",
+		"start-server-and-test": "3.0.9",
 		"typescript": "5.9.3"
+	},
+	"optionalDependencies": {
+		"@tensorflow/tfjs-core": "4.22.0"
 	}
 }

packages/backend/migration/1769664628306-sp-reactions.js

@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class SpReactions1769664628306 {
+    name = 'SpReactions1769664628306'
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "note_sp_reaction" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "noteId" character varying(32) NOT NULL, "reaction" character varying(260) NOT NULL, "noteUserId" character varying(32) NOT NULL, CONSTRAINT "PK_11fd5ecdd9bb91517edfcf890d9" PRIMARY KEY ("id")); COMMENT ON COLUMN "note_sp_reaction"."noteUserId" IS '[Denormalized]'`);
+        await queryRunner.query(`CREATE INDEX "IDX_3463a48b09fa41e1826ebd9f58" ON "note_sp_reaction" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_bfe4caa46cc0526bc2932d6dbe" ON "note_sp_reaction" ("noteId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_8be6eb3f4edc9940a3f8142669" ON "note_sp_reaction" ("noteUserId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_b5f210b20bd987fe8584c85d33" ON "note_sp_reaction" ("userId", "noteId") `);
+        await queryRunner.query(`ALTER TABLE "meta" ADD "enableSpReaction" boolean NOT NULL DEFAULT false`);
+        await queryRunner.query(`ALTER TABLE "note_sp_reaction" ADD CONSTRAINT "FK_3463a48b09fa41e1826ebd9f585" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "note_sp_reaction" ADD CONSTRAINT "FK_bfe4caa46cc0526bc2932d6dbed" FOREIGN KEY ("noteId") REFERENCES "note"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    /**
+     * @param {QueryRunner} queryRunner
+     */
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note_sp_reaction" DROP CONSTRAINT "FK_bfe4caa46cc0526bc2932d6dbed"`);
+        await queryRunner.query(`ALTER TABLE "note_sp_reaction" DROP CONSTRAINT "FK_3463a48b09fa41e1826ebd9f585"`);
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "enableSpReaction"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b5f210b20bd987fe8584c85d33"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_8be6eb3f4edc9940a3f8142669"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_bfe4caa46cc0526bc2932d6dbe"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_3463a48b09fa41e1826ebd9f58"`);
+        await queryRunner.query(`DROP TABLE "note_sp_reaction"`);
+    }
+}

packages/backend/migration/1780488454126-sensitiveMediaDetectionExternalService.js

@@ -1,22 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class SensitiveMediaDetectionExternalService1780488454126 {
-	name = 'SensitiveMediaDetectionExternalService1780488454126'
-
-	async up(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetectionApiUrl" character varying(1024)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetectionApiKey" character varying(1024)`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetectionTimeout" integer NOT NULL DEFAULT '60000'`);
-		await queryRunner.query(`ALTER TABLE "meta" ADD "sensitiveMediaDetectionMaxImagesPerRequest" integer NOT NULL DEFAULT '4'`);
-	}
-
-	async down(queryRunner) {
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionMaxImagesPerRequest"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionTimeout"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionApiKey"`);
-		await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "sensitiveMediaDetectionApiUrl"`);
-	}
-}

packages/backend/migration/1782581064131-urlPreviewSensitiveList.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class UrlPreviewSensitiveList1782581064131 {
-    name = 'UrlPreviewSensitiveList1782581064131'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" ADD "urlPreviewSensitiveList" character varying(3072) array NOT NULL DEFAULT '{}'`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "urlPreviewSensitiveList"`);
-    }
-}

packages/backend/package.json

@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"engines": {
-		"node": "^22.22.2 || ^24.17.0 || ^26.4.0"
+		"node": "^22.15.0 || ^24.10.0"
 	},
 	"scripts": {
 		"start": "pnpm compile-config && node ./built/entry.js",
@@ -34,6 +34,8 @@
 		"generate-api-json": "pnpm compile-config && node ./scripts/generate_api_json.js"
 	},
 	"optionalDependencies": {
+		"@tensorflow/tfjs": "4.22.0",
+		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.1.0",
 		"slacc-android-arm-eabi": "0.1.5",
 		"slacc-android-arm64": "0.1.5",
@@ -51,8 +53,8 @@
 		"utf-8-validate": "6.0.6"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.1075.0",
-		"@aws-sdk/lib-storage": "3.1075.0",
+		"@aws-sdk/client-s3": "3.1065.0",
+		"@aws-sdk/lib-storage": "3.1065.0",
 		"@fastify/accepts": "5.0.4",
 		"@fastify/cors": "11.2.0",
 		"@fastify/http-proxy": "11.5.0",
@@ -61,24 +63,26 @@
 		"@kitajs/html": "4.2.13",
 		"@misskey-dev/emoji-assets": "17.0.3",
 		"@misskey-dev/emoji-data": "17.0.3",
-		"@misskey-dev/sharp-read-bmp": "1.3.1",
+		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.5.1",
-		"@napi-rs/canvas": "1.0.1",
-		"@nestjs/common": "11.1.27",
-		"@nestjs/core": "11.1.27",
-		"@nestjs/testing": "11.1.27",
-		"@oxc-project/runtime": "0.137.0",
+		"@napi-rs/canvas": "1.0.0",
+		"@nestjs/common": "11.1.26",
+		"@nestjs/core": "11.1.26",
+		"@nestjs/testing": "11.1.26",
+		"@oxc-project/runtime": "0.135.0",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "10.62.0",
-		"@sentry/profiling-node": "10.62.0",
-		"@simplewebauthn/server": "13.3.2",
-		"@smithy/node-http-handler": "4.8.2",
+		"@sentry/node": "10.57.0",
+		"@sentry/profiling-node": "10.57.0",
+		"@simplewebauthn/server": "13.3.1",
+		"@sinonjs/fake-timers": "15.4.0",
+		"@smithy/node-http-handler": "4.7.7",
 		"accepts": "1.3.8",
 		"ajv": "8.20.0",
 		"archiver": "8.0.0",
+		"async-mutex": "0.5.0",
 		"bcryptjs": "3.0.3",
 		"blurhash": "2.0.5",
-		"bullmq": "5.79.2",
+		"bullmq": "5.78.0",
 		"cacheable-lookup": "7.0.0",
 		"chalk": "5.6.2",
 		"chalk-template": "1.1.2",
@@ -87,12 +91,13 @@
 		"content-disposition": "2.0.1",
 		"date-fns": "4.4.0",
 		"deep-email-validator": "0.1.27",
-		"fastify": "5.9.0",
+		"fastify": "5.8.5",
 		"fastify-raw-body": "5.0.0",
 		"feed": "5.2.1",
 		"file-type": "22.0.1",
 		"fluent-ffmpeg": "2.1.3",
-		"got": "15.0.7",
+		"form-data": "4.0.6",
+		"got": "15.0.5",
 		"hpagent": "1.2.0",
 		"http-link-header": "1.1.3",
 		"i18n": "workspace:*",
@@ -102,39 +107,41 @@
 		"is-svg": "6.1.0",
 		"json5": "2.2.3",
 		"jsonld": "9.0.0",
-		"juice": "12.1.1",
+		"juice": "12.1.0",
 		"meilisearch": "0.58.0",
 		"mfm-js": "0.26.0",
 		"mime-types": "3.0.2",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.202508261828",
-		"nanoid": "5.1.16",
+		"nanoid": "5.1.11",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"node-html-parser": "8.0.3",
-		"nodemailer": "9.0.1",
+		"node-html-parser": "7.1.0",
+		"nodemailer": "8.0.10",
+		"nsfwjs": "4.3.0",
 		"os-utils": "0.0.14",
 		"otpauth": "9.5.1",
-		"pg": "8.22.0",
+		"pg": "8.21.0",
 		"pkce-challenge": "6.0.0",
 		"probe-image-size": "7.3.0",
 		"promise-limit": "2.7.0",
 		"qrcode": "1.5.4",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.25.0",
+		"re2": "1.24.1",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
-		"sanitize-html": "2.17.5",
+		"rxjs": "7.8.2",
+		"sanitize-html": "2.17.4",
 		"secure-json-parse": "4.1.0",
-		"semver": "7.8.5",
-		"sharp": "0.35.2",
+		"semver": "7.8.4",
+		"sharp": "0.33.5",
 		"slacc": "0.1.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.31.11",
+		"systeminformation": "5.31.7",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.7",
 		"tsc-alias": "1.8.17",
@@ -147,19 +154,19 @@
 	},
 	"devDependencies": {
 		"@kitajs/ts-html-plugin": "4.1.4",
-		"@nestjs/platform-express": "11.1.27",
+		"@nestjs/platform-express": "11.1.26",
 		"@rollup/plugin-esm-shim": "0.1.8",
-		"@sentry/vue": "10.62.0",
-		"@sinonjs/fake-timers": "15.4.0",
+		"@sentry/vue": "10.57.0",
 		"@types/accepts": "1.3.7",
 		"@types/archiver": "8.0.0",
 		"@types/fluent-ffmpeg": "2.1.28",
 		"@types/http-link-header": "1.0.7",
+		"@types/js-yaml": "4.0.9",
 		"@types/jsonld": "1.5.15",
 		"@types/mime-types": "3.0.1",
 		"@types/ms": "2.1.0",
-		"@types/node": "26.0.1",
-		"@types/nodemailer": "8.0.1",
+		"@types/node": "24.13.1",
+		"@types/nodemailer": "8.0.0",
 		"@types/pg": "8.20.0",
 		"@types/qrcode": "1.5.6",
 		"@types/random-seed": "0.3.5",
@@ -169,26 +176,28 @@
 		"@types/semver": "7.7.1",
 		"@types/simple-oauth2": "5.0.8",
 		"@types/sinonjs__fake-timers": "15.0.1",
+		"@types/supertest": "7.2.0",
 		"@types/tinycolor2": "1.4.6",
 		"@types/tmp": "0.2.6",
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.4",
 		"@types/ws": "8.18.1",
-		"@typescript-eslint/eslint-plugin": "8.62.0",
-		"@typescript-eslint/parser": "8.62.0",
-		"@vitest/coverage-v8": "4.1.9",
+		"@typescript-eslint/eslint-plugin": "8.61.0",
+		"@typescript-eslint/parser": "8.61.0",
+		"@vitest/coverage-v8": "4.1.8",
 		"aws-sdk-client-mock": "4.1.0",
-		"cbor2": "2.3.0",
+		"cbor": "10.0.12",
 		"cross-env": "10.1.0",
 		"eslint-plugin-import": "2.32.0",
 		"execa": "9.6.1",
 		"fkill": "10.0.3",
-		"js-yaml": "5.2.0",
+		"js-yaml": "4.2.0",
 		"pid-port": "2.1.1",
-		"rolldown": "1.1.3",
+		"rolldown": "1.1.0",
 		"simple-oauth2": "5.1.0",
-		"vite": "8.1.0",
-		"vitest": "4.1.9",
+		"supertest": "7.2.2",
+		"vite": "8.0.16",
+		"vitest": "4.1.8",
 		"vitest-mock-extended": "4.0.0"
 	}
 }

packages/backend/rolldown.config.ts

@@ -3,7 +3,6 @@ import { version as summalyVersion } from '@misskey-dev/summaly';
 import type { Plugin, ExternalOption } from 'rolldown';
 import { execa, execaNode } from 'execa';
 import type { ResultPromise } from 'execa';
-import fkill from 'fkill';
 import esmShim from '@rollup/plugin-esm-shim';
 
 /**
@@ -11,7 +10,6 @@ import esmShim from '@rollup/plugin-esm-shim';
  */
 function backendDevServerPlugin(): Plugin {
 	let backendProcess: ResultPromise | null = null;
-	let backendShutdownPromise: Promise<void> | null = null;
 
 	async function runBuildAssets() {
 		await execa('pnpm', ['run', 'build-assets'], {
@@ -22,31 +20,12 @@ function backendDevServerPlugin(): Plugin {
 	}
 
 	async function killBackendProcess() {
-		if (backendShutdownPromise) return backendShutdownPromise;
-		if (!backendProcess) return;
-
-		const processToKill = backendProcess;
-		backendProcess = null;
-		processToKill.catch(() => {}); // プロセスの終了によって発生する例外を無視するためにcatch()を呼び出す
-
-		backendShutdownPromise = (async () => {
-			if (process.platform === 'win32' && processToKill.pid != null) {
-				await fkill(processToKill.pid, {
-					force: true,
-					tree: true,
-					silent: true,
-					waitForExit: 5000,
-				});
-			} else {
-				processToKill.kill();
-			}
-
-			await processToKill.catch(() => {});
-		})().finally(() => {
-			backendShutdownPromise = null;
-		});
-
-		return backendShutdownPromise;
+		if (backendProcess) {
+			backendProcess.catch(() => {}); // backendProcess.kill()によって発生する例外を無視するためにcatch()を呼び出す
+			backendProcess.kill();
+			await new Promise(resolve => backendProcess!.on('exit', resolve));
+			backendProcess = null;
+		}
 	}
 
 	return {
@@ -70,9 +49,6 @@ function backendDevServerPlugin(): Plugin {
 				await runBuildAssets();
 			}
 		},
-		async closeWatcher() {
-			await killBackendProcess();
-		},
 	};
 }
 
@@ -91,6 +67,14 @@ export default defineConfig((args) => {
 		'@nestjs/microservices/microservices-module',
 		'@nestjs/microservices',
 		/^@napi-rs\/.*/,
+		// @tensorflow/tfjs-node はネイティブバインディングを持つため external 必須 (#17501)。
+		// あわせて nsfwjs と @tensorflow/* 全体を external にする。bundle 内の nsfwjs が
+		// 抱える @tensorflow/tfjs-core と、external な tfjs-node が使う tfjs-core が
+		// 別インスタンスに分裂すると、tfjs-node が登録する file:// IOHandler を nsfwjs 側が
+		// 共有できず、モデル読み込みが HTTP handler(node-fetch) にフォールバックして
+		// 「URL scheme "file" is not supported」で失敗するため。
+		/^@tensorflow\/.*/,
+		'nsfwjs',
 		'mock-aws-s3',
 		'aws-sdk',
 		'nock',
@@ -99,8 +83,6 @@ export default defineConfig((args) => {
 		're2',
 		'ipaddr.js',
 		'file-type',
-		// バンドルするとSentryの自動計装が正しく行われなくなるため外しておく
-		'pg',
 	];
 
 	const define: Record<string, string> = {

packages/backend/scripts/compile_config.js

@@ -11,7 +11,7 @@
 import fs from 'node:fs';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { load as loadYaml } from 'js-yaml';
+import yaml from 'js-yaml';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -34,7 +34,7 @@ function yamlToJson(ymlPath) {
 	console.log(`${ymlPath} → ${OUTPUT_PATH}`);
 
 	const yamlContent = fs.readFileSync(ymlPath, 'utf-8');
-	const jsonContent = loadYaml(yamlContent);
+	const jsonContent = yaml.load(yamlContent);
 	if (!fs.existsSync(dirname(OUTPUT_PATH))) {
 		fs.mkdirSync(dirname(OUTPUT_PATH), { recursive: true });
 	}

packages/backend/scripts/measure-memory.mts

@@ -10,7 +10,6 @@ import { dirname, join } from 'node:path';
 import { tmpdir } from 'node:os';
 //import * as http from 'node:http';
 import * as fs from 'node:fs/promises';
-import { heapSnapshotCategory, type HeapSnapshotData } from '../../../.github/scripts/heap-snapshot-util.mts';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -41,25 +40,48 @@ const REQUEST_COUNT = readIntegerEnv('MK_MEMORY_REQUEST_COUNT', 10, 0);
 const HEAP_SNAPSHOT = readBooleanEnv('MK_MEMORY_HEAP_SNAPSHOT', false);
 const HEAP_SNAPSHOT_TIMEOUT = readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_TIMEOUT_MS', 120000, 1);
 const HEAP_SNAPSHOT_BREAKDOWN_TOP_N = readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', 6, 1);
-const HEAP_SNAPSHOT_SAVE_PATH = process.env.MK_MEMORY_HEAP_SNAPSHOT_SAVE_PATH;
 
 const procStatusKeys = ['VmPeak', 'VmSize', 'VmHWM', 'VmRSS', 'VmData', 'VmStk', 'VmExe', 'VmLib', 'VmPTE', 'VmSwap'] as const;
 const smapsRollupKeys = ['Pss', 'Shared_Clean', 'Shared_Dirty', 'Private_Clean', 'Private_Dirty', 'Swap', 'SwapPss'] as const;
 
-type GcMessage = 'gc ok' | 'gc unavailable';
-type RuntimeMemoryUsageMessage = {
-	type: 'memory usage';
-	value: NodeJS.MemoryUsage;
-};
-type HeapSnapshotMessage = {
-	type: 'heap snapshot';
-	path?: string;
-};
-type HeapSnapshotErrorMessage = {
-	type: 'heap snapshot error';
-	message: string;
-};
-type HeapSnapshotResponseMessage = HeapSnapshotMessage | HeapSnapshotErrorMessage;
+const heapSnapshotCategories = [
+	'Code',
+	'Strings',
+	'JS arrays',
+	'Typed arrays',
+	'System objects',
+	'Other JS objects',
+	'Other non-JS objects',
+	'Total',
+];
+
+const typedArrayNames = new Set([
+	'ArrayBuffer',
+	'SharedArrayBuffer',
+	'DataView',
+	'Int8Array',
+	'Uint8Array',
+	'Uint8ClampedArray',
+	'Int16Array',
+	'Uint16Array',
+	'Int32Array',
+	'Uint32Array',
+	'Float16Array',
+	'Float32Array',
+	'Float64Array',
+	'BigInt64Array',
+	'BigUint64Array',
+	'system / JSArrayBufferData',
+]);
+
+const otherJsNodeTypes = new Set([
+	'object',
+	'closure',
+	'regexp',
+	'number',
+	'symbol',
+	'bigint',
+]);
 
 function parseMemoryFile<KS extends readonly string[]>(content: string, keys: KS, path: string, required: boolean): Record<KS[number], number> {
 	const result = {} as Record<KS[number], number>;
@@ -79,6 +101,33 @@ function bytesToKiB(value: number) {
 	return Math.round(value / 1024);
 }
 
+function createEmptyHeapSnapshotCategoryMap() {
+	return Object.fromEntries(heapSnapshotCategories.map(category => [category, 0]));
+}
+
+function isTypedArrayNode(type, name) {
+	return typedArrayNames.has(name) ||
+		(type === 'native' && (name.includes('ArrayBuffer') || name.includes('TypedArray')));
+}
+
+function isSystemNode(type, name) {
+	return type === 'hidden' ||
+		type === 'synthetic' ||
+		type === 'object shape' ||
+		name.startsWith('system /') ||
+		name.startsWith('(system ');
+}
+
+function classifyHeapSnapshotNode(type, name) {
+	if (type === 'code') return 'Code';
+	if (type === 'string' || type === 'concatenated string' || type === 'sliced string') return 'Strings';
+	if (isTypedArrayNode(type, name)) return 'Typed arrays';
+	if (type === 'array' || (type === 'object' && name === 'Array')) return 'JS arrays';
+	if (isSystemNode(type, name)) return 'System objects';
+	if (otherJsNodeTypes.has(type)) return 'Other JS objects';
+	return 'Other non-JS objects';
+}
+
 function sanitizeHeapSnapshotBreakdownLabel(value, fallback = 'unknown') {
 	const label = String(value ?? '').replace(/\s+/g, ' ').trim();
 	if (label === '') return fallback;
@@ -86,38 +135,41 @@ function sanitizeHeapSnapshotBreakdownLabel(value, fallback = 'unknown') {
 	return `${label.slice(0, 77)}...`;
 }
 
-function classifyHeapSnapshotBreakdown(category: keyof typeof heapSnapshotCategory, type, name) {
-	if (category === 'strings') return type;
+function classifyHeapSnapshotBreakdown(category, type, name) {
+	if (category === 'Strings') return type;
 
-	if (category === 'jsArrays') {
-		if (type === 'array elements') return 'Array elements';
+	if (category === 'JS arrays') {
+		if (type === 'array') return 'array nodes';
 		if (type === 'object' && name === 'Array') return 'Array objects';
 		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
 	}
 
-	if (category === 'typedArrays') {
+	if (category === 'Typed arrays') {
 		if (name === 'system / JSArrayBufferData') return 'ArrayBuffer data';
+		if (name === 'Uint8Array') return 'Uint8Array / Buffer';
+		if (typedArrayNames.has(name)) return name;
+		if (type === 'native' && name.includes('ArrayBuffer')) return 'native ArrayBuffer';
+		if (type === 'native' && name.includes('TypedArray')) return 'native TypedArray';
 		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
 	}
 
-	if (category === 'systemObjects') {
+	if (category === 'System objects') {
 		if (name.startsWith('system /')) return sanitizeHeapSnapshotBreakdownLabel(name);
 		if (name.startsWith('(system ')) return sanitizeHeapSnapshotBreakdownLabel(name);
 		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
 	}
 
-	if (category === 'otherJsObjects') {
+	if (category === 'Other JS objects') {
 		if (type === 'object') return sanitizeHeapSnapshotBreakdownLabel(`object: ${name}`, 'object: unknown');
 		return type;
 	}
 
-	if (category === 'otherNonJsObjects') {
-		if (type === 'extra native bytes') return 'Extra native bytes';
+	if (category === 'Other non-JS objects') {
 		if (type === 'native') return sanitizeHeapSnapshotBreakdownLabel(`native: ${name}`, 'native: unknown');
 		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
 	}
 
-	if (category === 'code') {
+	if (category === 'Code') {
 		const lowerName = name.toLowerCase();
 		if (lowerName.includes('bytecode')) return 'bytecode';
 		if (lowerName.includes('builtin')) return 'builtins';
@@ -129,8 +181,8 @@ function classifyHeapSnapshotBreakdown(category: keyof typeof heapSnapshotCatego
 	return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
 }
 
-function collapseHeapSnapshotBreakdown(breakdowns: Record<string, Record<string, number>>) {
-	const collapsed = {} as Record<string, Record<string, number>>;
+function collapseHeapSnapshotBreakdown(breakdowns) {
+	const collapsed = {};
 
 	for (const [category, children] of Object.entries(breakdowns)) {
 		const entries = Object.entries(children)
@@ -150,61 +202,33 @@ function collapseHeapSnapshotBreakdown(breakdowns: Record<string, Record<string,
 	return collapsed;
 }
 
-// Keep these buckets aligned with Chrome DevTools' heap snapshot Statistics view.
 function analyzeHeapSnapshot(snapshot) {
 	const meta = snapshot?.snapshot?.meta;
 	const nodes = snapshot?.nodes;
-	const edges = snapshot?.edges;
 	const strings = snapshot?.strings;
-	if (meta == null || !Array.isArray(nodes) || !Array.isArray(edges) || !Array.isArray(strings)) {
+	if (meta == null || !Array.isArray(nodes) || !Array.isArray(strings)) {
 		throw new Error('Invalid heap snapshot format');
 	}
 
 	const nodeFields = meta.node_fields;
 	if (!Array.isArray(nodeFields)) throw new Error('Invalid heap snapshot node fields');
-	const edgeFields = meta.edge_fields;
-	if (!Array.isArray(edgeFields)) throw new Error('Invalid heap snapshot edge fields');
 
 	const typeOffset = nodeFields.indexOf('type');
 	const nameOffset = nodeFields.indexOf('name');
 	const selfSizeOffset = nodeFields.indexOf('self_size');
-	const edgeCountOffset = nodeFields.indexOf('edge_count');
-	if (typeOffset < 0 || nameOffset < 0 || selfSizeOffset < 0 || edgeCountOffset < 0) {
+	if (typeOffset < 0 || nameOffset < 0 || selfSizeOffset < 0) {
 		throw new Error('Heap snapshot is missing required node fields');
 	}
-	const edgeTypeOffset = edgeFields.indexOf('type');
-	const edgeNameOffset = edgeFields.indexOf('name_or_index');
-	const edgeToNodeOffset = edgeFields.indexOf('to_node');
-	if (edgeTypeOffset < 0 || edgeNameOffset < 0 || edgeToNodeOffset < 0) {
-		throw new Error('Heap snapshot is missing required edge fields');
-	}
 
 	const nodeTypeNames = meta.node_types?.[typeOffset];
 	if (!Array.isArray(nodeTypeNames)) throw new Error('Invalid heap snapshot node types');
-	const edgeTypeNames = meta.edge_types?.[edgeTypeOffset];
-	if (!Array.isArray(edgeTypeNames)) throw new Error('Invalid heap snapshot edge types');
 
-	function createEmptyHeapSnapshotCategoryMap() {
-		return Object.fromEntries(Object.keys(heapSnapshotCategory).map(category => [category, 0])) as Record<keyof typeof heapSnapshotCategory, number>;
-	}
-
-	const nodeFieldCount = nodeFields.length;
-	const edgeFieldCount = edgeFields.length;
-	const nativeType = nodeTypeNames.indexOf('native');
-	const codeType = nodeTypeNames.indexOf('code');
-	const hiddenType = nodeTypeNames.indexOf('hidden');
-	const stringTypes = new Set([
-		nodeTypeNames.indexOf('string'),
-		nodeTypeNames.indexOf('concatenated string'),
-		nodeTypeNames.indexOf('sliced string'),
-	]);
-	const internalEdgeType = edgeTypeNames.indexOf('internal');
-	const extraNativeBytes = Number.isFinite(snapshot.snapshot.extra_native_bytes) ? snapshot.snapshot.extra_native_bytes : 0;
+	const fieldCount = nodeFields.length;
 	const categories = createEmptyHeapSnapshotCategoryMap();
 	const nodeCounts = createEmptyHeapSnapshotCategoryMap();
 	const breakdowns = Object.fromEntries(
-		(Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[])
-			.filter(category => category !== 'total')
+		heapSnapshotCategories
+			.filter(category => category !== 'Total')
 			.map(category => [category, {}]),
 	);
 
@@ -212,104 +236,17 @@ function analyzeHeapSnapshot(snapshot) {
 		map[key] = (map[key] ?? 0) + value;
 	}
 
-	const edgeStartIndexes = new Map<number, number>();
-	const retainerCounts = new Map<number, number>();
-	let edgeIndex = 0;
-	for (let nodeIndex = 0; nodeIndex < nodes.length; nodeIndex += nodeFieldCount) {
-		edgeStartIndexes.set(nodeIndex, edgeIndex);
-		const edgeCount = nodes[nodeIndex + edgeCountOffset] ?? 0;
-		for (let i = 0; i < edgeCount; i++, edgeIndex += edgeFieldCount) {
-			const toNodeIndex = edges[edgeIndex + edgeToNodeOffset];
-			retainerCounts.set(toNodeIndex, (retainerCounts.get(toNodeIndex) ?? 0) + 1);
-		}
-	}
+	for (let offset = 0; offset < nodes.length; offset += fieldCount) {
+		const type = nodeTypeNames[nodes[offset + typeOffset]] ?? 'unknown';
+		const name = strings[nodes[offset + nameOffset]] ?? '';
+		const selfSize = nodes[offset + selfSizeOffset] ?? 0;
+		const category = classifyHeapSnapshotNode(type, name);
 
-	const jsArrayElementNodeIndexes = new Set<number>();
-
-	function addCategoryValue(category: keyof typeof heapSnapshotCategory, value: number, type: string, name: string, nodeIndex: number | null = null) {
-		if (value <= 0) return;
-		categories[category] += value;
-		addValue(breakdowns[category], classifyHeapSnapshotBreakdown(category, type, name), value);
-		if (nodeIndex != null) nodeCounts[category]++;
-	}
-
-	function addJsArrayElementSize(nodeIndex: number) {
-		const beginEdgeIndex = edgeStartIndexes.get(nodeIndex) ?? 0;
-		const edgeCount = nodes[nodeIndex + edgeCountOffset] ?? 0;
-		for (let i = 0, currentEdgeIndex = beginEdgeIndex; i < edgeCount; i++, currentEdgeIndex += edgeFieldCount) {
-			const edgeType = edges[currentEdgeIndex + edgeTypeOffset];
-			if (edgeType !== internalEdgeType) continue;
-
-			const edgeName = strings[edges[currentEdgeIndex + edgeNameOffset]];
-			if (edgeName !== 'elements') continue;
-
-			const elementsNodeIndex = edges[currentEdgeIndex + edgeToNodeOffset];
-			if ((retainerCounts.get(elementsNodeIndex) ?? 0) === 1) {
-				const elementsSize = nodes[elementsNodeIndex + selfSizeOffset] ?? 0;
-				addCategoryValue('jsArrays', elementsSize, 'array elements', 'Array elements', elementsNodeIndex);
-				jsArrayElementNodeIndexes.add(elementsNodeIndex);
-			}
-			break;
-		}
-	}
-
-	if (extraNativeBytes > 0) {
-		addCategoryValue('otherNonJsObjects', extraNativeBytes, 'extra native bytes', 'extra native bytes');
-	}
-
-	for (let nodeIndex = 0; nodeIndex < nodes.length; nodeIndex += nodeFieldCount) {
-		const typeId = nodes[nodeIndex + typeOffset];
-		const type = nodeTypeNames[typeId] ?? 'unknown';
-		const name = strings[nodes[nodeIndex + nameOffset]] ?? '';
-		const selfSize = nodes[nodeIndex + selfSizeOffset] ?? 0;
-		categories.total += selfSize;
-		nodeCounts.total++;
-
-		if (typeId === hiddenType) {
-			addCategoryValue('systemObjects', selfSize, type, name, nodeIndex);
-			continue;
-		}
-
-		if (typeId === nativeType) {
-			if (name === 'system / JSArrayBufferData') {
-				addCategoryValue('typedArrays', selfSize, type, name, nodeIndex);
-			} else {
-				addCategoryValue('otherNonJsObjects', selfSize, type, name, nodeIndex);
-			}
-			continue;
-		}
-
-		if (typeId === codeType) {
-			addCategoryValue('code', selfSize, type, name, nodeIndex);
-			continue;
-		}
-
-		if (stringTypes.has(typeId)) {
-			addCategoryValue('strings', selfSize, type, name, nodeIndex);
-			continue;
-		}
-
-		if (name === 'Array') {
-			addCategoryValue('jsArrays', selfSize, type, name, nodeIndex);
-			addJsArrayElementSize(nodeIndex);
-			continue;
-		}
-	}
-
-	categories.total += extraNativeBytes;
-
-	for (let nodeIndex = 0; nodeIndex < nodes.length; nodeIndex += nodeFieldCount) {
-		if (jsArrayElementNodeIndexes.has(nodeIndex)) continue;
-
-		const typeId = nodes[nodeIndex + typeOffset];
-		if (typeId === hiddenType || typeId === nativeType || typeId === codeType || stringTypes.has(typeId)) continue;
-
-		const name = strings[nodes[nodeIndex + nameOffset]] ?? '';
-		if (name === 'Array') continue;
-
-		const type = nodeTypeNames[typeId] ?? 'unknown';
-		const selfSize = nodes[nodeIndex + selfSizeOffset] ?? 0;
-		addCategoryValue('otherJsObjects', selfSize, type, name, nodeIndex);
+		categories[category] += selfSize;
+		categories.Total += selfSize;
+		nodeCounts[category]++;
+		nodeCounts.Total++;
+		addValue(breakdowns[category], classifyHeapSnapshotBreakdown(category, type, name), selfSize);
 	}
 
 	return {
@@ -331,32 +268,14 @@ async function getSmapsRollupMemoryUsage(pid: number) {
 	return parseMemoryFile(smapsRollup, smapsRollupKeys, path, false);
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return value != null && typeof value === 'object';
-}
-
-function isGcMessage(message: unknown): message is GcMessage {
-	return message === 'gc ok' || message === 'gc unavailable';
-}
-
-function isRuntimeMemoryUsageMessage(message: unknown): message is RuntimeMemoryUsageMessage {
-	return isRecord(message) && message.type === 'memory usage' && isRecord(message.value);
-}
-
-function isHeapSnapshotResponseMessage(message: unknown): message is HeapSnapshotResponseMessage {
-	if (!isRecord(message)) return false;
-	if (message.type === 'heap snapshot') return true;
-	return message.type === 'heap snapshot error' && typeof message.message === 'string';
-}
-
-function waitForMessage<T>(serverProcess: ChildProcess, predicate: (message: unknown) => message is T, description: string, timeout = IPC_TIMEOUT) {
-	return new Promise<T>((resolve, reject) => {
+function waitForMessage(serverProcess, predicate, description, timeout = IPC_TIMEOUT) {
+	return new Promise((resolve, reject) => {
 		const timer = globalThis.setTimeout(() => {
 			serverProcess.off('message', onMessage);
 			reject(new Error(`Timed out waiting for ${description}`));
 		}, timeout);
 
-		const onMessage = (message: unknown) => {
+		const onMessage = (message) => {
 			if (!predicate(message)) return;
 			globalThis.clearTimeout(timer);
 			serverProcess.off('message', onMessage);
@@ -370,7 +289,7 @@ function waitForMessage<T>(serverProcess: ChildProcess, predicate: (message: unk
 async function getRuntimeMemoryUsage(serverProcess: ChildProcess) {
 	const response = waitForMessage(
 		serverProcess,
-		isRuntimeMemoryUsageMessage,
+		message => message != null && typeof message === 'object' && message.type === 'memory usage',
 		'memory usage',
 	);
 
@@ -387,13 +306,13 @@ async function getRuntimeMemoryUsage(serverProcess: ChildProcess) {
 	};
 }
 
-async function getHeapSnapshotStatistics(serverProcess: ChildProcess): Promise<HeapSnapshotData | null> {
+async function getHeapSnapshotStatistics(serverProcess: ChildProcess) {
 	if (!HEAP_SNAPSHOT) return null;
 
 	const snapshotPath = join(tmpdir(), `misskey-backend-heap-${process.pid}-${serverProcess.pid}-${Date.now()}.heapsnapshot`);
 	const response = waitForMessage(
 		serverProcess,
-		isHeapSnapshotResponseMessage,
+		message => message != null && typeof message === 'object' && (message.type === 'heap snapshot' || message.type === 'heap snapshot error'),
 		'heap snapshot',
 		HEAP_SNAPSHOT_TIMEOUT,
 	);
@@ -411,11 +330,6 @@ async function getHeapSnapshotStatistics(serverProcess: ChildProcess): Promise<H
 	const writtenPath = typeof message.path === 'string' ? message.path : snapshotPath;
 
 	try {
-		if (HEAP_SNAPSHOT_SAVE_PATH != null && HEAP_SNAPSHOT_SAVE_PATH !== '') {
-			await fs.mkdir(dirname(HEAP_SNAPSHOT_SAVE_PATH), { recursive: true });
-			await fs.copyFile(writtenPath, HEAP_SNAPSHOT_SAVE_PATH);
-		}
-
 		const snapshot = JSON.parse(await fs.readFile(writtenPath, 'utf-8'));
 		return analyzeHeapSnapshot(snapshot);
 	} finally {
@@ -475,7 +389,7 @@ async function measureMemory() {
 	async function triggerGc() {
 		const ok = waitForMessage(
 			serverProcess,
-			isGcMessage,
+			message => message === 'gc ok' || message === 'gc unavailable',
 			'GC completion',
 		);
 

packages/backend/src/@types/probe-image-size.d.ts

@@ -26,6 +26,7 @@ declare module 'probe-image-size' {
 	function probeImageSize(src: string | ReadStream, callback: (err: Error | null, result?: ProbeResult) => void): void;
 	function probeImageSize(src: string | ReadStream, options: ProbeOptions, callback: (err: Error | null, result?: ProbeResult) => void): void;
 
-	// eslint-disable-next-line import/no-default-export
-	export { probeImageSize as default };
+	namespace probeImageSize {} // Hack
+
+	export = probeImageSize;
 }

packages/backend/src/boot/master.ts

@@ -13,7 +13,6 @@ import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { envOption } from '@/env.js';
-import { initTelemetry } from '@/core/telemetry/telemetry-registry.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
 
 const logger = new Logger('core', 'cyan');
@@ -67,7 +66,26 @@ export async function masterMain() {
 
 	initExtraThreadPool(config);
 
-	await initTelemetry(config);
+	if (config.sentryForBackend) {
+		const Sentry = await import('@sentry/node');
+		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
+
+		Sentry.init({
+			integrations: [
+				...(config.sentryForBackend.enableNodeProfiling ? [nodeProfilingIntegration()] : []),
+			],
+
+			// Performance Monitoring
+			tracesSampleRate: 1.0, //  Capture 100% of the transactions
+
+			// Set sampling rate for profiling - this is relative to tracesSampleRate
+			profilesSampleRate: 1.0,
+
+			maxBreadcrumbs: 0,
+
+			...config.sentryForBackend.options,
+		});
+	}
 
 	bootLogger.info(
 		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`,

packages/backend/src/boot/worker.ts

@@ -6,7 +6,6 @@
 import cluster from 'node:cluster';
 import { envOption } from '@/env.js';
 import { loadConfig } from '@/config.js';
-import { initTelemetry } from '@/core/telemetry/telemetry-registry.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
 
 /**
@@ -17,7 +16,26 @@ export async function workerMain() {
 
 	initExtraThreadPool(config);
 
-	await initTelemetry(config);
+	if (config.sentryForBackend) {
+		const Sentry = await import('@sentry/node');
+		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
+
+		Sentry.init({
+			integrations: [
+				...(config.sentryForBackend.enableNodeProfiling ? [nodeProfilingIntegration()] : []),
+			],
+
+			// Performance Monitoring
+			tracesSampleRate: 1.0, //  Capture 100% of the transactions
+
+			// Set sampling rate for profiling - this is relative to tracesSampleRate
+			profilesSampleRate: 1.0,
+
+			maxBreadcrumbs: 0,
+
+			...config.sentryForBackend.options,
+		});
+	}
 
 	if (envOption.onlyServer) {
 		await server();

packages/backend/src/config.ts

@@ -20,12 +20,6 @@ type RedisOptionsSource = Partial<RedisOptions> & {
 	prefix?: string;
 };
 
-type SentryBackendConfig = {
-	options: Partial<Sentry.NodeOptions>;
-	enableNodeProfiling: boolean;
-	disabledIntegrations?: string[];
-};
-
 /**
  * 設定ファイルの型
  */
@@ -70,7 +64,7 @@ type Source = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	};
-	sentryForBackend?: SentryBackendConfig;
+	sentryForBackend?: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; };
 	sentryForFrontend?: {
 		options: Partial<SentryVue.BrowserOptions> & { dsn: string };
 		vueIntegration?: SentryVue.VueIntegrationOptions | null;
@@ -207,7 +201,7 @@ export type Config = {
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
 	redisForTimelines: RedisOptions & RedisOptionsSource;
 	redisForReactions: RedisOptions & RedisOptionsSource;
-	sentryForBackend: SentryBackendConfig | undefined;
+	sentryForBackend: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; } | undefined;
 	sentryForFrontend: {
 		options: Partial<SentryVue.BrowserOptions> & { dsn: string };
 		vueIntegration?: SentryVue.VueIntegrationOptions | null;

packages/backend/src/core/AiService.ts

@@ -3,186 +3,92 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import * as fs from 'node:fs';
+import { pathToFileURL } from 'node:url';
+import { resolve } from 'node:path';
 import { Injectable, Inject } from '@nestjs/common';
+import { Mutex } from 'async-mutex';
 import fetch from 'node-fetch';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { HttpRequestService } from '@/core/HttpRequestService.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import type { MiMeta } from '@/models/_.js';
-import type Logger from '@/logger.js';
+import type { Config } from '@/config.js';
+import type { NSFWJS, PredictionType } from 'nsfwjs/core';
 
-/**
- * 正規化済み画像に対する nsfwjs 互換の予測値。
- * 推論自体は外部サービス (sensitive-detector) が行い、本体はその生の値を受け取って判定する。
- */
-export type Prediction = {
-	className: string;
-	probability: number;
-};
-
-type BatchItemResult =
-	| { success: true; predictions: Prediction[] }
-	| { success: false; error: { code: string; message: string } };
-
-type DetectImagesResponse =
-	| { success: true; result: { results: BatchItemResult[] } }
-	| { success: false; error: { code: string; message: string } };
-
-// #region type guards
-function isPrediction(v: unknown): v is Prediction {
-	if (typeof v !== 'object' || v === null) return false;
-	const obj = v as Record<string, unknown>;
-	return typeof obj['className'] === 'string' && typeof obj['probability'] === 'number';
-}
-
-function isBatchItemResult(v: unknown): v is BatchItemResult {
-	if (typeof v !== 'object' || v === null) return false;
-	const obj = v as Record<string, unknown>;
-	if (obj['success'] === true) {
-		return Array.isArray(obj['predictions']) && (obj['predictions'] as unknown[]).every(isPrediction);
-	}
-	if (obj['success'] === false) {
-		const error = obj['error'];
-		return typeof error === 'object' && error !== null && typeof (error as Record<string, unknown>)['code'] === 'string';
-	}
-	return false;
-}
-
-function isDetectImagesResponse(v: unknown): v is DetectImagesResponse {
-	if (typeof v !== 'object' || v === null) return false;
-	const obj = v as Record<string, unknown>;
-	if (obj['success'] === true) {
-		const result = obj['result'];
-		if (typeof result !== 'object' || result === null) return false;
-		const results = (result as Record<string, unknown>)['results'];
-		return Array.isArray(results) && (results as unknown[]).every(isBatchItemResult);
-	}
-	if (obj['success'] === false) {
-		const error = obj['error'];
-		return typeof error === 'object' && error !== null && typeof (error as Record<string, unknown>)['code'] === 'string';
-	}
-	return false;
-}
-// #endregion
-
-// サイドカーの判定エンドポイント。baseUrl にパスプレフィックスがあっても連結できるよう先頭スラッシュは付けない。
-const DETECT_IMAGES_PATH = 'v1/detect-images';
+const REQUIRED_CPU_FLAGS_X64 = ['avx2', 'fma'];
+let isSupportedCpu: undefined | boolean = undefined;
 
 @Injectable()
 export class AiService {
-	private logger: Logger;
+	private readonly modelDir: string;
+	private model: NSFWJS;
+	private modelLoadMutex: Mutex = new Mutex();
 
 	constructor(
-		@Inject(DI.meta)
-		private meta: MiMeta,
-
-		private httpRequestService: HttpRequestService,
-		private loggerService: LoggerService,
+		@Inject(DI.config)
+		private config: Config,
 	) {
-		this.logger = this.loggerService.getLogger('ai');
+		const md = resolve(this.config.rootDir, 'packages/backend/nsfw-model');
+		this.modelDir = md.endsWith('/') ? md : md + '/';
 	}
 
-	/**
-	 * 正規化済み画像 1 枚を外部サービスに送り、生の予測値を得る。
-	 * 接続先未設定・通信失敗・タイムアウト時は null（= 非センシティブ扱い）を返す。
-	 */
 	@bindThis
-	public async detectSensitive(source: Buffer): Promise<Prediction[] | null> {
-		return (await this.detectSensitiveMany([source]))[0] ?? null;
-	}
-
-	/**
-	 * 複数の正規化済み画像をまとめて外部サービスに送る。
-	 * maxImagesPerRequest 枚ごとにチャンク分割して順次送信し、送信順を保った結果配列を返す。
-	 * 接続先未設定・通信失敗・タイムアウト時は該当分を null（= 非センシティブ扱い）にしてフォールバックする
-	 * （API 呼び出し失敗時はセンシティブではない判定とする方針: misskey-dev/misskey#16804）。
-	 */
-	@bindThis
-	public async detectSensitiveMany(sources: Buffer[]): Promise<(Prediction[] | null)[]> {
-		if (sources.length === 0) return [];
-
-		const baseUrl = this.meta.sensitiveMediaDetectionApiUrl;
-		if (baseUrl == null || baseUrl.trim() === '') {
-			// 接続先が未設定なら検出不能。全件 null（非センシティブ扱い）を返す。
-			return sources.map(() => null);
-		}
-
-		const apiKey = this.meta.sensitiveMediaDetectionApiKey;
-		const timeout = this.meta.sensitiveMediaDetectionTimeout;
-		const chunkSize = Math.max(1, this.meta.sensitiveMediaDetectionMaxImagesPerRequest);
-
-		const base = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
-		let url: string;
+	public async detectSensitive(source: string | Buffer): Promise<PredictionType[] | null> {
 		try {
-			url = new URL(DETECT_IMAGES_PATH, base).href;
-		} catch {
-			this.logger.warn(`invalid sensitiveMediaDetectionApiUrl: ${baseUrl}`);
-			return sources.map(() => null);
-		}
-
-		const results: (Prediction[] | null)[] = [];
-		for (let i = 0; i < sources.length; i += chunkSize) {
-			const chunk = sources.slice(i, i + chunkSize);
-			results.push(...await this.detectChunk(url, apiKey, timeout, chunk));
-		}
-		return results;
-	}
-
-	@bindThis
-	private async detectChunk(url: string, apiKey: string | null, timeout: number, chunk: Buffer[]): Promise<(Prediction[] | null)[]> {
-		const controller = new AbortController();
-		const timer = setTimeout(() => controller.abort(), timeout);
-
-		try {
-			const form = new FormData();
-			for (let i = 0; i < chunk.length; i++) {
-				const image = Uint8Array.from(chunk[i]);
-				form.append(`image${i}`, new Blob([image], { type: 'image/png' }), `${i}.png`);
+			if (isSupportedCpu === undefined) {
+				isSupportedCpu = await this.computeIsSupportedCpu();
 			}
 
-			// Content-Type は FormData から boundary 付きで自動設定させるため、手動設定はしない。
-			// 手動指定すると boundary の欠落・不一致で multipart として読めなくなる。
-			const headers: Record<string, string> = {};
-			if (apiKey != null && apiKey !== '') {
-				headers['Authorization'] = `Bearer ${apiKey}`;
+			if (!isSupportedCpu) {
+				console.error('This CPU cannot use TensorFlow.');
+				return null;
 			}
 
-			const res = await fetch(url, {
-				method: 'POST',
-				headers,
-				body: form,
-				// 外部サービスとして通常の proxy / private address 制限を適用する。
-				// サイドカーへの private network 接続は allowedPrivateNetworks 等で明示的に許可する。
-				agent: (u) => this.httpRequestService.getAgentByUrl(u),
-				signal: controller.signal,
-			});
+			const tf = await import('@tensorflow/tfjs-node');
+			tf.env().global.fetch = fetch;
 
-			if (!res.ok) {
-				this.logger.warn(`sensitive detection request failed: ${res.status} ${res.statusText}`);
-				return chunk.map(() => null);
+			if (this.model == null) {
+				const nsfw = await import('nsfwjs/core');
+				await this.modelLoadMutex.runExclusive(async () => {
+					if (this.model == null) {
+						this.model = await nsfw.load(pathToFileURL(this.modelDir).toString(), { size: 299 });
+					}
+				});
 			}
 
-			const body = await res.json();
-			if (!isDetectImagesResponse(body)) {
-				this.logger.warn(`sensitive detection responded with unexpected shape: ${JSON.stringify(body)}`);
-				return chunk.map(() => null);
+			const buffer = source instanceof Buffer ? source : await fs.promises.readFile(source);
+			const image = await tf.node.decodeImage(buffer, 3) as any;
+			try {
+				const predictions = await this.model.classify(image);
+				return predictions;
+			} finally {
+				image.dispose();
 			}
-			if (!body.success) {
-				this.logger.warn(`sensitive detection responded with failure: ${body.error.code}`);
-				return chunk.map(() => null);
-			}
-
-			const items = body.result.results;
-			return chunk.map((_, i) => {
-				const item = items[i];
-				return (item.success) ? item.predictions : null;
-			});
 		} catch (err) {
-			this.logger.warn(`sensitive detection error: ${err instanceof Error ? err.message : String(err)}`);
-			return chunk.map(() => null);
-		} finally {
-			clearTimeout(timer);
+			console.error(err);
+			return null;
 		}
 	}
+
+	private async computeIsSupportedCpu(): Promise<boolean> {
+		switch (process.arch) {
+			case 'x64': {
+				const cpuFlags = await this.getCpuFlags();
+				return REQUIRED_CPU_FLAGS_X64.every(required => cpuFlags.includes(required));
+			}
+			case 'arm64': {
+				// As far as I know, no required CPU flags for ARM64.
+				return true;
+			}
+			default: {
+				return false;
+			}
+		}
+	}
+
+	@bindThis
+	private async getCpuFlags(): Promise<string[]> {
+		const si = await import('systeminformation');
+		const str = await si.cpuFlags();
+		return str.split(/\s+/);
+	}
 }

packages/backend/src/core/CoreModule.ts

@@ -154,12 +154,10 @@ import { ApQuestionService } from './activitypub/models/ApQuestionService.js';
 import { QueueModule } from './QueueModule.js';
 import { QueueService } from './QueueService.js';
 import { LoggerService } from './LoggerService.js';
-import { TelemetryService } from './telemetry/TelemetryService.js';
 import type { Provider } from '@nestjs/common';
 
 //#region 文字列ベースでのinjection用(循環参照対応のため)
 const $LoggerService: Provider = { provide: 'LoggerService', useExisting: LoggerService };
-const $TelemetryService: Provider = { provide: 'TelemetryService', useExisting: TelemetryService };
 const $AbuseReportService: Provider = { provide: 'AbuseReportService', useExisting: AbuseReportService };
 const $AbuseReportNotificationService: Provider = { provide: 'AbuseReportNotificationService', useExisting: AbuseReportNotificationService };
 const $AccountMoveService: Provider = { provide: 'AccountMoveService', useExisting: AccountMoveService };
@@ -460,7 +458,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
-		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -609,7 +606,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ApNoteService,
 		$ApPersonService,
 		$ApQuestionService,
-		$TelemetryService,
 		//#endregion
 	],
 	exports: [
@@ -761,7 +757,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
-		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -908,7 +903,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ApNoteService,
 		$ApPersonService,
 		$ApQuestionService,
-		$TelemetryService,
 		//#endregion
 	],
 })

packages/backend/src/core/DriveService.ts

@@ -7,7 +7,6 @@ import { randomUUID } from 'node:crypto';
 import * as fs from 'node:fs';
 import { Inject, Injectable } from '@nestjs/common';
 import sharp from 'sharp';
-import type { Sharp } from 'sharp';
 import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
 import { In, IsNull } from 'typeorm';
 import { DeleteObjectCommandInput, PutObjectCommandInput, NoSuchKey } from '@aws-sdk/client-s3';
@@ -301,7 +300,7 @@ export class DriveService {
 			};
 		}
 
-		let img: Sharp | null = null;
+		let img: sharp.Sharp | null = null;
 		let satisfyWebpublic: boolean;
 		let isAnimated: boolean;
 

packages/backend/src/core/EmailService.ts

@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { URLSearchParams } from 'node:url';
 import * as nodemailer from 'nodemailer';
 import juice from 'juice';
 import { Inject, Injectable } from '@nestjs/common';
+import { validate as validateEmail } from 'deep-email-validator';
 import { UtilityService } from '@/core/UtilityService.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -195,7 +197,6 @@ export class EmailService {
 			} else if (this.meta.enableTruemailApi && this.meta.truemailInstance && this.meta.truemailAuthKey != null) {
 				validated = await this.trueMail(this.meta.truemailInstance, emailAddress, this.meta.truemailAuthKey);
 			} else {
-				const { validate: validateEmail } = await import('deep-email-validator');
 				validated = await validateEmail({
 					email: emailAddress,
 					validateRegex: true,

packages/backend/src/core/FileInfoService.ts

@@ -21,7 +21,7 @@ import { LoggerService } from '@/core/LoggerService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
-import type { Prediction } from '@/core/AiService.js';
+import type { PredictionType } from 'nsfwjs';
 
 export type FileInfo = {
 	size: number;
@@ -192,7 +192,7 @@ export class FileInfoService {
 		let sensitive = false;
 		let porn = false;
 
-		function judgePrediction(result: readonly Prediction[]): [sensitive: boolean, porn: boolean] {
+		function judgePrediction(result: readonly PredictionType[]): [sensitive: boolean, porn: boolean] {
 			let sensitive = false;
 			let porn = false;
 
@@ -248,8 +248,7 @@ export class FileInfoService {
 					.format('image2')
 					.output(join(outDir, '%d.png'))
 					.outputOptions(['-vsync', '0']); // 可変フレームレートにすることで穴埋めをさせない
-				// 判定対象フレームを選定して正規化済みバッファとして集め、外部サービスへまとめて送る。
-				const frameBuffers: Buffer[] = [];
+				const results: ReturnType<typeof judgePrediction>[] = [];
 				let frameIndex = 0;
 				let targetIndex = 0;
 				let nextIndex = 1;
@@ -261,26 +260,22 @@ export class FileInfoService {
 						}
 						targetIndex = nextIndex;
 						nextIndex += index; // fibonacci sequence によってフレーム数制限を掛ける
-						frameBuffers.push(await fs.promises.readFile(path));
+						const result = await this.aiService.detectSensitive(path);
+						if (result) {
+							results.push(judgePrediction(result));
+						}
 					} finally {
 						fs.promises.unlink(path);
 					}
 				}
-				const predictions = await this.aiService.detectSensitiveMany(frameBuffers);
-				const results = predictions.filter((x): x is Prediction[] => x != null).map(x => judgePrediction(x));
-				// 判定に成功したフレームが 0 件のとき（接続先未設定・通信失敗等）は、
-				// Math.ceil(0) との比較が 0 >= 0 で真になり全動画がセンシティブ扱いになってしまうため、
-				// 1 件以上判定できたときのみ集約する（失敗時は非センシティブ扱い: misskey-dev/misskey#16804）。
-				if (results.length > 0) {
-					sensitive = results.filter(x => x[0]).length >= Math.ceil(results.length * sensitiveThreshold);
-					porn = results.filter(x => x[1]).length >= Math.ceil(results.length * sensitiveThresholdForPorn);
-				}
+				sensitive = results.filter(x => x[0]).length >= Math.ceil(results.length * sensitiveThreshold);
+				porn = results.filter(x => x[1]).length >= Math.ceil(results.length * sensitiveThresholdForPorn);
 			} finally {
 				disposeOutDir();
 			}
 		} else if (isMimeImage(mime, 'sharp-convertible-image-with-bmp')) {
 			/*
-			 * 判定サービス側のデコーダは限られた画像形式しか受け付けないため、sharp で PNG に変換する
+			 * tfjs-node は限られた画像形式しか受け付けないため、sharp で PNG に変換する
 			 * せっかくなので内部処理で使われる最大サイズの299x299に事前にリサイズする
 			 */
 			const png = await (await sharpBmp(source, mime))

packages/backend/src/core/HashtagService.ts

@@ -5,28 +5,20 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import { DataSource } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { MiUser } from '@/models/User.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { IdService } from '@/core/IdService.js';
-import { MiHashtag } from '@/models/Hashtag.js';
+import type { MiHashtag } from '@/models/Hashtag.js';
 import type { HashtagsRepository, MiMeta } from '@/models/_.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
 import { UtilityService } from '@/core/UtilityService.js';
-import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
-import Logger from '../logger.js';
-
-const logger = new Logger('hashtag/create');
 
 @Injectable()
 export class HashtagService {
 	constructor(
-		@Inject(DI.db)
-		private db: DataSource,
-
 		@Inject(DI.meta)
 		private meta: MiMeta,
 
@@ -68,74 +60,19 @@ export class HashtagService {
 		// TODO: サンプリング
 		this.updateHashtagsRanking(tag, user.id);
 
-		{
-			const index = await this.hashtagsRepository.findOneBy({ name: tag });
+		const index = await this.hashtagsRepository.findOneBy({ name: tag });
 
-			if (index == null && inc) {
-				try {
-					if (isUserAttached) {
-						await this.hashtagsRepository.insert({
-							id: this.idService.gen(),
-							name: tag,
-							mentionedUserIds: [],
-							mentionedUsersCount: 0,
-							mentionedLocalUserIds: [],
-							mentionedLocalUsersCount: 0,
-							mentionedRemoteUserIds: [],
-							mentionedRemoteUsersCount: 0,
-							attachedUserIds: [user.id],
-							attachedUsersCount: 1,
-							attachedLocalUserIds: this.userEntityService.isLocalUser(user) ? [user.id] : [],
-							attachedLocalUsersCount: this.userEntityService.isLocalUser(user) ? 1 : 0,
-							attachedRemoteUserIds: this.userEntityService.isRemoteUser(user) ? [user.id] : [],
-							attachedRemoteUsersCount: this.userEntityService.isRemoteUser(user) ? 1 : 0,
-						} as MiHashtag);
-					} else {
-						await this.hashtagsRepository.insert({
-							id: this.idService.gen(),
-							name: tag,
-							mentionedUserIds: [user.id],
-							mentionedUsersCount: 1,
-							mentionedLocalUserIds: this.userEntityService.isLocalUser(user) ? [user.id] : [],
-							mentionedLocalUsersCount: this.userEntityService.isLocalUser(user) ? 1 : 0,
-							mentionedRemoteUserIds: this.userEntityService.isRemoteUser(user) ? [user.id] : [],
-							mentionedRemoteUsersCount: this.userEntityService.isRemoteUser(user) ? 1 : 0,
-							attachedUserIds: [],
-							attachedUsersCount: 0,
-							attachedLocalUserIds: [],
-							attachedLocalUsersCount: 0,
-							attachedRemoteUserIds: [],
-							attachedRemoteUsersCount: 0,
-						} as MiHashtag);
-					}
-					return;
-				} catch (err) {
-					if (isDuplicateKeyValueError(err)) {
-						logger.info(`Duplicate insertion detected. Falling back to update. #${tag}`);
-					} else {
-						throw err;
-					}
-				}
-			}
-		}
+		if (index == null && !inc) return;
 
-		await this.db.transaction(async transactionalEntityManager => {
-			const transactionalHashtagRepository = transactionalEntityManager
-				.getRepository(MiHashtag);
-
-			const index = await transactionalHashtagRepository
-				.createQueryBuilder()
-				.setLock('pessimistic_write')
-				.where('name = :name', { name: tag })
-				.getOne();
-
-			if (index == null) return;
+		if (index != null) {
+			const q = this.hashtagsRepository.createQueryBuilder('tag').update()
+				.where('name = :name', { name: tag });
 
 			const set = {} as any;
 
 			if (isUserAttached) {
 				if (inc) {
-					// 自分が初めてこのタグを使ったなら
+				// 自分が初めてこのタグを使ったなら
 					if (!index.attachedUserIds.some(id => id === user.id)) {
 						set.attachedUserIds = () => `array_append("attachedUserIds", '${user.id}')`;
 						set.attachedUsersCount = () => '"attachedUsersCount" + 1';
@@ -180,14 +117,46 @@ export class HashtagService {
 			}
 
 			if (Object.keys(set).length > 0) {
-				await transactionalHashtagRepository
-					.createQueryBuilder()
-					.update()
-					.where('id = :id', { id: index.id })
-					.set(set)
-					.execute();
+				q.set(set);
+				q.execute();
 			}
-		});
+		} else {
+			if (isUserAttached) {
+				this.hashtagsRepository.insert({
+					id: this.idService.gen(),
+					name: tag,
+					mentionedUserIds: [],
+					mentionedUsersCount: 0,
+					mentionedLocalUserIds: [],
+					mentionedLocalUsersCount: 0,
+					mentionedRemoteUserIds: [],
+					mentionedRemoteUsersCount: 0,
+					attachedUserIds: [user.id],
+					attachedUsersCount: 1,
+					attachedLocalUserIds: this.userEntityService.isLocalUser(user) ? [user.id] : [],
+					attachedLocalUsersCount: this.userEntityService.isLocalUser(user) ? 1 : 0,
+					attachedRemoteUserIds: this.userEntityService.isRemoteUser(user) ? [user.id] : [],
+					attachedRemoteUsersCount: this.userEntityService.isRemoteUser(user) ? 1 : 0,
+				} as MiHashtag);
+			} else {
+				this.hashtagsRepository.insert({
+					id: this.idService.gen(),
+					name: tag,
+					mentionedUserIds: [user.id],
+					mentionedUsersCount: 1,
+					mentionedLocalUserIds: this.userEntityService.isLocalUser(user) ? [user.id] : [],
+					mentionedLocalUsersCount: this.userEntityService.isLocalUser(user) ? 1 : 0,
+					mentionedRemoteUserIds: this.userEntityService.isRemoteUser(user) ? [user.id] : [],
+					mentionedRemoteUsersCount: this.userEntityService.isRemoteUser(user) ? 1 : 0,
+					attachedUserIds: [],
+					attachedUsersCount: 0,
+					attachedLocalUserIds: [],
+					attachedLocalUsersCount: 0,
+					attachedRemoteUserIds: [],
+					attachedRemoteUsersCount: 0,
+				} as MiHashtag);
+			}
+		}
 	}
 
 	@bindThis

packages/backend/src/core/ImageProcessingService.ts

@@ -5,7 +5,6 @@
 
 import { Injectable } from '@nestjs/common';
 import sharp from 'sharp';
-import type { Sharp, WebpOptions, AvifOptions } from 'sharp';
 
 export type IImage = {
 	data: Buffer;
@@ -20,14 +19,14 @@ export type IImageStream = {
 };
 
 export type IImageSharp = {
-	data: Sharp;
+	data: sharp.Sharp;
 	ext: string | null;
 	type: string;
 };
 
 export type IImageStreamable = IImage | IImageStream | IImageSharp;
 
-export const webpDefault: WebpOptions = {
+export const webpDefault: sharp.WebpOptions = {
 	quality: 77,
 	alphaQuality: 95,
 	lossless: false,
@@ -38,7 +37,7 @@ export const webpDefault: WebpOptions = {
 	loop: 0,
 };
 
-export const avifDefault: AvifOptions = {
+export const avifDefault: sharp.AvifOptions = {
 	quality: 60,
 	lossless: false,
 	effort: 2,
@@ -58,12 +57,12 @@ export class ImageProcessingService {
 	 *   with resize, remove metadata, resolve orientation, stop animation
 	 */
 	@bindThis
-	public async convertToWebp(path: string, width: number, height: number, options: WebpOptions = webpDefault): Promise<IImage> {
+	public async convertToWebp(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): Promise<IImage> {
 		return this.convertSharpToWebp(sharp(path), width, height, options);
 	}
 
 	@bindThis
-	public async convertSharpToWebp(sharp: Sharp, width: number, height: number, options: WebpOptions = webpDefault): Promise<IImage> {
+	public async convertSharpToWebp(sharp: sharp.Sharp, width: number, height: number, options: sharp.WebpOptions = webpDefault): Promise<IImage> {
 		const result = this.convertSharpToWebpStream(sharp, width, height, options);
 
 		return {
@@ -74,12 +73,12 @@ export class ImageProcessingService {
 	}
 
 	@bindThis
-	public convertToWebpStream(path: string, width: number, height: number, options: WebpOptions = webpDefault): IImageSharp {
+	public convertToWebpStream(path: string, width: number, height: number, options: sharp.WebpOptions = webpDefault): IImageSharp {
 		return this.convertSharpToWebpStream(sharp(path), width, height, options);
 	}
 
 	@bindThis
-	public convertSharpToWebpStream(sharp: Sharp, width: number, height: number, options: WebpOptions = webpDefault): IImageSharp {
+	public convertSharpToWebpStream(sharp: sharp.Sharp, width: number, height: number, options: sharp.WebpOptions = webpDefault): IImageSharp {
 		const data = sharp
 			.resize(width, height, {
 				fit: 'inside',
@@ -100,12 +99,12 @@ export class ImageProcessingService {
 	 *   with resize, remove metadata, resolve orientation, stop animation
 	 */
 	@bindThis
-	public async convertToAvif(path: string, width: number, height: number, options: AvifOptions = avifDefault): Promise<IImage> {
+	public async convertToAvif(path: string, width: number, height: number, options: sharp.AvifOptions = avifDefault): Promise<IImage> {
 		return this.convertSharpToAvif(sharp(path), width, height, options);
 	}
 
 	@bindThis
-	public async convertSharpToAvif(sharp: Sharp, width: number, height: number, options: AvifOptions = avifDefault): Promise<IImage> {
+	public async convertSharpToAvif(sharp: sharp.Sharp, width: number, height: number, options: sharp.AvifOptions = avifDefault): Promise<IImage> {
 		const result = this.convertSharpToAvifStream(sharp, width, height, options);
 
 		return {
@@ -116,12 +115,12 @@ export class ImageProcessingService {
 	}
 
 	@bindThis
-	public convertToAvifStream(path: string, width: number, height: number, options: AvifOptions = avifDefault): IImageSharp {
+	public convertToAvifStream(path: string, width: number, height: number, options: sharp.AvifOptions = avifDefault): IImageSharp {
 		return this.convertSharpToAvifStream(sharp(path), width, height, options);
 	}
 
 	@bindThis
-	public convertSharpToAvifStream(sharp: Sharp, width: number, height: number, options: AvifOptions = avifDefault): IImageSharp {
+	public convertSharpToAvifStream(sharp: sharp.Sharp, width: number, height: number, options: sharp.AvifOptions = avifDefault): IImageSharp {
 		const data = sharp
 			.resize(width, height, {
 				fit: 'inside',
@@ -147,7 +146,7 @@ export class ImageProcessingService {
 	}
 
 	@bindThis
-	public async convertSharpToPng(sharp: Sharp, width: number, height: number): Promise<IImage> {
+	public async convertSharpToPng(sharp: sharp.Sharp, width: number, height: number): Promise<IImage> {
 		const data = await sharp
 			.resize(width, height, {
 				fit: 'inside',

packages/backend/src/core/ReactionService.ts

@@ -4,8 +4,9 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
+import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
-import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository, MiMeta } from '@/models/_.js';
+import type { EmojisRepository, NoteReactionsRepository, UsersRepository, NotesRepository, MiMeta, MiNoteSpReaction, NoteSpReactionsRepository } from '@/models/_.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import type { MiRemoteUser, MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
@@ -73,6 +74,9 @@ export class ReactionService {
 		@Inject(DI.meta)
 		private meta: MiMeta,
 
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -82,6 +86,9 @@ export class ReactionService {
 		@Inject(DI.noteReactionsRepository)
 		private noteReactionsRepository: NoteReactionsRepository,
 
+		@Inject(DI.noteSpReactionsRepository)
+		private noteSpReactionsRepository: NoteSpReactionsRepository,
+
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
@@ -337,6 +344,118 @@ export class ReactionService {
 		//#endregion
 	}
 
+	@bindThis
+	public async createSp(user: { id: MiUser['id']; isBot: MiUser['isBot'] }, note: MiNote, reaction: string) {
+		if (!this.meta.enableSpReaction) {
+			throw new IdentifiableError('52c432ea-b166-491c-a73b-5dd703221b20');
+		}
+
+		if (note.userId === user.id) {
+			throw new IdentifiableError('afa694bf-6661-4d72-b8f7-bfb86a7545a1');
+		}
+
+		if (note.userHost !== null) {
+			throw new IdentifiableError('b59abda2-0d81-49e3-8148-80cf35ac4402');
+		}
+
+		if (note.reactionAcceptance === 'likeOnly') {
+			throw new IdentifiableError('1b168811-a1aa-470a-9b61-7fcf807cf9c1');
+		}
+
+		if (!await this.noteEntityService.isVisibleForMe(note, user.id)) {
+			throw new IdentifiableError('3ce0e3bc-7d48-4e87-a902-578c6ffd369e', 'Note not accessible for you.');
+		}
+
+		// monthly limit
+		const policies = await this.roleService.getUserPolicies(user.id);
+		if (policies.spReactionsMonthlyLimit === 0) {
+			throw new IdentifiableError('e371be02-9478-4133-90ef-8401ee38e474');
+		}
+		const month = new Date().getUTCMonth() + 1;
+		const monthlySpReactionsCountMapKey = `monthlySpReactionsCountMap:${user.id}:${month}`;
+		const count = await this.redisClient.get(monthlySpReactionsCountMapKey);
+		if (count != null && parseInt(count, 10) >= policies.spReactionsMonthlyLimit) {
+			throw new IdentifiableError('82e1a10c-52a8-4ccb-8ff7-3678bff68444');
+		}
+
+		const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
+		if (blocked) {
+			throw new IdentifiableError('388ee683-8720-4aea-9ac8-b8c92d260815');
+		}
+
+		const custom = reaction.match(isCustomEmojiRegexp);
+		if (custom) {
+			const name = custom[1];
+			const emoji = (await this.customEmojiService.localEmojisCache.fetch()).get(name);
+
+			if (emoji == null) {
+				throw new IdentifiableError('47c098e2-d0b6-4197-8d00-5a68bbb156be');
+			}
+
+			// センシティブ
+			if ((note.reactionAcceptance === 'nonSensitiveOnly' || note.reactionAcceptance === 'nonSensitiveOnlyForLocalLikeOnlyForRemote') && emoji.isSensitive) {
+				throw new IdentifiableError('7fc2efbd-2652-4a60-975b-6eb65f60c7b3');
+			}
+
+			if (emoji.roleIdsThatCanBeUsedThisEmojiAsReaction.length > 0 && !(await this.roleService.getUserRoles(user.id)).some(r => emoji.roleIdsThatCanBeUsedThisEmojiAsReaction.includes(r.id))) {
+				// リアクションとして使う権限がない
+				throw new IdentifiableError('63288e20-4251-4c62-a9d5-9da4e0bdd41e');
+			}
+
+			reaction = `:${name}:`;
+		} else {
+			reaction = this.normalize(reaction);
+		}
+
+		const record: MiNoteSpReaction = {
+			id: this.idService.gen(),
+			noteId: note.id,
+			userId: user.id,
+			reaction,
+			noteUserId: note.userId,
+		};
+
+		try {
+			await this.noteSpReactionsRepository.insert(record);
+		} catch (e) {
+			if (isDuplicateKeyValueError(e)) {
+				throw new IdentifiableError('c9e8b0d0-d532-4453-8cc1-5cf8e95ba764');
+			} else {
+				throw e;
+			}
+		}
+
+		// increment monthly reactions count
+		const redisPipeline = this.redisClient.pipeline();
+		redisPipeline.incr(monthlySpReactionsCountMapKey);
+		redisPipeline.expireat(monthlySpReactionsCountMapKey,
+			(Date.now() / 1000) + (60 * 60 * 24 * 40), // TTLは最低でも一か月存続しさえすれば厳密でなくていい
+			'NX',
+		);
+		redisPipeline.exec();
+
+		// 3日以内に投稿されたノートの場合ハイライト用ランキング更新
+		if (
+			(Date.now() - this.idService.parse(note.id).date.getTime()) < 1000 * 60 * 60 * 24 * 3
+		) {
+			if (note.channelId != null) {
+				if (note.replyId == null) {
+					this.featuredService.updateInChannelNotesRanking(note.channelId, note.id, 1);
+				}
+			} else {
+				if (note.visibility === 'public' && note.replyId == null) {
+					this.featuredService.updateGlobalNotesRanking(note.id, 1);
+					this.featuredService.updatePerUserNotesRanking(note.userId, note.id, 1);
+				}
+			}
+		}
+
+		this.notificationService.createNotification(note.userId, 'spReaction', {
+			noteId: note.id,
+			reaction: reaction,
+		}, user.id);
+	}
+
 	/**
 	 * - 文字列タイプのレガシーな形式のリアクションを現在の形式に変換する
 	 * - ローカルのリアクションのホストを `@.` にする（`decodeReaction()`の効果）

packages/backend/src/core/RoleService.ts

@@ -73,6 +73,7 @@ export type RolePolicies = {
 	noteDraftLimit: number;
 	scheduledNoteLimit: number;
 	watermarkAvailable: boolean;
+	spReactionsMonthlyLimit: number;
 };
 
 export const DEFAULT_POLICIES: RolePolicies = {
@@ -121,6 +122,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	noteDraftLimit: 10,
 	scheduledNoteLimit: 1,
 	watermarkAvailable: true,
+	spReactionsMonthlyLimit: 0,
 };
 
 @Injectable()

packages/backend/src/core/entities/NotificationEntityService.ts

@@ -29,6 +29,7 @@ const NOTE_REQUIRED_NOTIFICATION_TYPES = new Set([
 	'renote:grouped',
 	'quote',
 	'reaction',
+	'spReaction',
 	'reaction:grouped',
 	'pollEnded',
 	'scheduledNotePosted',

packages/backend/src/core/telemetry/TelemetryService.ts

@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Injectable } from '@nestjs/common';
-import { bindThis } from '@/decorators.js';
-import { captureMessage, shutdownTelemetry, startSpan } from './telemetry-registry.js';
-import type { OnApplicationShutdown } from '@nestjs/common';
-import type { TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js';
-
-@Injectable()
-export class TelemetryService implements OnApplicationShutdown {
-	@bindThis
-	public captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void {
-		captureMessage(message, opts);
-	}
-
-	@bindThis
-	public startSpan<T>(name: string, fn: () => T): T {
-		return startSpan(name, fn);
-	}
-
-	@bindThis
-	public async onApplicationShutdown(_signal?: string): Promise<void> {
-		await shutdownTelemetry();
-	}
-}

packages/backend/src/core/telemetry/adapters/SentryTelemetryAdapter.ts

@@ -1,96 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import type { Config } from '@/config.js';
-import type { TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js';
-
-type SentryIntegrationsOption = NonNullable<import('@sentry/node').NodeOptions['integrations']>;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type SentryIntegrationFactory = Extract<SentryIntegrationsOption, (integrations: any[]) => any[]>;
-type SentryIntegration = Parameters<SentryIntegrationFactory>[0][number];
-type SentryNodeOptions = import('@sentry/node').NodeOptions;
-
-type BuildSentryIntegrationsOptions = {
-	disabledIntegrations?: string[];
-	enableNodeProfiling: boolean;
-	nodeProfilingIntegration?: () => SentryIntegration;
-	warn?: (message: string) => void;
-};
-
-export function buildSentryIntegrations(options: BuildSentryIntegrationsOptions): SentryIntegrationFactory {
-	return (defaults) => {
-		const disabledIntegrations = new Set(options.disabledIntegrations ?? []);
-		const defaultIntegrationNames = new Set(defaults.map((integration) => integration.name));
-		const unknownIntegrations = [...disabledIntegrations].filter((name) => !defaultIntegrationNames.has(name));
-
-		if (unknownIntegrations.length > 0) {
-			(options.warn ?? console.warn)(`Unknown Sentry integration configured in sentryForBackend.disabledIntegrations: ${unknownIntegrations.join(', ')}`);
-		}
-
-		return [
-			...defaults.filter((integration) => !disabledIntegrations.has(integration.name)),
-			...(options.enableNodeProfiling && options.nodeProfilingIntegration != null ? [options.nodeProfilingIntegration()] : []),
-		];
-	};
-}
-
-export function buildSentryNodeOptions(
-	config: NonNullable<Config['sentryForBackend']>,
-	nodeProfilingIntegration?: () => SentryIntegration,
-): SentryNodeOptions {
-	return {
-		// Do not send Sentry trace headers to remote ActivityPub/Webhook/etc. hosts by default.
-		// Admins can opt in for trusted internal services via sentryForBackend.options.
-		tracePropagationTargets: [],
-
-		// Performance Monitoring
-		tracesSampleRate: 1.0, //  Capture 100% of the transactions
-
-		// Set sampling rate for profiling - this is relative to tracesSampleRate
-		profilesSampleRate: 1.0,
-
-		maxBreadcrumbs: 0,
-
-		...config.options,
-
-		integrations: buildSentryIntegrations({
-			disabledIntegrations: config.disabledIntegrations,
-			enableNodeProfiling: config.enableNodeProfiling,
-			nodeProfilingIntegration,
-		}),
-	};
-}
-
-export class SentryTelemetryAdapter implements TelemetryAdapter {
-	private constructor(
-		private readonly Sentry: typeof import('@sentry/node'),
-	) {
-	}
-
-	public static async create(config: NonNullable<Config['sentryForBackend']>): Promise<SentryTelemetryAdapter> {
-		const Sentry = await import('@sentry/node');
-		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
-
-		Sentry.init(buildSentryNodeOptions(config, nodeProfilingIntegration));
-
-		return new SentryTelemetryAdapter(Sentry);
-	}
-
-	public captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void {
-		this.Sentry.captureMessage(message, {
-			level: opts.level,
-			...(opts.userId != null ? { user: { id: opts.userId } } : {}),
-			extra: opts.extra,
-		});
-	}
-
-	public startSpan<T>(name: string, fn: () => T): T {
-		return this.Sentry.startSpan({ name }, fn);
-	}
-
-	public async shutdown(): Promise<void> {
-		await this.Sentry.close();
-	}
-}

packages/backend/src/core/telemetry/adapters/TelemetryAdapter.ts

@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export interface TelemetryCaptureMessageOptions {
-	level: 'error';
-	userId?: string;
-	extra?: Record<string, unknown>;
-}
-
-/**
- * Sentry・OpenTelemetryなど、エラートラッキング/APMサービスごとの実装差異を隠蔽するための抽象。
- * 新しいサービスを追加する場合はこのインターフェースを実装するアダプタをこのディレクトリに追加し、
- * telemetry-registry.tsのinitTelemetry内で登録する。
- */
-export interface TelemetryAdapter {
-	captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void;
-	startSpan<T>(name: string, fn: () => T): T;
-	shutdown(): Promise<void>;
-}

packages/backend/src/core/telemetry/telemetry-registry.ts

@@ -1,39 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import type { Config } from '@/config.js';
-import { SentryTelemetryAdapter } from './adapters/SentryTelemetryAdapter.js';
-import type { TelemetryAdapter, TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js';
-
-/**
- * NestのDIコンテナが構築される前(boot処理内)で初期化する必要があるため、
- * DIを介さないモジュールレベルの状態として有効なアダプタを保持する。
- * TelemetryServiceはこの状態への薄いラッパーとして振る舞う。
- */
-const adapters: TelemetryAdapter[] = [];
-
-export async function initTelemetry(config: Config): Promise<void> {
-	if (config.sentryForBackend) {
-		adapters.push(await SentryTelemetryAdapter.create(config.sentryForBackend));
-	}
-}
-
-export function captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void {
-	for (const adapter of adapters) {
-		adapter.captureMessage(message, opts);
-	}
-}
-
-export function startSpan<T>(name: string, fn: () => T): T {
-	const wrapped = adapters.reduceRight<() => T>(
-		(inner, adapter) => () => adapter.startSpan(name, inner),
-		fn,
-	);
-	return wrapped();
-}
-
-export async function shutdownTelemetry(): Promise<void> {
-	await Promise.all(adapters.map(adapter => adapter.shutdown()));
-}

packages/backend/src/di-symbols.ts

@@ -24,6 +24,7 @@ export const DI = {
 	noteFavoritesRepository: Symbol('noteFavoritesRepository'),
 	noteThreadMutingsRepository: Symbol('noteThreadMutingsRepository'),
 	noteReactionsRepository: Symbol('noteReactionsRepository'),
+	noteSpReactionsRepository: Symbol('noteSpReactionsRepository'),
 	pollsRepository: Symbol('pollsRepository'),
 	pollVotesRepository: Symbol('pollVotesRepository'),
 	userProfilesRepository: Symbol('userProfilesRepository'),

packages/backend/src/env.ts

@@ -11,7 +11,6 @@ const envOption = {
 	verbose: false,
 	withLogTime: false,
 	quiet: false,
-	enableCrossOriginIsolation: false,
 };
 
 for (const key of Object.keys(envOption) as (keyof typeof envOption)[]) {

packages/backend/src/misc/cache.ts

@@ -204,13 +204,14 @@ export class RedisSingleCache<T> {
 	}
 }
 
+// TODO: メモリ節約のためあまり参照されないキーを定期的に削除できるようにする？
+
 export class MemoryKVCache<T> {
 	private readonly cache = new Map<string, { date: number; value: T; }>();
 	private readonly gcIntervalHandle = setInterval(() => this.gc(), 1000 * 60 * 3); // 3m
 
 	constructor(
 		private readonly lifetime: number,
-		private readonly limit: number = Infinity,
 	) {}
 
 	@bindThis
@@ -219,25 +220,6 @@ export class MemoryKVCache<T> {
 	 * @deprecated これを直接呼び出すべきではない。InternalEventなどで変更を全てのプロセス/マシンに通知するべき
 	 */
 	public set(key: string, value: T): void {
-		if (this.limit <= 0) {
-			throw new Error('Limit must be greater than 0');
-		}
-
-		if (this.limit !== Infinity) {
-			this.gc();
-
-			// 挿入順を更新して LRU を保つため、同一キーは一度削除する
-			this.cache.delete(key);
-
-			while (this.cache.size >= this.limit) {
-				const oldestKey = this.cache.keys().next().value;
-				if (oldestKey == null) {
-					throw new Error('Cache is empty but size exceeds the limit');
-				}
-				this.cache.delete(oldestKey);
-			}
-		}
-
 		this.cache.set(key, {
 			date: Date.now(),
 			value,
@@ -252,11 +234,6 @@ export class MemoryKVCache<T> {
 			this.cache.delete(key);
 			return undefined;
 		}
-		if (this.limit !== Infinity) {
-			// access 順を更新して LRU を保つ
-			this.cache.delete(key);
-			this.cache.set(key, cached);
-		}
 		return cached.value;
 	}
 

packages/backend/src/models/Meta.ts

@@ -292,26 +292,6 @@ export class MiMeta {
 	})
 	public enableSensitiveMediaDetectionForVideos: boolean;
 
-	@Column('varchar', {
-		length: 1024, nullable: true,
-	})
-	public sensitiveMediaDetectionApiUrl: string | null;
-
-	@Column('varchar', {
-		length: 1024, nullable: true,
-	})
-	public sensitiveMediaDetectionApiKey: string | null;
-
-	@Column('integer', {
-		default: 60000,
-	})
-	public sensitiveMediaDetectionTimeout: number;
-
-	@Column('integer', {
-		default: 4,
-	})
-	public sensitiveMediaDetectionMaxImagesPerRequest: number;
-
 	@Column('boolean', {
 		default: false,
 	})
@@ -672,11 +652,6 @@ export class MiMeta {
 	})
 	public urlPreviewUserAgent: string | null;
 
-	@Column('varchar', {
-		length: 3072, array: true, default: '{}',
-	})
-	public urlPreviewSensitiveList: string[];
-
 	@Column('varchar', {
 		length: 128,
 		default: 'none',
@@ -747,6 +722,11 @@ export class MiMeta {
 	})
 	public showRoleBadgesOfRemoteUsers: boolean;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public enableSpReaction: boolean;
+
 	@Column('jsonb', {
 		default: { },
 	})

packages/backend/src/models/NoteSpReaction.ts

@@ -0,0 +1,50 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from './util/id.js';
+import { MiUser } from './User.js';
+import { MiNote } from './Note.js';
+
+@Entity('note_sp_reaction')
+@Index(['userId', 'noteId'], { unique: true })
+export class MiNoteSpReaction {
+	@PrimaryColumn(id())
+	public id: string;
+
+	@Index()
+	@Column(id())
+	public userId: MiUser['id'];
+
+	@ManyToOne(() => MiUser, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public user?: MiUser | null;
+
+	@Index()
+	@Column(id())
+	public noteId: MiNote['id'];
+
+	@ManyToOne(() => MiNote, {
+		onDelete: 'CASCADE',
+	})
+	@JoinColumn()
+	public note?: MiNote | null;
+
+	@Column('varchar', {
+		length: 260,
+	})
+	public reaction: string;
+
+	//#region Denormalized fields
+	@Index()
+	@Column({
+		...id(),
+		comment: '[Denormalized]',
+	})
+	public noteUserId: MiUser['id'];
+	//#endregion
+}

packages/backend/src/models/Notification.ts

@@ -55,6 +55,13 @@ export type MiNotification = {
 	notifierId: MiUser['id'];
 	noteId: MiNote['id'];
 	reaction: string;
+} | {
+	type: 'spReaction';
+	id: string;
+	createdAt: string;
+	notifierId: MiUser['id'];
+	noteId: MiNote['id'];
+	reaction: string;
 } | {
 	type: 'pollEnded';
 	id: string;

packages/backend/src/models/RepositoryModule.ts

@@ -42,6 +42,7 @@ import {
 	MiNote,
 	MiNoteFavorite,
 	MiNoteReaction,
+	MiNoteSpReaction,
 	MiNoteThreadMuting,
 	MiNoteDraft,
 	MiPage,
@@ -142,6 +143,12 @@ const $noteReactionsRepository: Provider = {
 	inject: [DI.db],
 };
 
+const $noteSpReactionsRepository: Provider = {
+	provide: DI.noteSpReactionsRepository,
+	useFactory: (db: DataSource) => db.getRepository(MiNoteSpReaction).extend(miRepository as MiRepository<MiNoteSpReaction>),
+	inject: [DI.db],
+};
+
 const $noteDraftsRepository: Provider = {
 	provide: DI.noteDraftsRepository,
 	useFactory: (db: DataSource) => db.getRepository(MiNoteDraft).extend(miRepository as MiRepository<MiNoteDraft>),
@@ -556,6 +563,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteSpReactionsRepository,
 		$noteDraftsRepository,
 		$pollsRepository,
 		$pollVotesRepository,
@@ -634,6 +642,7 @@ const $reversiGamesRepository: Provider = {
 		$noteFavoritesRepository,
 		$noteThreadMutingsRepository,
 		$noteReactionsRepository,
+		$noteSpReactionsRepository,
 		$noteDraftsRepository,
 		$pollsRepository,
 		$pollVotesRepository,

packages/backend/src/models/_.ts

@@ -23,7 +23,7 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiChannel } from '@/models/Channel.js';
 import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
 import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
-import { MiChannelMuting } from "@/models/ChannelMuting.js";
+import { MiChannelMuting } from '@/models/ChannelMuting.js';
 import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiChatMessage } from '@/models/ChatMessage.js';
 import { MiChatRoom } from '@/models/ChatRoom.js';
@@ -50,6 +50,7 @@ import { MiNote } from '@/models/Note.js';
 import { MiNoteDraft } from '@/models/NoteDraft.js';
 import { MiNoteFavorite } from '@/models/NoteFavorite.js';
 import { MiNoteReaction } from '@/models/NoteReaction.js';
+import { MiNoteSpReaction } from '@/models/NoteSpReaction.js';
 import { MiNoteThreadMuting } from '@/models/NoteThreadMuting.js';
 import { MiPage } from '@/models/Page.js';
 import { MiPageLike } from '@/models/PageLike.js';
@@ -131,6 +132,7 @@ export {
 	MiNoteDraft,
 	MiNoteFavorite,
 	MiNoteReaction,
+	MiNoteSpReaction,
 	MiNoteThreadMuting,
 	MiPage,
 	MiPageLike,
@@ -211,6 +213,7 @@ export type NotesRepository = Repository<MiNote> & MiRepository<MiNote>;
 export type NoteDraftsRepository = Repository<MiNoteDraft> & MiRepository<MiNoteDraft>;
 export type NoteFavoritesRepository = Repository<MiNoteFavorite> & MiRepository<MiNoteFavorite>;
 export type NoteReactionsRepository = Repository<MiNoteReaction> & MiRepository<MiNoteReaction>;
+export type NoteSpReactionsRepository = Repository<MiNoteSpReaction> & MiRepository<MiNoteSpReaction>;
 export type NoteThreadMutingsRepository = Repository<MiNoteThreadMuting> & MiRepository<MiNoteThreadMuting>;
 export type PagesRepository = Repository<MiPage> & MiRepository<MiPage>;
 export type PageLikesRepository = Repository<MiPageLike> & MiRepository<MiPageLike>;

packages/backend/src/models/json-schema/notification.ts

@@ -182,6 +182,35 @@ export const packedNotificationSchema = {
 				optional: false, nullable: false,
 			},
 		},
+	}, {
+		type: 'object',
+		properties: {
+			...baseSchema.properties,
+			type: {
+				type: 'string',
+				optional: false, nullable: false,
+				enum: ['spReaction'],
+			},
+			user: {
+				type: 'object',
+				ref: 'UserLite',
+				optional: false, nullable: false,
+			},
+			userId: {
+				type: 'string',
+				optional: false, nullable: false,
+				format: 'id',
+			},
+			note: {
+				type: 'object',
+				ref: 'Note',
+				optional: false, nullable: false,
+			},
+			reaction: {
+				type: 'string',
+				optional: false, nullable: false,
+			},
+		},
 	}, {
 		type: 'object',
 		properties: {