Bump version to 2026.7.0-alpha.6

* enhance: JSON形式の構造化ログ出力に対応

* 起動時ログがJSON化出来ていなかったのを調整

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

.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/Cypress 適用ガイド |
+| 5 | Eval Coverage | `working-on-backend` / `working-on-frontend` の testing リファレンス (backend-testing.md / frontend-testing.md) の網羅、Misskey 固有の e2e/fed/Storybook/Playwright 適用ガイド |
 | 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 / Cypress) は CI 側で実行されるため、本コマンドには含めない。
+完了前の **軽量** 品質チェック。重い E2E / 連合テスト (test:e2e / test:fed / Playwright) は CI 側で実行されるため、本コマンドには含めない。
 
 ## Scope
 
@@ -120,4 +120,4 @@ Frontend ut: PASS  (87/87)
 
 - ジェネリックな言語自動判定を排除し、Misskey 固定 pipeline に。
 - formatter フェーズなし (Misskey は ESLint --fix のみ採用)。
-- e2e / federation / Cypress は重いため除外し CI 側に委譲。
+- e2e / federation / Playwright は重いため除外し 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` (Cypress 用にテストサーバーを起動するコマンド) を使う経路では実行時に `ncp` で自動コピーされる ([package.json](../../../../../package.json))。それ以外で backend テストを直接走らせる時は上記の手動コピーが必要
+- ルートの `pnpm start:test` (Playwright 用にテストサーバーを起動するコマンド) を使う経路では実行時に `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 / Cypress E2E の書き方と前提 → [references/knowledge/frontend-testing.md](references/knowledge/frontend-testing.md)
+- frontend Vitest / Playwright 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 / Cypress)
+# Frontend テスト (Vitest / Playwright)
 
 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 + Cypress でカバー)
+- 共有コンポーネント (`MkX.vue`) のユニットテストは現状少なく、`*.spec.ts` / `__tests__/` 形式は採用していない (Storybook + Playwright でカバー)
 
-## Cypress E2E
+## Playwright E2E
 
-Cypress は **起動済みのテストサーバー** に対して走るため、unit より前提が多い。[.github/workflows/test-frontend.yml](../../../../../.github/workflows/test-frontend.yml) の `e2e` ジョブと同じ手順をローカルで踏む:
+Playwright は **起動済みのテストサーバー** に対して走るため、unit より前提が多い。[.github/workflows/test-frontend.yml](../../../../../.github/workflows/test-frontend.yml) の `e2e` ジョブと同じ手順をローカルで踏む:
 
 ```bash
 # 1. テスト用 DB / Redis を起動 (テスト用ポート。開発用の compose.local-db.yml ではない)
@@ -29,15 +29,14 @@ cp .github/misskey/test.yml .config/test.yml
 # 3. 全体ビルド
 pnpm build
 
-# 4. テストサーバー起動 + Cypress 実行 (いずれもルートから)
-pnpm e2e                # 内部で pnpm start:test を起動し http://localhost:61812 を待って Cypress run
-pnpm cy:open            # 対話的に開く (サーバーは別途 pnpm start:test で起動しておく)
+# 4. テストサーバー起動 + Playwright 実行 (いずれもルートから)
+pnpm e2e                # 内部で pnpm start:test を起動し http://localhost:61812 を待って Playwright を実行
 ```
 
-- 設定: ルート [cypress.config.ts](../../../../../cypress.config.ts)
-- テスト本体は [cypress/](../../../../../cypress/) 配下
+- 設定: ルート [packages/frontend/playwright.config.ts](../../../../../packages/frontend/playwright.config.ts) で、`packages/frontend/test/e2e/` 配下の `*.spec.ts` を対象にする
+- テスト本体は [packages/frontend/test/e2e/](../../../../../packages/frontend/test/e2e/) 配下に配置する。
 
-新規 frontend 機能の E2E は Cypress に書くのが基本。ただし対象は主要 UI フロー (login / post / drive etc) に限定し、細かい単位テストは Vitest または Storybook で代替する慣習。
+新規 frontend 機能の E2E は Playwright に書くのが基本。ただし対象は主要 UI フロー (login / post / drive etc) に限定し、細かい単位テストは Vitest または Storybook で代替する慣習。
 
 ## Storybook (視覚確認 + Chromatic 視覚回帰)
 
@@ -55,6 +54,6 @@ pnpm --filter frontend build-storybook    # 静的ビルド
 frontend のテスト種別で DB / Redis の要否が違う:
 
 - **Vitest (unit)** — DB 不要。ロジック / コンポーネント単体のテストで backend に繋がない (CI の `vitest` ジョブにも `services:` は無い)
-- **Cypress (E2E)** — テストサーバー (`pnpm start:test`) 経由で backend に繋ぐため DB / Redis が必要。**テスト用ポートの [packages/backend/test/compose.yml](../../../../../packages/backend/test/compose.yml)** を使う (上記 Cypress E2E の手順を参照)
+- **Playwright (E2E)** — テストサーバー (`pnpm start:test`) 経由で backend に繋ぐため DB / Redis が必要。**テスト用ポートの [packages/backend/test/compose.yml](../../../../../packages/backend/test/compose.yml)** を使う (上記 Playwright E2E の手順を参照)
 
 開発用の `compose.local-db.yml` (db `5432` / redis `6379`) は **テストには使わない**。テスト用の `packages/backend/test/compose.yml` (`54312` / `56312`) とはポートが異なり、混同すると接続できない。

.coderabbit.yaml

@@ -0,0 +1,11 @@
+language: "ja-JP"
+tone_instructions: "常に丁寧語（です・ます調）を用い、敬意のある表現で応答してください。人格や能力への評価、皮肉、威圧的・高圧的・命令的な表現は避けてください。指摘では問題点と影響を明確にし、理由を簡潔に説明したうえで、具体的な改善案を提案してください。不確実な事項は推測と明示し、確認を促してください。重大なバグやセキュリティ上の懸念は重要度と根拠を明確に伝えてください。"
+reviews:
+  profile: "chill"
+  high_level_summary: false
+  poem: true
+  auto_review:
+    enabled: true
+    drafts: false
+    base_branches:
+      - "develop"

.config/docker_example.yml

@@ -233,15 +233,24 @@ proxyBypassHosts:
 # For security reasons, uploading attachments from the intranet is prohibited,
 # but exceptions can be made from the following settings. Default value is "undefined".
 # Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
-#allowedPrivateNetworks: [
-#  '127.0.0.1/32'
-#]
+#allowedPrivateNetworks:
+#  - '127.0.0.1/32'
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
 
 # Log settings
 # logging:
+#   # ログの出力形式。「json」で1行JSON、未指定時は「pretty」です。
+#   format: pretty
+#   # Minimum level for all loggers. Defaults to info in production and debug otherwise.
+#   level: info
+#   # The longest matching logger domain takes precedence over the global level.
+#   domains:
+#     core.boot: info
+#     queue: error
+#     queue.deliver: debug
+#     db.sql: off
 #   sql:
 #     # Outputs query parameters during SQL execution to the log.
 #     # default: false

.config/example.yml

@@ -303,8 +303,88 @@ 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'
+
+#   ┌─────────┐
+#───┘ Tracing └────────────────────────────────────────────────
+# OpenTelemetry distributed tracing (Traces only, opt-in).
+# Existing API and Queue spans are exported to an OTLP http/protobuf endpoint.
+#
+# Standard OTEL_* environment variables are honored for values omitted below:
+# OTEL_EXPORTER_OTLP_TRACES_ENDPOINT, OTEL_EXPORTER_OTLP_ENDPOINT,
+# OTEL_EXPORTER_OTLP_HEADERS, OTEL_TRACES_SAMPLER, OTEL_TRACES_SAMPLER_ARG, etc.
+#
+# When this is enabled together with sentryForBackend, Misskey shares Sentry's
+# TracerProvider and adds an OTLP SpanProcessor to it. In that mode:
+# - sampleRate below is ignored; sampling follows sentryForBackend.options
+#   tracesSampleRate / tracesSampler.
+# - resourceAttributes below is ignored; set OTEL_SERVICE_NAME and
+#   OTEL_RESOURCE_ATTRIBUTES in the environment if you need to override them.
+# - spans produced by Sentry integrations are exported to both Sentry and OTLP.
+# - sentry-trace / baggage propagation to outbound remote requests is disabled
+#   by default while OTel is enabled. Set propagateTraceToRemote: true only if
+#   you intentionally want Sentry trace propagation for your deployment.
+
+#otelForBackend:
+#  endpoint: 'http://localhost:4318/v1/traces'
+#  #headers:
+#  #  authorization: 'Bearer xxxxx'
+#  #sampleRate: 1.0
+#  # Record PostgreSQL query spans. Disabled by default to avoid instrumentation
+#  # overhead when database-level diagnostics are not needed.
+#  #capturePgSpans: false
+#  # Include raw SQL text in PostgreSQL spans. Requires capturePgSpans and is
+#  # disabled by default because non-parameterized queries can expose values to
+#  # the OTLP Collector.
+#  #capturePgStatement: false
+#  # Include PostgreSQL connection-pool spans with an existing parent span.
+#  # Requires capturePgSpans and is disabled by default to avoid noisy spans
+#  # from connection churn.
+#  #capturePgConnectionSpans: false
+#  # Record Redis command spans. Disabled by default because subscribing to the
+#  # ioredis diagnostics channel adds work to every Redis command, including
+#  # commands without a parent span. Enable for development diagnostics or when
+#  # the added overhead is acceptable in production.
+#  #captureRedisCommandSpans: false
+#  # Include Redis startup/reconnect spans. Disabled by default to avoid noisy
+#  # connection churn; these spans are recorded even without an HTTP or job
+#  # parent span.
+#  #captureRedisConnectionSpans: false
+#  # Record Redis commands without an HTTP or job parent span. Disabled by
+#  # default because queue polling and background work can produce many root
+#  # traces; only applies when captureRedisCommandSpans is enabled.
+#  #captureRedisRootSpans: false
+#  #resourceAttributes:
+#  #  deployment.environment: 'production'
+#  #propagateTraceToRemote: false
+#  # Queue worker spans are independent traces linked to their enqueuer by default.
+#  # Set to 'parent' to make them child spans instead. This can create very large
+#  # traces for high-fan-out queues such as federation delivery.
+#  #jobTraceContextMode: 'link'
 
 #sentryForFrontend:
 #  vueIntegration:
@@ -383,9 +463,8 @@ proxyBypassHosts:
 # For security reasons, uploading attachments from the intranet is prohibited,
 # but exceptions can be made from the following settings. Default value is "undefined".
 # Read changelog to learn more (Improvements of 12.90.0 (2021/09/04)).
-#allowedPrivateNetworks: [
-#  '127.0.0.1/32'
-#]
+#allowedPrivateNetworks:
+#  - '127.0.0.1/32'
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
@@ -395,6 +474,16 @@ proxyBypassHosts:
 
 # Log settings
 # logging:
+#   # ログの出力形式。「json」で1行JSON、未指定時は「pretty」です。
+#   format: pretty
+#   # Minimum level for all loggers. Defaults to info in production and debug otherwise.
+#   level: info
+#   # The longest matching logger domain takes precedence over the global level.
+#   domains:
+#     core.boot: info
+#     queue: error
+#     queue.deliver: debug
+#     db.sql: off
 #   sql:
 #     # Outputs query parameters during SQL execution to the log.
 #     # default: false

.config/playwright-devcontainer.yml

@@ -218,9 +218,8 @@ proxyBypassHosts:
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-allowedPrivateNetworks: [
-  '127.0.0.1/32'
-]
+allowedPrivateNetworks:
+ - '127.0.0.1/32'
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000

.devcontainer/devcontainer.yml

@@ -205,9 +205,8 @@ proxyBypassHosts:
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-allowedPrivateNetworks: [
-  '127.0.0.1/32'
-]
+allowedPrivateNetworks:
+ - '127.0.0.1/32'
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000

.devcontainer/init.sh

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

.github/labeler.yml

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

.github/scripts/backend-diagnostics.inspect.mts

@@ -0,0 +1,239 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { createRequire } from 'node:module';
+import { copyFile, rm, 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 { MemorySample } from '../../packages/backend/scripts/measure-memory.mts';
+
+const phases = ['afterGc'] as const;
+
+export type MemoryReport = {
+	timestamp: string;
+	sampleCount: number;
+	aggregation: string;
+	summary: Record<typeof phases[number], {
+		memoryUsage: Record<string, number>;
+		heapSnapshot?: heapSnapshotUtil.HeapSnapshotData;
+	}>;
+	samples: (MemorySample & {
+		round: number;
+	})[];
+};
+
+const [baseDirArg, headDirArg, baseOutputArg, headOutputArg] = process.argv.slice(2);
+
+const HEAP_SNAPSHOT_BREAKDOWN_TOP_N = util.readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', heapSnapshotUtil.defaultHeapSnapshotBreakdownTopN, 1);
+const heapSnapshotLabels = ['base', 'head'] as const;
+const HEAP_SNAPSHOT_WORK_DIRS = {
+	base: resolve('base-heap-snapshots'),
+	head: resolve('head-heap-snapshots'),
+};
+const HEAP_SNAPSHOT_OUTPUT_PATHS = {
+	base: resolve('base-heap-snapshot.heapsnapshot'),
+	head: resolve('head-heap-snapshot.heapsnapshot'),
+};
+// Use the head checkout's measurement harness for both targets so only the built backend differs.
+const MEASURE_MEMORY_SCRIPT = resolve(import.meta.dirname, '../../packages/backend/scripts/measure-memory.mts');
+
+async function resetState(repoDir: string) {
+	const require = createRequire(join(repoDir, 'packages/backend/package.json'));
+	const pg = require('pg');
+	const Redis = require('ioredis');
+
+	const postgres = new pg.Client({
+		host: '127.0.0.1',
+		port: 54312,
+		database: 'postgres',
+		user: 'postgres',
+	});
+
+	await postgres.connect();
+	try {
+		await postgres.query('DROP DATABASE IF EXISTS "test-misskey" WITH (FORCE)');
+		await postgres.query('CREATE DATABASE "test-misskey"');
+	} finally {
+		await postgres.end();
+	}
+
+	const redis = new Redis({ host: '127.0.0.1', port: 56312 });
+	try {
+		await redis.flushall();
+	} finally {
+		redis.disconnect();
+	}
+}
+
+function summarizeSamples(samples: MemoryReport['samples']) {
+	const summary = {} as MemoryReport['summary'];
+
+	for (const phase of phases) {
+		summary[phase] = {
+			memoryUsage: {},
+		};
+
+		const metricKeys = new Set<string>();
+		for (const sample of samples) {
+			for (const key of Object.keys(sample.phases[phase].memoryUsage)) {
+				metricKeys.add(key);
+			}
+		}
+
+		for (const key of metricKeys) {
+			const values = samples.map(sample => sample.phases[phase].memoryUsage[key]);
+			summary[phase].memoryUsage[key] = util.median(values);
+		}
+
+		const heapSnapshot = heapSnapshotUtil.summarizeHeapSnapshotDataSamples(
+			samples,
+			sample => sample.phases[phase].heapSnapshot,
+			{ breakdownTopN: HEAP_SNAPSHOT_BREAKDOWN_TOP_N },
+		);
+		if (heapSnapshot != null) summary[phase].heapSnapshot = heapSnapshot;
+	}
+
+	return summary;
+}
+
+async function genSample(label: string, repoDir: string, round: number, options: { heapSnapshotSavePath?: string } = {}) {
+	process.stderr.write(`[${label}] Resetting database and Redis\n`);
+	await resetState(repoDir);
+
+	process.stderr.write(`[${label}] Running migrations\n`);
+	await util.run('pnpm', ['--filter', 'backend', 'migrate'], {
+		cwd: repoDir,
+		env: process.env,
+		logStdout: true,
+	});
+
+	process.stderr.write(`[${label}] Measuring memory\n`);
+	const measureEnv = {
+		...process.env,
+		MK_MEMORY_BACKEND_DIR: resolve(repoDir, 'packages/backend'),
+	} 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', [MEASURE_MEMORY_SCRIPT], {
+		cwd: repoDir,
+		env: measureEnv,
+	});
+
+	return JSON.parse(stdout) as MemorySample;
+}
+
+function heapSnapshotPath(label: typeof heapSnapshotLabels[number], round: number) {
+	return join(HEAP_SNAPSHOT_WORK_DIRS[label], `round-${round}.heapsnapshot`);
+}
+
+function selectRepresentativeHeapSnapshotRound(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 saveRepresentativeHeapSnapshot(label: typeof heapSnapshotLabels[number], samples: MemoryReport['samples'], summary: MemoryReport['summary']) {
+	const round = selectRepresentativeHeapSnapshotRound(samples, summary);
+	if (round == null) return;
+
+	await copyFile(heapSnapshotPath(label, round), HEAP_SNAPSHOT_OUTPUT_PATHS[label]);
+	process.stderr.write(`Selected ${label} heap snapshot round ${round} for artifact\n`);
+	await rm(HEAP_SNAPSHOT_WORK_DIRS[label], { recursive: true, force: true });
+}
+
+async function main() {
+	const baseDir = resolve(baseDirArg);
+	const headDir = resolve(headDirArg);
+	const baseOutput = resolve(baseOutputArg);
+	const headOutput = resolve(headOutputArg);
+	const rounds = util.readIntegerEnv('MK_MEMORY_COMPARE_ROUNDS', 5, 1);
+	const warmupRounds = util.readIntegerEnv('MK_MEMORY_COMPARE_WARMUP_ROUNDS', 1, 0);
+	const startedAt = new Date().toISOString();
+
+	for (const label of heapSnapshotLabels) {
+		await rm(HEAP_SNAPSHOT_WORK_DIRS[label], { recursive: true, force: true });
+		await rm(HEAP_SNAPSHOT_OUTPUT_PATHS[label], { force: true });
+	}
+
+	const reports = {
+		base: {
+			dir: baseDir,
+			samples: [] as MemoryReport['samples'],
+		},
+		head: {
+			dir: headDir,
+			samples: [] as MemoryReport['samples'],
+		},
+	};
+
+	for (let round = 1; round <= warmupRounds; round++) {
+		process.stderr.write(`Starting warmup round ${round}/${warmupRounds}\n`);
+		for (const label of heapSnapshotLabels) {
+			await genSample(label, reports[label].dir, -round);
+		}
+	}
+
+	for (let round = 1; round <= rounds; round++) {
+		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 options = { heapSnapshotSavePath: heapSnapshotPath(label, round) };
+			const sample = await genSample(label, reports[label].dir, round, options);
+			reports[label].samples.push({
+				...sample,
+				round,
+			});
+		}
+	}
+
+	const summaries = {
+		base: summarizeSamples(reports.base.samples),
+		head: summarizeSamples(reports.head.samples),
+	};
+	for (const label of heapSnapshotLabels) {
+		await saveRepresentativeHeapSnapshot(label, reports[label].samples, summaries[label]);
+	}
+
+	for (const label of heapSnapshotLabels) {
+		const report = {
+			timestamp: new Date().toISOString(),
+			sampleCount: reports[label].samples.length,
+			aggregation: 'median',
+			comparison: {
+				strategy: 'interleaved-pairs',
+				rounds,
+				warmupRounds,
+				startedAt,
+			},
+			summary: summaries[label],
+			samples: reports[label].samples,
+		};
+
+		await writeFile(label === 'base' ? baseOutput : headOutput, `${JSON.stringify(report, null, 2)}\n`);
+	}
+}
+
+main().catch(err => {
+	console.error(err);
+	process.exit(1);
+});

.github/scripts/backend-diagnostics.render-md.mts

@@ -0,0 +1,183 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+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 './backend-diagnostics.inspect.mts';
+
+const [baseFile, headFile, outputFile] = process.argv.slice(2);
+
+const memoryReportPhases = [
+	{
+		key: 'afterGc',
+		title: 'After GC',
+	},
+] as const;
+
+const memoryMetrics = [
+	'HeapUsed',
+	'Pss',
+	'USS',
+	'External',
+] as const;
+
+function formatMemoryMb(valueKiB: number | null | undefined) {
+	if (valueKiB == null) return '-';
+	return `${util.formatNumber(valueKiB / 1000)} MB`;
+}
+
+function formatMemoryMetricName(metric: typeof memoryMetrics[number]) {
+	return metric === 'Pss' ? 'PSS' : metric;
+}
+
+function getMemoryValueFromSample(sample: MemoryReport['samples'][number], phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	const memoryUsage = sample.phases[phase].memoryUsage;
+	if (metric !== 'USS') return memoryUsage[metric];
+	return memoryUsage.Private_Clean + memoryUsage.Private_Dirty;
+}
+
+function getSampleValues(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	return report.samples.map(sample => getMemoryValueFromSample(sample, phase, metric));
+}
+
+function getMemoryValue(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	if (metric !== 'USS') return report.summary[phase].memoryUsage[metric];
+	return util.median(getSampleValues(report, phase, metric));
+}
+
+function getSampleSpread(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	const values = getSampleValues(report, phase, metric);
+	if (values.length < 2) return null;
+
+	const center = util.median(values);
+	return util.median(values.map(value => Math.abs(value - center)));
+}
+
+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 memoryMetrics) {
+		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 percent = summary.median * 100 / baseValue;
+		const deltaMedian = `${formatDeltaMemory(summary.median)}<br>${util.formatDeltaPercent(percent, 0.1).replaceAll('\\%', '\\\\%')}`;
+
+		lines.push(`| **${formatMemoryMetricName(metric)}** | ${formatMemoryMb(baseValue)} <br> ± ${formatMemoryMb(baseSpread)} | ${formatMemoryMb(headValue)} <br> ± ${formatMemoryMb(headSpread)} | ${deltaMedian} | ${formatMemoryMb(summary.mad)} | ${formatDeltaMemory(summary.min)} | ${formatDeltaMemory(summary.max)} |`);
+	}
+
+	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);
+	if (table == null) return null;
+
+	const lines = [
+		'### V8 Heap Snapshot Statistics',
+		'',
+		table,
+		'',
+	];
+
+	for (const graph of [
+		//heapSnapshotUtil.renderHeapSnapshotSankey(baseHeapSnapshotReport, 'Base'),
+		heapSnapshotUtil.renderHeapSnapshotSankey(headHeapSnapshotReport, 'Head'),
+	]) {
+		if (graph == null) continue;
+		lines.push(graph);
+		lines.push('');
+	}
+
+	return lines.join('\n');
+}
+
+const base = JSON.parse(await readFile(baseFile, 'utf8')) as MemoryReport;
+const head = JSON.parse(await readFile(headFile, 'utf8')) as MemoryReport;
+
+const lines = [
+	'## ⚙️ Backend Diagnostics Report',
+	'',
+];
+
+//const summary = measurementSummary(base, head);
+//if (summary != null) {
+//	lines.push(summary);
+//	lines.push('');
+//}
+
+for (const phase of memoryReportPhases) {
+	lines.push(`### Memory: ${phase.title}`);
+	lines.push(renderMainTableForPhase(base, head, phase.key));
+	lines.push('');
+}
+
+const heapSnapshotSection = renderHeapSnapshotSection(base, head);
+if (heapSnapshotSection != null) {
+	lines.push(heapSnapshotSection);
+	lines.push('');
+}
+
+const baseHeapSnapshotArtifactUrl = process.env.MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_BASE!.trim();
+const headHeapSnapshotArtifactUrl = process.env.MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_HEAD!.trim();
+lines.push(`You can download the representative heap snapshot: [base](${baseHeapSnapshotArtifactUrl}) / [head](${headHeapSnapshotArtifactUrl})`);
+lines.push('');
+
+function getDiffPercent(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	const baseValue = getMemoryValue(base, phase, metric);
+	const headValue = getMemoryValue(head, phase, metric);
+	return ((headValue - baseValue) * 100) / baseValue;
+}
+
+function isBeyondSampleNoise(base: MemoryReport, head: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof memoryMetrics[number]) {
+	const baseValue = getMemoryValue(base, phase, metric);
+	const headValue = getMemoryValue(head, phase, metric);
+
+	const delta = headValue - baseValue;
+	if (delta <= 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;
+}
+
+const warningMetric = 'Pss';
+const warningDiffPercent = getDiffPercent(base, head, 'afterGc', warningMetric);
+if (warningDiffPercent > 5 && isBeyondSampleNoise(base, head, 'afterGc', warningMetric)) {
+	lines.push(`⚠️ **Warning**: Memory usage (${formatMemoryMetricName(warningMetric)}) has increased by more than 5% and exceeds the observed sample noise. Please verify this is not an unintended change.`);
+	lines.push('');
+}
+
+await writeFile(outputFile, `${lines.join('\n')}\n`);

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

@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { appendFileSync, statSync } from 'node:fs';
-import { extname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const traceFile = process.env.MK_BACKEND_JS_FOOTPRINT_TRACE;
-const jsExtensions = new Set(['.js', '.mjs', '.cjs']);
-
-function recordLoadedFile(kind, url, format) {
-	if (traceFile == null || !url.startsWith('file:')) return;
-
-	let filePath;
-	try {
-		filePath = fileURLToPath(url);
-	} catch {
-		return;
-	}
-
-	const extension = extname(filePath);
-	if (!jsExtensions.has(extension)) return;
-
-	let size = null;
-	try {
-		size = statSync(filePath).size;
-	} catch {
-		return;
-	}
-
-	appendFileSync(traceFile, `${JSON.stringify({
-		kind,
-		format,
-		path: filePath,
-		size,
-		timestamp: Date.now(),
-	})}\n`);
-}
-
-export async function load(url, context, nextLoad) {
-	const result = await nextLoad(url, context);
-	recordLoadedFile('esm', url, result.format ?? context.format ?? null);
-	return result;
-}

.github/scripts/backend-js-footprint-require.cjs

@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-const { appendFileSync, statSync } = require('node:fs');
-const Module = require('node:module');
-const { extname } = require('node:path');
-
-const traceFile = process.env.MK_BACKEND_JS_FOOTPRINT_TRACE;
-const jsExtensions = new Set(['.js', '.mjs', '.cjs']);
-
-function recordLoadedFile(kind, filePath, request) {
-	if (traceFile == null || typeof filePath !== 'string') return;
-
-	const extension = extname(filePath);
-	if (!jsExtensions.has(extension) && extension !== '.node') return;
-
-	let size = null;
-	try {
-		size = statSync(filePath).size;
-	} catch {
-		return;
-	}
-
-	appendFileSync(traceFile, `${JSON.stringify({
-		kind,
-		format: extension === '.node' ? 'native' : 'commonjs',
-		path: filePath,
-		request,
-		size,
-		timestamp: Date.now(),
-	})}\n`);
-}
-
-const originalLoad = Module._load;
-const originalResolveFilename = Module._resolveFilename;
-
-Module._load = function load(request, parent, isMain) {
-	const resolved = originalResolveFilename.call(this, request, parent, isMain);
-	const result = originalLoad.apply(this, arguments);
-	recordLoadedFile('cjs', resolved, request);
-	return result;
-};

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

@@ -1,473 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { fork, spawn } from 'node:child_process';
-import { createRequire } from 'node:module';
-import { cpus, tmpdir } from 'node:os';
-import { dirname, extname, join, relative, resolve, sep } from 'node:path';
-import { setTimeout } from 'node:timers/promises';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { gzipSync } from 'node:zlib';
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as http from 'node:http';
-import * as util from './utility.mts';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-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 repoDir = resolve(repoDirArg);
-const outputFile = resolve(outputFileArg);
-const backendDir = join(repoDir, 'packages/backend');
-const backendBuiltDir = join(backendDir, 'built');
-const traceFile = join(tmpdir(), `misskey-backend-js-footprint-${process.pid}-${Date.now()}.jsonl`);
-const require = createRequire(join(repoDir, 'package.json'));
-const ts = require('typescript');
-const jsExtensions = new Set(['.js', '.mjs', '.cjs']);
-const fileMetricCache = new Map();
-const packageInfoCache = new Map();
-const nativePackageNames = new Set();
-
-function isInside(parent, child) {
-	const rel = relative(parent, child);
-	return rel === '' || (!rel.startsWith('..') && !rel.includes(`..${sep}`));
-}
-
-function bytesToKiB(value) {
-	return Math.round(value / 1024);
-}
-
-async function resetState() {
-	const backendRequire = createRequire(join(backendDir, 'package.json'));
-	const pg = backendRequire('pg');
-	const Redis = backendRequire('ioredis');
-
-	const postgres = new pg.Client({
-		host: '127.0.0.1',
-		port: 54312,
-		database: 'postgres',
-		user: 'postgres',
-	});
-
-	await postgres.connect();
-	try {
-		await postgres.query('DROP DATABASE IF EXISTS "test-misskey" WITH (FORCE)');
-		await postgres.query('CREATE DATABASE "test-misskey"');
-	} finally {
-		await postgres.end();
-	}
-
-	const redis = new Redis({ host: '127.0.0.1', port: 56312 });
-	try {
-		await redis.flushall();
-	} finally {
-		redis.disconnect();
-	}
-}
-
-function createRequest() {
-	return new Promise((resolvePromise, reject) => {
-		const req = http.request({
-			host: 'localhost',
-			port: 61812,
-			path: '/api/meta',
-			method: 'POST',
-		}, res => {
-			res.on('data', () => { });
-			res.on('end', () => resolvePromise());
-		});
-		req.on('error', reject);
-		req.end();
-	});
-}
-
-async function waitForServerReady(serverProcess) {
-	let serverReady = false;
-	serverProcess.on('message', message => {
-		if (message === 'ok') serverReady = true;
-	});
-
-	const startupStartTime = Date.now();
-	while (!serverReady) {
-		if (Date.now() - startupStartTime > STARTUP_TIMEOUT) {
-			serverProcess.kill('SIGTERM');
-			throw new Error('Server startup timeout');
-		}
-		await setTimeout(100);
-	}
-}
-
-async function stopServer(serverProcess) {
-	serverProcess.kill('SIGTERM');
-
-	let exited = false;
-	await new Promise(resolvePromise => {
-		serverProcess.on('exit', () => {
-			exited = true;
-			resolvePromise(undefined);
-		});
-
-		setTimeout(10000).then(() => {
-			if (!exited) serverProcess.kill('SIGKILL');
-			resolvePromise(undefined);
-		});
-	});
-}
-
-function getPackageNameFromPath(filePath) {
-	const normalized = util.normalizePath(filePath);
-	const marker = '/node_modules/';
-	const index = normalized.lastIndexOf(marker);
-	if (index === -1) return null;
-
-	const rest = normalized.slice(index + marker.length).split('/');
-	if (rest[0] === '.pnpm') {
-		const nestedNodeModulesIndex = rest.indexOf('node_modules');
-		if (nestedNodeModulesIndex === -1) return null;
-		const packageParts = rest.slice(nestedNodeModulesIndex + 1);
-		if (packageParts.length === 0) return null;
-		return packageParts[0].startsWith('@') ? packageParts.slice(0, 2).join('/') : packageParts[0];
-	}
-
-	return rest[0]?.startsWith('@') ? rest.slice(0, 2).join('/') : rest[0] ?? null;
-}
-
-function findPackageDir(filePath, packageName) {
-	const normalizedPackageName = packageName.split('/').join(sep);
-	let current = dirname(filePath);
-
-	while (current !== dirname(current)) {
-		if (current.endsWith(`${sep}${normalizedPackageName}`) && fsSync.existsSync(join(current, 'package.json'))) {
-			return current;
-		}
-
-		const parent = dirname(current);
-		if (parent === current) break;
-		current = parent;
-	}
-
-	return null;
-}
-
-function readPackageInfo(filePath) {
-	const externalPackageName = getPackageNameFromPath(filePath);
-	if (externalPackageName != null) {
-		const packageDir = findPackageDir(filePath, externalPackageName);
-		const cacheKey = packageDir ?? externalPackageName;
-		if (packageInfoCache.has(cacheKey)) return packageInfoCache.get(cacheKey);
-
-		let version = null;
-		if (packageDir != null) {
-			try {
-				const packageJson = JSON.parse(fsSync.readFileSync(join(packageDir, 'package.json'), 'utf8'));
-				version = typeof packageJson.version === 'string' ? packageJson.version : null;
-			} catch { }
-		}
-
-		const info = {
-			category: 'external',
-			name: externalPackageName,
-			version,
-			dir: packageDir,
-		};
-		packageInfoCache.set(cacheKey, info);
-		return info;
-	}
-
-	if (isInside(backendBuiltDir, filePath)) {
-		return {
-			category: 'internal',
-			name: 'backend',
-			version: null,
-			dir: backendDir,
-		};
-	}
-
-	return {
-		category: 'internal',
-		name: 'workspace',
-		version: null,
-		dir: repoDir,
-	};
-}
-
-function analyzeSource(filePath, source) {
-	const sourceFile = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-	const metrics = {
-		astNodeCount: 0,
-		functionCount: 0,
-		classCount: 0,
-		stringLiteralBytes: 0,
-	};
-
-	function visit(node) {
-		metrics.astNodeCount += 1;
-
-		if (
-			ts.isFunctionDeclaration(node) ||
-			ts.isFunctionExpression(node) ||
-			ts.isArrowFunction(node) ||
-			ts.isMethodDeclaration(node) ||
-			ts.isConstructorDeclaration(node) ||
-			ts.isGetAccessorDeclaration(node) ||
-			ts.isSetAccessorDeclaration(node)
-		) {
-			metrics.functionCount += 1;
-		} else if (ts.isClassDeclaration(node) || ts.isClassExpression(node)) {
-			metrics.classCount += 1;
-		} else if (ts.isStringLiteral(node) || ts.isNoSubstitutionTemplateLiteral(node)) {
-			metrics.stringLiteralBytes += Buffer.byteLength(node.text);
-		}
-
-		ts.forEachChild(node, visit);
-	}
-
-	visit(sourceFile);
-	return metrics;
-}
-
-function readFileMetrics(filePath) {
-	if (fileMetricCache.has(filePath)) return fileMetricCache.get(filePath);
-
-	const source = fsSync.readFileSync(filePath);
-	const sourceText = source.toString('utf8');
-	const astMetrics = analyzeSource(filePath, sourceText);
-	const packageInfo = readPackageInfo(filePath);
-	const metric = {
-		path: filePath,
-		displayPath: util.normalizePath(relative(repoDir, filePath)),
-		sourceBytes: source.byteLength,
-		gzipBytes: gzipSync(source).byteLength,
-		...astMetrics,
-		package: packageInfo,
-	};
-
-	fileMetricCache.set(filePath, metric);
-	return metric;
-}
-
-async function readTraceRecords() {
-	let content = '';
-	try {
-		content = await fs.readFile(traceFile, 'utf8');
-	} catch (err) {
-		if (err.code === 'ENOENT') return [];
-		throw err;
-	}
-
-	const records = [];
-	for (const line of content.split('\n')) {
-		if (line.trim() === '') continue;
-		try {
-			records.push(JSON.parse(line));
-		} catch { }
-	}
-	return records;
-}
-
-function emptyTotals() {
-	return {
-		loadedJsModules: 0,
-		loadedJsSourceBytes: 0,
-		loadedJsGzipBytes: 0,
-		astNodeCount: 0,
-		functionCount: 0,
-		classCount: 0,
-		stringLiteralBytes: 0,
-		externalPackageCount: 0,
-		nativeAddonPackageCount: 0,
-	};
-}
-
-function addFileMetrics(target, metric) {
-	target.loadedJsModules += 1;
-	target.loadedJsSourceBytes += metric.sourceBytes;
-	target.loadedJsGzipBytes += metric.gzipBytes;
-	target.astNodeCount += metric.astNodeCount;
-	target.functionCount += metric.functionCount;
-	target.classCount += metric.classCount;
-	target.stringLiteralBytes += metric.stringLiteralBytes;
-}
-
-function summarizeRecords(records, phase) {
-	const jsPaths = new Set();
-	const nativePaths = new Set();
-
-	for (const record of records) {
-		if (typeof record.path !== 'string') continue;
-
-		const extension = extname(record.path);
-		if (jsExtensions.has(extension)) {
-			jsPaths.add(resolve(record.path));
-		} else if (extension === '.node') {
-			nativePaths.add(resolve(record.path));
-		}
-	}
-
-	for (const nativePath of nativePaths) {
-		const packageInfo = readPackageInfo(nativePath);
-		if (packageInfo.category === 'external') nativePackageNames.add(packageInfo.name);
-	}
-
-	const totals = emptyTotals();
-	const packages = new Map();
-	const modules = [];
-
-	for (const filePath of [...jsPaths].toSorted()) {
-		let metric;
-		try {
-			metric = readFileMetrics(filePath);
-		} catch (err) {
-			process.stderr.write(`Failed to analyze ${filePath}: ${err.message}\n`);
-			continue;
-		}
-
-		addFileMetrics(totals, metric);
-
-		const packageKey = metric.package.name;
-		if (!packages.has(packageKey)) {
-			packages.set(packageKey, {
-				name: metric.package.name,
-				version: metric.package.version,
-				category: metric.package.category,
-				sourceBytes: 0,
-				gzipBytes: 0,
-				modules: 0,
-				astNodeCount: 0,
-				functionCount: 0,
-				classCount: 0,
-				stringLiteralBytes: 0,
-				nativeAddon: false,
-			});
-		}
-
-		const packageSummary = packages.get(packageKey);
-		packageSummary.sourceBytes += metric.sourceBytes;
-		packageSummary.gzipBytes += metric.gzipBytes;
-		packageSummary.modules += 1;
-		packageSummary.astNodeCount += metric.astNodeCount;
-		packageSummary.functionCount += metric.functionCount;
-		packageSummary.classCount += metric.classCount;
-		packageSummary.stringLiteralBytes += metric.stringLiteralBytes;
-
-		modules.push({
-			path: metric.displayPath,
-			package: metric.package.name,
-			category: metric.package.category,
-			sourceBytes: metric.sourceBytes,
-			gzipBytes: metric.gzipBytes,
-			astNodeCount: metric.astNodeCount,
-			functionCount: metric.functionCount,
-			classCount: metric.classCount,
-			stringLiteralBytes: metric.stringLiteralBytes,
-		});
-	}
-
-	for (const packageName of nativePackageNames) {
-		const packageSummary = packages.get(packageName);
-		if (packageSummary != null) packageSummary.nativeAddon = true;
-	}
-
-	const externalPackages = [...packages.values()].filter(packageSummary => packageSummary.category === 'external');
-	totals.externalPackageCount = externalPackages.length;
-	totals.nativeAddonPackageCount = externalPackages.filter(packageSummary => packageSummary.nativeAddon).length;
-
-	return {
-		totals: {
-			...totals,
-			loadedJsSourceKiB: bytesToKiB(totals.loadedJsSourceBytes),
-			loadedJsGzipKiB: bytesToKiB(totals.loadedJsGzipBytes),
-			stringLiteralKiB: bytesToKiB(totals.stringLiteralBytes),
-		},
-		packages: [...packages.values()].toSorted((a, b) => b.sourceBytes - a.sourceBytes),
-		modules: modules.toSorted((a, b) => b.sourceBytes - a.sourceBytes),
-	};
-}
-
-async function measureFootprint() {
-	await fs.writeFile(traceFile, '');
-
-	process.stderr.write('Resetting database and Redis\n');
-	await resetState();
-
-	process.stderr.write('Running migrations\n');
-	await util.run('pnpm', ['--filter', 'backend', 'migrate'], {
-		cwd: repoDir,
-		env: process.env,
-		logStdout: true,
-	});
-
-	const serverProcess = fork(join(backendBuiltDir, 'entry.js'), [], {
-		cwd: backendDir,
-		env: {
-			...process.env,
-			NODE_ENV: 'production',
-			MK_DISABLE_CLUSTERING: '1',
-			MK_ONLY_SERVER: '1',
-			MK_NO_DAEMONS: '1',
-			MK_BACKEND_JS_FOOTPRINT_TRACE: traceFile,
-		},
-		stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
-		execArgv: [
-			'--require',
-			join(__dirname, 'backend-js-footprint-require.cjs'),
-			'--experimental-loader',
-			pathToFileURL(join(__dirname, 'backend-js-footprint-loader.mjs')).href,
-		],
-	});
-
-	serverProcess.stdout?.on('data', data => {
-		process.stderr.write(`[server stdout] ${data}`);
-	});
-
-	serverProcess.stderr?.on('data', data => {
-		process.stderr.write(`[server stderr] ${data}`);
-	});
-
-	serverProcess.on('error', err => {
-		process.stderr.write(`[server error] ${err}\n`);
-	});
-
-	try {
-		await waitForServerReady(serverProcess);
-		await setTimeout(SETTLE_TIME);
-
-		//const startup = summarizeRecords(await readTraceRecords(), 'startup');
-
-		await Promise.all(
-			Array.from({ length: REQUEST_COUNT }).map(() => createRequest()),
-		);
-		await setTimeout(1000);
-
-		const afterRequest = summarizeRecords(await readTraceRecords(), 'afterRequest');
-
-		return {
-			timestamp: new Date().toISOString(),
-			measurement: {
-				strategy: 'runtime-loader-trace',
-				startupTimeoutMs: STARTUP_TIMEOUT,
-				settleTimeMs: SETTLE_TIME,
-				requestCount: REQUEST_COUNT,
-				cpus: cpus().length,
-			},
-			phases: {
-				//startup,
-				afterRequest,
-			},
-		};
-	} finally {
-		await stopServer(serverProcess);
-		await fs.rm(traceFile, { force: true });
-	}
-}
-
-const result = await measureFootprint();
-await fs.writeFile(outputFile, `${JSON.stringify(result, null, 2)}\n`);

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

@@ -1,429 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-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);
-
-type RuntimeLoadedJsFootprintReport = {
-	phases: Record<'afterRequest', {
-		totals: {
-			loadedJsModules: number;
-			loadedJsSourceBytes: number;
-			loadedJsGzipBytes: number;
-			astNodeCount: number;
-			functionCount: number;
-			classCount: number;
-			stringLiteralBytes: number;
-			externalPackageCount: number;
-			nativeAddonPackageCount: number;
-		};
-		modules: {
-			path: string;
-			package: string;
-			category: string;
-			sourceBytes: number;
-			gzipBytes: number;
-			astNodeCount: number;
-			functionCount: number;
-			classCount: number;
-			stringLiteralBytes: number;
-		}[];
-	}>;
-};
-
-const memoryReportPhases = [
-	{
-		key: 'afterGc',
-		title: 'After GC',
-	},
-] as const;
-
-const metrics = [
-	'HeapUsed',
-	'Pss',
-	'Private_Dirty',
-	'VmRSS',
-	'External',
-] as const;
-
-function formatMemoryMb(valueKiB: number | null | undefined) {
-	if (valueKiB == null) return '-';
-	return `${util.formatNumber(valueKiB / 1000)} MB`;
-}
-
-function getMemoryValue(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
-	return report.summary[phase].memoryUsage[metric];
-}
-
-function getMemoryValueFromSample(sample: MemoryReport['samples'][number], phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
-	return sample.phases[phase].memoryUsage[metric];
-}
-
-function getSampleSpread(report: MemoryReport, phase: typeof memoryReportPhases[number]['key'], metric: typeof metrics[number]) {
-	const values = report.samples.map(sample => getMemoryValueFromSample(sample, phase, metric));
-	if (values.length < 2) return null;
-
-	const center = util.median(values);
-	return util.median(values.map(value => Math.abs(value - center)));
-}
-
-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 percent = summary.median * 100 / baseValue;
-		const deltaMedian = summary == null ? '-' : `${formatDeltaMemory(summary.median)}<br>${util.formatDeltaPercent(percent, 0.1).replaceAll('\\%', '\\\\%')}`;
-
-		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)} |`);
-	}
-
-	return lines.join('\n');
-}
-
-/*
-function measurementSummary(base, head) {
-	const baseCount = base?.sampleCount;
-	const headCount = head?.sampleCount;
-	const strategy = base?.comparison?.strategy;
-	if (baseCount == null || headCount == null) return null;
-
-	if (strategy === 'interleaved-pairs') {
-		const rounds = base?.comparison?.rounds ?? baseCount;
-		const warmupRounds = base?.comparison?.warmupRounds ?? 0;
-		return `_Measured as ${rounds} interleaved base/head pairs after ${warmupRounds} warmup pair(s). Values are medians; ± is median absolute deviation._`;
-	}
-
-	return `_Sample count: base ${baseCount}, head ${headCount}. Values are medians; ± is median absolute deviation._`;
-}
-*/
-
-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);
-	if (table == null) return null;
-
-	const lines = [
-		'### V8 Heap Snapshot Statistics',
-		'',
-		table,
-		'',
-	];
-
-	for (const graph of [
-		//heapSnapshotUtil.renderHeapSnapshotSankey(baseHeapSnapshotReport, 'Base'),
-		heapSnapshotUtil.renderHeapSnapshotSankey(headHeapSnapshotReport, 'Head'),
-	]) {
-		if (graph == null) continue;
-		lines.push(graph);
-		lines.push('');
-	}
-
-	return lines.join('\n');
-}
-
-function getJsFootprintValue(report: RuntimeLoadedJsFootprintReport, phase: 'afterRequest', key: keyof RuntimeLoadedJsFootprintReport['phases'][typeof phase]['totals']) {
-	const value = report.phases[phase].totals[key];
-	return Number.isFinite(value) ? value : null;
-}
-
-function renderJsFootprintMetricTable(base: RuntimeLoadedJsFootprintReport, head: RuntimeLoadedJsFootprintReport) {
-	const metricRows = [
-		['Loaded JS modules', 'loadedJsModules', util.formatNumber],
-		['Loaded JS source', 'loadedJsSourceBytes', util.formatBytes],
-		//['Loaded JS gzip estimate', 'loadedJsGzipBytes', util.formatBytes],
-		//['AST nodes', 'astNodeCount', util.formatNumber],
-		//['Functions', 'functionCount', util.formatNumber],
-		//['Classes', 'classCount', util.formatNumber],
-		//['String literals', 'stringLiteralBytes', util.formatBytes],
-		['External packages loaded', 'externalPackageCount', util.formatNumber],
-		['Native addon packages', 'nativeAddonPackageCount', util.formatNumber],
-	] as const;
-
-	const lines = [
-		'| Metric | Base | Head | Δ | Δ (%) |',
-		'| --- | ---: | ---: | ---: | ---: |',
-	];
-
-	for (const [title, key, formatter] of metricRows) {
-		const baseValue = getJsFootprintValue(base, 'afterRequest', key);
-		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('\\%', '\\\\%')} |`);
-	}
-
-	return lines.join('\n');
-}
-
-/*
-function renderJsFootprintPhaseTable(base, head) {
-	const lines = [
-		'| Phase | Base modules | Head modules | Δ modules | Base source | Head source | Δ source |',
-		'| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
-	];
-
-	for (const [phase, title] of [['startup', 'Startup'], ['afterRequest', 'After warmup requests']]) {
-		const baseModules = getJsFootprintValue(base, phase, 'loadedJsModules');
-		const headModules = getJsFootprintValue(head, phase, 'loadedJsModules');
-		const baseSource = getJsFootprintValue(base, phase, 'loadedJsSourceBytes');
-		const headSource = getJsFootprintValue(head, phase, 'loadedJsSourceBytes');
-		if (baseModules == null || headModules == null || baseSource == null || headSource == null) continue;
-
-		lines.push(`| ${title} | ${util.formatNumber(baseModules)} | ${util.formatNumber(headModules)} | ${formatPlainDelta(baseModules, headModules)} | ${util.formatBytes(baseSource)} | ${util.formatBytes(headSource)} | ${formatPlainDelta(baseSource, headSource, util.formatBytes)} |`);
-	}
-
-	return lines.join('\n');
-}
-*/
-
-function packageMap(report: RuntimeLoadedJsFootprintReport) {
-	const map = new Map();
-	for (const packageSummary of report.phases.afterRequest.packages) {
-		if (packageSummary?.category !== 'external' || typeof packageSummary.name !== 'string') continue;
-		map.set(packageSummary.name, packageSummary);
-	}
-	return map;
-}
-
-function packageDisplayName(packageSummary: { name: string; version?: string | null }) {
-	if (packageSummary.version == null) return packageSummary.name;
-	return `${packageSummary.name} ${packageSummary.version}`;
-}
-
-function renderNewExternalPackages(base: RuntimeLoadedJsFootprintReport, head: RuntimeLoadedJsFootprintReport) {
-	const basePackages = packageMap(base);
-	const headPackages = packageMap(head);
-	const newPackages = [...headPackages.values()]
-		.filter(packageSummary => !basePackages.has(packageSummary.name))
-		.toSorted((a, b) => b.sourceBytes - a.sourceBytes)
-		.slice(0, 10);
-
-	if (newPackages.length === 0) return null;
-
-	const lines = [
-		'#### Newly Loaded External Packages',
-		'',
-		'| Package | Loaded JS | Modules | Notes |',
-		'| --- | ---: | ---: | --- |',
-	];
-
-	for (const packageSummary of newPackages) {
-		lines.push(`| ${packageDisplayName(packageSummary)} | ${util.formatBytes(packageSummary.sourceBytes)} | ${util.formatNumber(packageSummary.modules)} | ${packageSummary.nativeAddon ? 'native addon' : ''} |`);
-	}
-
-	return lines.join('\n');
-}
-
-function renderLargestPackageIncreases(base: RuntimeLoadedJsFootprintReport, head: RuntimeLoadedJsFootprintReport) {
-	const basePackages = packageMap(base);
-	const headPackages = packageMap(head);
-	const increases = [...headPackages.values()]
-		.map(headPackage => {
-			const basePackage = basePackages.get(headPackage.name);
-			const baseSourceBytes = basePackage?.sourceBytes ?? 0;
-			const baseModules = basePackage?.modules ?? 0;
-			return {
-				...headPackage,
-				baseSourceBytes,
-				baseModules,
-				sourceDiff: headPackage.sourceBytes - baseSourceBytes,
-				moduleDiff: headPackage.modules - baseModules,
-			};
-		})
-		.filter(packageSummary => packageSummary.sourceDiff > 0)
-		.toSorted((a, b) => b.sourceDiff - a.sourceDiff)
-		.slice(0, 10);
-
-	if (increases.length === 0) return null;
-
-	const lines = [
-		'#### Largest Package Increases',
-		'',
-		'| Package | Base | Head | Δ | Modules Δ |',
-		'| --- | ---: | ---: | ---: | ---: |',
-	];
-
-	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))} |`);
-	}
-
-	return lines.join('\n');
-}
-
-function renderNewLoadedModules(base: RuntimeLoadedJsFootprintReport, head: RuntimeLoadedJsFootprintReport) {
-	function moduleMap(report: RuntimeLoadedJsFootprintReport) {
-		const map = new Map();
-		for (const moduleSummary of report.phases.afterRequest.modules) {
-			if (typeof moduleSummary.path !== 'string') continue;
-			map.set(moduleSummary.path, moduleSummary);
-		}
-		return map;
-	}
-
-	const baseModules = moduleMap(base);
-	const headModules = moduleMap(head);
-	const newModules = [...headModules.values()]
-		.filter(moduleSummary => !baseModules.has(moduleSummary.path))
-		.toSorted((a, b) => b.sourceBytes - a.sourceBytes)
-		.slice(0, 10);
-
-	if (newModules.length === 0) return null;
-
-	const lines = [
-		'#### Largest Newly Loaded Modules',
-		'',
-		'| Module | Package | Loaded JS |',
-		'| --- | --- | ---: |',
-	];
-
-	for (const moduleSummary of newModules) {
-		lines.push(`| \`${moduleSummary.path}\` | ${moduleSummary.package} | ${util.formatBytes(moduleSummary.sourceBytes)} |`);
-	}
-
-	return lines.join('\n');
-}
-
-function renderJsFootprintSection(base: RuntimeLoadedJsFootprintReport, head: RuntimeLoadedJsFootprintReport) {
-	const lines = [
-		'### Runtime Loaded JS Footprint',
-		'',
-		'<details><summary>Click to show</summary>',
-		'',
-		renderJsFootprintMetricTable(base, head),
-		'',
-		//'#### Load Phase Breakdown',
-		//'',
-		//renderJsFootprintPhaseTable(base, head),
-		//'',
-	];
-
-	for (const block of [
-		renderNewExternalPackages(base, head),
-		renderLargestPackageIncreases(base, head),
-		renderNewLoadedModules(base, head),
-	]) {
-		if (block == null) continue;
-		lines.push(block);
-		lines.push('');
-	}
-
-	lines.push('</details>');
-	lines.push('');
-
-	return lines.join('\n');
-}
-
-const base = JSON.parse(await readFile(baseFile, 'utf8')) as MemoryReport;
-const head = JSON.parse(await readFile(headFile, 'utf8')) as MemoryReport;
-const baseJsFootprint = JSON.parse(await readFile(baseJsFootprintFile, 'utf8')) as RuntimeLoadedJsFootprintReport;
-const headJsFootprint = JSON.parse(await readFile(headJsFootprintFile, 'utf8')) as RuntimeLoadedJsFootprintReport;
-const lines = [
-	'## ⚙️ Backend Memory Usage Report',
-	'',
-];
-
-//const summary = measurementSummary(base, head);
-//if (summary != null) {
-//	lines.push(summary);
-//	lines.push('');
-//}
-
-for (const phase of memoryReportPhases) {
-	lines.push(`### ${phase.title}`);
-	lines.push(renderMainTableForPhase(base, head, phase.key));
-	lines.push('');
-}
-
-const heapSnapshotSection = renderHeapSnapshotSection(base, head);
-if (heapSnapshotSection != null) {
-	lines.push(heapSnapshotSection);
-	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);
-	lines.push('');
-}
-
-function getWarningMetric(base: MemoryReport, head: MemoryReport) {
-	for (const metric of ['Pss', 'Private_Dirty', 'VmRSS'] as const) {
-		if (getMemoryValue(base, 'afterGc', metric) != null && getMemoryValue(head, 'afterGc', metric) != null) {
-			return metric;
-		}
-	}
-	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 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;
-}
-
-const warningMetric = getWarningMetric(base, head);
-const warningDiffPercent = warningMetric == null ? null : getDiffPercent(base, head, 'afterGc', warningMetric);
-if (warningMetric != null && warningDiffPercent != null && warningDiffPercent > 5 && isBeyondSampleNoise(base, head, 'afterGc', warningMetric)) {
-	lines.push(`⚠️ **Warning**: Memory usage (${warningMetric}) has increased by more than 5% and exceeds the observed sample noise. Please verify this is not an unintended change.`);
-	lines.push('');
-}
-
-//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/chrome.mts

@@ -0,0 +1,570 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { createRequire } from 'node:module';
+import { writeFile } from 'node:fs/promises';
+import type { Browser, BrowserContext, CDPSession, Page } from 'playwright';
+import type { HeapSnapshotData } from './heap-snapshot-util.mts';
+import * as util from './utility.mts';
+
+export type NetworkRequest = {
+	requestId: string;
+	url: string;
+	method: string;
+	resourceType: string;
+	startedAt: number;
+	documentUrl?: string;
+	requestHeaders?: Record<string, string>;
+	requestBody?: string;
+	hasRequestBody: boolean;
+	status?: number;
+	statusText?: string;
+	mimeType?: string;
+	responseHeaders?: Record<string, string>;
+	protocol?: string;
+	remoteIPAddress?: string;
+	remotePort?: number;
+	encodedDataLength: number;
+	decodedBodyLength: number;
+	fromDiskCache: boolean;
+	fromServiceWorker: boolean;
+	finished: boolean;
+	failed: boolean;
+	errorText?: string;
+};
+
+export type WebSocketConnection = {
+	requestId: string;
+	url: string;
+	createdAt: number;
+	handshakeRequestHeaders?: Record<string, string>;
+	handshakeResponseStatus?: number;
+	handshakeResponseStatusText?: string;
+	handshakeResponseHeaders?: Record<string, string>;
+	closedAt?: number;
+	sentFrameCount: number;
+	receivedFrameCount: number;
+	sentBytes: number;
+	receivedBytes: number;
+	errorCount: number;
+};
+
+export type NetworkSummary = {
+	requestCount: number;
+	webSocketConnectionCount: number;
+	webSocketSentBytes: number;
+	webSocketReceivedBytes: number;
+	finishedRequestCount: number;
+	failedRequestCount: number;
+	cachedRequestCount: number;
+	serviceWorkerRequestCount: number;
+	totalEncodedBytes: number;
+	totalDecodedBodyBytes: number;
+	sameOriginEncodedBytes: number;
+	thirdPartyEncodedBytes: number;
+	byResourceType: Record<string, {
+		requests: number;
+		encodedBytes: number;
+		decodedBodyBytes: number;
+	}>;
+	largestRequests: {
+		url: string;
+		method: string;
+		resourceType: string;
+		status?: number;
+		encodedBytes: number;
+		decodedBodyBytes: number;
+	}[];
+	failedRequests: {
+		url: string;
+		method: string;
+		resourceType: string;
+		errorText?: string;
+		status?: number;
+	}[];
+};
+
+export type TabMemory = {
+	totalBytes: number;
+};
+
+export type BrowserDiagnostics = {
+	pageErrorCount: number;
+	console: Record<'log' | 'warning' | 'error' | 'info', number>;
+};
+
+export function summarizeBrowserDiagnostics(samples: BrowserDiagnostics[]): BrowserDiagnostics {
+	const median = (select: (sample: BrowserDiagnostics) => number) => util.median(samples.map(select));
+
+	return {
+		pageErrorCount: median(sample => sample.pageErrorCount),
+		console: {
+			log: median(sample => sample.console.log),
+			warning: median(sample => sample.console.warning),
+			error: median(sample => sample.console.error),
+			info: median(sample => sample.console.info),
+		},
+	};
+}
+
+export type BrowserMeasurement = {
+	label: string;
+	timestamp: string;
+	url: string;
+	scenario: string;
+	diagnostics: BrowserDiagnostics;
+	durationMs: number;
+	network: NetworkSummary;
+	performance: {
+		cdpMetrics: Record<string, number>;
+		runtimeHeap?: {
+			usedSize: number;
+			totalSize: number;
+		};
+		tabMemory: TabMemory;
+		webVitals: {
+			firstPaintMs?: number;
+			firstContentfulPaintMs?: number;
+			domContentLoadedEventEndMs?: number;
+			loadEventEndMs?: number;
+			longTaskCount: number;
+			longTaskDurationMs: number;
+			maxLongTaskDurationMs: number;
+			resourceEntryCount: number;
+			domElements: number;
+		};
+	};
+	heapSnapshot: HeapSnapshotData;
+};
+
+type PlaywrightModule = typeof import('playwright');
+
+const requireFromFrontend = createRequire(new URL('../../packages/frontend/package.json', import.meta.url));
+
+function loadPlaywright(): PlaywrightModule {
+	return requireFromFrontend('playwright') as PlaywrightModule;
+}
+
+function normalizeHeaders(headers: Record<string, unknown> | undefined) {
+	if (headers == null) return undefined;
+	const normalized = {} as Record<string, string>;
+	for (const [key, value] of Object.entries(headers)) {
+		normalized[key] = String(value);
+	}
+	return normalized;
+}
+
+function webSocketFramePayloadBytes(frame: { opcode?: number; payloadData?: string } | undefined) {
+	if (frame?.payloadData == null) return 0;
+	if (frame.opcode === 1) return Buffer.byteLength(frame.payloadData, 'utf8');
+	return Buffer.byteLength(frame.payloadData, 'base64');
+}
+
+type PlaywrightBrowserOptions = {
+	scenarioTimeoutMs: number;
+	baseUrl: string;
+};
+
+export class HeadlessChromeController {
+	public networkRequests: NetworkRequest[] = [];
+	public webSocketConnections: WebSocketConnection[] = [];
+	private readonly diagnostics = {
+		pageErrorCount: 0,
+		console: {} as Record<string, number | undefined>,
+	};
+	private readonly browser: Browser;
+	private readonly context: BrowserContext;
+	public readonly page: Page;
+	private readonly cdp: CDPSession;
+	private pendingNetworkDetailReads: Promise<void>[] = [];
+
+	private constructor(
+		browser: Browser,
+		context: BrowserContext,
+		page: Page,
+		cdp: CDPSession,
+		options: PlaywrightBrowserOptions,
+	) {
+		this.browser = browser;
+		this.context = context;
+		this.page = page;
+		this.cdp = cdp;
+		this.page.setDefaultTimeout(options.scenarioTimeoutMs);
+		this.page.setDefaultNavigationTimeout(options.scenarioTimeoutMs);
+		this.page.on('pageerror', () => {
+			this.diagnostics.pageErrorCount++;
+		});
+		this.page.on('console', message => {
+			if (this.diagnostics.console[message.type()] == null) {
+				this.diagnostics.console[message.type()] = 1;
+			} else {
+				this.diagnostics.console[message.type()]++;
+			}
+		});
+	}
+
+	static async create(label: string, options: PlaywrightBrowserOptions): Promise<HeadlessChromeController> {
+		process.stderr.write(`[${label}] Launching Playwright Chromium\n`);
+		const { chromium } = loadPlaywright();
+		const browser = await chromium.launch({
+			channel: 'chromium',
+			headless: true,
+			args: [
+				'--disable-gpu',
+				'--disable-dev-shm-usage',
+				'--disable-background-networking',
+				'--disable-default-apps',
+				'--disable-extensions',
+				'--disable-sync',
+				'--metrics-recording-only',
+				'--no-first-run',
+				'--no-default-browser-check',
+				'--no-sandbox',
+			],
+		});
+
+		try {
+			const context = await browser.newContext({
+				baseURL: options.baseUrl,
+				locale: 'en-US',
+			});
+			await context.addInitScript(() => {
+				// @ts-expect-error Test-only runtime hint consumed by Misskey frontend code.
+				window.isPlaywright = true;
+			});
+
+			const page = await context.newPage();
+			const cdp = await context.newCDPSession(page);
+			return new HeadlessChromeController(browser, context, page, cdp, options);
+		} catch (error) {
+			await browser.close().catch(() => undefined);
+			throw error;
+		}
+	}
+
+	static async with<T>(label: string, options: PlaywrightBrowserOptions, callback: (browser: HeadlessChromeController) => T | Promise<T>): Promise<T> {
+		const browser = await HeadlessChromeController.create(label, options);
+		try {
+			return await callback(browser);
+		} finally {
+			await browser.close();
+		}
+	}
+
+	public async enableNetworkTracking() {
+		const requests = new Map<string, NetworkRequest>();
+		const webSockets = new Map<string, WebSocketConnection>();
+
+		const readRequestBody = (row: NetworkRequest) => {
+			if (!row.hasRequestBody || row.requestBody != null) return;
+			const pending = this.cdp.send<{ postData: string }>('Network.getRequestPostData', {
+				requestId: row.requestId,
+			}).then(result => {
+				row.requestBody = result.postData;
+			}).catch(() => {
+				// Some requests expose hasPostData but no longer have retrievable body data.
+			});
+			this.pendingNetworkDetailReads.push(pending);
+		};
+
+		this.cdp.on('Network.requestWillBeSent', params => {
+			if (params.request?.url == null) return;
+			const row: NetworkRequest = {
+				requestId: params.requestId,
+				url: params.request.url,
+				method: params.request.method ?? 'GET',
+				resourceType: params.type ?? 'Other',
+				startedAt: params.timestamp ?? 0,
+				documentUrl: params.documentURL,
+				requestHeaders: normalizeHeaders(params.request.headers),
+				requestBody: typeof params.request.postData === 'string' ? params.request.postData : undefined,
+				hasRequestBody: params.request.hasPostData === true || typeof params.request.postData === 'string',
+				encodedDataLength: 0,
+				decodedBodyLength: 0,
+				fromDiskCache: false,
+				fromServiceWorker: false,
+				finished: false,
+				failed: false,
+			};
+			requests.set(params.requestId, row);
+			this.networkRequests.push(row);
+		});
+
+		this.cdp.on('Network.webSocketCreated', params => {
+			if (params.requestId == null || params.url == null) return;
+			const row: WebSocketConnection = {
+				requestId: params.requestId,
+				url: params.url,
+				createdAt: params.timestamp ?? 0,
+				sentFrameCount: 0,
+				receivedFrameCount: 0,
+				sentBytes: 0,
+				receivedBytes: 0,
+				errorCount: 0,
+			};
+			webSockets.set(params.requestId, row);
+			this.webSocketConnections.push(row);
+		});
+
+		this.cdp.on('Network.webSocketWillSendHandshakeRequest', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.handshakeRequestHeaders = normalizeHeaders(params.request?.headers);
+		});
+
+		this.cdp.on('Network.webSocketHandshakeResponseReceived', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.handshakeResponseStatus = params.response?.status;
+			row.handshakeResponseStatusText = params.response?.statusText;
+			row.handshakeResponseHeaders = normalizeHeaders(params.response?.headers);
+		});
+
+		this.cdp.on('Network.webSocketFrameSent', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.sentFrameCount += 1;
+			row.sentBytes += webSocketFramePayloadBytes(params.response);
+		});
+
+		this.cdp.on('Network.webSocketFrameReceived', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.receivedFrameCount += 1;
+			row.receivedBytes += webSocketFramePayloadBytes(params.response);
+		});
+
+		this.cdp.on('Network.webSocketFrameError', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.errorCount += 1;
+		});
+
+		this.cdp.on('Network.webSocketClosed', params => {
+			const row = webSockets.get(params.requestId);
+			if (row == null) return;
+			row.closedAt = params.timestamp ?? 0;
+		});
+
+		this.cdp.on('Network.responseReceived', params => {
+			const row = requests.get(params.requestId);
+			if (row == null) return;
+			row.status = params.response?.status;
+			row.statusText = params.response?.statusText;
+			row.mimeType = params.response?.mimeType;
+			row.responseHeaders = normalizeHeaders(params.response?.headers);
+			row.protocol = params.response?.protocol;
+			row.remoteIPAddress = params.response?.remoteIPAddress;
+			row.remotePort = params.response?.remotePort;
+			row.requestHeaders ??= normalizeHeaders(params.response?.requestHeaders);
+			row.fromDiskCache = params.response?.fromDiskCache === true;
+			row.fromServiceWorker = params.response?.fromServiceWorker === true;
+		});
+
+		this.cdp.on('Network.dataReceived', params => {
+			const row = requests.get(params.requestId);
+			if (row == null) return;
+			row.decodedBodyLength += params.dataLength ?? 0;
+			row.encodedDataLength += params.encodedDataLength ?? 0;
+		});
+
+		this.cdp.on('Network.loadingFinished', params => {
+			const row = requests.get(params.requestId);
+			if (row == null) return;
+			row.finished = true;
+			row.encodedDataLength = Math.max(row.encodedDataLength, params.encodedDataLength ?? 0);
+			readRequestBody(row);
+		});
+
+		this.cdp.on('Network.loadingFailed', params => {
+			const row = requests.get(params.requestId);
+			if (row == null) return;
+			row.failed = true;
+			row.finished = true;
+			row.errorText = params.errorText;
+			readRequestBody(row);
+		});
+
+		await this.cdp.send('Network.enable');
+		await this.cdp.send('Network.setCacheDisabled', { cacheDisabled: true });
+		await this.cdp.send('Network.setBypassServiceWorker', { bypass: true });
+		await this.cdp.send('Page.enable');
+		await this.cdp.send('Runtime.enable');
+		await this.cdp.send('Performance.enable');
+	}
+
+	public async waitForNetworkDetails() {
+		let settledCount = 0;
+		while (settledCount < this.pendingNetworkDetailReads.length) {
+			const pending = this.pendingNetworkDetailReads.slice(settledCount);
+			settledCount = this.pendingNetworkDetailReads.length;
+			await Promise.allSettled(pending);
+		}
+	}
+
+	public async evaluate<T>(expression: string, timeoutMs = 30_000): Promise<T> {
+		return await Promise.race([
+			this.page.evaluate(expression),
+			new Promise<never>((_, reject) => setTimeout(() => reject(new Error(`Playwright evaluate timed out after ${timeoutMs}ms`)), timeoutMs).unref()),
+		]) as T;
+	}
+
+	public collectDiagnostics(): BrowserDiagnostics {
+		return {
+			pageErrorCount: this.diagnostics.pageErrorCount,
+			console: {
+				log: this.diagnostics.console.log ?? 0,
+				warning: this.diagnostics.console.warning ?? 0,
+				error: this.diagnostics.console.error ?? 0,
+				info: this.diagnostics.console.info ?? 0,
+			},
+		};
+	}
+
+	public async collectPerformance(): Promise<BrowserMeasurement['performance']> {
+		const cdpMetricsResult = await this.cdp.send<{ metrics: { name: string; value: number }[] }>('Performance.getMetrics');
+		const cdpMetrics = Object.fromEntries(cdpMetricsResult.metrics.map(metric => [metric.name, metric.value]));
+		const runtimeHeap = await this.cdp.send<{ usedSize: number; totalSize: number }>('Runtime.getHeapUsage').catch(() => undefined);
+		const tabMemory = await this.collectTabMemory();
+		const webVitals = await this.evaluate<BrowserMeasurement['performance']['webVitals']>(`(() => {
+			const navigation = performance.getEntriesByType('navigation')[0];
+			const paintEntries = Object.fromEntries(performance.getEntriesByType('paint').map(entry => [entry.name, entry.startTime]));
+			const longTasks = performance.getEntriesByType('longtask');
+			const resourceEntries = performance.getEntriesByType('resource');
+			return {
+				firstPaintMs: paintEntries['first-paint'],
+				firstContentfulPaintMs: paintEntries['first-contentful-paint'],
+				domContentLoadedEventEndMs: navigation?.domContentLoadedEventEnd,
+				loadEventEndMs: navigation?.loadEventEnd,
+				longTaskCount: longTasks.length,
+				longTaskDurationMs: longTasks.reduce((sum, entry) => sum + entry.duration, 0),
+				maxLongTaskDurationMs: longTasks.reduce((max, entry) => Math.max(max, entry.duration), 0),
+				resourceEntryCount: resourceEntries.length,
+				domElements: document.getElementsByTagName('*').length,
+			};
+		})()`);
+
+		return {
+			cdpMetrics,
+			runtimeHeap,
+			tabMemory,
+			webVitals,
+		};
+	}
+
+	public async collectTabMemory(): Promise<TabMemory> {
+		const userAgentSpecificMemory = await this.evaluate<{ bytes?: number }>(`(async () => {
+			const measureMemory = performance.measureUserAgentSpecificMemory;
+			if (typeof measureMemory !== 'function') return {};
+			const result = await measureMemory.call(performance);
+			return { bytes: result.bytes };
+		})()`, 60_000);
+
+		const userAgentSpecificBytes = userAgentSpecificMemory?.bytes;
+		if (!Number.isFinite(userAgentSpecificBytes)) {
+			throw new Error('performance.measureUserAgentSpecificMemory() did not return finite bytes');
+		}
+
+		return {
+			totalBytes: userAgentSpecificBytes as number,
+		};
+	}
+
+	public async takeHeapSnapshot(savePath?: string) {
+		const chunks: string[] = [];
+		this.cdp.on('HeapProfiler.addHeapSnapshotChunk', params => {
+			chunks.push(params.chunk);
+		});
+
+		await this.cdp.send('HeapProfiler.enable');
+		await this.cdp.send('HeapProfiler.collectGarbage');
+		await this.cdp.send('HeapProfiler.takeHeapSnapshot', { reportProgress: false });
+
+		const content = chunks.join('');
+		if (savePath != null) {
+			await writeFile(savePath, content);
+		}
+
+		return JSON.parse(content);
+	}
+
+	public async close() {
+		await this.cdp.detach().catch(() => undefined);
+		await this.context.close().catch(() => undefined);
+		await this.browser.close().catch(() => undefined);
+	}
+}
+
+function isMeasurableRequest(row: NetworkRequest) {
+	return !row.url.startsWith('data:') && !row.url.startsWith('blob:') && !row.url.startsWith('devtools:');
+}
+
+export function summarizeNetwork(requestRows: NetworkRequest[], baseUrl: string, webSocketRows?: WebSocketConnection[]): NetworkSummary {
+	const origin = new URL(baseUrl).origin;
+	const rows = requestRows.filter(isMeasurableRequest);
+	const byResourceType = {} as NetworkSummary['byResourceType'];
+
+	for (const row of rows) {
+		const summary = byResourceType[row.resourceType] ?? {
+			requests: 0,
+			encodedBytes: 0,
+			decodedBodyBytes: 0,
+		};
+		summary.requests += 1;
+		summary.encodedBytes += row.encodedDataLength;
+		summary.decodedBodyBytes += row.decodedBodyLength;
+		byResourceType[row.resourceType] = summary;
+	}
+
+	function isSameOrigin(url: string) {
+		try {
+			return new URL(url).origin === origin;
+		} catch {
+			return false;
+		}
+	}
+
+	return {
+		requestCount: rows.length,
+		webSocketConnectionCount: webSocketRows == null
+			? rows.filter(row => row.resourceType === 'WebSocket').length
+			: webSocketRows.length,
+		webSocketSentBytes: webSocketRows?.reduce((sum, row) => sum + row.sentBytes, 0) ?? 0,
+		webSocketReceivedBytes: webSocketRows?.reduce((sum, row) => sum + row.receivedBytes, 0) ?? 0,
+		finishedRequestCount: rows.filter(row => row.finished).length,
+		failedRequestCount: rows.filter(row => row.failed).length,
+		cachedRequestCount: rows.filter(row => row.fromDiskCache).length,
+		serviceWorkerRequestCount: rows.filter(row => row.fromServiceWorker).length,
+		totalEncodedBytes: rows.reduce((sum, row) => sum + row.encodedDataLength, 0),
+		totalDecodedBodyBytes: rows.reduce((sum, row) => sum + row.decodedBodyLength, 0),
+		sameOriginEncodedBytes: rows
+			.filter(row => isSameOrigin(row.url))
+			.reduce((sum, row) => sum + row.encodedDataLength, 0),
+		thirdPartyEncodedBytes: rows
+			.filter(row => !isSameOrigin(row.url))
+			.reduce((sum, row) => sum + row.encodedDataLength, 0),
+		byResourceType,
+		largestRequests: rows
+			.toSorted((a, b) => b.encodedDataLength - a.encodedDataLength)
+			.slice(0, 15)
+			.map(row => ({
+				url: row.url,
+				method: row.method,
+				resourceType: row.resourceType,
+				status: row.status,
+				encodedBytes: row.encodedDataLength,
+				decodedBodyBytes: row.decodedBodyLength,
+			})),
+		failedRequests: rows
+			.filter(row => row.failed)
+			.map(row => ({
+				url: row.url,
+				method: row.method,
+				resourceType: row.resourceType,
+				errorText: row.errorText,
+				status: row.status,
+			})),
+	};
+}

.github/scripts/frontend-browser-diagnostics.inspect.mts

@@ -0,0 +1,279 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { copyFile, mkdir, rm, 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 { HeadlessChromeController, summarizeBrowserDiagnostics, summarizeNetwork } from './chrome.mts';
+import type { BrowserMeasurement, NetworkRequest, NetworkSummary } from './chrome.mts';
+import { closeUserSetupDialog, postNote, signupThroughUi, visitHome } from '../../packages/frontend/test/e2e/shared.ts';
+
+const [baseDirArg, headDirArg, baseOutputArg, headOutputArg] = process.argv.slice(2);
+
+const baseUrl = process.env.FRONTEND_BROWSER_METRICS_URL ?? 'http://127.0.0.1:61812';
+const sampleCount = util.readIntegerEnv('FRONTEND_BROWSER_METRICS_SAMPLE_COUNT', 5, 1);
+const heapSnapshotBreakdownTopN = util.readIntegerEnv('FRONTEND_BROWSER_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', heapSnapshotUtil.defaultHeapSnapshotBreakdownTopN, 1);
+const heapSnapshotWorkDirs = {
+	base: resolve('frontend-browser-base-heap-snapshots'),
+	head: resolve('frontend-browser-head-heap-snapshots'),
+} as const;
+const heapSnapshotOutputPaths = {
+	base: resolve('base-heap-snapshot.heapsnapshot'),
+	head: resolve('head-heap-snapshot.heapsnapshot'),
+} as const;
+
+type BrowserMeasurementSample = BrowserMeasurement & {
+	round: number;
+	networkRequests: NetworkRequest[];
+};
+
+type BrowserMetricsReport = {
+	label: string;
+	timestamp: string;
+	url: string;
+	scenario: string;
+	sampleCount: number;
+	aggregation: 'median';
+	summary: BrowserMeasurement;
+	samples: BrowserMeasurementSample[];
+};
+
+async function runSignupAndPostScenario(chrome: HeadlessChromeController) {
+	const page = chrome.page;
+	const noteText = `Frontend browser metrics ${Date.now()}`;
+
+	await visitHome(page, baseUrl);
+	await signupThroughUi(page, { username: 'alice', password: 'password' });
+	await closeUserSetupDialog(page);
+	await postNote(page, noteText, 10_000);
+
+	await util.sleep(1000);
+}
+
+function finiteMedian(values: (number | null | undefined)[], defaultValue = 0) {
+	const finiteValues = values.filter(value => Number.isFinite(value)) as number[];
+	if (finiteValues.length === 0) return defaultValue;
+	return util.median(finiteValues);
+}
+
+function selectRepresentativeSample(samples: BrowserMeasurementSample[], getValue: (sample: BrowserMeasurementSample) => number) {
+	const medianValue = finiteMedian(samples.map(getValue));
+	let selected: { sample: BrowserMeasurementSample; distance: number } | null = null;
+
+	for (const sample of samples) {
+		const value = getValue(sample);
+		if (!Number.isFinite(value)) continue;
+		const distance = Math.abs(value - medianValue);
+		if (selected == null || distance < selected.distance || (distance === selected.distance && sample.round < selected.sample.round)) {
+			selected = {
+				sample,
+				distance,
+			};
+		}
+	}
+
+	return selected?.sample ?? samples[0];
+}
+
+function summarizeResourceType(samples: BrowserMeasurementSample[], resourceType: string) {
+	return {
+		requests: finiteMedian(samples.map(sample => sample.network.byResourceType[resourceType]?.requests)),
+		encodedBytes: finiteMedian(samples.map(sample => sample.network.byResourceType[resourceType]?.encodedBytes)),
+		decodedBodyBytes: finiteMedian(samples.map(sample => sample.network.byResourceType[resourceType]?.decodedBodyBytes)),
+	};
+}
+
+function summarizeNetworkSamples(samples: BrowserMeasurementSample[]): NetworkSummary {
+	const resourceTypes = new Set<string>();
+	for (const sample of samples) {
+		for (const resourceType of Object.keys(sample.network.byResourceType)) {
+			resourceTypes.add(resourceType);
+		}
+	}
+
+	const representative = selectRepresentativeSample(samples, sample => sample.network.totalEncodedBytes);
+	const byResourceType = {} as NetworkSummary['byResourceType'];
+	for (const resourceType of resourceTypes) {
+		byResourceType[resourceType] = summarizeResourceType(samples, resourceType);
+	}
+
+	return {
+		requestCount: finiteMedian(samples.map(sample => sample.network.requestCount)),
+		webSocketConnectionCount: finiteMedian(samples.map(sample => sample.network.webSocketConnectionCount)),
+		webSocketSentBytes: finiteMedian(samples.map(sample => sample.network.webSocketSentBytes)),
+		webSocketReceivedBytes: finiteMedian(samples.map(sample => sample.network.webSocketReceivedBytes)),
+		finishedRequestCount: finiteMedian(samples.map(sample => sample.network.finishedRequestCount)),
+		failedRequestCount: finiteMedian(samples.map(sample => sample.network.failedRequestCount)),
+		cachedRequestCount: finiteMedian(samples.map(sample => sample.network.cachedRequestCount)),
+		serviceWorkerRequestCount: finiteMedian(samples.map(sample => sample.network.serviceWorkerRequestCount)),
+		totalEncodedBytes: finiteMedian(samples.map(sample => sample.network.totalEncodedBytes)),
+		totalDecodedBodyBytes: finiteMedian(samples.map(sample => sample.network.totalDecodedBodyBytes)),
+		sameOriginEncodedBytes: finiteMedian(samples.map(sample => sample.network.sameOriginEncodedBytes)),
+		thirdPartyEncodedBytes: finiteMedian(samples.map(sample => sample.network.thirdPartyEncodedBytes)),
+		byResourceType,
+		largestRequests: representative.network.largestRequests,
+		failedRequests: representative.network.failedRequests,
+	};
+}
+
+function summarizePerformanceSamples(samples: BrowserMeasurementSample[]): BrowserMeasurement['performance'] {
+	const cdpMetricKeys = new Set<string>();
+	for (const sample of samples) {
+		for (const key of Object.keys(sample.performance.cdpMetrics)) {
+			cdpMetricKeys.add(key);
+		}
+	}
+
+	const cdpMetrics = {} as Record<string, number>;
+	for (const key of cdpMetricKeys) {
+		cdpMetrics[key] = finiteMedian(samples.map(sample => sample.performance.cdpMetrics[key]));
+	}
+
+	const webVitalKeys = [
+		'firstPaintMs',
+		'firstContentfulPaintMs',
+		'domContentLoadedEventEndMs',
+		'loadEventEndMs',
+		'longTaskCount',
+		'longTaskDurationMs',
+		'maxLongTaskDurationMs',
+		'resourceEntryCount',
+		'domElements',
+	] as const satisfies (keyof BrowserMeasurement['performance']['webVitals'])[];
+
+	const webVitals = {} as BrowserMeasurement['performance']['webVitals'];
+	for (const key of webVitalKeys) {
+		webVitals[key] = finiteMedian(samples.map(sample => sample.performance.webVitals[key]));
+	}
+
+	return {
+		cdpMetrics,
+		runtimeHeap: {
+			usedSize: finiteMedian(samples.map(sample => sample.performance.runtimeHeap?.usedSize)),
+			totalSize: finiteMedian(samples.map(sample => sample.performance.runtimeHeap?.totalSize)),
+		},
+		tabMemory: {
+			totalBytes: finiteMedian(samples.map(sample => sample.performance.tabMemory.totalBytes)),
+		},
+		webVitals,
+	};
+}
+
+function summarizeHeapSnapshotSamples(samples: BrowserMeasurementSample[]) {
+	const summary = heapSnapshotUtil.summarizeHeapSnapshotDataSamples(
+		samples,
+		sample => sample.heapSnapshot,
+		{ breakdownTopN: heapSnapshotBreakdownTopN },
+	);
+	if (summary == null) throw new Error('No heap snapshot samples');
+	return summary;
+}
+
+function summarizeSamples(label: 'base' | 'head', samples: BrowserMeasurementSample[]): BrowserMetricsReport {
+	if (samples.length === 0) throw new Error(`No browser metric samples for ${label}`);
+	const representative = selectRepresentativeSample(samples, sample => sample.network.totalEncodedBytes);
+	const summary: BrowserMeasurement = {
+		label,
+		timestamp: new Date().toISOString(),
+		url: baseUrl,
+		scenario: representative.scenario,
+		diagnostics: summarizeBrowserDiagnostics(samples.map(sample => sample.diagnostics)),
+		durationMs: finiteMedian(samples.map(sample => sample.durationMs)),
+		network: summarizeNetworkSamples(samples),
+		performance: summarizePerformanceSamples(samples),
+		heapSnapshot: summarizeHeapSnapshotSamples(samples),
+	};
+
+	return {
+		label,
+		timestamp: new Date().toISOString(),
+		url: baseUrl,
+		scenario: representative.scenario,
+		sampleCount: samples.length,
+		aggregation: 'median',
+		summary,
+		samples,
+	};
+}
+
+async function measureSample(label: 'base' | 'head', round: number, heapSnapshotSavePath?: string) {
+	await util.prepareInstance(baseUrl);
+
+	return await HeadlessChromeController.with(label, { scenarioTimeoutMs: 120000, baseUrl }, async chrome => {
+		await chrome.enableNetworkTracking();
+
+		const startedAt = Date.now();
+		await runSignupAndPostScenario(chrome);
+		const durationMs = Date.now() - startedAt;
+		await chrome.waitForNetworkDetails();
+		const performance = await chrome.collectPerformance();
+		const heapSnapshotRaw = await chrome.takeHeapSnapshot(heapSnapshotSavePath);
+		const heapSnapshot = heapSnapshotUtil.analyzeHeapSnapshot(heapSnapshotRaw, { breakdownTopN: heapSnapshotBreakdownTopN });
+		const measurement: BrowserMeasurementSample = {
+			label,
+			round,
+			timestamp: new Date().toISOString(),
+			url: baseUrl,
+			scenario: 'fresh browser signup, first timeline note, after the note becomes visible',
+			diagnostics: chrome.collectDiagnostics(),
+			durationMs,
+			network: summarizeNetwork(chrome.networkRequests, baseUrl, chrome.webSocketConnections),
+			networkRequests: chrome.networkRequests,
+			performance,
+			heapSnapshot,
+		};
+
+		return measurement;
+	});
+}
+
+function heapSnapshotPath(label: 'base' | 'head', round: number) {
+	return join(heapSnapshotWorkDirs[label], `round-${round}.heapsnapshot`);
+}
+
+async function saveRepresentativeHeapSnapshot(label: 'base' | 'head', report: BrowserMetricsReport) {
+	const representative = selectRepresentativeSample(report.samples, sample => sample.heapSnapshot.categories.total);
+	await copyFile(heapSnapshotPath(label, representative.round), heapSnapshotOutputPaths[label]);
+	process.stderr.write(`[${label}] Selected round ${representative.round} heap snapshot for artifact\n`);
+	await rm(heapSnapshotWorkDirs[label], { recursive: true, force: true });
+}
+
+async function genReport(label: 'base' | 'head', repoDir: string, outputPath: string) {
+	let server: ReturnType<typeof util.startServer> | null = null;
+
+	try {
+		server = util.startServer(label, repoDir);
+		await util.waitForServer(baseUrl, server);
+
+		await rm(heapSnapshotWorkDirs[label], { recursive: true, force: true });
+		await mkdir(heapSnapshotWorkDirs[label], { recursive: true });
+
+		const samples: BrowserMeasurementSample[] = [];
+		for (let round = 1; round <= sampleCount; round++) {
+			process.stderr.write(`[${label}] Measuring browser metrics sample ${round}/${sampleCount}\n`);
+			samples.push(await measureSample(
+				label,
+				round,
+				heapSnapshotPath(label, round),
+			));
+		}
+
+		const report = summarizeSamples(label, samples);
+		await writeFile(outputPath, JSON.stringify(report, null, '\t'));
+		process.stderr.write(`[${label}] Wrote browser metrics report to ${outputPath}\n`);
+
+		await saveRepresentativeHeapSnapshot(label, report);
+	} finally {
+		if (server != null) await util.stopServer(server);
+	}
+}
+
+async function main() {
+	await genReport('base', resolve(baseDirArg), resolve(baseOutputArg));
+	await genReport('head', resolve(headDirArg), resolve(headOutputArg));
+}
+
+await main();

.github/scripts/frontend-browser-diagnostics.render-additional-html.mts

@@ -0,0 +1,446 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { readFile, writeFile } from 'node:fs/promises';
+import { pathToFileURL } from 'node:url';
+import * as util from './utility.mts';
+import type { BrowserMeasurementSample, BrowserMetricsReport } from './frontend-browser-diagnostics.render-md.mts';
+import type { NetworkRequest } from './chrome.mts';
+
+type DiffDirection = 'added' | 'removed';
+
+type RequestDiff = {
+	direction: DiffDirection;
+	round: number;
+	baseCount: number;
+	headCount: number;
+	request: NetworkRequest;
+};
+
+function escapeHtml(value: unknown) {
+	return String(value ?? '')
+		.replaceAll('&', '&')
+		.replaceAll('<', '&lt;')
+		.replaceAll('>', '&gt;')
+		.replaceAll('"', '&quot;')
+		.replaceAll("'", '&#39;');
+}
+
+function escapeAttribute(value: unknown) {
+	return escapeHtml(value);
+}
+
+function isHttpRequest(request: NetworkRequest) {
+	try {
+		const { protocol } = new URL(request.url);
+		return protocol === 'http:' || protocol === 'https:';
+	} catch {
+		return false;
+	}
+}
+
+function requestKey(request: NetworkRequest) {
+	return [
+		request.method,
+		request.resourceType,
+		request.url,
+	].join('\u0000');
+}
+
+function groupRequests(requests: NetworkRequest[] | undefined) {
+	const grouped = new Map<string, NetworkRequest[]>();
+	for (const request of requests ?? []) {
+		if (!isHttpRequest(request)) continue;
+		const key = requestKey(request);
+		const rows = grouped.get(key) ?? [];
+		rows.push(request);
+		grouped.set(key, rows);
+	}
+	return grouped;
+}
+
+function byRound(samples: BrowserMeasurementSample[]) {
+	return new Map(samples.map(sample => [sample.round, sample]));
+}
+
+function diffRound(round: number, baseSample: BrowserMeasurementSample | undefined, headSample: BrowserMeasurementSample | undefined) {
+	const baseRequests = groupRequests(baseSample?.networkRequests);
+	const headRequests = groupRequests(headSample?.networkRequests);
+	const keys = [...new Set([
+		...baseRequests.keys(),
+		...headRequests.keys(),
+	])].toSorted();
+	const diffs: RequestDiff[] = [];
+
+	for (const key of keys) {
+		const baseRows = baseRequests.get(key) ?? [];
+		const headRows = headRequests.get(key) ?? [];
+		if (headRows.length > baseRows.length) {
+			for (const request of headRows.slice(baseRows.length)) {
+				diffs.push({
+					direction: 'added',
+					round,
+					baseCount: baseRows.length,
+					headCount: headRows.length,
+					request,
+				});
+			}
+		} else if (baseRows.length > headRows.length) {
+			for (const request of baseRows.slice(headRows.length)) {
+				diffs.push({
+					direction: 'removed',
+					round,
+					baseCount: baseRows.length,
+					headCount: headRows.length,
+					request,
+				});
+			}
+		}
+	}
+
+	return diffs;
+}
+
+function diffReports(base: BrowserMetricsReport, head: BrowserMetricsReport) {
+	const baseSamples = byRound(base.samples);
+	const headSamples = byRound(head.samples);
+	const rounds = [...new Set([
+		...baseSamples.keys(),
+		...headSamples.keys(),
+	])].toSorted((a, b) => a - b);
+	return rounds.flatMap(round => diffRound(round, baseSamples.get(round), headSamples.get(round)));
+}
+
+function formatMaybeJson(value: string | undefined) {
+	if (value == null || value === '') return null;
+	try {
+		return JSON.stringify(JSON.parse(value), null, '\t');
+	} catch {
+		return value;
+	}
+}
+
+function formatHeaders(headers: Record<string, string> | undefined) {
+	if (headers == null || Object.keys(headers).length === 0) return null;
+	return JSON.stringify(headers, null, '\t');
+}
+
+function countBy<T extends string>(diffs: RequestDiff[], getKey: (diff: RequestDiff) => T) {
+	const counts = new Map<T, number>();
+	for (const diff of diffs) {
+		counts.set(getKey(diff), (counts.get(getKey(diff)) ?? 0) + 1);
+	}
+	return [...counts].toSorted((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]));
+}
+
+function renderSummary(base: BrowserMetricsReport, head: BrowserMetricsReport, diffs: RequestDiff[]) {
+	const added = diffs.filter(diff => diff.direction === 'added').length;
+	const removed = diffs.filter(diff => diff.direction === 'removed').length;
+	const typeRows = countBy(diffs, diff => diff.request.resourceType).map(([type, count]) => `
+				<tr>
+					<td>${escapeHtml(type)}</td>
+					<td class="num">${util.formatNumber(count)}</td>
+				</tr>`).join('');
+
+	return `
+		<section class="summary">
+			<div>
+				<span class="label">Base samples</span>
+				<strong>${util.formatNumber(base.sampleCount)}</strong>
+			</div>
+			<div>
+				<span class="label">Head samples</span>
+				<strong>${util.formatNumber(head.sampleCount)}</strong>
+			</div>
+			<div>
+				<span class="label">Added in Head</span>
+				<strong class="added-text">${util.formatNumber(added)}</strong>
+			</div>
+			<div>
+				<span class="label">Removed in Head</span>
+				<strong class="removed-text">${util.formatNumber(removed)}</strong>
+			</div>
+		</section>
+		${typeRows === '' ? '' : `
+		<section>
+			<h2>Diffs by Resource Type</h2>
+			<table>
+				<thead><tr><th>Type</th><th>Diff requests</th></tr></thead>
+				<tbody>${typeRows}
+				</tbody>
+			</table>
+		</section>`}`;
+}
+
+function renderDetails(title: string, content: string | null, open = false) {
+	if (content == null || content === '') return '';
+	return `
+			<details${open ? ' open' : ''}>
+				<summary>${escapeHtml(title)}</summary>
+				<pre>${escapeHtml(content)}</pre>
+			</details>`;
+}
+
+function renderRequest(diff: RequestDiff) {
+	const { request } = diff;
+	const requestBody = formatMaybeJson(request.requestBody);
+	const requestHeaders = formatHeaders(request.requestHeaders);
+	const responseHeaders = formatHeaders(request.responseHeaders);
+	const bodyNote = requestBody == null && request.hasRequestBody === true
+		? '<p class="empty">Request body was present but could not be retrieved from CDP.</p>'
+		: '';
+
+	return `
+		<article class="request ${diff.direction}">
+			<header>
+				<span class="badge">${diff.direction === 'added' ? 'Added in Head' : 'Removed in Head'}</span>
+				<span class="method">${escapeHtml(request.method)}</span>
+				<span class="type">${escapeHtml(request.resourceType)}</span>
+				<span class="status">${escapeHtml(request.status ?? '-')}</span>
+			</header>
+			<a class="url" href="${escapeAttribute(request.url)}">${escapeHtml(request.url)}</a>
+			<dl>
+				<div><dt>Round</dt><dd>${util.formatNumber(diff.round)}</dd></div>
+				<div><dt>Base count</dt><dd>${util.formatNumber(diff.baseCount)}</dd></div>
+				<div><dt>Head count</dt><dd>${util.formatNumber(diff.headCount)}</dd></div>
+				<div><dt>Encoded</dt><dd>${util.formatBytes(request.encodedDataLength ?? 0)}</dd></div>
+				<div><dt>Decoded body</dt><dd>${util.formatBytes(request.decodedBodyLength ?? 0)}</dd></div>
+				<div><dt>MIME</dt><dd>${escapeHtml(request.mimeType ?? '-')}</dd></div>
+				<div><dt>Protocol</dt><dd>${escapeHtml(request.protocol ?? '-')}</dd></div>
+				<div><dt>Remote</dt><dd>${escapeHtml(request.remoteIPAddress == null ? '-' : `${request.remoteIPAddress}:${request.remotePort ?? ''}`)}</dd></div>
+				<div><dt>Failed</dt><dd>${request.failed ? escapeHtml(request.errorText ?? 'yes') : 'no'}</dd></div>
+			</dl>
+			${bodyNote}
+			${renderDetails('Request body', requestBody, requestBody != null)}
+			${renderDetails('Request headers', requestHeaders)}
+			${renderDetails('Response headers', responseHeaders)}
+		</article>`;
+}
+
+function renderRound(round: number, diffs: RequestDiff[]) {
+	const added = diffs.filter(diff => diff.direction === 'added').length;
+	const removed = diffs.filter(diff => diff.direction === 'removed').length;
+	return `
+		<section>
+			<h2>Round ${util.formatNumber(round)}</h2>
+			<p>${util.formatNumber(added)} added, ${util.formatNumber(removed)} removed</p>
+			<div class="requests">
+				${diffs.map(renderRequest).join('\n')}
+			</div>
+		</section>`;
+}
+
+function renderHtml(base: BrowserMetricsReport, head: BrowserMetricsReport) {
+	const diffs = diffReports(base, head);
+	const rounds = [...new Set(diffs.map(diff => diff.round))].toSorted((a, b) => a - b);
+	const generatedAt = new Date().toISOString();
+	const content = diffs.length === 0
+		? '<section><p>No added or removed HTTP(S) requests were found in paired samples.</p></section>'
+		: rounds.map(round => renderRound(round, diffs.filter(diff => diff.round === round))).join('\n');
+
+	return `<!doctype html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>Frontend Browser Network Request Diff</title>
+	<style>
+		:root {
+			color-scheme: light dark;
+			--bg: #f7f7f8;
+			--fg: #202124;
+			--muted: #5f6368;
+			--card: #ffffff;
+			--border: #dfe1e5;
+			--added: #137333;
+			--added-bg: #e6f4ea;
+			--removed: #a50e0e;
+			--removed-bg: #fce8e6;
+		}
+		@media (prefers-color-scheme: dark) {
+			:root {
+				--bg: #111315;
+				--fg: #e8eaed;
+				--muted: #bdc1c6;
+				--card: #1b1d20;
+				--border: #3c4043;
+				--added-bg: #17351f;
+				--removed-bg: #3c1f1d;
+			}
+		}
+		body {
+			margin: 0;
+			font: 14px/1.5 system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+			background: var(--bg);
+			color: var(--fg);
+		}
+		main {
+			max-width: 1200px;
+			margin: 0 auto;
+			padding: 24px;
+		}
+		h1 {
+			font-size: 24px;
+			margin: 0 0 8px;
+		}
+		h2 {
+			font-size: 18px;
+			margin: 32px 0 8px;
+		}
+		.meta {
+			color: var(--muted);
+			margin: 0 0 24px;
+		}
+		.summary {
+			display: grid;
+			grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
+			gap: 12px;
+			margin: 24px 0;
+		}
+		.summary > div, .request, table {
+			background: var(--card);
+			border: 1px solid var(--border);
+			border-radius: 8px;
+		}
+		.summary > div {
+			padding: 14px;
+		}
+		.label {
+			display: block;
+			color: var(--muted);
+			font-size: 12px;
+		}
+		.summary strong {
+			display: block;
+			font-size: 24px;
+			margin-top: 4px;
+		}
+		.added-text {
+			color: var(--added);
+		}
+		.removed-text {
+			color: var(--removed);
+		}
+		table {
+			border-collapse: collapse;
+			width: 100%;
+			overflow: hidden;
+		}
+		th, td {
+			border-bottom: 1px solid var(--border);
+			padding: 8px 10px;
+			text-align: left;
+		}
+		th {
+			color: var(--muted);
+			font-weight: 600;
+		}
+		.num {
+			text-align: right;
+		}
+		.requests {
+			display: grid;
+			gap: 12px;
+		}
+		.request {
+			padding: 14px;
+			overflow-wrap: anywhere;
+		}
+		.request.added {
+			border-left: 4px solid var(--added);
+		}
+		.request.removed {
+			border-left: 4px solid var(--removed);
+		}
+		.request header {
+			display: flex;
+			flex-wrap: wrap;
+			gap: 8px;
+			align-items: center;
+			margin-bottom: 8px;
+		}
+		.badge, .method, .type, .status {
+			border-radius: 999px;
+			padding: 2px 8px;
+			font-size: 12px;
+			font-weight: 600;
+		}
+		.added .badge {
+			background: var(--added-bg);
+			color: var(--added);
+		}
+		.removed .badge {
+			background: var(--removed-bg);
+			color: var(--removed);
+		}
+		.method, .type, .status {
+			background: color-mix(in srgb, var(--muted) 14%, transparent);
+			color: var(--fg);
+		}
+		.url {
+			display: block;
+			margin: 8px 0 12px;
+			color: inherit;
+			font-family: ui-monospace, SFMono-Regular, Consolas, "Liberation Mono", monospace;
+		}
+		dl {
+			display: grid;
+			grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+			gap: 8px 16px;
+			margin: 0 0 12px;
+		}
+		dl div {
+			min-width: 0;
+		}
+		dt {
+			color: var(--muted);
+			font-size: 12px;
+		}
+		dd {
+			margin: 0;
+		}
+		details {
+			margin-top: 8px;
+		}
+		summary {
+			cursor: pointer;
+			color: var(--muted);
+		}
+		pre {
+			white-space: pre-wrap;
+			overflow-x: auto;
+			background: color-mix(in srgb, var(--muted) 10%, transparent);
+			border-radius: 6px;
+			padding: 10px;
+		}
+		.empty {
+			color: var(--muted);
+		}
+	</style>
+</head>
+<body>
+	<main>
+		<h1>Frontend Browser Network Request Diff</h1>
+		<p class="meta">Generated at ${escapeHtml(generatedAt)}. Requests are compared per paired round by method, resource type, and exact URL. Bodies are shown for added/removed request instances when CDP exposes them.</p>
+		${renderSummary(base, head, diffs)}
+		${content}
+	</main>
+</body>
+</html>
+`;
+}
+
+async function main() {
+	const [baseFile, headFile, outputFile] = process.argv.slice(2);
+
+	const base = JSON.parse(await readFile(baseFile, 'utf8')) as BrowserMetricsReport;
+	const head = JSON.parse(await readFile(headFile, 'utf8')) as BrowserMetricsReport;
+	await writeFile(outputFile, renderHtml(base, head));
+}
+
+// 直接実行されたときだけ呼ぶための判定(テストなどでこのファイル内の関数をimportするだけのとき用)
+if (process.argv[1] != null && import.meta.url === pathToFileURL(process.argv[1]).href) {
+	await main();
+}

.github/scripts/frontend-browser-diagnostics.render-md.mts

@@ -0,0 +1,378 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { readFile, writeFile } from 'node:fs/promises';
+import { pathToFileURL } from 'node:url';
+import * as util from './utility.mts';
+import * as heapSnapshotUtil from './heap-snapshot-util.mts';
+import type { HeapSnapshotData, HeapSnapshotReport } from './heap-snapshot-util.mts';
+import type { BrowserDiagnostics, NetworkRequest } from './chrome.mts';
+
+export type BrowserMeasurement = {
+	label: string;
+	timestamp: string;
+	url: string;
+	scenario: string;
+	diagnostics: BrowserDiagnostics;
+	durationMs: number;
+	network: {
+		requestCount: number;
+		webSocketConnectionCount: number;
+		webSocketSentBytes: number;
+		webSocketReceivedBytes: number;
+		finishedRequestCount: number;
+		failedRequestCount: number;
+		cachedRequestCount: number;
+		serviceWorkerRequestCount: number;
+		totalEncodedBytes: number;
+		totalDecodedBodyBytes: number;
+		sameOriginEncodedBytes: number;
+		thirdPartyEncodedBytes: number;
+		byResourceType: Record<string, {
+			requests: number;
+			encodedBytes: number;
+			decodedBodyBytes: number;
+		}>;
+		largestRequests: {
+			url: string;
+			method: string;
+			resourceType: string;
+			status?: number;
+			encodedBytes: number;
+			decodedBodyBytes: number;
+		}[];
+		failedRequests: {
+			url: string;
+			method: string;
+			resourceType: string;
+			errorText?: string;
+			status?: number;
+		}[];
+	};
+	performance: {
+		cdpMetrics: Record<string, number>;
+		runtimeHeap?: {
+			usedSize: number;
+			totalSize: number;
+		};
+		tabMemory: {
+			totalBytes: number;
+		};
+		webVitals: {
+			firstPaintMs?: number;
+			firstContentfulPaintMs?: number;
+			domContentLoadedEventEndMs?: number;
+			loadEventEndMs?: number;
+			longTaskCount: number;
+			longTaskDurationMs: number;
+			maxLongTaskDurationMs: number;
+			resourceEntryCount: number;
+			domElements: number;
+		};
+	};
+	heapSnapshot: HeapSnapshotData;
+};
+
+export type BrowserMeasurementSample = BrowserMeasurement & {
+	round: number;
+	networkRequests?: NetworkRequest[];
+};
+
+export type BrowserMetricsReport = {
+	label: string;
+	timestamp: string;
+	url: string;
+	scenario: string;
+	sampleCount: number;
+	aggregation: 'median';
+	summary: BrowserMeasurement;
+	samples: BrowserMeasurementSample[];
+};
+
+function escapeCell(value: string) {
+	return String(value).replaceAll('|', '\\|').replaceAll('\n', '<br>');
+}
+
+function truncate(value: string, maxLength = 140) {
+	if (value.length <= maxLength) return value;
+	return `${value.slice(0, maxLength - 3)}...`;
+}
+
+function formatMs(value: number | null | undefined) {
+	if (value == null || !Number.isFinite(value)) return '-';
+	if (value >= 1_000) return `${util.formatNumber(value / 1_000)} s`;
+	return `${util.formatNumber(value)} ms`;
+}
+
+function formatSecondsAsMs(value: number | null | undefined) {
+	if (value == null || !Number.isFinite(value)) return '-';
+	return formatMs(value * 1_000);
+}
+
+function formatDelta(delta: number, formatter: (value: number) => string, colorThreshold = 0) {
+	if (delta === 0) return formatter(0);
+	return util.formatColoredDelta(delta, v => formatter(v), colorThreshold);
+}
+
+function finiteValues(values: (number | null | undefined)[]) {
+	return values.filter(value => Number.isFinite(value)) as number[];
+}
+
+function sampleSpread(report: BrowserMetricsReport, getValue: (sample: BrowserMeasurementSample) => number | null | undefined) {
+	const values = finiteValues(report.samples.map(sample => getValue(sample)));
+	if (values.length < 2) return null;
+
+	const center = util.median(values);
+	return util.median(values.map(value => Math.abs(value - center)));
+}
+
+function formatValueWithSpread(report: BrowserMetricsReport, value: number, getSampleValue: (sample: BrowserMeasurementSample) => number | null | undefined, formatter: (value: number) => string) {
+	const spread = sampleSpread(report, getSampleValue);
+	if (spread == null) return formatter(value);
+	return `${formatter(value)}<br>± ${formatter(spread)}`;
+}
+
+function metricRow(
+	label: string,
+	base: BrowserMetricsReport,
+	head: BrowserMetricsReport,
+	getSummaryValue: (summary: BrowserMeasurement) => number,
+	getSampleValue: (sample: BrowserMeasurementSample) => number,
+	formatter: (value: number) => string,
+	significantThreshold = 0,
+	skipIfNotSignificant = true
+) {
+	const baseValue = getSummaryValue(base.summary);
+	const headValue = getSummaryValue(head.summary);
+	if (baseValue == null || headValue == null || !Number.isFinite(baseValue) || !Number.isFinite(headValue)) return null;
+
+	const summary = util.pairedDeltaSummary(base.samples, head.samples, sample => getSampleValue(sample));
+	// 有意な閾値に満たない場合はそもそもrowとして出力しない
+	if (skipIfNotSignificant && (Math.abs(summary.median) < significantThreshold)) return null;
+
+	const percent = baseValue === 0 ? null : summary.median * 100 / baseValue;
+	//const deltaMedian = `${formatDelta(summary.median, formatter, colorThreshold)}<br>${percent == null ? '-' : util.formatDeltaPercent(percent, 0.1).replaceAll('\\%', '\\\\%')}`;
+	const deltaMedian = formatDelta(summary.median, formatter, significantThreshold);
+
+	//return `| **${label}** | ${formatValueWithSpread(base, baseValue, getSampleValue, formatter)} | ${formatValueWithSpread(head, headValue, getSampleValue, formatter)} | ${deltaMedian} | ${summary == null ? '-' : formatter(summary.mad)} | ${summary == null ? '-' : formatDelta(summary.min, formatter)} | ${summary == null ? '-' : formatDelta(summary.max, formatter)} |`;
+	return `| **${label}** | ${formatter(baseValue)} | ${formatter(headValue)} | ${deltaMedian} | ${summary == null ? '-' : formatter(summary.mad)} | ${summary == null ? '-' : formatDelta(summary.min, formatter, significantThreshold)} | ${summary == null ? '-' : formatDelta(summary.max, formatter, significantThreshold)} |`;
+}
+
+function resourceTypeBytes(report: BrowserMeasurement, resourceTypes: string[]) {
+	return resourceTypes.reduce((sum, resourceType) => sum + (report.network.byResourceType[resourceType]?.encodedBytes ?? 0), 0);
+}
+
+function resourceTypeSampleBytes(sample: BrowserMeasurementSample, resourceTypes: string[]) {
+	return resourceTypeBytes(sample, resourceTypes);
+}
+
+function getMetric(report: BrowserMeasurement, key: string) {
+	return report.performance.cdpMetrics[key];
+}
+
+function renderSummaryTable(base: BrowserMetricsReport, head: BrowserMetricsReport, all = false) {
+	const rows = [
+		//metricRow('Scenario duration', base, head, summary => summary.durationMs, sample => sample.durationMs, formatMs),
+		metricRow('Requests', base, head, summary => summary.network.requestCount, sample => sample.network.requestCount, util.formatNumber, 1, !all),
+		//metricRow('Failed requests', base, head, summary => summary.network.failedRequestCount, sample => sample.network.failedRequestCount, util.formatNumber),
+		metricRow('Encoded network', base, head, summary => summary.network.totalEncodedBytes, sample => sample.network.totalEncodedBytes, util.formatBytes, 10000, !all),
+		metricRow('Decoded body', base, head, summary => summary.network.totalDecodedBodyBytes, sample => sample.network.totalDecodedBodyBytes, util.formatBytes, 10000, !all),
+		metricRow('Same-origin encoded', base, head, summary => summary.network.sameOriginEncodedBytes, sample => sample.network.sameOriginEncodedBytes, util.formatBytes, 10000, !all),
+		metricRow('Third-party encoded', base, head, summary => summary.network.thirdPartyEncodedBytes, sample => sample.network.thirdPartyEncodedBytes, util.formatBytes, 10000, !all),
+		metricRow('Script encoded', base, head, summary => resourceTypeBytes(summary, ['Script']), sample => resourceTypeSampleBytes(sample, ['Script']), util.formatBytes, 10000, !all),
+		metricRow('Stylesheet encoded', base, head, summary => resourceTypeBytes(summary, ['Stylesheet']), sample => resourceTypeSampleBytes(sample, ['Stylesheet']), util.formatBytes, 10000, !all),
+		metricRow('Fetch/XHR encoded', base, head, summary => resourceTypeBytes(summary, ['Fetch', 'XHR']), sample => resourceTypeSampleBytes(sample, ['Fetch', 'XHR']), util.formatBytes, 10000, !all),
+		metricRow('Image encoded', base, head, summary => resourceTypeBytes(summary, ['Image']), sample => resourceTypeSampleBytes(sample, ['Image']), util.formatBytes, 10000, !all),
+		metricRow('Font encoded', base, head, summary => resourceTypeBytes(summary, ['Font']), sample => resourceTypeSampleBytes(sample, ['Font']), util.formatBytes, 10000, !all),
+		//metricRow('First contentful paint', base, head, summary => summary.performance.webVitals.firstContentfulPaintMs, sample => sample.performance.webVitals.firstContentfulPaintMs, formatMs),
+		//metricRow('Load event end', base, head, summary => summary.performance.webVitals.loadEventEndMs, sample => sample.performance.webVitals.loadEventEndMs, formatMs),
+		//metricRow('Long tasks', base, head, summary => summary.performance.webVitals.longTaskCount, sample => sample.performance.webVitals.longTaskCount, util.formatNumber),
+		//metricRow('Long task duration', base, head, summary => summary.performance.webVitals.longTaskDurationMs, sample => sample.performance.webVitals.longTaskDurationMs, formatMs),
+		//metricRow('Max long task', base, head, summary => summary.performance.webVitals.maxLongTaskDurationMs, sample => sample.performance.webVitals.maxLongTaskDurationMs, formatMs),
+		//metricRow('JS heap used', base, head, summary => summary.performance.runtimeHeap?.usedSize ?? getMetric(summary, 'JSHeapUsedSize'), sample => sample.performance.runtimeHeap?.usedSize ?? getMetric(sample, 'JSHeapUsedSize'), util.formatBytes),
+		//metricRow('JS heap total', base, head, summary => summary.performance.runtimeHeap?.totalSize ?? getMetric(summary, 'JSHeapTotalSize'), sample => sample.performance.runtimeHeap?.totalSize ?? getMetric(sample, 'JSHeapTotalSize'), util.formatBytes),
+		//metricRow('V8 heap snapshot total', base, head, summary => summary.heapSnapshot.categories.total, sample => sample.heapSnapshot.categories.total, util.formatBytes, 10000),
+		//metricRow('DOM elements', base, head, summary => summary.performance.webVitals.domElements, sample => sample.performance.webVitals.domElements, util.formatNumber),
+		//metricRow('CDP nodes', base, head, summary => getMetric(summary, 'Nodes'), sample => getMetric(sample, 'Nodes'), util.formatNumber),
+		//metricRow('JS event listeners', base, head, summary => getMetric(summary, 'JSEventListeners'), sample => getMetric(sample, 'JSEventListeners'), util.formatNumber),
+		//metricRow('Layout count', base, head, summary => getMetric(summary, 'LayoutCount'), sample => getMetric(sample, 'LayoutCount'), util.formatNumber),
+		//metricRow('Recalc style count', base, head, summary => getMetric(summary, 'RecalcStyleCount'), sample => getMetric(sample, 'RecalcStyleCount'), util.formatNumber),
+		//metricRow('Script duration', base, head, summary => getMetric(summary, 'ScriptDuration'), sample => getMetric(sample, 'ScriptDuration'), formatSecondsAsMs),
+		//metricRow('Task duration', base, head, summary => getMetric(summary, 'TaskDuration'), sample => getMetric(sample, 'TaskDuration'), formatSecondsAsMs),
+		metricRow('WebSocket connections', base, head, summary => summary.network.webSocketConnectionCount, sample => sample.network.webSocketConnectionCount, util.formatNumber, 1, !all),
+		metricRow('WebSocket sent', base, head, summary => summary.network.webSocketSentBytes, sample => sample.network.webSocketSentBytes, util.formatBytes, 10000, !all),
+		metricRow('WebSocket received', base, head, summary => summary.network.webSocketReceivedBytes, sample => sample.network.webSocketReceivedBytes, util.formatBytes, 10000, !all),
+		metricRow('Page errors', base, head, summary => summary.diagnostics.pageErrorCount, sample => sample.diagnostics.pageErrorCount, util.formatNumber, 1, !all),
+		metricRow('Console log', base, head, summary => summary.diagnostics.console.log, sample => sample.diagnostics.console.log, util.formatNumber, 1, !all),
+		metricRow('Console warnings', base, head, summary => summary.diagnostics.console.warning, sample => sample.diagnostics.console.warning, util.formatNumber, 1, !all),
+		metricRow('Console errors', base, head, summary => summary.diagnostics.console.error, sample => sample.diagnostics.console.error, util.formatNumber, 1, !all),
+		metricRow('Console info', base, head, summary => summary.diagnostics.console.info, sample => sample.diagnostics.console.info, util.formatNumber, 1, !all),
+		metricRow('Page-attributed memory', base, head, summary => summary.performance.tabMemory.totalBytes, sample => sample.performance.tabMemory.totalBytes, util.formatBytes, 10000, !all),
+	].filter(row => row != null);
+
+	return [
+		'| Metric | Base | Head | Δ median | Δ MAD | Δ min | Δ max |',
+		'| --- | ---: | ---: | ---: | ---: | ---: | ---: |',
+		...rows,
+	].join('\n');
+}
+
+function renderResourceTypeTable(base: BrowserMetricsReport, head: BrowserMetricsReport) {
+	const preferredOrder = ['Document', 'Script', 'Stylesheet', 'Fetch', 'XHR', 'Image', 'Font', 'Media', 'WebSocket', 'EventSource', 'Other'];
+	const keys = [...new Set([
+		...preferredOrder,
+		...Object.keys(base.summary.network.byResourceType),
+		...Object.keys(head.summary.network.byResourceType),
+	])].filter(key => base.summary.network.byResourceType[key] != null || head.summary.network.byResourceType[key] != null);
+
+	const lines = [
+		'<table>',
+		'<thead>',
+		'<tr>',
+		'<th rowspan="2">Type</th>',
+		'<th colspan="3">Requests</th>',
+		'<th colspan="3">Encoded bytes</th>',
+		'</tr>',
+		'<tr>',
+		'<th>Base</th>',
+		'<th>Head</th>',
+		'<th>Δ</th>',
+		'<th>Base</th>',
+		'<th>Head</th>',
+		'<th>Δ</th>',
+		'</tr>',
+		'</thead>',
+		'<tbody>',
+	];
+
+	for (const key of keys) {
+		const baseRow = base.summary.network.byResourceType[key] ?? { requests: 0, encodedBytes: 0 };
+		const headRow = head.summary.network.byResourceType[key] ?? { requests: 0, encodedBytes: 0 };
+		lines.push('<tr>');
+		lines.push(`<td><b>${key}</b></td>`);
+		lines.push(`<td align="right">${util.formatNumber(baseRow.requests)}</td>`);
+		lines.push(`<td align="right">${util.formatNumber(headRow.requests)}</td>`);
+		lines.push(`<td align="right">${formatDelta(headRow.requests - baseRow.requests, util.formatNumber)}</td>`);
+		lines.push(`<td align="right">${util.formatBytes(baseRow.encodedBytes)}</td>`);
+		lines.push(`<td align="right">${util.formatBytes(headRow.encodedBytes)}</td>`);
+		lines.push(`<td align="right">${formatDelta(headRow.encodedBytes - baseRow.encodedBytes, util.formatBytes)}</td>`);
+		lines.push('</tr>');
+	}
+
+	lines.push('</tbody>');
+	lines.push('</table>');
+
+	return lines.join('\n');
+}
+
+function renderLargestRequests(report: BrowserMetricsReport, title: string) {
+	if (report.summary.network.largestRequests.length === 0) return null;
+
+	const lines = [
+		`<details><summary>${title}</summary>`,
+		'',
+		'| Resource | Type | Status | Encoded | Decoded |',
+		'| --- | --- | ---: | ---: | ---: |',
+	];
+
+	for (const request of report.summary.network.largestRequests.slice(0, 10)) {
+		lines.push(`| \`${escapeCell(truncate(request.url))}\` | ${escapeCell(request.resourceType)} | ${request.status ?? '-'} | ${util.formatBytes(request.encodedBytes)} | ${util.formatBytes(request.decodedBodyBytes)} |`);
+	}
+
+	lines.push('', '</details>');
+	return lines.join('\n');
+}
+
+function renderFailedRequests(report: BrowserMetricsReport, title: string) {
+	if (report.summary.network.failedRequests.length === 0) return null;
+
+	const lines = [
+		`<details><summary>${title}</summary>`,
+		'',
+		'| Resource | Type | Status | Error |',
+		'| --- | --- | ---: | --- |',
+	];
+
+	for (const request of report.summary.network.failedRequests.slice(0, 20)) {
+		lines.push(`| \`${escapeCell(truncate(request.url))}\` | ${escapeCell(request.resourceType)} | ${request.status ?? '-'} | ${escapeCell(request.errorText ?? '')} |`);
+	}
+
+	lines.push('', '</details>');
+	return lines.join('\n');
+}
+
+function toHeapSnapshotReport(report: BrowserMetricsReport): HeapSnapshotReport {
+	return {
+		summary: report.summary.heapSnapshot,
+		samples: report.samples.map(sample => ({
+			round: sample.round,
+			data: sample.heapSnapshot,
+		})),
+	};
+}
+
+function renderMd(base: BrowserMetricsReport, head: BrowserMetricsReport, options: {
+	baseHeapSnapshotUrl: string;
+	headHeapSnapshotUrl: string;
+	detailedHtmlUrl?: string;
+}) {
+	const detailedHtmlUrl = options.detailedHtmlUrl;
+	const heapSnapshotTable = heapSnapshotUtil.renderHeapSnapshotTable(toHeapSnapshotReport(base), toHeapSnapshotReport(head));
+	const lines = [
+		'## 🖥 Frontend Browser Diagnostics Report',
+		'',
+		renderSummaryTable(base, head),
+		'',
+		'<i>Only metrics showing significant changes are displayed.</i>',
+		'',
+		detailedHtmlUrl == null || detailedHtmlUrl === '' ? null : `[View details](${detailedHtmlUrl})`,
+		detailedHtmlUrl == null || detailedHtmlUrl === '' ? null : '',
+		'<details>',
+		'<summary>Requests by resource type</summary>',
+		'',
+		renderResourceTypeTable(base, head),
+		'',
+		'</details>',
+		'',
+		'<details>',
+		'<summary>V8 heap snapshot statistics</summary>',
+		'',
+		heapSnapshotTable ?? '_No V8 heap snapshot data._',
+		'',
+		heapSnapshotUtil.renderHeapSnapshotSankey(toHeapSnapshotReport(head), 'Head'),
+		'',
+		`Download representative heap snapshot: [base](${options.baseHeapSnapshotUrl}) / [head](${options.headHeapSnapshotUrl})`,
+		'</details>',
+		'',
+	];
+
+	for (const section of [
+		//renderLargestRequests(head, 'Largest representative head requests'),
+		//renderFailedRequests(base, 'Failed representative base requests'),
+		//renderFailedRequests(head, 'Failed representative head requests'),
+	]) {
+		if (section == null) continue;
+		lines.push(section, '');
+	}
+
+	return lines.filter(line => line != null).join('\n').trimEnd() + '\n';
+}
+
+async function main() {
+	const [baseFile, headFile, outputFile] = process.argv.slice(2);
+
+	const base = JSON.parse(await readFile(baseFile, 'utf8')) as BrowserMetricsReport;
+	const head = JSON.parse(await readFile(headFile, 'utf8')) as BrowserMetricsReport;
+	await writeFile(outputFile, renderMd(base, head, {
+		baseHeapSnapshotUrl: process.env.FRONTEND_BROWSER_BASE_HEAP_SNAPSHOT_ARTIFACT_URL!,
+		headHeapSnapshotUrl: process.env.FRONTEND_BROWSER_HEAD_HEAP_SNAPSHOT_ARTIFACT_URL!,
+		detailedHtmlUrl: process.env.FRONTEND_BROWSER_DETAILED_HTML_ARTIFACT_URL,
+	}));
+}
+
+// 直接実行されたときだけ呼ぶための判定(テストなどでこのファイル内の関数をimportするだけのとき用)
+if (process.argv[1] != null && import.meta.url === pathToFileURL(process.argv[1]).href) {
+	await main();
+}

.github/scripts/frontend-bundle-diagnostics.render-md.mts

@@ -7,9 +7,9 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import * as util from './utility.mts';
 
-const marker = '<!-- misskey-frontend-js-size -->';
+const marker = '<!-- misskey-frontend-bundle-diagnostics -->';
 
-const locale = process.env.FRONTEND_JS_SIZE_LOCALE ?? 'ja-JP';
+const locale = 'ja-JP';
 
 //function sharePercent(value, total) {
 //	if (total === 0) return '0%';
@@ -40,13 +40,24 @@ function escapeCell(value: string) {
 
 type Manifest = Record<string, { file?: string; src?: string; name?: string; isEntry?: boolean; imports?: string[] }>;
 
+const stableNamedChunks = new Set(['vue', 'i18n']);
+
 type FileEntry = {
-	key: string;
+	comparisonKey: string | null;
 	displayName: string;
 	file: string;
+	manifestKeys: string[];
 	size: number;
 };
 
+type CollectedReport = {
+	manifest: Manifest;
+	chunks: FileEntry[];
+	comparableChunks: Record<string, FileEntry>;
+	chunksByManifestKey: Record<string, FileEntry>;
+	startupFiles: string[];
+};
+
 function entryDisplayName(entry: FileEntry) {
 	if (!entry) return '';
 	return entry.displayName || entry.file;
@@ -60,23 +71,26 @@ function findEntryKey(manifest: Manifest) {
 		?? null;
 }
 
-function stableChunkKey(manifestKey: string, chunk: Manifest[string]) {
-	return chunk.src ?? (chunk.name ? `chunk:${chunk.name}` : manifestKey);
+function stableChunkKey(chunk: Manifest[string]) {
+	if (chunk.src != null) return `src:${util.normalizePath(chunk.src)}`;
+	if (chunk.name != null && stableNamedChunks.has(chunk.name)) return `named:${chunk.name}`;
+	return null;
 }
 
-function collectStartupKeys(manifest: Manifest) {
+function collectStartupManifestKeys(manifest: Manifest) {
 	const entryKey = findEntryKey(manifest);
 	const keys = new Set<string>();
-	if (entryKey == null) return keys;
+	if (entryKey == null) throw new Error('Unable to find frontend startup entry in Vite manifest.');
 
-	function visit(key: string) {
+	function visit(key: string, importedBy?: string) {
 		if (keys.has(key)) return;
 		const chunk = manifest[key];
-		if (!chunk || !chunk.file?.endsWith('.js')) return;
-		keys.add(stableChunkKey(key, chunk));
-		for (const importKey of chunk.imports ?? []) {
-			visit(importKey);
-		}
+		const importContext = importedBy == null ? '' : ` imported by "${importedBy}"`;
+		if (chunk == null) throw new Error(`Startup manifest key "${key}"${importContext} is missing.`);
+		if (chunk.file == null || chunk.file.length === 0) throw new Error(`Startup manifest key "${key}"${importContext} has no output file.`);
+		if (!chunk.file.endsWith('.js')) throw new Error(`Startup manifest key "${key}"${importContext} resolves to non-JavaScript output "${chunk.file}".`);
+		keys.add(key);
+		for (const importKey of chunk.imports ?? []) visit(importKey, key);
 	}
 
 	visit(entryKey);
@@ -102,26 +116,41 @@ async function resolveBuiltFile(outDir: string, file: string) {
 	};
 }
 
-async function collectReport(repoDir: string) {
+async function collectReport(repoDir: string): Promise<CollectedReport> {
 	const outDir = path.join(repoDir, 'built/_frontend_vite_');
 	const manifestPath = path.join(outDir, 'manifest.json');
 	const manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8')) as Manifest;
-	const byKey = new Map<string, FileEntry>();
-	const byFile = new Set<string>();
+	const chunksByFile = new Map<string, FileEntry>();
+	const comparableChunks = new Map<string, FileEntry>();
+	const chunksByManifestKey = new Map<string, FileEntry>();
 
-	for (const [key, chunk] of Object.entries(manifest)) {
+	for (const [manifestKey, chunk] of Object.entries(manifest)) {
 		if (!chunk.file?.endsWith('.js')) continue;
 		const builtFile = await resolveBuiltFile(outDir, chunk.file);
-		const size = await util.fileSize(builtFile.absolutePath);
-		const stableKey = stableChunkKey(key, chunk);
-		const displayName = chunk.src ?? chunk.name ?? key;
-		byKey.set(stableKey, {
-			key: stableKey,
-			displayName,
-			file: builtFile.relativePath,
-			size,
-		});
-		byFile.add(builtFile.relativePath);
+		const comparisonKey = stableChunkKey(chunk);
+		let entry = chunksByFile.get(builtFile.relativePath);
+		if (entry == null) {
+			entry = {
+				comparisonKey,
+				displayName: chunk.src ?? chunk.name ?? manifestKey,
+				file: builtFile.relativePath,
+				manifestKeys: [manifestKey],
+				size: await util.fileSize(builtFile.absolutePath),
+			};
+			chunksByFile.set(entry.file, entry);
+		} else if (entry.comparisonKey !== comparisonKey) {
+			throw new Error(`Conflicting identities for ${entry.file}`);
+		} else {
+			entry.manifestKeys.push(manifestKey);
+		}
+		chunksByManifestKey.set(manifestKey, entry);
+		if (comparisonKey != null) {
+			const existing = comparableChunks.get(comparisonKey);
+			if (existing != null && existing.file !== entry.file) {
+				throw new Error(`Duplicate stable chunk key "${comparisonKey}": ${existing.file}, ${entry.file}`);
+			}
+			comparableChunks.set(comparisonKey, entry);
+		}
 	}
 
 	const localeDir = path.join(outDir, locale);
@@ -129,21 +158,29 @@ async function collectReport(repoDir: string) {
 		for await (const fullPath of util.traverseDirectory(localeDir)) {
 			if (!fullPath.endsWith('.js')) continue;
 			const relativePath = util.normalizePath(path.relative(outDir, fullPath));
-			if (byFile.has(relativePath)) continue;
-			const size = await util.fileSize(fullPath);
-			byKey.set(relativePath, {
-				key: relativePath,
+			if (chunksByFile.has(relativePath)) continue;
+			chunksByFile.set(relativePath, {
+				comparisonKey: null,
 				displayName: relativePath,
 				file: relativePath,
-				size,
+				manifestKeys: [],
+				size: await util.fileSize(fullPath),
 			});
 		}
 	}
 
+	const startupFiles = new Set<string>();
+	for (const manifestKey of collectStartupManifestKeys(manifest)) {
+		const entry = chunksByManifestKey.get(manifestKey);
+		if (entry != null) startupFiles.add(entry.file);
+	}
+
 	return {
 		manifest,
-		chunks: Object.fromEntries(byKey),
-		startupKeys: [...collectStartupKeys(manifest)],
+		chunks: [...chunksByFile.values()],
+		comparableChunks: Object.fromEntries(comparableChunks),
+		chunksByManifestKey: Object.fromEntries(chunksByManifestKey),
+		startupFiles: [...startupFiles],
 	};
 }
 
@@ -312,16 +349,17 @@ function renderVisualizerSummaryTable(before: ReturnType<typeof collectVisualize
 	];
 }
 
-function getChunkComparisonRows(keys: string[], before: Awaited<ReturnType<typeof collectReport>>, after: Awaited<ReturnType<typeof collectReport>>) {
-	return keys.map((key) => {
-		const beforeEntry = before.chunks[key];
-		const afterEntry = after.chunks[key];
+function getChunkComparisonRows(keys: string[], before: Record<string, FileEntry>, after: Record<string, FileEntry>) {
+	return keys.map(key => {
+		const beforeEntry = before[key];
+		const afterEntry = after[key];
 		const beforeSize = beforeEntry?.size ?? 0;
 		const afterSize = afterEntry?.size ?? 0;
 		return {
 			key,
 			name: entryDisplayName(beforeEntry ?? afterEntry),
-			chunkFile: beforeEntry?.file ?? afterEntry?.file,
+			beforeFile: beforeEntry?.file,
+			afterFile: afterEntry?.file,
 			beforeSize,
 			afterSize,
 			changeType: beforeEntry == null ? 'added' : afterEntry == null ? 'removed' : beforeSize !== afterSize ? 'updated' : 'unchanged',
@@ -330,6 +368,53 @@ function getChunkComparisonRows(keys: string[], before: Awaited<ReturnType<typeo
 	});
 }
 
+type ChunkComparisonRow = ReturnType<typeof getChunkComparisonRows>[number];
+
+type ChunkAggregate = {
+	beforeSize: number;
+	afterSize: number;
+	beforeCount: number;
+	afterCount: number;
+};
+
+const smallDeltaThreshold = 5;
+
+function sumChunkSizes(chunks: FileEntry[]) {
+	return chunks.reduce((sum, chunk) => sum + chunk.size, 0);
+}
+
+function generatedAggregate(before: FileEntry[], after: FileEntry[]): ChunkAggregate {
+	const beforeGenerated = before.filter(chunk => chunk.comparisonKey == null);
+	const afterGenerated = after.filter(chunk => chunk.comparisonKey == null);
+	return {
+		beforeSize: sumChunkSizes(beforeGenerated),
+		afterSize: sumChunkSizes(afterGenerated),
+		beforeCount: beforeGenerated.length,
+		afterCount: afterGenerated.length,
+	};
+}
+
+function hasSmallDelta(row: ChunkComparisonRow) {
+	return Math.abs(row.afterSize - row.beforeSize) <= smallDeltaThreshold;
+}
+
+function comparisonRowsAggregate(rows: ChunkComparisonRow[]): ChunkAggregate {
+	return {
+		beforeSize: rows.reduce((sum, row) => sum + row.beforeSize, 0),
+		afterSize: rows.reduce((sum, row) => sum + row.afterSize, 0),
+		beforeCount: rows.filter(row => row.beforeFile != null).length,
+		afterCount: rows.filter(row => row.afterFile != null).length,
+	};
+}
+
+function comparableMap(chunks: FileEntry[]) {
+	const entries: [string, FileEntry][] = [];
+	for (const chunk of chunks) {
+		if (chunk.comparisonKey != null) entries.push([chunk.comparisonKey, chunk]);
+	}
+	return Object.fromEntries(entries);
+}
+
 function summarizeChunkChanges(rows: ReturnType<typeof getChunkComparisonRows>) {
 	return {
 		updated: rows.filter((row) => row.changeType === 'updated').length,
@@ -342,15 +427,28 @@ function formatChunkChangeSummary(label: string, summary: ReturnType<typeof summ
 	return `${label} (${summary.updated} updated, ${summary.added} added, ${summary.removed} removed)`;
 }
 
-function compareChunkComparisonRows(a: ReturnType<typeof getChunkComparisonRows>[number], b: ReturnType<typeof getChunkComparisonRows>[number]) {
+function compareChunkComparisonRows(a: ChunkComparisonRow, b: ChunkComparisonRow) {
 	return Math.abs(b.afterSize - b.beforeSize) - Math.abs(a.afterSize - a.beforeSize)
 		|| (b.afterSize - b.beforeSize) - (a.afterSize - a.beforeSize)
 		|| b.sortSize - a.sortSize
 		|| a.name.localeCompare(b.name);
 }
 
-function chunkMarkdownTable(rows: ReturnType<typeof getChunkComparisonRows>, total?: { beforeSize: number; afterSize: number }) {
-	if (rows.length === 0) return '_No data_';
+function chunkFileDisplay(row: ChunkComparisonRow) {
+	if (row.beforeFile == null) return row.afterFile ?? '';
+	if (row.afterFile == null || row.beforeFile === row.afterFile) return row.beforeFile;
+	return `${row.beforeFile} → ${row.afterFile}`;
+}
+
+function chunkMarkdownTable(
+	rows: ReturnType<typeof getChunkComparisonRows>,
+	total?: { beforeSize: number; afterSize: number },
+	generated?: ChunkAggregate,
+	other?: ChunkAggregate,
+) {
+	const hasGenerated = generated != null && (generated.beforeCount > 0 || generated.afterCount > 0);
+	const hasOther = other != null && (other.beforeCount > 0 || other.afterCount > 0);
+	if (rows.length === 0 && total == null && !hasGenerated && !hasOther) return '_No data_';
 
 	const lines = [
 		'| Chunk | Before | After | Δ | Δ (%) |',
@@ -360,49 +458,58 @@ function chunkMarkdownTable(rows: ReturnType<typeof getChunkComparisonRows>, tot
 		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('| | | | | |');
 	}
+
 	for (const row of rows) {
+		const chunkFile = chunkFileDisplay(row);
 		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(chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize, 1000)} | $\\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(chunkFile)}\` </details> | ${util.formatBytes(row.beforeSize)} | ${util.formatBytes(row.afterSize)} | ${util.calcAndFormatDeltaBytes(row.beforeSize, row.afterSize, 1000)} | $\\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(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('\\%', '\\\\%')} |`);
 		}
 	}
+	if (hasGenerated) {
+		lines.push(`| (other generated chunks) | ${util.formatBytes(generated.beforeSize)} | ${util.formatBytes(generated.afterSize)} | ${util.calcAndFormatDeltaBytes(generated.beforeSize, generated.afterSize, 1000)} | ${util.calcAndFormatDeltaPercent(generated.beforeSize, generated.afterSize, 0.1).replaceAll('\\%', '\\\\%')} |`);
+	}
+	if (hasOther) {
+		lines.push(`| (other) | ${util.formatBytes(other.beforeSize)} | ${util.formatBytes(other.afterSize)} | ${util.calcAndFormatDeltaBytes(other.beforeSize, other.afterSize, 1000)} | ${util.calcAndFormatDeltaPercent(other.beforeSize, other.afterSize, 0.1).replaceAll('\\%', '\\\\%')} |`);
+	}
 	return lines.join('\n');
 }
 
 function renderFrontendChunkReport(before: Awaited<ReturnType<typeof collectReport>>, after: Awaited<ReturnType<typeof collectReport>>) {
-	const commonChunkKeys = Object.keys(before.chunks).filter((key) => after.chunks[key] != null);
-	const addedChunkKeys = Object.keys(after.chunks).filter((key) => before.chunks[key] == null);
-	const removedChunkKeys = Object.keys(before.chunks).filter((key) => after.chunks[key] == null);
-	const allChunkKeys = [
-		...commonChunkKeys,
-		...addedChunkKeys,
-		...removedChunkKeys,
-	];
-	//const comparisonRows = getChunkComparisonRows(commonChunkKeys, before, after);
-	const allComparisonRows = getChunkComparisonRows(allChunkKeys, before, after);
+	const beforeComparable = before.comparableChunks;
+	const afterComparable = after.comparableChunks;
+	const allChunkKeys = [...new Set([...Object.keys(beforeComparable), ...Object.keys(afterComparable)])];
+	const allComparisonRows = getChunkComparisonRows(allChunkKeys, beforeComparable, afterComparable);
 
 	const changedRows = allComparisonRows.filter((row) => row.changeType !== 'unchanged');
 	const diffSummary = summarizeChunkChanges(changedRows);
 	const diffTotal = {
-		beforeSize: allComparisonRows.reduce((sum, row) => sum + row.beforeSize, 0),
-		afterSize: allComparisonRows.reduce((sum, row) => sum + row.afterSize, 0),
+		beforeSize: sumChunkSizes(before.chunks),
+		afterSize: sumChunkSizes(after.chunks),
 	};
-	const diffRows = changedRows.sort(compareChunkComparisonRows).slice(0, 30); // TODO: 実際に30を超えて切り捨てられたrowがあった場合はその旨をmarkdown内に表示するようにする
+	const diffGenerated = generatedAggregate(before.chunks, after.chunks);
+	const diffOther = comparisonRowsAggregate(changedRows.filter(hasSmallDelta));
+	const diffRows = changedRows.filter(row => !hasSmallDelta(row)).sort(compareChunkComparisonRows).slice(0, 30); // TODO: 実際に30を超えて切り捨てられたrowがあった場合はその旨をmarkdown内に表示するようにする
 
-	const startupKeys = new Set([
-		...before.startupKeys,
-		...after.startupKeys,
-	]);
-	const startupComparisonRows = getChunkComparisonRows([...startupKeys], before, after);
-	const startupRows = startupComparisonRows.sort(compareChunkComparisonRows);
+	const beforeStartupFiles = new Set(before.startupFiles);
+	const afterStartupFiles = new Set(after.startupFiles);
+	const beforeStartupChunks = before.chunks.filter(chunk => beforeStartupFiles.has(chunk.file));
+	const afterStartupChunks = after.chunks.filter(chunk => afterStartupFiles.has(chunk.file));
+	const beforeStartupComparable = comparableMap(beforeStartupChunks);
+	const afterStartupComparable = comparableMap(afterStartupChunks);
+	const startupKeys = [...new Set([...Object.keys(beforeStartupComparable), ...Object.keys(afterStartupComparable)])];
+	const startupComparisonRows = getChunkComparisonRows(startupKeys, beforeStartupComparable, afterStartupComparable);
 	const startupSummary = summarizeChunkChanges(startupComparisonRows);
+	const startupOther = comparisonRowsAggregate(startupComparisonRows.filter(hasSmallDelta));
+	const startupRows = startupComparisonRows.filter(row => !hasSmallDelta(row)).sort(compareChunkComparisonRows);
 	const startupTotal = {
-		beforeSize: startupComparisonRows.reduce((sum, row) => sum + row.beforeSize, 0),
-		afterSize: startupComparisonRows.reduce((sum, row) => sum + row.afterSize, 0),
+		beforeSize: sumChunkSizes(beforeStartupChunks),
+		afterSize: sumChunkSizes(afterStartupChunks),
 	};
+	const startupGenerated = generatedAggregate(beforeStartupChunks, afterStartupChunks);
 
 	//const largeRows = comparisonRows
 	//	.sort((a, b) => b.sortSize - a.sortSize || a.name.localeCompare(b.name))
@@ -412,14 +519,14 @@ function renderFrontendChunkReport(before: Awaited<ReturnType<typeof collectRepo
 		'<details open>',
 		`<summary>${formatChunkChangeSummary('Chunk size diff', diffSummary)}</summary>`,
 		'',
-		chunkMarkdownTable(diffRows, diffTotal),
+		chunkMarkdownTable(diffRows, diffTotal, diffGenerated, diffOther),
 		'',
 		'</details>',
 		'',
 		'<details>',
 		`<summary>${formatChunkChangeSummary('Startup chunk size', startupSummary)}</summary>`,
 		'',
-		chunkMarkdownTable(startupRows, startupTotal),
+		chunkMarkdownTable(startupRows, startupTotal, startupGenerated, startupOther),
 		'',
 		`_Startup chunks are the Vite entry for \`src/_boot_.ts\` and its static imports._`,
 		'',

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

@@ -32,6 +32,326 @@ export type HeapSnapshotReport = {
 	}[];
 };
 
+export const defaultHeapSnapshotBreakdownTopN = 6;
+
+export function createEmptyHeapSnapshotData(): HeapSnapshotData {
+	const categories = {} as HeapSnapshotData['categories'];
+	const nodeCounts = {} as HeapSnapshotData['nodeCounts'];
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		categories[category] = 0;
+		nodeCounts[category] = 0;
+	}
+	return {
+		categories,
+		nodeCounts,
+		breakdowns: {} as HeapSnapshotData['breakdowns'],
+	};
+}
+
+function sanitizeHeapSnapshotBreakdownLabel(value: unknown, fallback = 'unknown') {
+	const label = String(value ?? '').replace(/\s+/g, ' ').trim();
+	if (label === '') return fallback;
+	if (label.length <= 80) return label;
+	return `${label.slice(0, 77)}...`;
+}
+
+function classifyHeapSnapshotBreakdown(category: keyof typeof heapSnapshotCategory, type: string, name: string) {
+	if (category === 'strings') return type;
+
+	if (category === 'jsArrays') {
+		if (type === 'array elements') return 'Array elements';
+		if (type === 'object' && name === 'Array') return 'Array objects';
+		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
+	}
+
+	if (category === 'typedArrays') {
+		if (name === 'system / JSArrayBufferData') return 'ArrayBuffer data';
+		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
+	}
+
+	if (category === 'systemObjects') {
+		if (name.startsWith('system /')) return sanitizeHeapSnapshotBreakdownLabel(name);
+		if (name.startsWith('(system ')) return sanitizeHeapSnapshotBreakdownLabel(name);
+		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
+	}
+
+	if (category === 'otherJsObjects') {
+		if (type === 'object') return sanitizeHeapSnapshotBreakdownLabel(`object: ${name}`, 'object: unknown');
+		return type;
+	}
+
+	if (category === 'otherNonJsObjects') {
+		if (type === 'extra native bytes') return 'Extra native bytes';
+		if (type === 'native') return sanitizeHeapSnapshotBreakdownLabel(`native: ${name}`, 'native: unknown');
+		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
+	}
+
+	if (category === 'code') {
+		const lowerName = name.toLowerCase();
+		if (lowerName.includes('bytecode')) return 'bytecode';
+		if (lowerName.includes('builtin')) return 'builtins';
+		if (lowerName.includes('regexp')) return 'regexp code';
+		if (lowerName.includes('stub')) return 'stubs';
+		return sanitizeHeapSnapshotBreakdownLabel(`code: ${name}`, 'code: unknown');
+	}
+
+	return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
+}
+
+export function collapseHeapSnapshotBreakdown(breakdown: Record<string, number>, topN = defaultHeapSnapshotBreakdownTopN) {
+	const entries = Object.entries(breakdown)
+		.filter(([, value]) => value > 0)
+		.toSorted((a, b) => b[1] - a[1]);
+
+	const topEntries = entries.slice(0, topN);
+	const otherValue = entries
+		.slice(topN)
+		.reduce((sum, [, value]) => sum + value, 0);
+
+	const collapsed = Object.fromEntries(topEntries);
+	if (otherValue > 0) collapsed.Other = otherValue;
+	return collapsed;
+}
+
+export function collapseHeapSnapshotBreakdowns(
+	breakdowns: Partial<Record<keyof typeof heapSnapshotCategory, Record<string, number>>>,
+	topN = defaultHeapSnapshotBreakdownTopN,
+) {
+	const collapsed = {} as NonNullable<HeapSnapshotData['breakdowns']>;
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		if (category === 'total') continue;
+
+		const categoryBreakdown = breakdowns[category];
+		if (categoryBreakdown == null) continue;
+
+		const collapsedCategory = collapseHeapSnapshotBreakdown(categoryBreakdown, topN);
+		if (Object.keys(collapsedCategory).length > 0) {
+			collapsed[category] = collapsedCategory;
+		}
+	}
+
+	return collapsed;
+}
+
+// Keep these buckets aligned with Chrome DevTools' heap snapshot Statistics view.
+export function analyzeHeapSnapshot(snapshot: any, options: { breakdownTopN?: number } = {}): HeapSnapshotData {
+	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)) {
+		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) {
+		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');
+
+	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 { categories, nodeCounts } = createEmptyHeapSnapshotData();
+	const breakdowns = {} as Record<keyof typeof heapSnapshotCategory, Record<string, number>>;
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		if (category !== 'total') breakdowns[category] = {};
+	}
+
+	function addValue(map: Record<string, number>, key: string, value: number) {
+		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);
+		}
+	}
+
+	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);
+	}
+
+	return {
+		categories,
+		nodeCounts,
+		breakdowns: collapseHeapSnapshotBreakdowns(breakdowns, options.breakdownTopN),
+	};
+}
+
+function finiteMedian(values: (number | null | undefined)[]) {
+	const finiteValues = values.filter(value => Number.isFinite(value)) as number[];
+	if (finiteValues.length === 0) return null;
+	return util.median(finiteValues);
+}
+
+export function summarizeHeapSnapshotDataSamples<T>(
+	samples: T[],
+	getData: (sample: T) => HeapSnapshotData | null | undefined,
+	options: { breakdownTopN?: number } = {},
+) {
+	const data = samples.map(getData);
+	const categories = {} as HeapSnapshotData['categories'];
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		const value = finiteMedian(data.map(snapshot => snapshot?.categories?.[category]));
+		if (value != null) categories[category] = value;
+	}
+
+	const nodeCounts = {} as HeapSnapshotData['nodeCounts'];
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		const value = finiteMedian(data.map(snapshot => snapshot?.nodeCounts?.[category]));
+		if (value != null) nodeCounts[category] = value;
+	}
+
+	if (Object.keys(categories).length === 0) return null;
+
+	const breakdowns = {} as NonNullable<HeapSnapshotData['breakdowns']>;
+	for (const category of Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[]) {
+		if (category === 'total') continue;
+
+		const childKeys = new Set<string>();
+		for (const snapshot of data) {
+			for (const childKey of Object.keys(snapshot?.breakdowns?.[category] ?? {})) {
+				childKeys.add(childKey);
+			}
+		}
+
+		const categoryBreakdown = {} as Record<string, number>;
+		for (const childKey of childKeys) {
+			const value = finiteMedian(data.map(snapshot => snapshot?.breakdowns?.[category]?.[childKey]));
+			if (value != null) categoryBreakdown[childKey] = value;
+		}
+
+		const collapsed = collapseHeapSnapshotBreakdown(categoryBreakdown, options.breakdownTopN);
+		if (Object.keys(collapsed).length > 0) {
+			breakdowns[category] = collapsed;
+		}
+	}
+
+	return {
+		categories,
+		nodeCounts,
+		...(Object.keys(breakdowns).length > 0 ? { breakdowns } : {}),
+	};
+}
+
 function getHeapSnapshotCategoryValue(report: HeapSnapshotReport, category: keyof typeof heapSnapshotCategory) {
 	return report.summary.categories[category];
 }

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

@@ -1,309 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { createRequire } from 'node:module';
-import { copyFile, rm, 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;
-
-export type MemoryReport = {
-	timestamp: string;
-	sampleCount: any;
-	aggregation: string;
-	measurement: {
-		startupTimeoutMs: any;
-		memorySettleTimeMs: any;
-		ipcTimeoutMs: any;
-		requestCount: any;
-		heapSnapshot: {
-			enabled: any;
-			timeoutMs: any;
-			breakdownTopN: any;
-		};
-	};
-	summary: Record<typeof phases[number], {
-		memoryUsage: Record<string, number>;
-		heapSnapshot?: heapSnapshotUtil.HeapSnapshotData;
-	}>;
-	samples: (MemoryReportRaw['samples'][number] & {
-		round: number;
-	})[];
-};
-
-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'));
-	const pg = require('pg');
-	const Redis = require('ioredis');
-
-	const postgres = new pg.Client({
-		host: '127.0.0.1',
-		port: 54312,
-		database: 'postgres',
-		user: 'postgres',
-	});
-
-	await postgres.connect();
-	try {
-		await postgres.query('DROP DATABASE IF EXISTS "test-misskey" WITH (FORCE)');
-		await postgres.query('CREATE DATABASE "test-misskey"');
-	} finally {
-		await postgres.end();
-	}
-
-	const redis = new Redis({ host: '127.0.0.1', port: 56312 });
-	try {
-		await redis.flushall();
-	} finally {
-		redis.disconnect();
-	}
-}
-
-function summarizeHeapSnapshotBreakdowns(samples: MemoryReport['samples'], phase: typeof phases[number]) {
-	const breakdowns = {} as Record<keyof typeof heapSnapshotUtil.heapSnapshotCategory, Record<string, number>>;
-
-	for (const category of Object.keys(heapSnapshotUtil.heapSnapshotCategory) as (keyof typeof heapSnapshotUtil.heapSnapshotCategory)[]) {
-		if (category === 'total') continue;
-
-		const childKeys = new Set<string>();
-		for (const sample of samples) {
-			for (const childKey of Object.keys(sample.phases[phase].heapSnapshot?.breakdowns?.[category] ?? {})) {
-				childKeys.add(childKey);
-			}
-		}
-
-		const categoryBreakdown = {} as Record<string, number>;
-		for (const childKey of childKeys) {
-			const values = samples
-				.map(sample => sample.phases[phase].heapSnapshot?.breakdowns?.[category]?.[childKey])
-				.filter(value => Number.isFinite(value)) as number[];
-
-			if (values.length > 0) categoryBreakdown[childKey] = util.median(values);
-		}
-
-		if (Object.keys(categoryBreakdown).length > 0) {
-			breakdowns[category] = collapseHeapSnapshotBreakdown(categoryBreakdown);
-		}
-	}
-
-	return breakdowns;
-}
-
-function collapseHeapSnapshotBreakdown(breakdown: Record<string, number>) {
-	const entries = Object.entries(breakdown)
-		.filter(([, value]) => value > 0)
-		.toSorted((a, b) => b[1] - a[1]);
-
-	const topEntries = entries.slice(0, HEAP_SNAPSHOT_BREAKDOWN_TOP_N);
-	const otherValue = entries
-		.slice(HEAP_SNAPSHOT_BREAKDOWN_TOP_N)
-		.reduce((sum, [, value]) => sum + value, 0);
-
-	const collapsed = Object.fromEntries(topEntries);
-	if (otherValue > 0) collapsed.Other = otherValue;
-	return collapsed;
-}
-
-function summarizeSamples(samples: MemoryReport['samples']) {
-	const summary = {} as MemoryReport['summary'];
-
-	for (const phase of phases) {
-		summary[phase] = {
-			memoryUsage: {},
-		};
-
-		const metricKeys = new Set<string>();
-		for (const sample of samples) {
-			for (const key of Object.keys(sample.phases[phase].memoryUsage)) {
-				metricKeys.add(key);
-			}
-		}
-
-		for (const key of metricKeys) {
-			const values = samples.map(sample => sample.phases[phase].memoryUsage[key]);
-			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 values = samples
-				.map(sample => sample.phases[phase].heapSnapshot?.categories?.[category])
-				.filter(value => Number.isFinite(value)) as number[];
-
-			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 values = samples
-				.map(sample => sample.phases[phase].heapSnapshot?.nodeCounts?.[category])
-				.filter(value => Number.isFinite(value)) as number[];
-
-			if (values.length > 0) heapSnapshotNodeCountValues[category] = util.median(values);
-		}
-
-		if (Object.keys(heapSnapshotCategoryValues).length > 0) {
-			const heapSnapshotBreakdowns = summarizeHeapSnapshotBreakdowns(samples, phase);
-
-			summary[phase].heapSnapshot = {
-				categories: heapSnapshotCategoryValues,
-				nodeCounts: heapSnapshotNodeCountValues,
-				...(Object.keys(heapSnapshotBreakdowns).length > 0 ? { breakdowns: heapSnapshotBreakdowns } : {}),
-			};
-		}
-	}
-
-	return summary;
-}
-
-async function measureRepo(label: string, repoDir: string, round: number, options: { heapSnapshotSavePath?: string } = {}) {
-	process.stderr.write(`[${label}] Resetting database and Redis\n`);
-	await resetState(repoDir);
-
-	process.stderr.write(`[${label}] Running migrations\n`);
-	await util.run('pnpm', ['--filter', 'backend', 'migrate'], {
-		cwd: repoDir,
-		env: process.env,
-		logStdout: true,
-	});
-
-	process.stderr.write(`[${label}] Measuring memory\n`);
-	const measureEnv = {
-		...process.env,
-		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,
-		env: measureEnv,
-	});
-
-	const report = JSON.parse(stdout) as MemoryReportRaw;
-	const sample = report.samples[0];
-
-	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);
-	const baseOutput = resolve(baseOutputArg);
-	const headOutput = resolve(headOutputArg);
-	const rounds = util.readIntegerEnv('MK_MEMORY_COMPARE_ROUNDS', 5, 1);
-	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,
-			samples: [] as MemoryReport['samples'],
-		},
-		head: {
-			dir: headDir,
-			samples: [] as MemoryReport['samples'],
-		},
-	};
-
-	for (let round = 1; round <= warmupRounds; round++) {
-		process.stderr.write(`Starting warmup round ${round}/${warmupRounds}\n`);
-		for (const label of ['base', 'head'] as const) {
-			await measureRepo(label, reports[label].dir, -round);
-		}
-	}
-
-	for (let round = 1; round <= rounds; round++) {
-		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);
-			reports[label].samples.push({
-				...sample,
-				round,
-			});
-		}
-	}
-
-	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(),
-			sampleCount: reports[label].samples.length,
-			aggregation: 'median',
-			comparison: {
-				strategy: 'interleaved-pairs',
-				rounds,
-				warmupRounds,
-				startedAt,
-			},
-			summary: summaries[label],
-			samples: reports[label].samples,
-		};
-
-		await writeFile(label === 'base' ? baseOutput : headOutput, `${JSON.stringify(report, null, 2)}\n`);
-	}
-}
-
-main().catch(err => {
-	console.error(err);
-	process.exit(1);
-});

.github/scripts/memory-stability-util.mts

@@ -0,0 +1,75 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { setTimeout } from 'node:timers/promises';
+
+type MemoryStabilityTimer = {
+	now: () => number;
+	wait: (durationMs: number) => Promise<void>;
+};
+
+const intervalMs = 2000;
+const maxWaitMs = 10000;
+const windowSize = 3;
+const slopeThresholdKiBPerSecond = 256;
+const stabilityMetrics = ['Pss', 'Private_Dirty'] as const;
+
+const defaultTimer: MemoryStabilityTimer = {
+	now: () => performance.now(),
+	wait: durationMs => setTimeout(durationMs),
+};
+
+function getMaxAbsoluteSlopes<T extends Record<string, number>>(readings: { elapsedMs: number; memoryUsage: T }[]) {
+	const result = {} as Record<typeof stabilityMetrics[number], number>;
+
+	for (const metric of stabilityMetrics) {
+		let maxAbsoluteSlope = 0;
+		for (let i = 1; i < readings.length; i++) {
+			const previous = readings[i - 1];
+			const current = readings[i];
+			const durationSeconds = (current.elapsedMs - previous.elapsedMs) / 1000;
+			maxAbsoluteSlope = Math.max(maxAbsoluteSlope, Math.abs(current.memoryUsage[metric] - previous.memoryUsage[metric]) / durationSeconds);
+		}
+		result[metric] = maxAbsoluteSlope;
+	}
+
+	return result;
+}
+
+export async function measureMemoryUntilStable<T extends Record<string, number>>(
+	readMemoryUsage: () => Promise<T>,
+	timer: MemoryStabilityTimer = defaultTimer,
+) {
+	const startedAt = timer.now();
+	const readings: { elapsedMs: number; memoryUsage: T }[] = [];
+	let maxAbsoluteSlopesKiBPerSecond: Record<typeof stabilityMetrics[number], number> | null = null;
+
+	while (true) {
+		const memoryUsage = await readMemoryUsage();
+		const elapsedMs = timer.now() - startedAt;
+		readings.push({ elapsedMs, memoryUsage });
+
+		let converged = false;
+		if (readings.length >= windowSize) {
+			const latestSlopes = getMaxAbsoluteSlopes(readings.slice(-windowSize));
+			maxAbsoluteSlopesKiBPerSecond = latestSlopes;
+			converged = stabilityMetrics.every(metric => latestSlopes[metric] <= slopeThresholdKiBPerSecond);
+		}
+
+		if (converged || elapsedMs >= maxWaitMs) {
+			return {
+				memoryUsage,
+				stability: {
+					converged,
+					readingCount: readings.length,
+					elapsedMs,
+					maxAbsoluteSlopesKiBPerSecond,
+				},
+			};
+		}
+
+		await timer.wait(Math.min(intervalMs, maxWaitMs - elapsedMs));
+	}
+}

.github/scripts/memory-stability-util.test.mts

@@ -0,0 +1,110 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { measureMemoryUntilStable } from './memory-stability-util.mts';
+
+function createTimer() {
+	let elapsedMs = 0;
+
+	return {
+		now: () => elapsedMs,
+		wait: async (durationMs: number) => {
+			elapsedMs += durationMs;
+		},
+	};
+}
+
+async function measure(readings: Record<string, number>[]) {
+	let readCount = 0;
+	const result = await measureMemoryUntilStable(
+		async () => readings[readCount++],
+		createTimer(),
+	);
+	return { result, readCount };
+}
+
+test('adopts the latest reading once Pss and Private_Dirty slopes converge', async () => {
+	const readings = [
+		{ Pss: 1000, Private_Dirty: 500, HeapUsed: 300 },
+		{ Pss: 1100, Private_Dirty: 520, HeapUsed: 310 },
+		{ Pss: 1200, Private_Dirty: 540, HeapUsed: 320 },
+	];
+	const { result, readCount } = await measure(readings);
+
+	assert.equal(readCount, 3);
+	assert.deepEqual(result.memoryUsage, readings[2]);
+	assert.deepEqual(result.stability, {
+		converged: true,
+		readingCount: 3,
+		elapsedMs: 4000,
+		maxAbsoluteSlopesKiBPerSecond: {
+			Pss: 50,
+			Private_Dirty: 10,
+		},
+	});
+});
+
+test('uses only the latest readings when determining convergence', async () => {
+	const readings = [
+		{ Pss: 1000, Private_Dirty: 500 },
+		{ Pss: 2000, Private_Dirty: 1000 },
+		{ Pss: 3000, Private_Dirty: 1500 },
+		{ Pss: 3040, Private_Dirty: 1520 },
+		{ Pss: 3080, Private_Dirty: 1540 },
+	];
+	const { result, readCount } = await measure(readings);
+
+	assert.equal(readCount, 5);
+	assert.equal(result.stability.converged, true);
+	assert.deepEqual(result.stability.maxAbsoluteSlopesKiBPerSecond, {
+		Pss: 20,
+		Private_Dirty: 10,
+	});
+});
+
+test('bounds the wait and reports the latest slopes when memory does not converge', async () => {
+	const readings = [
+		{ Pss: 1000, Private_Dirty: 500 },
+		{ Pss: 1600, Private_Dirty: 520 },
+		{ Pss: 2200, Private_Dirty: 540 },
+		{ Pss: 2800, Private_Dirty: 560 },
+		{ Pss: 3400, Private_Dirty: 580 },
+		{ Pss: 4000, Private_Dirty: 600 },
+	];
+	const { result, readCount } = await measure(readings);
+
+	assert.equal(readCount, 6);
+	assert.deepEqual(result.memoryUsage, readings[5]);
+	assert.deepEqual(result.stability, {
+		converged: false,
+		readingCount: 6,
+		elapsedMs: 10000,
+		maxAbsoluteSlopesKiBPerSecond: {
+			Pss: 300,
+			Private_Dirty: 10,
+		},
+	});
+});
+
+test('does not treat opposing adjacent slopes as convergence', async () => {
+	const readings = [
+		{ Pss: 1000, Private_Dirty: 500 },
+		{ Pss: 1600, Private_Dirty: 500 },
+		{ Pss: 1000, Private_Dirty: 500 },
+		{ Pss: 1600, Private_Dirty: 500 },
+		{ Pss: 1000, Private_Dirty: 500 },
+		{ Pss: 1600, Private_Dirty: 500 },
+	];
+	const { result, readCount } = await measure(readings);
+
+	assert.equal(readCount, 6);
+	assert.equal(result.stability.converged, false);
+	assert.deepEqual(result.stability.maxAbsoluteSlopesKiBPerSecond, {
+		Pss: 300,
+		Private_Dirty: 0,
+	});
+});

.github/scripts/utility.mts

@@ -5,10 +5,14 @@
 
 // NOTE: このファイルはworkflow上でバックエンドからも参照されるため、side effectがあってはならない
 
-import { spawn } from 'node:child_process';
+import { spawn, spawnSync, type ChildProcessWithoutNullStreams } from 'node:child_process';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 
+export function sleep(ms: number) {
+	return new Promise(resolvePromise => setTimeout(resolvePromise, ms));
+}
+
 export function median(values: number[]) {
 	const sorted = values.toSorted((a, b) => a - b);
 	const center = Math.floor(sorted.length / 2);
@@ -202,3 +206,91 @@ export function run(command: string, args: string[], options: { cwd?: string; en
 		});
 	});
 }
+
+export function startServer(label: string, repoDir: string) {
+	process.stderr.write(`[${label}] Starting Misskey test server\n`);
+	const child = spawn(commandName('pnpm'), ['start:test'], {
+		cwd: repoDir,
+		env: process.env,
+		stdio: ['ignore', 'pipe', 'pipe'],
+		detached: process.platform !== 'win32',
+	});
+	child.stdout.on('data', data => process.stderr.write(`[server:${label}] ${data}`));
+	child.stderr.on('data', data => process.stderr.write(`[server:${label}] ${data}`));
+	return child;
+}
+
+export async function waitForServer(baseUrl: string, child: ChildProcessWithoutNullStreams) {
+	const startedAt = Date.now();
+	while (Date.now() - startedAt < 120_000) {
+		if (child.exitCode != null) throw new Error(`Misskey server exited early with code ${child.exitCode}`);
+		try {
+			const response = await fetch(`${baseUrl}/`, { redirect: 'manual' });
+			if (response.status < 500) return;
+		} catch {
+			// retry
+		}
+		await sleep(1_000);
+	}
+	throw new Error(`Timed out waiting for ${baseUrl}`);
+}
+
+export async function api(baseUrl: string, endpoint: string, body: Record<string, unknown>) {
+	const response = await fetch(`${baseUrl}/api/${endpoint}`, {
+		method: 'POST',
+		headers: {
+			'content-type': 'application/json',
+		},
+		body: JSON.stringify(body),
+	});
+	if (!response.ok) {
+		throw new Error(`/api/${endpoint} returned ${response.status}: ${await response.text()}`);
+	}
+	if (response.status === 204) return null;
+	return await response.json();
+}
+
+export async function prepareInstance(baseUrl: string) {
+	await api(baseUrl, 'reset-db', {});
+	await api(baseUrl, 'admin/accounts/create', {
+		username: 'admin',
+		password: 'admin1234',
+		setupPassword: 'example_password_please_change_this_or_you_will_get_hacked',
+	});
+}
+
+export async function stopServer(child: ChildProcessWithoutNullStreams) {
+	if (child.exitCode != null) return;
+
+	if (process.platform === 'win32') {
+		spawnSync('taskkill', ['/pid', String(child.pid), '/t', '/f'], { stdio: 'ignore' });
+	} else if (child.pid != null) {
+		try {
+			process.kill(-child.pid, 'SIGTERM');
+		} catch {
+			child.kill('SIGTERM');
+		}
+	}
+
+	await new Promise<void>(resolvePromise => {
+		if (child.exitCode != null) {
+			resolvePromise();
+			return;
+		}
+		child.once('exit', () => resolvePromise());
+		setTimeout(() => {
+			if (child.pid != null) {
+				try {
+					if (process.platform === 'win32') {
+						spawnSync('taskkill', ['/pid', String(child.pid), '/t', '/f'], { stdio: 'ignore' });
+					} else {
+						process.kill(-child.pid, 'SIGKILL');
+					}
+				} catch {
+					child.kill('SIGKILL');
+				}
+			}
+			resolvePromise();
+		}, 10_000).unref();
+	});
+}

.github/workflows/backend-diagnostics.comment.yml

@@ -1,10 +1,10 @@
-name: Report backend memory
+name: Backend diagnostics (comment)
 
 on:
   workflow_run:
     types: [completed]
     workflows:
-      - Get backend memory usage # get-backend-memory.yml
+      - Backend diagnostics (inspect) # backend-diagnostics.inspect.yml
 
 jobs:
   compare-memory:
@@ -33,9 +33,9 @@ jobs:
       - 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
+      - name: Find heap snapshot artifacts
+        id: find-heap-snapshot-artifacts
+        uses: actions/github-script@v9
         with:
           script: |
             const { owner, repo } = context.repo;
@@ -45,15 +45,22 @@ jobs:
               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}`);
+            const artifactNames = {
+              base: 'base-heap-snapshot.heapsnapshot',
+              head: 'head-heap-snapshot.heapsnapshot',
+            };
+            for (const [label, artifactName] of Object.entries(artifactNames)) {
+              const artifact = artifacts.find(artifact => artifact.name === artifactName);
+              if (artifact == null) throw new Error(`Artifact not found: ${artifactName}`);
+              core.setOutput(`${label}-url`, `https://github.com/${owner}/${repo}/actions/runs/${run_id}/artifacts/${artifact.id}`);
+            }
 
       - 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
+          MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_BASE: ${{ steps.find-heap-snapshot-artifacts.outputs.base-url }}
+          MK_MEMORY_HEAP_SNAPSHOT_ARTIFACT_URL_HEAD: ${{ steps.find-heap-snapshot-artifacts.outputs.head-url }}
+        run: node .github/scripts/backend-diagnostics.render-md.mts ./artifacts/memory-base.json ./artifacts/memory-head.json ./output.md
       - uses: thollander/actions-comment-pull-request@v3
         with:
           pr-number: ${{ steps.load-pr-num.outputs.pr-number }}

.github/workflows/backend-diagnostics.inspect.yml

@@ -1,5 +1,5 @@
-# this name is used in report-backend-memory.yml so be careful when change name
-name: Get backend memory usage
+# this name is used in backend-diagnostics.comment.yml so be careful when change name
+name: Backend diagnostics (inspect)
 
 on:
   pull_request:
@@ -10,13 +10,11 @@ on:
       - packages/backend/**
       - packages/misskey-js/**
       - .github/scripts/utility.mts
-      - .github/scripts/backend-memory-report.mts
-      - .github/scripts/measure-backend-memory-comparison.mts
-      - .github/scripts/backend-js-footprint.mjs
-      - .github/scripts/backend-js-footprint-loader.mjs
-      - .github/scripts/backend-js-footprint-require.cjs
-      - .github/workflows/get-backend-memory.yml
-      - .github/workflows/report-backend-memory.yml
+      - .github/scripts/backend-diagnostics.render-md.mts
+      - .github/scripts/backend-diagnostics.inspect.mts
+      - .github/scripts/memory-stability-util*.mts
+      - .github/workflows/backend-diagnostics.inspect.yml
+      - .github/workflows/backend-diagnostics.comment.yml
 
 jobs:
   get-memory-usage:
@@ -92,21 +90,24 @@ jobs:
       run: pnpm build
     - name: Measure backend memory usage
       env:
-        MK_MEMORY_COMPARE_ROUNDS: 5
+        MK_MEMORY_COMPARE_ROUNDS: 10
         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
+      run: node head/.github/scripts/backend-diagnostics.inspect.mts base head memory-base.json memory-head.json
+    - name: Upload base heap snapshot
+      uses: actions/upload-artifact@v7
+      with:
+        path: base-heap-snapshot.heapsnapshot
+        archive: false
+        if-no-files-found: error
+        retention-days: 7
     - name: Upload head heap snapshot
       uses: actions/upload-artifact@v7
       with:
-        name: backend-memory-head-heap-snapshot
         path: head-heap-snapshot.heapsnapshot
+        archive: false
         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
-        node head/.github/scripts/backend-js-footprint.mjs head js-footprint-head.json
     - name: Upload Artifact
       uses: actions/upload-artifact@v7
       with:
@@ -114,8 +115,6 @@ jobs:
         path: |
           memory-base.json
           memory-head.json
-          js-footprint-base.json
-          js-footprint-head.json
 
   save-pr-number:
     runs-on: ubuntu-latest

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

@@ -44,7 +44,6 @@ jobs:
           }
 
           directories=(
-            "cypress/e2e"
             "packages/backend/migration"
             "packages/backend/src"
             "packages/backend/test"

.github/workflows/frontend-browser-diagnostics.comment.yml

@@ -0,0 +1,44 @@
+name: Frontend browser diagnostics (comment)
+
+on:
+  workflow_run:
+    workflows:
+      - Frontend browser diagnostics (inspect)
+    types:
+      - completed
+
+permissions:
+  actions: read
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    name: Comment frontend browser diagnostics report
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    concurrency:
+      group: frontend-browser-diagnostics-report-${{ github.event.workflow_run.id }}
+      cancel-in-progress: true
+    steps:
+      - name: Download browser metrics report
+        uses: actions/download-artifact@v8
+        with:
+          name: frontend-browser-diagnostics
+          path: ${{ runner.temp }}/frontend-browser-diagnostics
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      - name: Load PR number
+        id: load-pr-number
+        shell: bash
+        run: echo "pr-number=$(cat "$RUNNER_TEMP/frontend-browser-diagnostics/pr-number.txt")" >> "$GITHUB_OUTPUT"
+
+      - name: Comment on pull request
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          pr-number: ${{ steps.load-pr-number.outputs.pr-number }}
+          comment-tag: frontend-browser-diagnostics
+          file-path: ${{ runner.temp }}/frontend-browser-diagnostics/frontend-browser-diagnostics.md

.github/workflows/frontend-browser-diagnostics.inspect.yml

@@ -0,0 +1,210 @@
+name: Frontend browser diagnostics (inspect)
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+    paths:
+      - packages/frontend/**
+      - packages/frontend-shared/**
+      - packages/frontend-builder/**
+      - packages/backend/**
+      - packages/i18n/**
+      - packages/icons-subsetter/**
+      - packages/misskey-js/**
+      - packages/misskey-reversi/**
+      - packages/misskey-bubble-game/**
+      - package.json
+      - pnpm-lock.yaml
+      - pnpm-workspace.yaml
+      - .node-version
+      - .github/misskey/test.yml
+      - .github/scripts/utility.mts
+      - .github/scripts/heap-snapshot-util.mts
+      - .github/scripts/chrome.mts
+      - .github/scripts/frontend-browser-diagnostics.render-additional-html.mts
+      - .github/scripts/frontend-browser-diagnostics.render-md.mts
+      - .github/scripts/frontend-browser-diagnostics.inspect.mts
+      - .github/workflows/frontend-browser-diagnostics.inspect.yml
+      - .github/workflows/frontend-browser-diagnostics.comment.yml
+
+permissions:
+  contents: read
+  pull-requests: read
+
+concurrency:
+  group: frontend-browser-diagnostics-inspect-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  report:
+    name: Measure frontend browser metrics
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+
+    services:
+      postgres:
+        image: postgres:18
+        ports:
+          - 54312:5432
+        env:
+          POSTGRES_DB: test-misskey
+          POSTGRES_HOST_AUTH_METHOD: trust
+      redis:
+        image: redis:8
+        ports:
+          - 56312:6379
+
+    steps:
+      - name: Checkout base
+        uses: actions/checkout@v6.0.3
+        with:
+          persist-credentials: false
+          repository: ${{ github.event.pull_request.base.repo.full_name }}
+          ref: ${{ github.event.pull_request.base.sha }}
+          path: before
+          submodules: true
+
+      - name: Checkout pull request
+        uses: actions/checkout@v6.0.3
+        with:
+          persist-credentials: false
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: after
+          submodules: true
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v6.0.9
+        with:
+          package_json_file: after/package.json
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v6.4.0
+        with:
+          node-version-file: after/.node-version
+          cache: pnpm
+          cache-dependency-path: |
+            before/pnpm-lock.yaml
+            after/pnpm-lock.yaml
+
+      - name: Install dependencies for base
+        working-directory: before
+        run: pnpm i --frozen-lockfile
+
+      - name: Configure base
+        working-directory: before
+        run: cp .github/misskey/test.yml .config
+
+      - name: Build base
+        working-directory: before
+        run: pnpm build
+
+      - name: Install dependencies for pull request
+        working-directory: after
+        run: pnpm i --frozen-lockfile
+
+      - name: Configure pull request
+        working-directory: after
+        run: cp .github/misskey/test.yml .config
+
+      - name: Build pull request
+        working-directory: after
+        run: pnpm build
+
+      - name: Install Playwright browsers
+        working-directory: after/packages/frontend
+        run: pnpm exec playwright install --with-deps --no-shell chromium
+
+      - name: Measure frontend browser metrics
+        shell: bash
+        env:
+          FRONTEND_BROWSER_METRICS_SAMPLE_COUNT: 5
+          MK_ENABLE_CROSS_ORIGIN_ISOLATION: "true"
+        run: |
+          REPORT_DIR="$RUNNER_TEMP/frontend-browser-diagnostics"
+          mkdir -p "$REPORT_DIR"
+          node after/.github/scripts/frontend-browser-diagnostics.inspect.mts before after "$REPORT_DIR/before-browser.json" "$REPORT_DIR/after-browser.json"
+
+      - name: Upload browser base heap snapshot
+        id: upload-browser-base-heap-snapshot
+        uses: actions/upload-artifact@v7
+        with:
+          path: base-heap-snapshot.heapsnapshot
+          archive: false
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Upload browser head heap snapshot
+        id: upload-browser-head-heap-snapshot
+        uses: actions/upload-artifact@v7
+        with:
+          path: head-heap-snapshot.heapsnapshot
+          archive: false
+          if-no-files-found: error
+          retention-days: 7
+
+      - name: Generate browser detailed html
+        shell: bash
+        run: |
+          REPORT_DIR="$RUNNER_TEMP/frontend-browser-diagnostics"
+          test -s "$REPORT_DIR/before-browser.json"
+          test -s "$REPORT_DIR/after-browser.json"
+          node after/.github/scripts/frontend-browser-diagnostics.render-additional-html.mts "$REPORT_DIR/before-browser.json" "$REPORT_DIR/after-browser.json" "$REPORT_DIR/frontend-browser-detailed-html.html"
+
+      - name: Upload browser detailed html
+        id: upload-browser-detailed-html
+        uses: actions/upload-artifact@v7
+        with:
+          name: frontend-browser-metrics-detailed-html
+          path: ${{ runner.temp }}/frontend-browser-diagnostics/frontend-browser-detailed-html.html
+          if-no-files-found: error
+          archive: false
+          retention-days: 7
+
+      - name: Generate browser metrics report
+        shell: bash
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          FRONTEND_BROWSER_BASE_HEAP_SNAPSHOT_ARTIFACT_URL: ${{ steps.upload-browser-base-heap-snapshot.outputs.artifact-url }}
+          FRONTEND_BROWSER_HEAD_HEAP_SNAPSHOT_ARTIFACT_URL: ${{ steps.upload-browser-head-heap-snapshot.outputs.artifact-url }}
+          FRONTEND_BROWSER_DETAILED_HTML_ARTIFACT_URL: ${{ steps.upload-browser-detailed-html.outputs.artifact-url }}
+        run: |
+          REPORT_DIR="$RUNNER_TEMP/frontend-browser-diagnostics"
+          test -s "$REPORT_DIR/before-browser.json"
+          test -s "$REPORT_DIR/after-browser.json"
+          node after/.github/scripts/frontend-browser-diagnostics.render-md.mts "$REPORT_DIR/before-browser.json" "$REPORT_DIR/after-browser.json" "$REPORT_DIR/frontend-browser-diagnostics.md"
+          printf '%s\n' "$PR_NUMBER" > "$REPORT_DIR/pr-number.txt"
+          printf '%s\n' "$BASE_SHA" > "$REPORT_DIR/base-sha.txt"
+          printf '%s\n' "$HEAD_SHA" > "$REPORT_DIR/head-sha.txt"
+          printf '%s\n' "${{ github.event.pull_request.html_url }}" > "$REPORT_DIR/pr-url.txt"
+
+      - name: Check browser metrics report
+        shell: bash
+        run: |
+          REPORT_DIR="$RUNNER_TEMP/frontend-browser-diagnostics"
+          test -s "$REPORT_DIR/frontend-browser-diagnostics.md"
+          test -s "$REPORT_DIR/frontend-browser-detailed-html.html"
+          test -s "$REPORT_DIR/pr-number.txt"
+          test -s "$REPORT_DIR/head-sha.txt"
+          cat "$REPORT_DIR/frontend-browser-diagnostics.md" >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Upload browser metrics report
+        uses: actions/upload-artifact@v7
+        with:
+          name: frontend-browser-diagnostics
+          path: |
+            ${{ runner.temp }}/frontend-browser-diagnostics/before-browser.json
+            ${{ runner.temp }}/frontend-browser-diagnostics/after-browser.json
+            ${{ runner.temp }}/frontend-browser-diagnostics/frontend-browser-diagnostics.md
+            ${{ runner.temp }}/frontend-browser-diagnostics/pr-number.txt
+            ${{ runner.temp }}/frontend-browser-diagnostics/base-sha.txt
+            ${{ runner.temp }}/frontend-browser-diagnostics/head-sha.txt
+            ${{ runner.temp }}/frontend-browser-diagnostics/pr-url.txt
+          if-no-files-found: error
+          retention-days: 7

.github/workflows/frontend-bundle-diagnostics.comment.yml

@@ -0,0 +1,44 @@
+name: Frontend bundle diagnostics (comment)
+
+on:
+  workflow_run:
+    workflows:
+      - Frontend bundle diagnostics (inspect)
+    types:
+      - completed
+
+permissions:
+  actions: read
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    name: Comment frontend bundle report
+    if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    concurrency:
+      group: frontend-bundle-diagnostics-report-${{ github.event.workflow_run.id }}
+      cancel-in-progress: true
+    steps:
+      - name: Download bundle report
+        uses: actions/download-artifact@v8
+        with:
+          name: frontend-bundle-report
+          path: ${{ runner.temp }}/frontend-bundle-report
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ github.event.workflow_run.id }}
+
+      - name: Load PR number
+        id: load-pr-number
+        shell: bash
+        run: echo "pr-number=$(cat "$RUNNER_TEMP/frontend-bundle-report/pr-number.txt")" >> "$GITHUB_OUTPUT"
+
+      - name: Comment on pull request
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          pr-number: ${{ steps.load-pr-number.outputs.pr-number }}
+          comment-tag: frontend-bundle-diagnostics
+          file-path: ${{ runner.temp }}/frontend-bundle-report/frontend-bundle-diagnostics-report.md

.github/workflows/frontend-bundle-diagnostics.inspect.yml

@@ -1,4 +1,4 @@
-name: frontend-bundle-report
+name: Frontend bundle diagnostics (inspect)
 
 on:
   pull_request:
@@ -21,24 +21,22 @@ on:
       - pnpm-workspace.yaml
       - .node-version
       - .github/scripts/utility.mts
-      - .github/scripts/frontend-js-size.mts
-      - .github/workflows/frontend-bundle-report.yml
-      - .github/workflows/frontend-bundle-report-comment.yml
+      - .github/scripts/frontend-bundle-diagnostics.render-md.mts
+      - .github/workflows/frontend-bundle-diagnostics.inspect.yml
+      - .github/workflows/frontend-bundle-diagnostics.comment.yml
 
 permissions:
   contents: read
   pull-requests: read
 
 concurrency:
-  group: frontend-bundle-report-${{ github.event.pull_request.number }}
+  group: frontend-bundle-diagnostics-inspect-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
 jobs:
   report:
     name: Build frontend bundle report
     runs-on: ubuntu-latest
-    env:
-      FRONTEND_JS_SIZE_LOCALE: ja-JP
     steps:
       - name: Checkout base
         uses: actions/checkout@v6.0.3
@@ -56,25 +54,12 @@ jobs:
           path: after
           submodules: true
 
-      - name: Check base visualizer support
-        id: check-base-visualizer
-        shell: bash
-        run: |
-          if grep -q 'FRONTEND_BUNDLE_VISUALIZER' before/packages/frontend/vite.config.ts; then
-            echo 'supported=true' >> "$GITHUB_OUTPUT"
-          else
-            echo 'supported=false' >> "$GITHUB_OUTPUT"
-            echo 'Base commit does not support frontend bundle visualizer. Skipping frontend bundle report.' >> "$GITHUB_STEP_SUMMARY"
-          fi
-
       - name: Setup pnpm
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         uses: pnpm/action-setup@v6.0.9
         with:
           package_json_file: after/package.json
 
       - name: Setup Node.js
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         uses: actions/setup-node@v6.4.0
         with:
           node-version-file: after/.node-version
@@ -84,21 +69,17 @@ jobs:
             after/pnpm-lock.yaml
 
       - name: Install dependencies for base
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: before
         run: pnpm i --frozen-lockfile
 
       - name: Build frontend dependencies for base
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: before
         run: pnpm --filter "frontend^..." run build
 
       - name: Prepare report output
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         run: mkdir -p "$RUNNER_TEMP/frontend-bundle-report"
 
       - name: Build frontend report for base
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: before
         env:
           FRONTEND_BUNDLE_VISUALIZER: 'true'
@@ -106,17 +87,14 @@ jobs:
         run: pnpm --filter frontend run build
 
       - name: Install dependencies for pull request
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: after
         run: pnpm i --frozen-lockfile
 
       - name: Build frontend dependencies for pull request
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: after
         run: pnpm --filter "frontend^..." run build
 
       - name: Build frontend report for pull request
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         working-directory: after
         env:
           FRONTEND_BUNDLE_VISUALIZER: 'true'
@@ -125,7 +103,6 @@ jobs:
         run: pnpm --filter frontend run build
 
       - name: Upload bundle visualizer
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         id: upload-bundle-visualizer
         uses: actions/upload-artifact@v7
         with:
@@ -136,7 +113,6 @@ jobs:
           retention-days: 7
 
       - name: Generate report markdown
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         shell: bash
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
@@ -145,23 +121,21 @@ jobs:
           FRONTEND_BUNDLE_REPORT_ARTIFACT_URL: ${{ steps.upload-bundle-visualizer.outputs.artifact-url }}
         run: |
           REPORT_DIR="$RUNNER_TEMP/frontend-bundle-report"
-          node after/.github/scripts/frontend-js-size.mts before after "$REPORT_DIR/before-stats.json" "$REPORT_DIR/after-stats.json" "$REPORT_DIR/frontend-js-size-report.md"
+          node after/.github/scripts/frontend-bundle-diagnostics.render-md.mts before after "$REPORT_DIR/before-stats.json" "$REPORT_DIR/after-stats.json" "$REPORT_DIR/frontend-bundle-diagnostics-report.md"
           printf '%s\n' "$PR_NUMBER" > "$REPORT_DIR/pr-number.txt"
           printf '%s\n' "$BASE_SHA" > "$REPORT_DIR/base-sha.txt"
           printf '%s\n' "$HEAD_SHA" > "$REPORT_DIR/head-sha.txt"
           printf '%s\n' "${{ github.event.pull_request.html_url }}" > "$REPORT_DIR/pr-url.txt"
 
       - name: Check report
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         run: |
           REPORT_DIR="$RUNNER_TEMP/frontend-bundle-report"
           test -s "$REPORT_DIR/before-stats.json"
           test -s "$REPORT_DIR/after-stats.json"
-          test -s "$REPORT_DIR/frontend-js-size-report.md"
-          cat "$REPORT_DIR/frontend-js-size-report.md" >> "$GITHUB_STEP_SUMMARY"
+          test -s "$REPORT_DIR/frontend-bundle-diagnostics-report.md"
+          cat "$REPORT_DIR/frontend-bundle-diagnostics-report.md" >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload bundle report
-        if: steps.check-base-visualizer.outputs.supported == 'true'
         uses: actions/upload-artifact@v7
         with:
           name: frontend-bundle-report

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

@@ -1,318 +0,0 @@
-name: frontend-bundle-report-comment
-
-on:
-  workflow_run:
-    workflows:
-      - frontend-bundle-report
-    types:
-      - completed
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-    paths:
-      - packages/frontend/**
-      - packages/frontend-shared/**
-      - packages/frontend-builder/**
-      - packages/i18n/**
-      - packages/icons-subsetter/**
-      - packages/misskey-js/**
-      - packages/misskey-reversi/**
-      - packages/misskey-bubble-game/**
-      - package.json
-      - pnpm-lock.yaml
-      - pnpm-workspace.yaml
-      - .node-version
-      - .github/scripts/utility.mts
-      - .github/scripts/frontend-js-size.mts
-      - .github/workflows/frontend-bundle-report.yml
-      - .github/workflows/frontend-bundle-report-comment.yml
-
-permissions:
-  actions: read
-  contents: read
-  issues: write
-  pull-requests: write
-
-jobs:
-  comment:
-    name: Comment frontend bundle report
-    if: github.event_name == 'pull_request_target' || (github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success')
-    runs-on: ubuntu-latest
-    concurrency:
-      group: frontend-bundle-report-comment-${{ github.event.pull_request.number || github.event.workflow_run.id }}
-      cancel-in-progress: true
-    steps:
-      - name: Find bundle report run
-        if: github.event_name == 'pull_request_target'
-        id: find-report-run
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const workflow_id = 'frontend-bundle-report.yml';
-            const artifactName = 'frontend-bundle-report';
-            const headSha = context.payload.pull_request.head.sha;
-            const prNumber = context.payload.pull_request.number;
-            const pollIntervalMs = 30_000;
-            const timeoutMs = 90 * 60_000;
-            const startedAt = Date.now();
-            const { owner, repo } = context.repo;
-
-            async function listReportWorkflowRuns() {
-              const runsForHead = await github.paginate(github.rest.actions.listWorkflowRuns, {
-                owner,
-                repo,
-                workflow_id,
-                event: 'pull_request',
-                head_sha: headSha,
-                per_page: 100,
-              });
-
-              if (runsForHead.length > 0) {
-                return runsForHead;
-              }
-
-              const recentRuns = await github.paginate(github.rest.actions.listWorkflowRuns, {
-                owner,
-                repo,
-                workflow_id,
-                event: 'pull_request',
-                per_page: 100,
-              });
-              return recentRuns.filter((run) =>
-                run.pull_requests?.some((pullRequest) => pullRequest.number === prNumber));
-            }
-
-            async function findReportRun() {
-              const runs = (await listReportWorkflowRuns())
-                .sort((a, b) => new Date(b.updated_at) - new Date(a.updated_at));
-
-              for (const run of runs) {
-                if (run.status !== 'completed') continue;
-                if (run.conclusion !== 'success') {
-                  core.warning(`Frontend bundle report run ${run.id} completed with conclusion: ${run.conclusion}`);
-                  return { done: true, run: null };
-                }
-
-                const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
-                  owner,
-                  repo,
-                  run_id: run.id,
-                  per_page: 100,
-                });
-                const report = artifacts.find((artifact) => artifact.name === artifactName && !artifact.expired);
-                if (report) return { done: true, run };
-
-                core.info(`Frontend bundle report run ${run.id} did not produce ${artifactName}.`);
-                return { done: true, run: null };
-              }
-
-              return { done: false, run: null };
-            }
-
-            while (Date.now() - startedAt < timeoutMs) {
-              const { done, run } = await findReportRun();
-              if (run) {
-                core.info(`Found frontend bundle report on workflow run ${run.id}.`);
-                core.setOutput('run-id', String(run.id));
-                return;
-              }
-              if (done) {
-                return;
-              }
-
-              core.info('Waiting for frontend bundle report artifact...');
-              await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
-            }
-
-            core.warning(`Timed out waiting for ${artifactName} from ${workflow_id} for ${headSha}.`);
-
-      - name: Find bundle report artifact
-        if: github.event_name == 'workflow_run'
-        id: find-report-artifact
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const artifactName = 'frontend-bundle-report';
-            const { owner, repo } = context.repo;
-            const artifacts = await github.paginate(github.rest.actions.listWorkflowRunArtifacts, {
-              owner,
-              repo,
-              run_id: context.payload.workflow_run.id,
-              per_page: 100,
-            });
-            const report = artifacts.find((artifact) => artifact.name === artifactName && !artifact.expired);
-            if (report) {
-              core.setOutput('exists', 'true');
-            } else {
-              core.info(`Workflow run ${context.payload.workflow_run.id} did not produce ${artifactName}.`);
-              core.setOutput('exists', 'false');
-            }
-
-      - name: Download bundle report from workflow_run
-        if: github.event_name == 'workflow_run' && steps.find-report-artifact.outputs.exists == 'true'
-        uses: actions/download-artifact@v8
-        with:
-          name: frontend-bundle-report
-          path: ${{ runner.temp }}/frontend-bundle-report
-          github-token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          run-id: ${{ github.event.workflow_run.id }}
-
-      - name: Download bundle report from pull_request_target
-        if: github.event_name == 'pull_request_target' && steps.find-report-run.outputs.run-id != ''
-        uses: actions/download-artifact@v8
-        with:
-          name: frontend-bundle-report
-          path: ${{ runner.temp }}/frontend-bundle-report
-          github-token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          run-id: ${{ steps.find-report-run.outputs.run-id }}
-
-      - name: Comment on pull request
-        if: (github.event_name == 'workflow_run' && steps.find-report-artifact.outputs.exists == 'true') || steps.find-report-run.outputs.run-id != ''
-        uses: actions/github-script@v9
-        with:
-          github-token: ${{ secrets.FRONTEND_BUNDLE_REPORT_COMMENT_TOKEN || secrets.FRONTEND_JS_SIZE_COMMENT_TOKEN || secrets.FRONTEND_BUNDLE_VISUALIZER_COMMENT_TOKEN || github.token }}
-          script: |
-            const fs = require('node:fs');
-            const path = require('node:path');
-
-            const jsSizeMarker = '<!-- misskey-frontend-js-size -->';
-            const visualizerMarker = '<!-- misskey-frontend-bundle-visualizer -->';
-            const reportMarkers = [jsSizeMarker, visualizerMarker];
-            const reportDir = path.join(process.env.RUNNER_TEMP, 'frontend-bundle-report');
-            const jsSizeReportPath = path.join(reportDir, 'frontend-js-size-report.md');
-            const prNumberPath = path.join(reportDir, 'pr-number.txt');
-            const headShaPath = path.join(reportDir, 'head-sha.txt');
-            const workflowRun = context.payload.workflow_run;
-            const pullRequest = context.payload.pull_request;
-            const eventHeadSha = workflowRun?.head_sha ?? pullRequest?.head?.sha ?? null;
-            const { owner, repo } = context.repo;
-
-            if (!fs.existsSync(jsSizeReportPath)) {
-              core.setFailed('The frontend bundle report artifact does not contain frontend-js-size-report.md.');
-              return;
-            }
-
-            const artifactHeadSha = fs.existsSync(headShaPath)
-              ? fs.readFileSync(headShaPath, 'utf8').trim()
-              : null;
-            if (eventHeadSha != null && artifactHeadSha != null && artifactHeadSha !== eventHeadSha) {
-              core.info(`The artifact head SHA (${artifactHeadSha}) differs from the event head SHA (${eventHeadSha}). Using artifact metadata for PR validation.`);
-            }
-            const reportHeadSha = artifactHeadSha ?? eventHeadSha;
-
-            const artifactPrNumber = fs.existsSync(prNumberPath)
-              ? Number(fs.readFileSync(prNumberPath, 'utf8').trim())
-              : null;
-            let issue_number = null;
-            if (pullRequest != null) {
-              issue_number = pullRequest.number;
-              if (Number.isInteger(artifactPrNumber) && artifactPrNumber !== issue_number) {
-                core.setFailed(`The artifact pull request number (${artifactPrNumber}) does not match the event pull request number (${issue_number}).`);
-                return;
-              }
-            } else if (workflowRun != null) {
-              const associatedPullRequests = new Map();
-              for (const pullRequest of workflowRun.pull_requests ?? []) {
-                if (Number.isInteger(pullRequest.number)) {
-                  associatedPullRequests.set(pullRequest.number, pullRequest);
-                }
-              }
-
-              if (reportHeadSha != null) {
-                const pullRequestsForCommit = await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
-                  owner,
-                  repo,
-                  commit_sha: reportHeadSha,
-                  per_page: 100,
-                });
-                for (const pullRequest of pullRequestsForCommit) {
-                  associatedPullRequests.set(pullRequest.number, pullRequest);
-                }
-              }
-
-              if (Number.isInteger(artifactPrNumber) && associatedPullRequests.has(artifactPrNumber)) {
-                issue_number = artifactPrNumber;
-              } else if (Number.isInteger(artifactPrNumber) && associatedPullRequests.size === 0) {
-                issue_number = artifactPrNumber;
-              } else if (!Number.isInteger(artifactPrNumber) && associatedPullRequests.size === 1) {
-                issue_number = [...associatedPullRequests.keys()][0];
-              } else if (Number.isInteger(artifactPrNumber)) {
-                core.setFailed(`The artifact pull request number (${artifactPrNumber}) is not associated with ${reportHeadSha}.`);
-                return;
-              } else {
-                core.setFailed(`Could not determine the pull request associated with ${reportHeadSha}.`);
-                return;
-              }
-            } else {
-              core.setFailed('Could not determine the pull request event for this report.');
-              return;
-            }
-
-            const currentPullRequest = await github.rest.pulls.get({
-              owner,
-              repo,
-              pull_number: issue_number,
-            });
-            const currentHeadSha = currentPullRequest.data.head?.sha;
-            if (reportHeadSha != null && currentHeadSha != null && reportHeadSha !== currentHeadSha) {
-              core.info(`The report head SHA (${reportHeadSha}) is not the current pull request head SHA (${currentHeadSha}). Skipping stale frontend bundle report.`);
-              return;
-            }
-
-            const jsSizeReport = fs.readFileSync(jsSizeReportPath, 'utf8').trim();
-            if (!jsSizeReport.includes(jsSizeMarker)) {
-              core.setFailed('The frontend JS size report is missing the expected marker.');
-              return;
-            }
-            let body = `${jsSizeReport}\n`;
-
-            const maxCommentLength = 65_000;
-            if (body.length > maxCommentLength) {
-              const reportLocation = workflowRun?.html_url != null
-                ? `[workflow run](${workflowRun.html_url})`
-                : 'workflow artifact';
-              const footer = [
-                '',
-                '',
-                `_Report truncated because it exceeded ${maxCommentLength.toLocaleString('en-US')} characters. See the ${reportLocation} for the full report._`,
-              ].join('\n');
-              body = `${body.slice(0, maxCommentLength - footer.length)}${footer}`;
-            }
-
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner,
-              repo,
-              issue_number,
-              per_page: 100,
-            });
-            const previousReports = comments.filter((comment) =>
-              comment.user?.type === 'Bot' && reportMarkers.some((reportMarker) => comment.body?.includes(reportMarker)));
-
-            if (previousReports.length > 0) {
-              const [previous, ...duplicates] = previousReports;
-              await github.rest.issues.updateComment({
-                owner,
-                repo,
-                comment_id: previous.id,
-                body,
-              });
-              for (const duplicate of duplicates) {
-                await github.rest.issues.deleteComment({
-                  owner,
-                  repo,
-                  comment_id: duplicate.id,
-                });
-              }
-            } else {
-              await github.rest.issues.createComment({
-                owner,
-                repo,
-                issue_number,
-                body,
-              });
-            }

.github/workflows/lint.yml

@@ -17,7 +17,9 @@ 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/**
@@ -31,7 +33,9 @@ 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
@@ -113,3 +117,22 @@ jobs:
     - 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.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: node --test scripts/check-dts.test.mjs
+    - run: pnpm check-dts

.github/workflows/locale.yml

@@ -1,4 +1,4 @@
-name: Lint
+name: Locale
 
 on:
   push:

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

@@ -65,7 +65,7 @@ jobs:
             echo '```diff' >> ./output.md
             cat ./api.json.diff >> ./output.md
             echo '```' >> ./output.md
-            echo '</details>' >> ./output.md
+            echo '</details>' >> .output.md
           fi
 
           echo "$FOOTER" >> ./output.md

.github/workflows/test-frontend.yml

@@ -57,11 +57,6 @@ jobs:
     name: E2E tests (frontend)
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        browser: [chrome]
-
     services:
       postgres:
         image: postgres:18
@@ -79,12 +74,6 @@ jobs:
     - uses: actions/checkout@v6.0.3
       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
     - name: Use Node.js
@@ -97,29 +86,14 @@ jobs:
       run: cp .github/misskey/test.yml .config
     - name: Build
       run: pnpm build
-    # 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.4.0
+    - 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"
       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: ${{ matrix.browser }}-cypress-screenshots
-        path: cypress/screenshots
-    - uses: actions/upload-artifact@v7
-      if: always()
-      with:
-        name: ${{ matrix.browser }}-cypress-videos
-        path: cypress/videos
+        name: playwright-e2e-artifacts
+        path: packages/frontend/test/e2e/artifacts

.gitignore

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

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2026.6.1
+## 2026.7.0
 
 ### Note
 
@@ -15,19 +15,50 @@
 
 ### General
 - Feat: コントロールパネルから二要素認証を解除できるように
+- Feat: 条件に一致したURLプレビューのサムネイルを隠すことができるように  
+  (Based on https://github.com/MisskeyIO/misskey/pull/214)
 
 ### Client
-- Fix: チャットでIMEの変換を確定するEnterでメッセージが送信されてしまうことがある問題を修正
 - 2025.4.0 以前の設定情報の移行処理が削除されました
 	- 2025.4.0 から直接 2026.6.0 以上にアップデートする場合は設定が移行されませんので注意してください。移行したい場合は一度 2026.5.1 を経由してください。
+- Enhance: 画像ビューワーを独自実装に変更・動画プレイヤーを統合
+  - 操作性の改善
+  - ビューワーとMisskeyの各種機能との統合を強化
+  - パフォーマンスの向上
+  - Enhance: マウスホイールで拡大縮小できるように
+  - Fix: 幅が狭い画面で動画の再生が困難な問題を修正
+  - Fix: 一部の画像のみセンシティブなとき、ビューワー内で画像を切り替えるとセンシティブな画像がそのまま表示される問題を修正
+  - Fix: 一部の画像をビューワーで読み込んだ際に正しく表示されない問題を修正
+- Enhance: タイムラインの読み込みパフォーマンスを改善
+- Fix: 「画像を新しいタブで開く」が機能しなくなっていた問題を修正
 - Fix: デバイスタイプをスマートフォンに固定している状態で画面幅が広いとき、画面左上のアイコンが表示されない問題を修正
+- Fix: チャットでIMEの変換を確定するEnterでメッセージが送信されてしまうことがある問題を修正
+- Fix: 自分へのメンションに対する色分けで、判定が大文字/小文字を区別していた問題を修正
+- Fix: いくつかのイベントリスナーが正しく解除されない問題を修正（メモリ使用量の改善）
+- Fix: 非ログイン時トップページをスクロール操作できないことがある問題を修正
 
 ### Server
+- Feat: OpenTelemetryサポート
+  - 詳細な設定はconfigファイルを参照してください。
+  - Sentryとの併用も可能です。Sentry併用時は、PostgreSQL Query と Redis command は Sentry で計装されます。
+  - 以下の自動計装をサポートしています。（計装対象にする項目は設定可能）
+    - PostgreSQL query
+    - Redis command
+    - 全ての受信HTTPリクエスト
+    - 全ての送信HTTPリクエスト
+    - ジョブキュー（エンキュー元のトレースを含む）
+- Enhance: Sentry バックエンドの自動計装を `sentryForBackend.disabledIntegrations` で個別に無効化できるように
 - Enhance: センシティブメディアの判定を外部サービス ([sensitive-detector](https://github.com/misskey-dev/sensitive-detector)) に分離し、`nsfwjs` / `@tensorflow/tfjs(-node)` の同梱と NSFW 判定モデルを廃止 (#16804)
 - 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プレビューの結果を内部でキャッシュするように
+- Enhance: API内部エラーのログに構造化属性と正規化したエラー情報を付与し、認証情報を自動的に秘匿するように（従来形式の表示は維持）
+- Enhance: ログ全体の既定levelとlogger domainごとの出力levelを設定できるように
+- Enhance: バックエンドのログを1行JSON形式で出力できるように
 - Fix: `/stats` API のレスポンス型が正しくない問題を修正
 - Fix: ハッシュタグに関連するデータを更新する際のエラーハンドリングを修正
+- Fix: Sentry 使用環境下にて、Misskey が発行した SQL クエリが span に含まれない問題を修正
+- Fix: Sentry 使用環境下にて、外部送信リクエストへ `sentry-trace` / `baggage` ヘッダーが既定で付与されないように
 
 ## 2026.6.0
 

chart/files/default.yml

@@ -224,9 +224,8 @@ id: "aidx"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
-#allowedPrivateNetworks: [
-#  '127.0.0.1/32'
-#]
+allowedPrivateNetworks:
+ - '127.0.0.1/32'
 
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000

cypress.config.ts

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

cypress/e2e/basic.cy.ts

@@ -1,265 +0,0 @@
-/*
- * 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

@@ -1,35 +0,0 @@
-/*
- * 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

@@ -1,76 +0,0 @@
-/*
- * 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

@@ -1,5 +0,0 @@
-{
-  "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

@@ -1,67 +0,0 @@
-// ***********************************************
-// 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

@@ -1,34 +0,0 @@
-// ***********************************************************
-// 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

@@ -1,19 +0,0 @@
-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

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

docs/superpowers/specs/2026-07-15-frontend-bundle-generated-chunks-design.md

@@ -0,0 +1,176 @@
+# Frontend bundle report: generated chunk handling
+
+## Background
+
+The frontend bundle report compares the Vite manifests produced for the pull request base and head builds. Chunks with a `src` value are currently identified by that source path. Chunks without `src` are identified by Rolldown's generated `name`.
+
+Generated names are not unique or stable identities. Multiple unrelated shared chunks can all be called `dist`, `esm`, `index`, or a similar path-derived name. The current collection logic stores those chunks in a `Map` under `chunk:<name>`, so later entries overwrite earlier entries. This produces two problems:
+
+1. unrelated chunks can be compared as if they were the same chunk; and
+2. overwritten chunks are omitted from the reported total.
+
+Individual size changes for these generated shared chunks are not sufficiently actionable to justify heuristic matching.
+
+## Goals
+
+- Never compare unrelated generated chunks as the same chunk.
+- Keep generated chunks out of the individual chunk-diff rows.
+- Preserve the contribution of every physical JavaScript chunk in totals.
+- Show the aggregate size change of generated chunks so unexplained bundle growth remains visible.
+- Apply the same rules to the full chunk report and the startup chunk report.
+- Continue comparing source-backed chunks and intentionally named chunks.
+
+## Non-goals
+
+- Inferring chunk identity from module-set similarity.
+- Preserving an `updated` relationship for every shared chunk after code splitting changes.
+- Changing the frontend's code-splitting strategy or output filenames.
+- Suppressing specific names such as `esm` or `dist` with a denylist.
+
+## Approaches considered
+
+### Denylist generated-looking names
+
+Exclude names such as `esm`, `dist`, `lib`, and `index`.
+
+This is not selected because Rolldown can generate many other names, and a denylist can also hide an intentionally named chunk. It would leave the underlying name collision and total-size bug in place.
+
+### Compare only stable identities and aggregate the rest
+
+Classify chunks by whether the report has a stable semantic identity. Source-backed chunks and explicitly supported manual chunk names remain individually comparable. All other generated chunks are retained as physical files but shown only as an aggregate.
+
+This is the selected approach. It removes false comparisons without introducing matching heuristics, and it keeps all bytes visible.
+
+### Match shared chunks by their module sets
+
+Use visualizer metadata to compare exact or similar sets of module IDs.
+
+This could retain more individual diffs, but splits, merges, dependency-version paths, and small module movements make the matching policy complex and potentially misleading. It can be added later if aggregate data proves insufficient.
+
+## Design
+
+### Separate physical chunks from comparable identities
+
+`collectReport` will no longer use a single map keyed by the comparison identity as its source of truth. It will collect every resolved JavaScript output file exactly once into a physical chunk collection.
+
+Each physical chunk contains:
+
+- its resolved relative output path;
+- its byte size;
+- its manifest key, when present;
+- its display name; and
+- an optional comparison key.
+
+The physical output path is used only for de-duplication within one build. It is not used to match changed chunks across builds.
+
+### Comparison-key classification
+
+A chunk receives a comparison key only in one of these cases:
+
+1. `chunk.src` is present: use `src:<normalized source path>`.
+2. `chunk.name` is in an explicit allowlist of intentionally stable manual chunks: use `named:<name>`.
+
+The initial stable-name allowlist is:
+
+- `vue`
+- `i18n`
+
+These names correspond to the explicit `codeSplitting.groups` configuration in `packages/frontend/vite.config.ts`.
+
+All other manifest chunks without `src`, including generated names such as `esm` and `dist`, receive no comparison key. JavaScript files found in the localized output directory but absent from the manifest also receive no comparison key.
+
+If a supposedly stable comparison key occurs more than once within one build, the report must not silently overwrite it. Collection will fail with a descriptive error because duplicate `src` or allowlisted manual names violate the assumptions required for a correct comparison.
+
+### Full chunk report
+
+The report computes three independent values:
+
+1. **Total:** the sum of every unique physical JavaScript chunk.
+2. **Generated chunk aggregate:** the sum of chunks without a comparison key.
+3. **Individual rows:** before/after comparisons for stable comparison keys only.
+
+The table starts with the existing `(total)` row. Generated chunks are rendered at the bottom of the table as one aggregate row such as:
+
+```text
+(other generated chunks)
+```
+
+This row compares aggregate sizes, not individual chunk identities. Generated chunks do not participate in the updated/added/removed row counts. No additional generated-chunk count note is rendered below the table.
+
+### Small-delta aggregation
+
+Stable comparison rows whose absolute byte delta is at most `5 B` are grouped into an `(other)` aggregate instead of being rendered individually. The threshold is inclusive: deltas from `-5 B` through `+5 B` are grouped, while a `6 B` absolute delta remains an individual row. Small additions and removals are handled by the same rule.
+
+The `(other)` row reports the sum of the grouped chunks' before sizes and the sum of their after sizes. It does not expose an arbitrary representative filename. In the full chunk report, only changed rows are candidates because unchanged rows are already omitted. In the startup report, all rows currently eligible for display are candidates, so unchanged rows are also grouped instead of being listed individually.
+
+The updated/added/removed counts are calculated before small-delta rows are grouped. Therefore the summary continues to include every stable changed chunk, including chunks represented only by `(other)`.
+
+Table rows are ordered as follows:
+
+1. `(total)`;
+2. one empty separator row;
+3. individual stable comparison rows whose absolute delta is greater than `5 B`;
+4. `(other generated chunks)`, when generated chunks exist; and
+5. `(other)`, when small-delta stable chunks exist.
+
+There is no additional separator row before the aggregate rows. If no individual stable row exists, the empty row after `(total)` is therefore immediately followed by the aggregate rows.
+
+The existing 30-row limit applies after small-delta rows have been removed from the individual-row candidates.
+
+### Startup chunk report
+
+Startup traversal continues to follow the entry chunk's static `imports`, but it records manifest keys or resolved physical file paths rather than generated comparison keys. This prevents two startup chunks named `dist` from collapsing into one.
+
+Startup totals include every unique physical startup chunk. Stable startup chunks receive individual rows, while startup chunks without stable identities contribute to the same `(other generated chunks)` aggregate row within the startup table.
+
+### Displayed filenames
+
+For an individually comparable chunk, the details should expose both filenames when they differ. A single before-side filename must not imply that the after size belongs to that same file.
+
+The display can use one filename when unchanged and `before → after` when the content-hashed filename differs.
+
+The generated aggregate row does not display an arbitrary representative filename.
+
+## Data flow
+
+1. Read each build's Vite manifest.
+2. Resolve localized output files and collect unique physical chunks.
+3. Attach optional stable comparison keys using the classification rules.
+4. Traverse startup imports using manifest identities and map them to physical chunks.
+5. Calculate full and startup totals from physical chunks.
+6. Calculate generated aggregates from chunks without comparison keys.
+7. Compare only unique stable keys for individual rows.
+8. Render totals, generated aggregates, and stable rows.
+
+## Error handling
+
+- A manifest entry whose expected localized JavaScript file is absent remains a fatal report-generation error.
+- Duplicate physical output paths are de-duplicated and counted once.
+- Duplicate stable comparison keys fail with an error that includes the key and conflicting files.
+- Missing or malformed manifest data remains fatal rather than producing a partial report.
+
+## Testing
+
+Add focused fixtures or pure-function tests covering:
+
+- two unrelated `dist` chunks are both counted in total and grouped into the generated aggregate;
+- `dist` and `esm` chunks never produce individual comparison rows;
+- source-backed chunks with the same `src` are reported as updated;
+- source-backed additions and removals remain visible;
+- allowlisted `vue` and `i18n` chunks remain individually comparable;
+- duplicate stable keys produce a descriptive error instead of overwriting;
+- full totals equal the sum of all unique physical chunks;
+- startup totals include multiple same-name generated chunks exactly once each;
+- generated aggregate changes do not affect the updated/added/removed summary counts;
+- differing before/after filenames are rendered without attributing both sizes to one file;
+- deltas of exactly `5 B` are grouped into `(other)`, while `6 B` deltas remain individual;
+- small updated, added, and removed chunks remain included in the summary counts;
+- an empty separator row appears immediately after `(total)`, with no additional separator before `(other generated chunks)` or `(other)`;
+- no generated-chunk grouping note is rendered below the table; and
+- the same small-delta and ordering rules apply to the full and startup tables.
+
+Validation should include the focused tests and repository lint. No CHANGELOG entry is required because this changes developer-facing CI reporting rather than Misskey user behavior.
+
+## Future extension
+
+If aggregate generated-chunk data is later found insufficient, visualizer module metadata can support a separate opt-in analysis. That extension must preserve the physical-chunk accounting introduced here and must not reintroduce name-based identity.

locales/ja-JP.yml

@@ -1419,6 +1419,8 @@ addToEmojiPalette: "絵文字パレットに追加"
 emojiPaletteAlreadyAddedConfirm: "この絵文字はすでにこの絵文字パレットに含まれています。追加しなおしますか？"
 append: "末尾に追加"
 prepend: "先頭に追加"
+urlPreviewSensitiveList: "サムネイルの表示を制限するURL"
+urlPreviewSensitiveListDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、サムネイルが表示されなくなります。"
 
 _imageEditing:
   _vars:

package.json

@@ -1,12 +1,12 @@
 {
 	"name": "misskey",
-	"version": "2026.6.1-alpha.1",
+	"version": "2026.7.0-alpha.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/misskey-dev/misskey.git"
 	},
-	"packageManager": "pnpm@11.8.0",
+	"packageManager": "pnpm@11.9.0",
 	"workspaces": [
 		"packages/misskey-js",
 		"packages/i18n",
@@ -39,11 +39,10 @@
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"watch": "pnpm dev",
 		"dev": "node scripts/dev.mjs",
-		"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",
+		"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\"",
 		"backend-unit-test": "cd packages/backend && pnpm test",
 		"backend-unit-test-and-coverage": "cd packages/backend && pnpm test-and-coverage",
 		"test": "pnpm -r test",
@@ -56,23 +55,21 @@
 		"esbuild": "0.28.1",
 		"execa": "9.6.1",
 		"ignore-walk": "9.0.0",
-		"js-yaml": "4.2.0",
-		"tar": "7.5.16"
+		"js-yaml": "5.2.0",
+		"tar": "7.5.19"
 	},
 	"devDependencies": {
 		"@eslint/js": "9.39.4",
 		"@misskey-dev/eslint-plugin": "2.1.0",
-		"@types/js-yaml": "4.0.9",
-		"@types/node": "26.0.0",
-		"@typescript-eslint/eslint-plugin": "8.61.1",
-		"@typescript-eslint/parser": "8.61.1",
+		"@types/node": "26.0.1",
+		"@typescript-eslint/eslint-plugin": "8.62.0",
+		"@typescript-eslint/parser": "8.62.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.6.0",
+		"globals": "17.7.0",
 		"ncp": "2.0.0",
-		"pnpm": "11.8.0",
+		"pnpm": "11.9.0",
 		"start-server-and-test": "3.0.11",
 		"typescript": "5.9.3"
 	}

packages/backend/migration/1782581064131-urlPreviewSensitiveList.js

@@ -0,0 +1,16 @@
+/*
+ * 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

@@ -51,35 +51,43 @@
 		"utf-8-validate": "6.0.6"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.1073.0",
-		"@aws-sdk/lib-storage": "3.1073.0",
+		"@aws-sdk/client-s3": "3.1075.0",
+		"@aws-sdk/lib-storage": "3.1075.0",
 		"@fastify/accepts": "5.0.4",
 		"@fastify/cors": "11.2.0",
 		"@fastify/http-proxy": "11.5.0",
 		"@fastify/multipart": "10.0.0",
+		"@fastify/otel": "0.19.0",
 		"@fastify/static": "9.1.3",
 		"@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/summaly": "5.5.1",
-		"@napi-rs/canvas": "1.0.0",
+		"@napi-rs/canvas": "1.0.1",
 		"@nestjs/common": "11.1.27",
 		"@nestjs/core": "11.1.27",
 		"@nestjs/testing": "11.1.27",
+		"@opentelemetry/api": "1.9.1",
+		"@opentelemetry/core": "2.8.0",
+		"@opentelemetry/exporter-trace-otlp-proto": "0.214.0",
+		"@opentelemetry/instrumentation-pg": "0.72.0",
+		"@opentelemetry/resources": "2.7.1",
+		"@opentelemetry/sdk-trace-base": "2.7.1",
+		"@opentelemetry/sdk-trace-node": "2.7.1",
+		"@opentelemetry/semantic-conventions": "1.40.0",
 		"@oxc-project/runtime": "0.137.0",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "10.59.0",
-		"@sentry/profiling-node": "10.59.0",
-		"@simplewebauthn/server": "13.3.1",
-		"@sinonjs/fake-timers": "15.4.0",
-		"@smithy/node-http-handler": "4.8.1",
+		"@sentry/node": "10.62.0",
+		"@sentry/profiling-node": "10.62.0",
+		"@simplewebauthn/server": "13.3.2",
+		"@smithy/node-http-handler": "4.8.2",
 		"accepts": "1.3.8",
 		"ajv": "8.20.0",
 		"archiver": "8.0.0",
 		"bcryptjs": "3.0.3",
 		"blurhash": "2.0.5",
-		"bullmq": "5.79.0",
+		"bullmq": "5.79.2",
 		"cacheable-lookup": "7.0.0",
 		"chalk": "5.6.2",
 		"chalk-template": "1.1.2",
@@ -88,12 +96,12 @@
 		"content-disposition": "2.0.1",
 		"date-fns": "4.4.0",
 		"deep-email-validator": "0.1.27",
-		"fastify": "5.8.5",
+		"fastify": "5.9.0",
 		"fastify-raw-body": "5.0.0",
 		"feed": "5.2.1",
 		"file-type": "22.0.1",
 		"fluent-ffmpeg": "2.1.3",
-		"got": "15.0.5",
+		"got": "15.0.7",
 		"hpagent": "1.2.0",
 		"http-link-header": "1.1.3",
 		"i18n": "workspace:*",
@@ -110,10 +118,10 @@
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.202508261828",
-		"nanoid": "5.1.14",
+		"nanoid": "5.1.16",
 		"nested-property": "4.0.0",
 		"node-fetch": "3.3.2",
-		"node-html-parser": "7.1.0",
+		"node-html-parser": "8.0.3",
 		"nodemailer": "9.0.1",
 		"os-utils": "0.0.14",
 		"otpauth": "9.5.1",
@@ -135,7 +143,7 @@
 		"slacc": "0.1.5",
 		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
-		"systeminformation": "5.31.7",
+		"systeminformation": "5.31.11",
 		"tinycolor2": "1.6.0",
 		"tmp": "0.2.7",
 		"tsc-alias": "1.8.17",
@@ -150,16 +158,16 @@
 		"@kitajs/ts-html-plugin": "4.1.4",
 		"@nestjs/platform-express": "11.1.27",
 		"@rollup/plugin-esm-shim": "0.1.8",
-		"@sentry/vue": "10.59.0",
+		"@sentry/vue": "10.62.0",
+		"@sinonjs/fake-timers": "15.4.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.0",
+		"@types/node": "26.0.1",
 		"@types/nodemailer": "8.0.1",
 		"@types/pg": "8.20.0",
 		"@types/qrcode": "1.5.6",
@@ -170,14 +178,13 @@
 		"@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.61.1",
-		"@typescript-eslint/parser": "8.61.1",
+		"@typescript-eslint/eslint-plugin": "8.62.0",
+		"@typescript-eslint/parser": "8.62.0",
 		"@vitest/coverage-v8": "4.1.9",
 		"aws-sdk-client-mock": "4.1.0",
 		"cbor2": "2.3.0",
@@ -185,11 +192,10 @@
 		"eslint-plugin-import": "2.32.0",
 		"execa": "9.6.1",
 		"fkill": "10.0.3",
-		"js-yaml": "4.2.0",
+		"js-yaml": "5.2.0",
 		"pid-port": "2.1.1",
-		"rolldown": "1.1.2",
+		"rolldown": "1.1.3",
 		"simple-oauth2": "5.1.0",
-		"supertest": "7.2.2",
 		"vite": "8.1.0",
 		"vitest": "4.1.9",
 		"vitest-mock-extended": "4.0.0"

packages/backend/rolldown.config.ts

@@ -3,6 +3,7 @@ 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';
 
 /**
@@ -10,6 +11,7 @@ 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'], {
@@ -20,12 +22,31 @@ function backendDevServerPlugin(): Plugin {
 	}
 
 	async function killBackendProcess() {
-		if (backendProcess) {
-			backendProcess.catch(() => {}); // backendProcess.kill()によって発生する例外を無視するためにcatch()を呼び出す
-			backendProcess.kill();
-			await new Promise(resolve => backendProcess!.on('exit', resolve));
-			backendProcess = null;
-		}
+		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;
 	}
 
 	return {
@@ -49,6 +70,9 @@ function backendDevServerPlugin(): Plugin {
 				await runBuildAssets();
 			}
 		},
+		async closeWatcher() {
+			await killBackendProcess();
+		},
 	};
 }
 
@@ -63,6 +87,7 @@ export default defineConfig((args) => {
 		'class-validator',
 		/^@sentry\/.*/,
 		/^@sentry-internal\/.*/,
+		/^@opentelemetry\/.*/,
 		'@nestjs/websockets/socket-module',
 		'@nestjs/microservices/microservices-module',
 		'@nestjs/microservices',
@@ -75,6 +100,8 @@ 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 yaml from 'js-yaml';
+import { load as loadYaml } 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 = yaml.load(yamlContent);
+	const jsonContent = loadYaml(yamlContent);
 	if (!fs.existsSync(dirname(OUTPUT_PATH))) {
 		fs.mkdirSync(dirname(OUTPUT_PATH), { recursive: true });
 	}

packages/backend/scripts/measure-memory.mts

@@ -4,16 +4,15 @@
  */
 
 import { ChildProcess, fork } from 'node:child_process';
-import { setTimeout } from 'node:timers/promises';
-import { fileURLToPath } from 'node:url';
-import { dirname, join } from 'node:path';
+import { dirname, join, resolve } 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';
+import { analyzeHeapSnapshot, defaultHeapSnapshotBreakdownTopN, type HeapSnapshotData } from '../../../.github/scripts/heap-snapshot-util.mts';
+import { measureMemoryUntilStable } from '../../../.github/scripts/memory-stability-util.mts';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const backendDir = process.env.MK_MEMORY_BACKEND_DIR == null || process.env.MK_MEMORY_BACKEND_DIR === ''
+	? join(import.meta.dirname, '..')
+	: resolve(process.env.MK_MEMORY_BACKEND_DIR);
 
 function readIntegerEnv(name, defaultValue, min) {
 	const rawValue = process.env[name];
@@ -33,14 +32,11 @@ function readBooleanEnv(name, defaultValue) {
 	throw new Error(`${name} must be one of: 1, 0, true, false`);
 }
 
-const SAMPLE_COUNT = readIntegerEnv('MK_MEMORY_SAMPLE_COUNT', 3, 1); // Number of samples to measure
 const STARTUP_TIMEOUT = readIntegerEnv('MK_MEMORY_STARTUP_TIMEOUT_MS', 120000, 1); // Timeout for server startup
-const MEMORY_SETTLE_TIME = readIntegerEnv('MK_MEMORY_SETTLE_TIME_MS', 10000, 0); // Wait after startup for memory to settle
 const IPC_TIMEOUT = readIntegerEnv('MK_MEMORY_IPC_TIMEOUT_MS', 30000, 1); // Timeout for IPC responses
-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_BREAKDOWN_TOP_N = readIntegerEnv('MK_MEMORY_HEAP_SNAPSHOT_BREAKDOWN_TOP_N', defaultHeapSnapshotBreakdownTopN, 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;
@@ -61,14 +57,14 @@ type HeapSnapshotErrorMessage = {
 };
 type HeapSnapshotResponseMessage = HeapSnapshotMessage | HeapSnapshotErrorMessage;
 
-function parseMemoryFile<KS extends readonly string[]>(content: string, keys: KS, path: string, required: boolean): Record<KS[number], number> {
+function parseMemoryFile<KS extends readonly string[]>(content: string, keys: KS, path: string): Record<KS[number], number> {
 	const result = {} as Record<KS[number], number>;
 	for (const _key of keys) {
 		const key = _key as KS[number];
 		const match = content.match(new RegExp(`${key}:\\s+(\\d+)\\s+kB`));
 		if (match) {
 			result[key] = parseInt(match[1], 10);
-		} else if (required) {
+		} else {
 			throw new Error(`Failed to parse ${key} from ${path}`);
 		}
 	}
@@ -79,256 +75,16 @@ function bytesToKiB(value: number) {
 	return Math.round(value / 1024);
 }
 
-function sanitizeHeapSnapshotBreakdownLabel(value, fallback = 'unknown') {
-	const label = String(value ?? '').replace(/\s+/g, ' ').trim();
-	if (label === '') return fallback;
-	if (label.length <= 80) return label;
-	return `${label.slice(0, 77)}...`;
-}
-
-function classifyHeapSnapshotBreakdown(category: keyof typeof heapSnapshotCategory, type, name) {
-	if (category === 'strings') return type;
-
-	if (category === 'jsArrays') {
-		if (type === 'array elements') return 'Array elements';
-		if (type === 'object' && name === 'Array') return 'Array objects';
-		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
-	}
-
-	if (category === 'typedArrays') {
-		if (name === 'system / JSArrayBufferData') return 'ArrayBuffer data';
-		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`);
-	}
-
-	if (category === 'systemObjects') {
-		if (name.startsWith('system /')) return sanitizeHeapSnapshotBreakdownLabel(name);
-		if (name.startsWith('(system ')) return sanitizeHeapSnapshotBreakdownLabel(name);
-		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
-	}
-
-	if (category === 'otherJsObjects') {
-		if (type === 'object') return sanitizeHeapSnapshotBreakdownLabel(`object: ${name}`, 'object: unknown');
-		return type;
-	}
-
-	if (category === 'otherNonJsObjects') {
-		if (type === 'extra native bytes') return 'Extra native bytes';
-		if (type === 'native') return sanitizeHeapSnapshotBreakdownLabel(`native: ${name}`, 'native: unknown');
-		return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
-	}
-
-	if (category === 'code') {
-		const lowerName = name.toLowerCase();
-		if (lowerName.includes('bytecode')) return 'bytecode';
-		if (lowerName.includes('builtin')) return 'builtins';
-		if (lowerName.includes('regexp')) return 'regexp code';
-		if (lowerName.includes('stub')) return 'stubs';
-		return sanitizeHeapSnapshotBreakdownLabel(`code: ${name}`, 'code: unknown');
-	}
-
-	return sanitizeHeapSnapshotBreakdownLabel(`${type}: ${name}`, type);
-}
-
-function collapseHeapSnapshotBreakdown(breakdowns: Record<string, Record<string, number>>) {
-	const collapsed = {} as Record<string, Record<string, number>>;
-
-	for (const [category, children] of Object.entries(breakdowns)) {
-		const entries = Object.entries(children)
-			.filter(([, value]) => value > 0)
-			.toSorted((a, b) => b[1] - a[1]);
-
-		const topEntries = entries.slice(0, HEAP_SNAPSHOT_BREAKDOWN_TOP_N);
-		const otherValue = entries
-			.slice(HEAP_SNAPSHOT_BREAKDOWN_TOP_N)
-			.reduce((sum, [, value]) => sum + value, 0);
-
-		const categoryBreakdown = Object.fromEntries(topEntries);
-		if (otherValue > 0) categoryBreakdown.Other = otherValue;
-		if (Object.keys(categoryBreakdown).length > 0) collapsed[category] = categoryBreakdown;
-	}
-
-	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)) {
-		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) {
-		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 categories = createEmptyHeapSnapshotCategoryMap();
-	const nodeCounts = createEmptyHeapSnapshotCategoryMap();
-	const breakdowns = Object.fromEntries(
-		(Object.keys(heapSnapshotCategory) as (keyof typeof heapSnapshotCategory)[])
-			.filter(category => category !== 'total')
-			.map(category => [category, {}]),
-	);
-
-	function addValue(map: Record<string, number>, key: string, value: number) {
-		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);
-		}
-	}
-
-	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);
-	}
-
-	return {
-		categories,
-		nodeCounts,
-		breakdowns: collapseHeapSnapshotBreakdown(breakdowns),
-	};
-}
-
 async function getMemoryUsage(pid: number) {
 	const path = `/proc/${pid}/status`;
 	const status = await fs.readFile(path, 'utf-8');
-	return parseMemoryFile(status, procStatusKeys, path, true);
+	return parseMemoryFile(status, procStatusKeys, path);
 }
 
 async function getSmapsRollupMemoryUsage(pid: number) {
 	const path = `/proc/${pid}/smaps_rollup`;
 	const smapsRollup = await fs.readFile(path, 'utf-8');
-	return parseMemoryFile(smapsRollup, smapsRollupKeys, path, false);
+	return parseMemoryFile(smapsRollup, smapsRollupKeys, path);
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -417,7 +173,7 @@ async function getHeapSnapshotStatistics(serverProcess: ChildProcess): Promise<H
 		}
 
 		const snapshot = JSON.parse(await fs.readFile(writtenPath, 'utf-8'));
-		return analyzeHeapSnapshot(snapshot);
+		return analyzeHeapSnapshot(snapshot, { breakdownTopN: HEAP_SNAPSHOT_BREAKDOWN_TOP_N });
 	} finally {
 		await fs.unlink(writtenPath).catch(err => {
 			process.stderr.write(`Failed to delete heap snapshot ${writtenPath}: ${err.message}\n`);
@@ -427,17 +183,23 @@ async function getHeapSnapshotStatistics(serverProcess: ChildProcess): Promise<H
 
 async function getAllMemoryUsage(serverProcess: ChildProcess) {
 	const pid = serverProcess.pid!;
+	const stableSmapsRollup = await measureMemoryUntilStable(
+		() => getSmapsRollupMemoryUsage(pid),
+	);
+
 	return {
-		...await getMemoryUsage(pid),
-		...await getSmapsRollupMemoryUsage(pid),
-		...await getRuntimeMemoryUsage(serverProcess),
+		memoryUsage: {
+			...await getMemoryUsage(pid),
+			...stableSmapsRollup.memoryUsage,
+			...await getRuntimeMemoryUsage(serverProcess),
+		},
+		stability: stableSmapsRollup.stability,
 	};
 }
 
 async function measureMemory() {
-	// Start the Misskey backend server using fork to enable IPC
-	const serverProcess = fork(join(__dirname, '../built/entry.js'), [], {
-		cwd: join(__dirname, '..'),
+	const serverProcess = fork(join(backendDir, 'built/entry.js'), [], {
+		cwd: backendDir,
 		env: {
 			...process.env,
 			NODE_ENV: 'production',
@@ -449,16 +211,13 @@ async function measureMemory() {
 		execArgv: [...process.execArgv, '--expose-gc'],
 	});
 
-	let serverReady = false;
+	const serverReady = waitForMessage(
+		serverProcess,
+		(message): message is 'ok' => message === 'ok',
+		'server startup',
+		STARTUP_TIMEOUT,
+	);
 
-	// Listen for the 'ok' message from the server indicating it's ready
-	serverProcess.on('message', (message) => {
-		if (message === 'ok') {
-			serverReady = true;
-		}
-	});
-
-	// Handle server output
 	serverProcess.stdout?.on('data', (data) => {
 		process.stderr.write(`[server stdout] ${data}`);
 	});
@@ -467,7 +226,6 @@ async function measureMemory() {
 		process.stderr.write(`[server stderr] ${data}`);
 	});
 
-	// Handle server error
 	serverProcess.on('error', (err) => {
 		process.stderr.write(`[server error] ${err}\n`);
 	});
@@ -485,141 +243,55 @@ async function measureMemory() {
 		if (message === 'gc unavailable') {
 			throw new Error('GC is unavailable. Start the process with --expose-gc to enable this feature.');
 		}
-
-		await setTimeout(1000);
 	}
 
-	//function createRequest() {
-	//	return new Promise((resolve, reject) => {
-	//		const req = http.request({
-	//			host: 'localhost',
-	//			port: 61812,
-	//			path: '/api/meta',
-	//			method: 'POST',
-	//		}, (res) => {
-	//			res.on('data', () => { });
-	//			res.on('end', () => {
-	//				resolve();
-	//			});
-	//		});
-	//		req.on('error', (err) => {
-	//			reject(err);
-	//		});
-	//		req.end();
-	//	});
-	//}
-
-	// Wait for server to be ready or timeout
 	const startupStartTime = Date.now();
-	while (!serverReady) {
-		if (Date.now() - startupStartTime > STARTUP_TIMEOUT) {
-			serverProcess.kill('SIGTERM');
-			throw new Error('Server startup timeout');
-		}
-		await setTimeout(100);
+	try {
+		await serverReady;
+	} catch (err) {
+		serverProcess.kill('SIGTERM');
+		throw err;
 	}
 
 	const startupTime = Date.now() - startupStartTime;
 	process.stderr.write(`Server started in ${startupTime}ms\n`);
 
-	// Wait for memory to settle
-	await setTimeout(MEMORY_SETTLE_TIME);
-
-	//const beforeGc = await getAllMemoryUsage(serverProcess);
-
 	await triggerGc();
 
-	const memoryUsageAfterGC = await getAllMemoryUsage(serverProcess);
-
-	//// create some http requests to simulate load
-	//await Promise.all(
-	//	Array.from({ length: REQUEST_COUNT }).map(() => createRequest()),
-	//);
-
-	//await triggerGc();
-
-	//const afterRequest = await getAllMemoryUsage(serverProcess);
+	const afterGc = await getAllMemoryUsage(serverProcess);
+	process.stderr.write(`Memory ${afterGc.stability.converged ? 'stabilized' : 'did not stabilize'} after ${afterGc.stability.readingCount} readings over ${Math.round(afterGc.stability.elapsedMs)}ms\n`);
 
 	const heapSnapshotAfterGc = await getHeapSnapshotStatistics(serverProcess);
 
-	// Stop the server
-	serverProcess.kill('SIGTERM');
-
-	// Wait for process to exit
-	let exited = false;
-	await new Promise((resolve) => {
-		serverProcess.on('exit', () => {
-			exited = true;
-			resolve(undefined);
-		});
-		// Force kill after 10 seconds if not exited
-		setTimeout(10000).then(() => {
-			if (!exited) {
-				serverProcess.kill('SIGKILL');
-			}
-			resolve(undefined);
+	const serverExited = new Promise<void>(resolve => {
+		const timer = globalThis.setTimeout(() => {
+			serverProcess.kill('SIGKILL');
+			resolve();
+		}, 10000);
+		serverProcess.once('exit', () => {
+			globalThis.clearTimeout(timer);
+			resolve();
 		});
 	});
+	serverProcess.kill('SIGTERM');
+	await serverExited;
 
-	const result = {
+	return {
 		timestamp: new Date().toISOString(),
 		phases: {
-			//beforeGc,
 			afterGc: {
-				memoryUsage: memoryUsageAfterGC,
+				memoryUsage: afterGc.memoryUsage,
+				memoryStability: afterGc.stability,
 				heapSnapshot: heapSnapshotAfterGc,
 			},
-			//afterRequest,
 		},
 	};
-
-	return result;
 }
 
-export type MemoryReportRaw = {
-	timestamp: string;
-	sampleCount: number;
-	measurement: {
-		startupTimeoutMs: number;
-		memorySettleTimeMs: number;
-		ipcTimeoutMs: number;
-		requestCount: number;
-		heapSnapshot: {
-			enabled: boolean;
-			timeoutMs: number;
-			breakdownTopN: number;
-		};
-	};
-	samples: Awaited<ReturnType<typeof measureMemory>>[];
-};
+export type MemorySample = Awaited<ReturnType<typeof measureMemory>>;
 
 async function main() {
-	const results = [];
-	for (let i = 0; i < SAMPLE_COUNT; i++) {
-		process.stderr.write(`Starting sample ${i + 1}/${SAMPLE_COUNT}\n`);
-		const res = await measureMemory();
-		results.push(res);
-	}
-
-	const result: MemoryReportRaw = {
-		timestamp: new Date().toISOString(),
-		sampleCount: SAMPLE_COUNT,
-		measurement: {
-			startupTimeoutMs: STARTUP_TIMEOUT,
-			memorySettleTimeMs: MEMORY_SETTLE_TIME,
-			ipcTimeoutMs: IPC_TIMEOUT,
-			requestCount: REQUEST_COUNT,
-			heapSnapshot: {
-				enabled: HEAP_SNAPSHOT,
-				timeoutMs: HEAP_SNAPSHOT_TIMEOUT,
-				breakdownTopN: HEAP_SNAPSHOT_BREAKDOWN_TOP_N,
-			},
-		},
-		samples: results,
-	};
-
-	// Output as JSON to stdout
-	console.log(JSON.stringify(result, null, 2));
+	console.log(JSON.stringify(await measureMemory(), null, 2));
 }
 
 main().catch((err) => {

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

@@ -26,7 +26,6 @@ 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;
 
-	namespace probeImageSize {} // Hack
-
-	export = probeImageSize;
+	// eslint-disable-next-line import/no-default-export
+	export { probeImageSize as default };
 }

packages/backend/src/boot/entry.ts

@@ -10,10 +10,11 @@
 import cluster from 'node:cluster';
 import { EventEmitter } from 'node:events';
 import { writeHeapSnapshot } from 'node:v8';
-import chalk from 'chalk';
 import Xev from 'xev';
 import Logger from '@/logger.js';
 import { envOption } from '../env.js';
+import { installProcessErrorHandlers } from './process-error-handler.js';
+import { isShutdownInProgress } from './shutdown-handler.js';
 import { readyRef } from './ready.js';
 
 import 'reflect-metadata';
@@ -27,6 +28,8 @@ const logger = new Logger('core', 'cyan');
 const clusterLogger = logger.createSubLogger('cluster', 'orange');
 const ev = new Xev();
 
+installProcessErrorHandlers({ logger, quiet: envOption.quiet });
+
 //#region Events
 
 // Listen new workers
@@ -41,27 +44,19 @@ cluster.on('online', worker => {
 
 // Listen for dying workers
 cluster.on('exit', worker => {
-	// Replace the dead worker,
-	// we're not sentimental
-	clusterLogger.error(chalk.red(`[${worker.id}] died :(`));
+	if (isShutdownInProgress()) {
+		clusterLogger.info(`Process exited during shutdown: [${worker.id}]`);
+		return;
+	}
+
+	// 終了したワーカーは従来どおり再生成し、表示色は出力処理へ任せます。
+	clusterLogger.error(`[${worker.id}] died :(`);
 	cluster.fork();
 });
 
-// Display detail of unhandled promise rejection
-if (!envOption.quiet) {
-	process.on('unhandledRejection', console.dir);
-}
-
-// Display detail of uncaught exception
-process.on('uncaughtException', err => {
-	try {
-		logger.error(err);
-		console.trace(err);
-	} catch { }
-});
-
 // Dying away...
 process.on('exit', code => {
+	if (isShutdownInProgress()) return;
 	logger.info(`The process is going to exit with code ${code}`);
 });
 
@@ -69,12 +64,10 @@ process.on('exit', code => {
 
 if (!envOption.disableClustering) {
 	if (cluster.isPrimary) {
-		logger.info(`Start main process... pid: ${process.pid}`);
 		const { masterMain } = await import('./master.js');
 		await masterMain();
 		ev.mount();
 	} else if (cluster.isWorker) {
-		logger.info(`Start worker process... pid: ${process.pid}`);
 		const { workerMain } = await import('./worker.js');
 		await workerMain();
 	} else {
@@ -82,7 +75,6 @@ if (!envOption.disableClustering) {
 	}
 } else {
 	// 非clusterの場合はMasterのみが起動するため、Workerの処理は行わない(cluster.isWorker === trueの状態でこのブロックに来ることはない)
-	logger.info(`Start main process... pid: ${process.pid}`);
 	const { masterMain } = await import('./master.js');
 	await masterMain();
 	ev.mount();

packages/backend/src/boot/master.ts

@@ -11,16 +11,30 @@ import chalkTemplate from 'chalk-template';
 import Logger from '@/logger.js';
 import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
+import { configureLogging, shutdownLogging } from '@/logging/logging-runtime.js';
+import type { LogFormat } from '@/logging/types.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { envOption } from '@/env.js';
+import { initTelemetry, shutdownTelemetry } from '@/core/telemetry/telemetry-registry.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
+import { installShutdownSignalHandlers } from './shutdown-handler.js';
 
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta');
 
 const themeColor = chalk.hex('#86b300');
 
-function greet(props: { version: string }) {
+/** 起動時の案内を、選択されたログ形式に合わせて出力します。 */
+function greet(props: { version: string; format: LogFormat }) {
+	if (!envOption.quiet && props.format === 'json') {
+		// JSONモードでは生のコンソール出力を避け、各案内を1件ずつ構造化ログにします。
+		bootLogger.info('Welcome to Misskey!');
+		bootLogger.info(`Misskey v${props.version}`, null, true);
+		bootLogger.info('Misskey is an open-source decentralized microblogging platform.');
+		bootLogger.info('If you like Misskey, please consider donating to support dev. https://misskey-hub.net/docs/donate/');
+		return;
+	}
+
 	if (!envOption.quiet) {
 		//#region Misskey logo
 		const v = `v${props.version}`;
@@ -51,7 +65,9 @@ export async function masterMain() {
 	// initialize app
 	try {
 		config = loadConfigBoot();
-		greet({ version: config.version });
+		logger.info(`Start main process... pid: ${process.pid}`);
+		bootLogger.createSubLogger('config').succ('Loaded');
+		greet({ version: config.version, format: config.logging?.format ?? 'pretty' });
 		showEnvironment();
 		await showMachineInfo(bootLogger);
 		showNodejsVersion();
@@ -66,26 +82,16 @@ export async function masterMain() {
 
 	initExtraThreadPool(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,
-		});
+	try {
+		await initTelemetry(config);
+	} catch (e) {
+		bootLogger.error(e instanceof Error ? e : new Error(String(e)), null, true);
+		process.exit(1);
 	}
+	installShutdownSignalHandlers({
+		shutdownTasks: [shutdownTelemetry, shutdownLogging],
+		onRegistered: message => bootLogger.info(message),
+	});
 
 	bootLogger.info(
 		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`,
@@ -143,12 +149,14 @@ function showNodejsVersion(): void {
 	nodejsLogger.info(`Version ${process.version} detected.`);
 }
 
+/** 設定を読み込み、成功時に後続のログ出力形式を適用します。 */
 function loadConfigBoot(): Config {
 	const configLogger = bootLogger.createSubLogger('config');
 	let config;
 
 	try {
 		config = loadConfig();
+		configureLogging(config.logging);
 	} catch (exception) {
 		if (typeof exception === 'string') {
 			configLogger.error(exception);
@@ -160,8 +168,6 @@ function loadConfigBoot(): Config {
 		throw exception;
 	}
 
-	configLogger.succ('Loaded');
-
 	return config;
 }
 

packages/backend/src/boot/process-error-handler.ts

@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { LogWriteInput } from '@/logging/types.js';
+
+/** プロセス例外をロガーへ渡すために必要な最小の処理対象です。 */
+export type ProcessErrorHandlerProcess = {
+	on(event: 'unhandledRejection', listener: (reason: unknown) => void): unknown;
+	on(event: 'uncaughtException', listener: (error: Error) => void): unknown;
+};
+
+/** 例外記録に必要なロガーの最小インターフェースです。 */
+export type ProcessErrorHandlerLogger = {
+	write(input: LogWriteInput): void;
+};
+
+/** プロセス例外ハンドラーの登録に使う依存関係です。 */
+export type ProcessErrorHandlerOptions = {
+	readonly process?: ProcessErrorHandlerProcess;
+	readonly logger: ProcessErrorHandlerLogger;
+	readonly quiet: boolean;
+};
+
+/** ログ記録の失敗が別の例外を起こさないよう、プロセス異常を安全に記録します。 */
+function writeProcessError(
+	logger: ProcessErrorHandlerLogger,
+	eventName: 'process.unhandled_rejection' | 'process.uncaught_exception',
+	message: string,
+	error: unknown,
+): void {
+	try {
+		// 元の値をerrorへ渡し、JSON形式の出力処理で安全な形へ正規化します。
+		logger.write({
+			level: 'error',
+			eventName,
+			message,
+			error,
+		});
+	} catch {
+		// 例外処理中のログ失敗で、さらにプロセスを不安定にしないよう握りつぶします。
+	}
+}
+
+/** 未処理のPromise拒否と未捕捉例外を構造化ログへ接続します。 */
+export function installProcessErrorHandlers(options: ProcessErrorHandlerOptions): void {
+	const processLike: ProcessErrorHandlerProcess = options.process ?? (process as unknown as ProcessErrorHandlerProcess);
+
+	if (!options.quiet) {
+		processLike.on('unhandledRejection', reason => {
+			writeProcessError(options.logger, 'process.unhandled_rejection', 'Unhandled promise rejection', reason);
+		});
+	}
+
+	processLike.on('uncaughtException', error => {
+		writeProcessError(options.logger, 'process.uncaught_exception', 'Uncaught exception', error);
+	});
+}

packages/backend/src/boot/shutdown-handler.ts

@@ -0,0 +1,100 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+type ShutdownSignalProcess = {
+	once(event: 'SIGTERM' | 'SIGINT', listener: () => Promise<void>): unknown;
+};
+
+const SHUTDOWN_TIMEOUT_MS = 10_000;
+
+export type ShutdownTask = () => Promise<void>;
+
+export type ShutdownHandlerOptions = {
+	/** The process-like object that receives the signal handlers. */
+	process?: ShutdownSignalProcess;
+	/** Shutdown tasks, executed in array order. */
+	shutdownTasks: readonly ShutdownTask[];
+	/** Process termination function. */
+	exit?: (code: number) => void;
+	/** Optional boot logger hook used after signal handlers are registered. */
+	onRegistered?: (message: string) => void;
+};
+
+let shuttingDown = false;
+
+/**
+ * Register the process-level shutdown signals.
+ *
+ * Boot owns signal coordination and receives shutdown tasks through callbacks
+ * so individual domains do not depend on each other.
+ *
+ * 注意: このプロジェクトでは app.enableShutdownHooks() が一切呼ばれていないため、
+ * NestJSのOnApplicationShutdown経由のgraceful shutdown(GlobalModule.dispose()によるDB/Redis切断、
+ * QueueProcessorService.stop()によるqueue drain、ServerService.dispose()によるfastify/WebSocket close)は
+ * SIGTERM/SIGINTを起点には発火しない。このhandlerはそれらを経由せず、登録された終了処理を実行して即exitする。
+ * 将来enableShutdownHooks()を配線する場合は、この即exitとNestJS側のshutdown sequenceが競合しないよう順序を設計すること。
+ */
+export function installShutdownSignalHandlers(options: ShutdownHandlerOptions): void {
+	// テストではprocess/exitを差し替え、本番では実processにSIGTERM/SIGINT handlerを登録する。
+	const processLike = options.process ?? process;
+	const exit = options.exit ?? ((code: number) => process.exit(code));
+
+	const handleSignal = async () => {
+		// 同時に複数signalが来てもflushを二重実行せず、cluster refork抑止用の状態もここで立てる。
+		if (shuttingDown) return;
+		shuttingDown = true;
+
+		let timedOut = false;
+		let timeout: NodeJS.Timeout | undefined;
+		try {
+			// 処理時間上限つきのシャットダウンプロセス
+			await Promise.race([
+				(async () => {
+					for (const shutdownTask of options.shutdownTasks) {
+						if (timedOut) return;
+						try {
+							await shutdownTask();
+						} catch (error) {
+							// 1つの終了処理の失敗で後続タスクを妨げないよう、stderrへフォールバックする。
+							try {
+								console.error('Shutdown task failed:', error);
+							} catch {
+								// stderrの出力自体が失敗しても、残りの終了処理とexitは継続する。
+							}
+						}
+					}
+				})(),
+				new Promise<void>(resolve => {
+					timeout = setTimeout(() => {
+						timedOut = true;
+						try {
+							console.error(`Shutdown tasks timed out after ${SHUTDOWN_TIMEOUT_MS}ms.`);
+						} catch {
+							// stderrの出力自体が失敗してもexitは継続する。
+						}
+						resolve();
+					}, SHUTDOWN_TIMEOUT_MS);
+				}),
+			]);
+		} finally {
+			if (timeout != null) clearTimeout(timeout);
+		}
+
+		// 既存挙動と同じく、終了処理後はプロセスを終了する。
+		exit(0);
+	};
+
+	// onceにして、同じsignalでhandlerが再入しないようにする。
+	processLike.once('SIGTERM', handleSignal);
+	processLike.once('SIGINT', handleSignal);
+
+	// app.enableShutdownHooks()未配線の現状、SIGTERM/SIGINT時には登録済み終了処理のみを行う。
+	options.onRegistered?.('Registered SIGTERM/SIGINT shutdown handler (this process does not perform NestJS graceful shutdown on these signals).');
+}
+
+export function isShutdownInProgress(): boolean {
+	// masterのcluster exit handlerが、意図したshutdown中のworker終了を再forkしないために参照する。
+	return shuttingDown;
+}

packages/backend/src/boot/worker.ts

@@ -4,38 +4,45 @@
  */
 
 import cluster from 'node:cluster';
+import Logger from '@/logger.js';
 import { envOption } from '@/env.js';
 import { loadConfig } from '@/config.js';
+import type { Config } from '@/config.js';
+import { configureLogging, shutdownLogging } from '@/logging/logging-runtime.js';
+import { initTelemetry, shutdownTelemetry } from '@/core/telemetry/telemetry-registry.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
+import { installShutdownSignalHandlers } from './shutdown-handler.js';
+
+const logger = new Logger('core', 'cyan');
+const bootLogger = logger.createSubLogger('boot', 'magenta');
 
 /**
  * Init worker process
  */
 export async function workerMain() {
-	const config = loadConfig();
+	let config: Config;
+	try {
+		config = loadConfig();
+		configureLogging(config.logging);
+		logger.info(`Start worker process... pid: ${process.pid}`);
+	} catch (e) {
+		bootLogger.error(e instanceof Error ? e : new Error(String(e)), null, true);
+		process.exit(1);
+		return;
+	}
 
 	initExtraThreadPool(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,
-		});
+	try {
+		await initTelemetry(config);
+	} catch (e) {
+		bootLogger.error(e instanceof Error ? e : new Error(String(e)), null, true);
+		process.exit(1);
 	}
+	installShutdownSignalHandlers({
+		shutdownTasks: [shutdownTelemetry, shutdownLogging],
+		onRegistered: message => bootLogger.info(message),
+	});
 
 	if (envOption.onlyServer) {
 		await server();

packages/backend/src/config.ts

@@ -10,6 +10,7 @@ import { type FastifyServerOptions } from 'fastify';
 import type * as Sentry from '@sentry/node';
 import type * as SentryVue from '@sentry/vue';
 import type { RedisOptions } from 'ioredis';
+import type { LogFormat, LogLevelSetting } from './logging/types.js';
 
 type RedisOptionsSource = Partial<RedisOptions> & {
 	host: string;
@@ -20,6 +21,27 @@ type RedisOptionsSource = Partial<RedisOptions> & {
 	prefix?: string;
 };
 
+type SentryBackendConfig = {
+	options: Partial<Sentry.NodeOptions>;
+	enableNodeProfiling: boolean;
+	disabledIntegrations?: string[];
+};
+
+type OtelBackendConfig = {
+	endpoint?: string;
+	headers?: Record<string, string>;
+	sampleRate?: number;
+	capturePgSpans?: boolean;
+	capturePgStatement?: boolean;
+	capturePgConnectionSpans?: boolean;
+	captureRedisCommandSpans?: boolean;
+	captureRedisConnectionSpans?: boolean;
+	captureRedisRootSpans?: boolean;
+	resourceAttributes?: Record<string, string>;
+	propagateTraceToRemote?: boolean;
+	jobTraceContextMode?: 'link' | 'parent';
+};
+
 /**
  * 設定ファイルの型
  */
@@ -64,7 +86,8 @@ type Source = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	};
-	sentryForBackend?: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; };
+	sentryForBackend?: SentryBackendConfig;
+	otelForBackend?: OtelBackendConfig;
 	sentryForFrontend?: {
 		options: Partial<SentryVue.BrowserOptions> & { dsn: string };
 		vueIntegration?: SentryVue.VueIntegrationOptions | null;
@@ -110,6 +133,9 @@ type Source = {
 	pidFile: string;
 
 	logging?: {
+		format?: LogFormat;
+		level?: LogLevelSetting;
+		domains?: Record<string, LogLevelSetting> | null;
 		sql?: {
 			disableQueryTruncation?: boolean,
 			enableQueryParamLogging?: boolean,
@@ -172,6 +198,9 @@ export type Config = {
 	deliverJobMaxAttempts: number | undefined;
 	inboxJobMaxAttempts: number | undefined;
 	logging?: {
+		format?: LogFormat;
+		level?: LogLevelSetting;
+		domains?: Record<string, LogLevelSetting> | null;
 		sql?: {
 			disableQueryTruncation?: boolean,
 			enableQueryParamLogging?: boolean,
@@ -201,7 +230,8 @@ export type Config = {
 	redisForJobQueue: RedisOptions & RedisOptionsSource;
 	redisForTimelines: RedisOptions & RedisOptionsSource;
 	redisForReactions: RedisOptions & RedisOptionsSource;
-	sentryForBackend: { options: Partial<Sentry.NodeOptions>; enableNodeProfiling: boolean; } | undefined;
+	sentryForBackend: SentryBackendConfig | undefined;
+	otelForBackend: OtelBackendConfig | undefined;
 	sentryForFrontend: {
 		options: Partial<SentryVue.BrowserOptions> & { dsn: string };
 		vueIntegration?: SentryVue.VueIntegrationOptions | null;
@@ -307,6 +337,7 @@ export function loadConfig(): Config {
 		redisForTimelines: config.redisForTimelines ? convertRedisOptions(config.redisForTimelines, host) : redis,
 		redisForReactions: config.redisForReactions ? convertRedisOptions(config.redisForReactions, host) : redis,
 		sentryForBackend: config.sentryForBackend,
+		otelForBackend: config.otelForBackend,
 		sentryForFrontend: config.sentryForFrontend,
 		id: config.id,
 		proxy: config.proxy,

packages/backend/src/core/CoreModule.ts

@@ -154,10 +154,12 @@ 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 };
@@ -458,6 +460,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
+		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -606,6 +609,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ApNoteService,
 		$ApPersonService,
 		$ApQuestionService,
+		$TelemetryService,
 		//#endregion
 	],
 	exports: [
@@ -757,6 +761,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
+		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -903,6 +908,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ApNoteService,
 		$ApPersonService,
 		$ApQuestionService,
+		$TelemetryService,
 		//#endregion
 	],
 })

packages/backend/src/core/EmailService.ts

@@ -3,11 +3,9 @@
  * 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';
@@ -197,6 +195,7 @@ 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/QueueModule.ts

@@ -9,6 +9,7 @@ import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { baseQueueOptions, QUEUE } from '@/queue/const.js';
 import { allSettled } from '@/misc/promise-tracker.js';
+import { instrumentQueue } from '@/core/telemetry/queue-instrumentation.js';
 import {
 	DeliverJobData,
 	EndedPollNotificationJobData,
@@ -31,63 +32,72 @@ export type ObjectStorageQueue = Bull.Queue;
 export type UserWebhookDeliverQueue = Bull.Queue<UserWebhookDeliverJobData>;
 export type SystemWebhookDeliverQueue = Bull.Queue<SystemWebhookDeliverJobData>;
 
+function createQueue<T extends object>(queueName: string, config: Config): Bull.Queue<T> {
+	const queue = new Bull.Queue<T>(queueName, baseQueueOptions(config, queueName));
+	// Queue のラップは、enqueue 時に OTel context をジョブデータへ埋め込むためのもの。
+	// Sentry 単独ではジョブ間の context 伝播を使わないので、OTel 未設定時は元の Queue を返す。
+	if (config.otelForBackend == null) return queue;
+
+	return instrumentQueue(queue);
+}
+
 const $system: Provider = {
 	provide: 'queue:system',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.SYSTEM, baseQueueOptions(config, QUEUE.SYSTEM)),
+	useFactory: (config: Config) => createQueue<Record<string, unknown>>(QUEUE.SYSTEM, config),
 	inject: [DI.config],
 };
 
 const $endedPollNotification: Provider = {
 	provide: 'queue:endedPollNotification',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.ENDED_POLL_NOTIFICATION, baseQueueOptions(config, QUEUE.ENDED_POLL_NOTIFICATION)),
+	useFactory: (config: Config) => createQueue<EndedPollNotificationJobData>(QUEUE.ENDED_POLL_NOTIFICATION, config),
 	inject: [DI.config],
 };
 
 const $postScheduledNote: Provider = {
 	provide: 'queue:postScheduledNote',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.POST_SCHEDULED_NOTE, baseQueueOptions(config, QUEUE.POST_SCHEDULED_NOTE)),
+	useFactory: (config: Config) => createQueue<PostScheduledNoteJobData>(QUEUE.POST_SCHEDULED_NOTE, config),
 	inject: [DI.config],
 };
 
 const $deliver: Provider = {
 	provide: 'queue:deliver',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.DELIVER, baseQueueOptions(config, QUEUE.DELIVER)),
+	useFactory: (config: Config) => createQueue<DeliverJobData>(QUEUE.DELIVER, config),
 	inject: [DI.config],
 };
 
 const $inbox: Provider = {
 	provide: 'queue:inbox',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.INBOX, baseQueueOptions(config, QUEUE.INBOX)),
+	useFactory: (config: Config) => createQueue<InboxJobData>(QUEUE.INBOX, config),
 	inject: [DI.config],
 };
 
 const $db: Provider = {
 	provide: 'queue:db',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.DB, baseQueueOptions(config, QUEUE.DB)),
+	useFactory: (config: Config) => createQueue<Record<string, unknown>>(QUEUE.DB, config),
 	inject: [DI.config],
 };
 
 const $relationship: Provider = {
 	provide: 'queue:relationship',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.RELATIONSHIP, baseQueueOptions(config, QUEUE.RELATIONSHIP)),
+	useFactory: (config: Config) => createQueue<RelationshipJobData>(QUEUE.RELATIONSHIP, config),
 	inject: [DI.config],
 };
 
 const $objectStorage: Provider = {
 	provide: 'queue:objectStorage',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.OBJECT_STORAGE, baseQueueOptions(config, QUEUE.OBJECT_STORAGE)),
+	useFactory: (config: Config) => createQueue<Record<string, unknown>>(QUEUE.OBJECT_STORAGE, config),
 	inject: [DI.config],
 };
 
 const $userWebhookDeliver: Provider = {
 	provide: 'queue:userWebhookDeliver',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.USER_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.USER_WEBHOOK_DELIVER)),
+	useFactory: (config: Config) => createQueue<UserWebhookDeliverJobData>(QUEUE.USER_WEBHOOK_DELIVER, config),
 	inject: [DI.config],
 };
 
 const $systemWebhookDeliver: Provider = {
 	provide: 'queue:systemWebhookDeliver',
-	useFactory: (config: Config) => new Bull.Queue(QUEUE.SYSTEM_WEBHOOK_DELIVER, baseQueueOptions(config, QUEUE.SYSTEM_WEBHOOK_DELIVER)),
+	useFactory: (config: Config) => createQueue<SystemWebhookDeliverJobData>(QUEUE.SYSTEM_WEBHOOK_DELIVER, config),
 	inject: [DI.config],
 };
 

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

@@ -0,0 +1,35 @@
+/*
+ * 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, startSpanWithTraceContext } 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 startSpanWithTraceContext<T>(name: string, jobData: object, fn: () => T): T {
+		// jobData に enqueue 元の context があれば worker span へ復元する。
+		// context の無い既存ジョブは、通常の startSpan と同じ扱いになる。
+		return startSpanWithTraceContext(name, jobData, fn);
+	}
+
+	@bindThis
+	public async onApplicationShutdown(_signal?: string): Promise<void> {
+		await shutdownTelemetry();
+	}
+}

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

@@ -0,0 +1,249 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import * as os from 'node:os';
+import cluster from 'node:cluster';
+import { envOption } from '@/env.js';
+import { registerDiagLogger } from '@/core/telemetry/telemetry-diag.js';
+import { installHttpClientInstrumentation } from '@/core/telemetry/http-client-instrumentation.js';
+import { installDatabaseInstrumentation } from '@/core/telemetry/database-instrumentation.js';
+import { installRedisInstrumentation } from '@/core/telemetry/redis-instrumentation.js';
+import { executeSpan, getQueueTraceContextMode, injectActiveTraceContext, recordSpanError, startSpanWithQueueTraceContext } from '@/core/telemetry/queue-trace-context.js';
+import type { Span, SpanStatusCode, Tracer } from '@opentelemetry/api';
+import type { Resource, ResourceDetector } from '@opentelemetry/resources';
+import type { ParentBasedSampler, Sampler } from '@opentelemetry/sdk-trace-base';
+import type { OtelBackendRuntimeConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js';
+import type { QueueTraceContextCarrier, QueueTraceContextDeps } from '../queue-trace-context.js';
+
+const DEFAULT_SHUTDOWN_TIMEOUT = 5000;
+
+type OpenTelemetryAdapterDeps = {
+	tracer: Pick<Tracer, 'startActiveSpan'>;
+	provider: {
+		shutdown(): Promise<void>;
+	};
+	getActiveSpan: () => Span | undefined;
+	spanStatusCodeError: SpanStatusCode;
+	shutdownTimeout: number;
+	shutdownHttpClientInstrumentation?: () => void;
+	shutdownDatabaseInstrumentation?: () => void;
+	shutdownRedisInstrumentation?: () => void;
+	queueTraceContext?: QueueTraceContextDeps;
+};
+
+type CreateSamplerDeps = {
+	ParentBasedSampler: new (config: { root: Sampler }) => ParentBasedSampler;
+	TraceIdRatioBasedSampler: new (sampleRate: number) => Sampler;
+};
+
+type CreateResourceDeps = {
+	defaultResource: () => Resource;
+	resourceFromAttributes: (attributes: Record<string, string>) => Resource;
+	detectResources: (config: { detectors: ResourceDetector[] }) => Resource;
+	envDetector: ResourceDetector;
+	serviceNameAttribute: string;
+	serviceInstanceIdAttribute: string;
+	serviceVersionAttribute: string;
+	serviceVersion: string;
+};
+
+export class OpenTelemetryAdapter implements TelemetryAdapter {
+	public constructor(
+		private readonly deps: OpenTelemetryAdapterDeps,
+	) {
+	}
+
+	public static async create(config: OtelBackendRuntimeConfig): Promise<OpenTelemetryAdapter> {
+		const [
+			{ context, diag, DiagLogLevel, propagation, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace },
+			{ W3CTraceContextPropagator },
+			{ OTLPTraceExporter },
+			{ defaultResource, detectResources, envDetector, resourceFromAttributes },
+			{ BatchSpanProcessor, ParentBasedSampler, TraceIdRatioBasedSampler },
+			{ NodeTracerProvider },
+			{ ATTR_SERVICE_INSTANCE_ID, ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION },
+		] = await Promise.all([
+			import('@opentelemetry/api'),
+			import('@opentelemetry/core'),
+			import('@opentelemetry/exporter-trace-otlp-proto'),
+			import('@opentelemetry/resources'),
+			import('@opentelemetry/sdk-trace-base'),
+			import('@opentelemetry/sdk-trace-node'),
+			import('@opentelemetry/semantic-conventions'),
+		]);
+
+		// OTel SDK内部のexport失敗は既定だと見えにくいため、Misskeyのloggerへ橋渡しする。
+		registerDiagLogger(diag, DiagLogLevel.WARN);
+
+		// endpoint/headersを未指定にしておくと、OTEL_EXPORTER_OTLP_* 環境変数の標準fallbackが効く。
+		const exporter = new OTLPTraceExporter({
+			...(config.endpoint != null ? { url: config.endpoint } : {}),
+			...(config.headers != null ? { headers: config.headers } : {}),
+		});
+		const spanProcessor = new BatchSpanProcessor(exporter);
+
+		// SDK 2.xではSpanProcessorをprovider生成時に渡す。ここでOTel単体用のproviderを作る。
+		const provider = new NodeTracerProvider({
+			resource: createResource(config, {
+				defaultResource,
+				resourceFromAttributes,
+				detectResources,
+				envDetector,
+				serviceNameAttribute: ATTR_SERVICE_NAME,
+				serviceInstanceIdAttribute: ATTR_SERVICE_INSTANCE_ID,
+				serviceVersionAttribute: ATTR_SERVICE_VERSION,
+				serviceVersion: config.serviceVersion,
+			}),
+			...(config.sampleRate != null ? { sampler: createSampler(config.sampleRate, {
+				ParentBasedSampler,
+				TraceIdRatioBasedSampler,
+			}) } : {}),
+			spanProcessors: [spanProcessor],
+		});
+
+		// HTTP送信には注入しないが、将来のQueue連結でpropagation APIを使える状態にする。
+		provider.register({
+			propagator: new W3CTraceContextPropagator(),
+		});
+
+		// provider操作をdepsに閉じ込め、span wrapper本体をユニットテストしやすくする。
+		const tracer = provider.getTracer('misskey-backend');
+
+		return new OpenTelemetryAdapter({
+			tracer,
+			provider,
+			getActiveSpan: () => trace.getActiveSpan(),
+			spanStatusCodeError: SpanStatusCode.ERROR,
+			shutdownTimeout: DEFAULT_SHUTDOWN_TIMEOUT,
+			shutdownHttpClientInstrumentation: installHttpClientInstrumentation({
+				tracer,
+				spanKindClient: SpanKind.CLIENT,
+				spanStatusCodeError: SpanStatusCode.ERROR,
+			}),
+			// pg のrequire hookとioredis diagnostics channelは、Nest moduleの動的importより前に有効化する。
+			shutdownDatabaseInstrumentation: await installDatabaseInstrumentation(provider, {
+				capturePgSpans: config.capturePgSpans === true,
+				capturePgStatement: config.capturePgStatement === true,
+				capturePgConnectionSpans: config.capturePgConnectionSpans === true,
+			}),
+			shutdownRedisInstrumentation: installRedisInstrumentation(tracer, SpanKind.CLIENT, SpanStatusCode.ERROR, {
+				captureConnectionSpans: config.captureRedisConnectionSpans === true,
+				captureCommandSpans: config.captureRedisCommandSpans === true,
+				requireParentSpan: config.captureRedisRootSpans !== true,
+			}),
+			queueTraceContext: {
+				tracer,
+				propagation,
+				trace,
+				getActiveContext: () => context.active(),
+				rootContext: ROOT_CONTEXT,
+				mode: getQueueTraceContextMode(config.jobTraceContextMode),
+				spanStatusCodeError: SpanStatusCode.ERROR,
+			},
+		});
+	}
+
+	public captureMessage(message: string, _opts: TelemetryCaptureMessageOptions): void {
+		// captureMessageは例外通知APIなので、OTelでは対象spanにエラー状態を付ける。
+		// アクティブspanが無い場合(例: BullMQのjob処理が既に完了しspanが閉じた後の'failed'イベント)でも
+		// 通知を握り潰さないよう、報告専用の短命spanを作ってそこに記録する。
+		const span = this.deps.getActiveSpan();
+		if (span != null) {
+			recordSpanError(span, new Error(message), this.deps.spanStatusCodeError);
+			return;
+		}
+
+		this.deps.tracer.startActiveSpan('captureMessage', reportSpan => {
+			recordSpanError(reportSpan, new Error(message), this.deps.spanStatusCodeError);
+			reportSpan.end();
+		});
+	}
+
+	public startSpan<T>(name: string, fn: () => T): T {
+		// 既存のTelemetryAdapter契約に合わせ、同期/非同期どちらでも同じspan lifetimeを保証する。
+		return this.deps.tracer.startActiveSpan(name, span => executeSpan(span, fn, this.deps.spanStatusCodeError));
+	}
+
+	public injectTraceContext(carrier: QueueTraceContextCarrier): void {
+		const queueTraceContext = this.deps.queueTraceContext;
+		// Queue context 用の依存は任意なので、無い場合はジョブデータを変更しない。
+		if (queueTraceContext == null) return;
+		injectActiveTraceContext(queueTraceContext, carrier);
+	}
+
+	public startSpanWithTraceContext<T>(name: string, jobData: object, fn: () => T): T {
+		const queueTraceContext = this.deps.queueTraceContext;
+		// Queue context 用の依存が無い場合は、従来の span 作成経路と同じ動作を保つ。
+		if (queueTraceContext == null) return this.startSpan(name, fn);
+
+		return startSpanWithQueueTraceContext(queueTraceContext, name, jobData, fn, () => this.startSpan(name, fn));
+	}
+
+	public async shutdown(): Promise<void> {
+		this.deps.shutdownHttpClientInstrumentation?.();
+		this.deps.shutdownDatabaseInstrumentation?.();
+		this.deps.shutdownRedisInstrumentation?.();
+		// BatchSpanProcessorのflushが詰まってもプロセス終了を妨げないよう、上限時間を設ける。
+		// タイムアウト側のtimerは、flushが先に終わった場合にイベントループを無駄に引き留めないようclearする。
+		let timer: NodeJS.Timeout | undefined;
+		await Promise.race([
+			this.deps.provider.shutdown(),
+			new Promise<void>(resolve => {
+				timer = setTimeout(resolve, this.deps.shutdownTimeout);
+			}),
+		]).finally(() => {
+			if (timer != null) clearTimeout(timer);
+		});
+	}
+}
+
+export function createResource(config: OtelBackendRuntimeConfig, deps: CreateResourceDeps): Resource {
+	// resourceを明示指定するとSDKのdefaultResource()は自動付与されなくなる(マージではなく上書き)ため、
+	// telemetry.sdk.*等の標準属性を失わないよう明示的にmergeする。
+	const misskeyDefaultResource = deps.resourceFromAttributes({
+		[deps.serviceNameAttribute]: 'misskey-backend',
+		[deps.serviceInstanceIdAttribute]: `${os.hostname()}:${process.pid}`,
+		[deps.serviceVersionAttribute]: deps.serviceVersion,
+		'misskey.process.role': getMisskeyProcessRole(),
+	});
+
+	// OTel標準の OTEL_SERVICE_NAME / OTEL_RESOURCE_ATTRIBUTES を尊重する。
+	// mergeは右辺が優先されるため、config.resourceAttributesを最優先にする。
+	return deps.defaultResource()
+		.merge(misskeyDefaultResource)
+		.merge(deps.detectResources({ detectors: [deps.envDetector] }))
+		.merge(deps.resourceFromAttributes(config.resourceAttributes ?? {}));
+}
+
+export function createSampler(sampleRate: number, deps: CreateSamplerDeps): ParentBasedSampler {
+	// 設定ミスを無言でAlwaysOn/AlwaysOffに倒さず、起動時に明確に失敗させる。
+	// (YAMLでクォートされた数値文字列などnumber型の保証が無い値が来てもここで弾く)
+	if (typeof sampleRate !== 'number' || !Number.isFinite(sampleRate) || sampleRate < 0 || sampleRate > 1) {
+		throw new Error('otelForBackend.sampleRate must be a number between 0.0 and 1.0.');
+	}
+
+	return new deps.ParentBasedSampler({
+		root: new deps.TraceIdRatioBasedSampler(sampleRate),
+	});
+}
+
+export function getMisskeyProcessRole(): string {
+	// Trace backend上でserver/queue/workerを見分けられるよう、Misskey固有の役割をresourceに載せる。
+	if (envOption.disableClustering) {
+		if (envOption.onlyServer) return 'primary-server';
+		if (envOption.onlyQueue) return 'primary-queue';
+		return 'primary-server+queue';
+	}
+
+	if (cluster.isPrimary) {
+		if (envOption.onlyServer) return 'fork-only';
+		if (envOption.onlyQueue) return 'primary-queue';
+		return 'primary-server';
+	}
+
+	// worker.tsのworkerMainに合わせる: onlyServerならserver()、それ以外はjobQueue()を実行する。
+	if (envOption.onlyServer) return 'worker-server';
+	return 'worker-queue';
+}

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

@@ -0,0 +1,199 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import Logger from '@/logger.js';
+import { registerDiagLogger } from '@/core/telemetry/telemetry-diag.js';
+import { getQueueTraceContextMode, injectActiveTraceContext, startSpanWithQueueTraceContext } from '@/core/telemetry/queue-trace-context.js';
+import type * as SentryNode from '@sentry/node';
+import type { NodeOptions } from '@sentry/node';
+import type { OtelBackendRuntimeConfig, SentryBackendConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './TelemetryAdapter.js';
+import type { QueueTraceContextCarrier, QueueTraceContextDeps } from '../queue-trace-context.js';
+
+// OpenTelemetryAdapterのDEFAULT_SHUTDOWN_TIMEOUTと揃え、Sentryのtransportが詰まってもプロセス終了を妨げないようにする。
+const DEFAULT_SHUTDOWN_TIMEOUT = 5000;
+const logger = new Logger('telemetry', 'green');
+
+type SentryIntegrationsOption = NonNullable<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 = 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: SentryBackendConfig,
+	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,
+		}),
+	};
+}
+
+type BuildSentryOtlpInitOptions = {
+	sentryConfig: SentryBackendConfig;
+	otelConfig: OtelBackendRuntimeConfig;
+	otlpProcessor: unknown;
+	nodeProfilingIntegration?: () => SentryIntegration;
+	warn?: (message: string) => void;
+};
+
+export function buildSentryOtlpInitOptions(options: BuildSentryOtlpInitOptions): SentryNodeOptions {
+	// OTel併存時も、remoteへtrace headerを漏らさないデフォルトはSentry単体時と揃える。
+	// propagateTraceToRemote: true か、options.tracePropagationTargets の明示指定がある場合のみ既定を上書きする。
+	const { tracePropagationTargets, ...sentryOptions } = options.sentryConfig.options;
+	const propagateTraceToRemote = options.otelConfig.propagateTraceToRemote === true || tracePropagationTargets != null;
+	const warn = options.warn ?? ((message: string) => logger.warn(message));
+
+	if (options.otelConfig.sampleRate != null) {
+		warn('otelForBackend.sampleRate is ignored when sentryForBackend is also configured; configure sentryForBackend.options.tracesSampleRate or tracesSampler instead.');
+	}
+
+	if (options.otelConfig.resourceAttributes != null) {
+		warn('otelForBackend.resourceAttributes is ignored when sentryForBackend is also configured; configure OTEL_RESOURCE_ATTRIBUTES instead.');
+	}
+
+	return {
+		...buildSentryNodeOptions({
+			...options.sentryConfig,
+			options: {
+				...sentryOptions,
+				...(propagateTraceToRemote ? { tracePropagationTargets } : {}),
+			},
+		}, options.nodeProfilingIntegration),
+
+		// Sentryの単一TracerProviderにOTLP processorを追加し、親欠損や二重providerを避ける。
+		openTelemetrySpanProcessors: [
+			...(options.sentryConfig.options.openTelemetrySpanProcessors ?? []),
+			options.otlpProcessor as NonNullable<SentryNodeOptions['openTelemetrySpanProcessors']>[number],
+		],
+	};
+}
+
+export class SentryTelemetryAdapter implements TelemetryAdapter {
+	private constructor(
+		private readonly Sentry: typeof SentryNode,
+		private readonly queueTraceContext?: QueueTraceContextDeps,
+	) {
+	}
+
+	public static async create(config: SentryBackendConfig): 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 static async createWithOtlpExport(
+		sentryConfig: SentryBackendConfig,
+		otelConfig: OtelBackendRuntimeConfig,
+	): Promise<SentryTelemetryAdapter> {
+		const Sentry = await import('@sentry/node');
+		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
+		const { context, diag, DiagLogLevel, propagation, ROOT_CONTEXT, SpanStatusCode, trace } = await import('@opentelemetry/api');
+		const { BatchSpanProcessor } = await import('@opentelemetry/sdk-trace-base');
+		const { OTLPTraceExporter } = await import('@opentelemetry/exporter-trace-otlp-proto');
+
+		registerDiagLogger(diag, DiagLogLevel.WARN);
+
+		// OTLP送信だけを担うprocessorを作り、provider生成はSentry.init側に任せる。
+		const otlpProcessor = new BatchSpanProcessor(new OTLPTraceExporter({
+			...(otelConfig.endpoint != null ? { url: otelConfig.endpoint } : {}),
+			...(otelConfig.headers != null ? { headers: otelConfig.headers } : {}),
+		}));
+
+		// SentryとOTLPを同一providerに集約することで、どちらの宛先にも同じspan実体を流す。
+		Sentry.init(buildSentryOtlpInitOptions({
+			sentryConfig,
+			otelConfig,
+			otlpProcessor,
+			nodeProfilingIntegration,
+		}));
+
+		// Sentry が初期化した同じ OTel provider から tracer/context API を受け取り、
+		// Queue を跨ぐ context 伝播も Sentry と OTLP の両方へ同一 span として出力する。
+		return new SentryTelemetryAdapter(Sentry, {
+			tracer: trace.getTracer('misskey-backend'),
+			propagation,
+			trace,
+			getActiveContext: () => context.active(),
+			rootContext: ROOT_CONTEXT,
+			mode: getQueueTraceContextMode(otelConfig.jobTraceContextMode),
+			spanStatusCodeError: SpanStatusCode.ERROR,
+		});
+	}
+
+	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 injectTraceContext(carrier: QueueTraceContextCarrier): void {
+		// Sentry 単体構成では queueTraceContext を持たず、従来どおりジョブデータを変更しない。
+		if (this.queueTraceContext == null) return;
+		injectActiveTraceContext(this.queueTraceContext, carrier);
+	}
+
+	public startSpanWithTraceContext<T>(name: string, jobData: object, fn: () => T): T {
+		// Sentry 単体構成では Sentry 既存の span 作成経路を使う。
+		if (this.queueTraceContext == null) return this.startSpan(name, fn);
+
+		return startSpanWithQueueTraceContext(this.queueTraceContext, name, jobData, fn, () => this.startSpan(name, fn));
+	}
+
+	public async shutdown(): Promise<void> {
+		// timeout未指定だとtransportのflushが詰まった際にプロセス終了を妨げるため、上限時間を設ける。
+		await this.Sentry.close(DEFAULT_SHUTDOWN_TIMEOUT);
+	}
+}

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

@@ -0,0 +1,61 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Config } from '@/config.js';
+import type { QueueTraceContextCarrier } from '../queue-trace-context.js';
+
+export type SentryBackendConfig = NonNullable<Config['sentryForBackend']>;
+export type OtelBackendConfig = NonNullable<Config['otelForBackend']>;
+export type OtelBackendRuntimeConfig = OtelBackendConfig & {
+	serviceVersion: string;
+};
+
+export interface TelemetryCaptureMessageOptions {
+	/** 現在はエラー通知用途だけに絞る。追加する場合は各adapterでの扱いを揃えること。 */
+	level: 'error';
+
+	/** Sentryではuser.idへ渡す。OTel adapterは現在span属性へ付与していないため、必要ならadapter側で拡張する。 */
+	userId?: string;
+
+	/** queue名やendpoint名など、通知先で調査に使う補助情報。 */
+	extra?: Record<string, unknown>;
+}
+
+/**
+ * Sentry・OpenTelemetryなど、エラートラッキング/APMサービスごとの実装差異を隠蔽するための抽象。
+ * 新しいサービスを追加する場合はこのインターフェースを実装するアダプタをこのディレクトリに追加し、
+ * telemetry-registry.tsのinitTelemetry内で登録する。
+ */
+export interface TelemetryAdapter {
+	/**
+	 * 実行中の処理で起きたエラー相当の事象を記録する。
+	 * Sentryはmessage通知、OTelはactive spanまたは短命spanへの例外記録として扱う。
+	 */
+	captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void;
+
+	/**
+	 * API endpointやqueue jobなど、呼び出し側の処理単位をspanで包む。
+	 * fnの戻り値・例外はそのまま呼び出し側へ返し、Promiseの場合はsettleまでspanを閉じない。
+	 */
+	startSpan<T>(name: string, fn: () => T): T;
+
+	/**
+	 * BullMQ のジョブデータへ保存する carrier に、active trace context を注入する。
+	 * OTel を使わない adapter は実装しない。
+	 */
+	injectTraceContext?(carrier: QueueTraceContextCarrier): void;
+
+	/**
+	 * ジョブに保存された enqueue 元の context を、worker span の Link または parent として復元する。
+	 * context を持たないジョブの互換性は adapter 側で保つ。
+	 */
+	startSpanWithTraceContext?<T>(name: string, jobData: object, fn: () => T): T;
+
+	/**
+	 * プロセス終了時にtelemetry backendへ残りのデータをflushする。
+	 * 実装側ではtransport停止に引きずられないよう、待機時間に上限を設ける。
+	 */
+	shutdown(): Promise<void>;
+}

packages/backend/src/core/telemetry/database-instrumentation.ts

@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Span, TracerProvider } from '@opentelemetry/api';
+
+type Instrumentation = {
+	setTracerProvider(provider: TracerProvider): void;
+	enable(): void;
+	disable(): void;
+};
+
+type PgInstrumentationConfig = {
+	enhancedDatabaseReporting: boolean;
+	requireParentSpan: boolean;
+	ignoreConnectSpans: boolean;
+	requestHook?(span: Span): void;
+};
+
+type InstrumentationConstructor = new (config: PgInstrumentationConfig) => Instrumentation;
+
+type InstrumentationDeps = {
+	PgInstrumentation: InstrumentationConstructor;
+};
+
+type DatabaseInstrumentationOptions = {
+	capturePgStatement: boolean;
+	capturePgConnectionSpans: boolean;
+};
+
+type InstallDatabaseInstrumentationOptions = DatabaseInstrumentationOptions & {
+	capturePgSpans: boolean;
+};
+
+/**
+ * pg はアプリケーションが import する前に有効化しないと、require hook 型の
+ * 自動計装がモジュールを patch できない。そのため、
+ * telemetry provider の登録直後にこの関数を呼び出す。
+ */
+export async function installDatabaseInstrumentation(provider: TracerProvider, options: InstallDatabaseInstrumentationOptions): Promise<() => void> {
+	if (!options.capturePgSpans) return () => {};
+
+	const { PgInstrumentation } = await import('@opentelemetry/instrumentation-pg');
+
+	return installInstrumentation(provider, { PgInstrumentation }, options);
+}
+
+export function installInstrumentation(provider: TracerProvider, deps: InstrumentationDeps, options: DatabaseInstrumentationOptions = {
+	capturePgStatement: false,
+	capturePgConnectionSpans: false,
+}): () => void {
+	const instrumentations = [
+		new deps.PgInstrumentation({
+			// SQLパラメータには投稿内容・認証情報などが含まれ得るため、常に記録しない。
+			enhancedDatabaseReporting: false,
+			requireParentSpan: true,
+			ignoreConnectSpans: !options.capturePgConnectionSpans,
+			// instrumentation-pgはSQL本文を無加工で属性へ追加する。明示opt-in時だけ残す。
+			...(options.capturePgStatement ? {} : {
+				requestHook: (span: Span) => {
+					span.setAttribute('db.statement', '[REDACTED]');
+					span.setAttribute('db.query.text', '[REDACTED]');
+				},
+			}),
+		}),
+	];
+
+	try {
+		for (const instrumentation of instrumentations) {
+			instrumentation.setTracerProvider(provider);
+			instrumentation.enable();
+		}
+	} catch (error) {
+		for (const instrumentation of instrumentations) {
+			instrumentation.disable();
+		}
+		throw error;
+	}
+
+	return () => {
+		for (const instrumentation of instrumentations) {
+			instrumentation.disable();
+		}
+	};
+}

packages/backend/src/core/telemetry/http-client-instrumentation.ts

@@ -0,0 +1,122 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { channel } from 'node:diagnostics_channel';
+import type { ClientRequest, IncomingMessage } from 'node:http';
+import type { Span, SpanOptions, SpanStatusCode, Tracer } from '@opentelemetry/api';
+
+const HTTP_CLIENT_REQUEST_CREATED = 'http.client.request.created';
+const HTTP_CLIENT_RESPONSE_FINISH = 'http.client.response.finish';
+const HTTP_CLIENT_REQUEST_ERROR = 'http.client.request.error';
+
+type HttpClientSpan = Pick<Span, 'end' | 'recordException' | 'setAttribute' | 'setStatus'>;
+
+type HttpClientInstrumentationDeps = {
+	tracer: Pick<Tracer, 'startSpan'>;
+	spanKindClient: SpanOptions['kind'];
+	spanStatusCodeError: SpanStatusCode;
+	subscribe: (name: string, listener: (message: unknown) => void) => () => void;
+};
+
+type RequestCreatedMessage = { request: ClientRequest };
+type ResponseFinishMessage = { request: ClientRequest; response: IncomingMessage };
+type RequestErrorMessage = { request: ClientRequest; error: Error };
+
+/**
+ * require フックを使わず、Node.js 組み込み HTTP クライアントの diagnostics channel を計装する。
+ * telemetry 初期化前に読み込まれたモジュールも対象になる。
+ */
+export function createHttpClientInstrumentation(deps: HttpClientInstrumentationDeps): () => void {
+	const spans = new WeakMap<ClientRequest, HttpClientSpan>();
+
+	const unsubscribeCreated = deps.subscribe(HTTP_CLIENT_REQUEST_CREATED, (message: unknown) => {
+		const { request } = message as RequestCreatedMessage;
+		const { url, host, port } = getRequestDetails(request);
+		const method = request.method ?? 'GET';
+		const span = deps.tracer.startSpan(method, {
+			kind: deps.spanKindClient,
+			attributes: {
+				'http.request.method': method,
+				'url.full': url,
+				'server.address': host,
+				'server.port': port,
+			},
+		});
+		spans.set(request, span);
+	});
+
+	const unsubscribeResponseFinish = deps.subscribe(HTTP_CLIENT_RESPONSE_FINISH, (message: unknown) => {
+		const { request, response } = message as ResponseFinishMessage;
+		const span = spans.get(request);
+		if (span == null) return;
+
+		const statusCode = response.statusCode;
+		if (statusCode != null) {
+			span.setAttribute('http.response.status_code', statusCode);
+		}
+		if (response.httpVersion != null) {
+			span.setAttribute('network.protocol.version', response.httpVersion);
+		}
+		if (statusCode != null && statusCode >= 400) {
+			span.setAttribute('error.type', String(statusCode));
+			span.setStatus({ code: deps.spanStatusCodeError });
+		}
+		span.end();
+		spans.delete(request);
+	});
+
+	const unsubscribeRequestError = deps.subscribe(HTTP_CLIENT_REQUEST_ERROR, (message: unknown) => {
+		const { request, error } = message as RequestErrorMessage;
+		const span = spans.get(request);
+		if (span == null) return;
+
+		span.recordException(error);
+		span.setAttribute('error.type', getErrorType(error));
+		span.setStatus({ code: deps.spanStatusCodeError });
+		span.end();
+		spans.delete(request);
+	});
+
+	return () => {
+		unsubscribeCreated();
+		unsubscribeResponseFinish();
+		unsubscribeRequestError();
+	};
+}
+
+export function installHttpClientInstrumentation(deps: Omit<HttpClientInstrumentationDeps, 'subscribe'>): () => void {
+	return createHttpClientInstrumentation({
+		...deps,
+		subscribe: (name, listener) => {
+			const diagnosticChannel = channel(name);
+			diagnosticChannel.subscribe(listener);
+			return () => diagnosticChannel.unsubscribe(listener);
+		},
+	});
+}
+
+function getRequestDetails(request: ClientRequest): { url: string; host: string; port: number } {
+	const protocol = request.protocol ?? 'http:';
+	const host = request.getHeader('host')?.toString() ?? request.host ?? 'localhost';
+	const url = new URL(request.path || '/', `${protocol}//${host}`);
+	// URL 属性には認証情報やクエリ文字列を含めない。
+	url.username = '';
+	url.password = '';
+	url.search = '';
+	url.hash = '';
+
+	return {
+		url: url.toString(),
+		host: url.hostname,
+		// URL.port は既定ポートでは空文字列になるため、スキームから補う。
+		port: url.port === '' ? (url.protocol === 'https:' ? 443 : 80) : Number(url.port),
+	};
+}
+
+function getErrorType(error: Error): string {
+	// Node.js の system error code は安定した低カーディナリティの識別子になる。
+	const code = (error as NodeJS.ErrnoException).code;
+	return code ?? error.name;
+}

packages/backend/src/core/telemetry/queue-instrumentation.ts

@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { injectTraceContext } from './telemetry-registry.js';
+import { injectQueueTraceContext } from './queue-trace-context.js';
+import type * as Bull from 'bullmq';
+
+/**
+ * Queue の add/addBulk をラップし、全ての BullMQ enqueue 経路を一箇所で捕捉する。
+ * QueueService を通さず直接 add/addBulk する呼び出し元もあるため、それぞれで注入すると漏れやすい。
+ */
+export function instrumentQueue<T extends object>(queue: Bull.Queue<T>): Bull.Queue<T> {
+	// BullMQ のメソッドは Queue インスタンスを this として使うため、差し替え前に bind して保持する。
+	const add = queue.add.bind(queue);
+	queue.add = ((name, data, opts) => {
+		// BullMQ が data を Redis 用にシリアライズする前に、enqueue 元の context を内部フィールドへ追加する。
+		injectQueueTraceContext(data, injectTraceContext);
+		return add(name, data, opts);
+	}) as typeof queue.add;
+
+	// addBulk は複数ジョブを一度にシリアライズするので、各 data へ同じ context を注入する。
+	const addBulk = queue.addBulk.bind(queue);
+	queue.addBulk = ((jobs) => {
+		for (const job of jobs) {
+			injectQueueTraceContext(job.data, injectTraceContext);
+		}
+		return addBulk(jobs);
+	}) as typeof queue.addBulk;
+
+	return queue;
+}

packages/backend/src/core/telemetry/queue-trace-context.ts

@@ -0,0 +1,182 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Context, PropagationAPI, Span, SpanContext, SpanOptions, SpanStatusCode, Tracer } from '@opentelemetry/api';
+
+/*
+ * enqueue (push) から worker による取得・処理 (pop) までをテレメトリ上で関連付け、
+ * Queue を挟む非同期処理を一連の流れとして追跡できるようにする。
+ * そのため、trace context を次の流れで伝播する:
+ *
+ * 1. producer 側で active context を W3C Trace Context 形式の carrier へ注入する。
+ * 2. carrier をジョブデータの内部フィールドに保存し、BullMQ/Redis 経由で worker へ渡す。
+ * 3. worker 側で carrier を context へ戻し、設定に応じて Link または parent に使う。
+ *
+ * OTel API への依存を引数にしているのは、OTel 単体構成と Sentry + OTLP 構成で
+ * 同じ伝播処理を使うため。
+ */
+/** Redis 上のジョブデータにだけ保存する、OpenTelemetry propagator 用の carrier。 */
+export type QueueTraceContextCarrier = Record<string, string>;
+export type QueueTraceContextMode = 'link' | 'parent';
+
+// 通常のジョブプロセッサが参照しない Misskey 内部フィールドとして、ユーザー定義の data と区別する。
+const QUEUE_TRACE_CONTEXT_KEY = '__misskeyTraceContext';
+
+export type QueueTraceContextDeps = {
+	tracer: Pick<Tracer, 'startActiveSpan'>;
+	propagation: Pick<PropagationAPI, 'extract' | 'inject'>;
+	trace: {
+		getSpanContext(context: Context): SpanContext | undefined;
+	};
+	getActiveContext: () => Context;
+	rootContext: Context;
+	mode: QueueTraceContextMode;
+	spanStatusCodeError: SpanStatusCode;
+};
+
+export type QueueSpanContext = {
+	options: SpanOptions;
+	parentContext: Context;
+};
+
+type QueueSpanContextDeps = Pick<QueueTraceContextDeps, 'propagation' | 'trace' | 'rootContext' | 'mode'>;
+
+/**
+ * enqueue 元の active context を、ジョブ本来のデータを壊さない内部フィールドとして保持する。
+ * propagator が何も注入しなかった場合は、Redis に不要な空オブジェクトを残さない。
+ */
+export function injectQueueTraceContext(data: unknown, inject: (carrier: QueueTraceContextCarrier) => void): void {
+	// BullMQ の型定義外から渡される値も考慮し、書き込めない値は無視する。
+	if (data == null || typeof data !== 'object') return;
+
+	const carrier: QueueTraceContextCarrier = {};
+	inject(carrier);
+
+	// active span が無い場合、propagator は何も注入しない。空の内部フィールドは Redis に保存しない。
+	if (Object.keys(carrier).length === 0) return;
+	Object.assign(data, { [QUEUE_TRACE_CONTEXT_KEY]: carrier });
+}
+
+/** 現在実行中の span を propagator の標準形式で carrier へ書き出す。 */
+export function injectActiveTraceContext(deps: QueueTraceContextDeps, carrier: QueueTraceContextCarrier): void {
+	deps.propagation.inject(deps.getActiveContext(), carrier);
+}
+
+/**
+ * ジョブに保存された carrier から、worker span の開始に必要な context と options を組み立てる。
+ *
+ * - parent: enqueue span の子として同じ trace を継続する。
+ * - link: worker span を別の root trace にし、enqueue span への関連だけを Link に残す。
+ *
+ * link モードで trace を分けることで、worker 側の sampling 判定を enqueue 側から独立させられる。
+ */
+export function getQueueSpanContext(data: unknown, deps: QueueSpanContextDeps): QueueSpanContext | undefined {
+	const carrier = getQueueTraceContextCarrier(data);
+	if (carrier == null) return undefined;
+
+	// Redis から復元した carrier は別プロセス由来なので、現在の context ではなく ROOT_CONTEXT から展開する。
+	const extractedContext = deps.propagation.extract(deps.rootContext, carrier);
+	if (deps.mode === 'parent') {
+		return {
+			options: {},
+			parentContext: extractedContext,
+		};
+	}
+
+	// Link が受け取るのは Context ではなく SpanContext なので、extract 後に取り出す。
+	const spanContext = deps.trace.getSpanContext(extractedContext);
+	return {
+		options: {
+			root: true,
+			...(spanContext != null ? { links: [{ context: spanContext }] } : {}),
+		},
+		parentContext: deps.rootContext,
+	};
+}
+
+/**
+ * context を持つジョブは Link/parent の規則で span を開始する。
+ * デプロイ前に enqueue されたジョブなど、context を持たない場合は既存の adapter 固有実装へ委ねる。
+ */
+export function startSpanWithQueueTraceContext<T>(
+	deps: QueueTraceContextDeps,
+	name: string,
+	jobData: object,
+	fn: () => T,
+	fallback: () => T,
+): T {
+	const spanContext = getQueueSpanContext(jobData, deps);
+	if (spanContext == null) return fallback();
+
+	return deps.tracer.startActiveSpan(name, spanContext.options, spanContext.parentContext, span => executeSpan(span, fn, deps.spanStatusCodeError));
+}
+
+/**
+ * 既存の TelemetryAdapter 契約に合わせ、同期値と Promise のどちらを返す処理も span で包む。
+ * 成功・失敗のどちらでも処理完了まで span を開き、必ず一度だけ閉じる。
+ */
+export function executeSpan<T>(span: Span, fn: () => T, spanStatusCodeError: SpanStatusCode): T {
+	try {
+		const result = fn();
+		if (isPromiseLike(result)) {
+			// fn() の戻り値は T のまま保ちつつ、Promise の settle 時に span を閉じる。
+			return result.then(
+				value => {
+					span.end();
+					return value;
+				},
+				error => {
+					recordSpanError(span, error, spanStatusCodeError);
+					span.end();
+					throw error;
+				},
+			) as T;
+		}
+
+		span.end();
+		return result;
+	} catch (error) {
+		// fn() が同期的に throw した場合も、Promise の reject と同じ形で記録して呼び出し元へ戻す。
+		recordSpanError(span, error, spanStatusCodeError);
+		span.end();
+		throw error;
+	}
+}
+
+/** Error 以外の throw 値も OTel exporter が扱える例外に正規化し、span をエラー状態にする。 */
+export function recordSpanError(span: Span, error: unknown, spanStatusCodeError: SpanStatusCode): void {
+	const exception = error instanceof Error ? error : new Error(String(error));
+	span.recordException(exception);
+	span.setStatus({
+		code: spanStatusCodeError,
+		message: exception.message,
+	});
+}
+
+/**
+ * 未設定時は、enqueue と worker の sampling を分離できる link を使う。
+ * 設定ミスを無言でフォールバックさせないため、未知の値は起動時にエラーにする。
+ */
+export function getQueueTraceContextMode(mode: unknown): QueueTraceContextMode {
+	if (mode == null || mode === 'link') return 'link';
+	if (mode === 'parent') return 'parent';
+	throw new Error('otelForBackend.jobTraceContextMode must be either \'link\' or \'parent\'.');
+}
+
+function getQueueTraceContextCarrier(data: unknown): QueueTraceContextCarrier | undefined {
+	if (data == null || typeof data !== 'object') return undefined;
+	const carrier = (data as Record<string, unknown>)[QUEUE_TRACE_CONTEXT_KEY];
+	if (carrier == null || typeof carrier !== 'object' || Array.isArray(carrier)) return undefined;
+
+	// Redis 上の旧いジョブや壊れたデータで worker を落とさないよう、propagator に渡せる string map だけを受け入れる。
+	const entries = Object.entries(carrier);
+	if (entries.length === 0 || entries.some(([, value]) => typeof value !== 'string')) return undefined;
+	return Object.fromEntries(entries) as QueueTraceContextCarrier;
+}
+
+function isPromiseLike<T>(value: T): value is T & PromiseLike<Awaited<T>> {
+	// native Promise に限らず thenable も span の完了を待てるよう、instanceof ではなく then の有無で判定する。
+	return value != null && typeof (value as { then?: unknown }).then === 'function';
+}

packages/backend/src/core/telemetry/redis-instrumentation.ts

@@ -0,0 +1,178 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { tracingChannel } from 'node:diagnostics_channel';
+import { context, trace } from '@opentelemetry/api';
+import type { Span, SpanKind, SpanStatusCode, Tracer } from '@opentelemetry/api';
+
+type IORedisCommandContext = {
+	command: string;
+	args: string[];
+	database: number;
+	serverAddress: string;
+	serverPort: number | undefined;
+};
+
+type IORedisConnectContext = {
+	serverAddress: string;
+	serverPort: number | undefined;
+};
+
+type TracingChannelSubscribers<T extends object> = {
+	start(message: T): void;
+	end(message: T & { error?: unknown }): void;
+	asyncStart(message: T & { error?: unknown }): void;
+	asyncEnd(message: T & { error?: unknown }): void;
+	error(message: T & { error: unknown }): void;
+};
+
+type TracingChannel<T extends object> = {
+	subscribe(subscribers: TracingChannelSubscribers<T>): void;
+	unsubscribe(subscribers: TracingChannelSubscribers<T>): void;
+};
+
+type RedisInstrumentationDeps = {
+	tracingChannel<T extends object>(name: string): TracingChannel<T>;
+	tracer: Pick<Tracer, 'startSpan'>;
+	getActiveSpan(): Span | undefined;
+	spanKindClient: SpanKind;
+	spanStatusCodeError: SpanStatusCode;
+};
+
+type RedisInstrumentationOptions = {
+	captureCommandSpans?: boolean;
+	/** requireParentSpan is the official ioredis instrumentation's default. */
+	requireParentSpan?: boolean;
+	captureConnectionSpans?: boolean;
+};
+
+/**
+ * ioredis 5.11以降が公開する native diagnostics channel を購読する。
+ * バンドル後もioredis自身が発行するイベントを使うため、require hook に
+ * 依存せず、ESM import 経路でもコマンド span を取得できる。
+ */
+export function installRedisInstrumentation(
+	tracer: Pick<Tracer, 'startSpan'>,
+	spanKindClient: SpanKind,
+	spanStatusCodeError: SpanStatusCode,
+	options: RedisInstrumentationOptions = {},
+): () => void {
+	return createRedisInstrumentation({
+		tracingChannel,
+		tracer,
+		getActiveSpan: () => trace.getSpan(context.active()),
+		spanKindClient,
+		spanStatusCodeError,
+	}, options);
+}
+
+export function createRedisInstrumentation(deps: RedisInstrumentationDeps, options: RedisInstrumentationOptions = {}): () => void {
+	const requireParentSpan = options.requireParentSpan ?? true;
+	const cleanup: Array<() => void> = [];
+	if (options.captureCommandSpans === true) {
+		const commandChannel = deps.tracingChannel<IORedisCommandContext>('ioredis:command');
+		const commandSubscribers = createTracingChannelSubscribers(commandChannel, deps, requireParentSpan, message => ({
+			name: message.command,
+			attributes: {
+				'db.system.name': 'redis',
+				'db.namespace': message.database.toString(10),
+				'db.operation.name': message.command,
+				'server.address': message.serverAddress,
+				...(message.serverPort != null ? { 'server.port': message.serverPort } : {}),
+			},
+		}));
+		cleanup.push(() => commandChannel.unsubscribe(commandSubscribers));
+	}
+	if (options.captureConnectionSpans === true) {
+		const connectChannel = deps.tracingChannel<IORedisConnectContext>('ioredis:connect');
+		// Connection spans are explicitly opt-in and should include startup and reconnect attempts.
+		const connectSubscribers = createTracingChannelSubscribers(connectChannel, deps, false, message => ({
+			name: 'connect',
+			attributes: {
+				'db.system.name': 'redis',
+				'db.operation.name': 'connect',
+				'server.address': message.serverAddress,
+				...(message.serverPort != null ? { 'server.port': message.serverPort } : {}),
+			},
+		}));
+		cleanup.push(() => connectChannel.unsubscribe(connectSubscribers));
+	}
+
+	return () => {
+		for (const unsubscribe of cleanup) {
+			unsubscribe();
+		}
+	};
+}
+
+function createTracingChannelSubscribers<T extends object>(
+	channel: TracingChannel<T>,
+	deps: RedisInstrumentationDeps,
+	requireParentSpan: boolean,
+	getSpanOptions: (message: T) => { name: string; attributes: Record<string, string | number> },
+): TracingChannelSubscribers<T> {
+	const spans = new WeakMap<object, { span: Span; recordedError: boolean }>();
+
+	const recordError = (state: { span: Span; recordedError: boolean }, value: unknown): void => {
+		if (state.recordedError) return;
+		const error = toError(value);
+		state.span.recordException(error);
+		state.span.setStatus({ code: deps.spanStatusCodeError, message: error.message });
+		state.span.setAttribute('error.type', getErrorType(error));
+		const statusCode = getRedisErrorStatusCode(error.message);
+		if (statusCode != null) state.span.setAttribute('db.response.status_code', statusCode);
+		state.recordedError = true;
+	};
+
+	const finish = (message: T & { error?: unknown }): void => {
+		const state = spans.get(message);
+		if (state == null) return;
+
+		if (message.error != null) {
+			recordError(state, message.error);
+		}
+		state.span.end();
+		spans.delete(message);
+	};
+
+	const subscribers: TracingChannelSubscribers<T> = {
+		start: (message) => {
+			if (requireParentSpan && deps.getActiveSpan() == null) return;
+
+			const options = getSpanOptions(message);
+			const span = deps.tracer.startSpan(options.name, {
+				kind: deps.spanKindClient,
+				attributes: options.attributes,
+			});
+			spans.set(message, { span, recordedError: false });
+		},
+		// Promiseを返すコマンドでは完了前にもendイベントが来るため、同期例外だけここで閉じる。
+		end: (message) => {
+			if (message.error != null) finish(message);
+		},
+		asyncStart: () => {},
+		asyncEnd: finish,
+		error: (message) => {
+			const state = spans.get(message);
+			if (state == null) return;
+			recordError(state, message.error);
+		},
+	};
+
+	channel.subscribe(subscribers);
+	return subscribers;
+}
+
+function toError(value: unknown): Error {
+	return value instanceof Error ? value : new Error(String(value));
+}
+
+function getRedisErrorStatusCode(message: string): string | undefined {
+	return message.match(/^([A-Z][A-Z0-9_]*)\b/)?.[1];
+}
+
+function getErrorType(error: Error): string {
+	return (error as NodeJS.ErrnoException).code ?? error.name;
+}

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

@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import Logger from '@/logger.js';
+import type { DiagAPI, DiagLogger, DiagLogLevel } from '@opentelemetry/api';
+
+export function registerDiagLogger(
+	diagApi: DiagAPI,
+	diagLogLevelWarn: DiagLogLevel,
+): void {
+	// diagはプロセスグローバルなので、通常運用で必要なWARN以上だけをMisskeyのログに流す。
+	const logger = new Logger('otel', 'green');
+	const diagLogger: DiagLogger = {
+		error: (message, ...args) => logger.error(formatDiagMessage(message, args)),
+		warn: (message, ...args) => logger.warn(formatDiagMessage(message, args)),
+		info: (message, ...args) => logger.info(formatDiagMessage(message, args)),
+		debug: (message, ...args) => logger.debug(formatDiagMessage(message, args)),
+		verbose: (message, ...args) => logger.debug(formatDiagMessage(message, args)),
+	};
+
+	diagApi.setLogger(diagLogger, {
+		logLevel: diagLogLevelWarn,
+		suppressOverrideMessage: true,
+	});
+}
+
+function formatDiagMessage(message: string, args: unknown[]): string {
+	if (args.length === 0) return message;
+	return `${message} ${args.map(arg => {
+		if (arg instanceof Error) return arg.stack ?? arg.message;
+		if (typeof arg === 'string') return arg;
+		try {
+			return JSON.stringify(arg);
+		} catch {
+			return String(arg);
+		}
+	}).join(' ')}`;
+}

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

@@ -0,0 +1,74 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Config } from '@/config.js';
+import { OpenTelemetryAdapter } from './adapters/OpenTelemetryAdapter.js';
+import { SentryTelemetryAdapter } from './adapters/SentryTelemetryAdapter.js';
+import type { OtelBackendRuntimeConfig, TelemetryAdapter, TelemetryCaptureMessageOptions } from './adapters/TelemetryAdapter.js';
+import type { QueueTraceContextCarrier } from './queue-trace-context.js';
+
+/**
+ * NestのDIコンテナが構築される前(boot処理内)で初期化する必要があるため、
+ * DIを介さないモジュールレベルの状態として有効なアダプタを保持する。
+ * TelemetryServiceはこの状態への薄いラッパーとして振る舞う。
+ */
+const adapters: TelemetryAdapter[] = [];
+
+export async function initTelemetry(config: Config): Promise<void> {
+	const otelForBackend: OtelBackendRuntimeConfig | undefined = config.otelForBackend == null ? undefined : {
+		...config.otelForBackend,
+		serviceVersion: config.version,
+	};
+
+	// SentryとOTelを同時に使う場合はproviderを分けず、Sentry側へOTLP processorを追加する。
+	if (config.sentryForBackend && otelForBackend) {
+		adapters.push(await SentryTelemetryAdapter.createWithOtlpExport(config.sentryForBackend, otelForBackend));
+	} else if (config.sentryForBackend) {
+		// Sentry単体時は既存のSentry adapterだけを登録する。
+		adapters.push(await SentryTelemetryAdapter.create(config.sentryForBackend));
+	} else if (otelForBackend) {
+		// OTel単体時だけMisskey自身でNodeTracerProviderを立てる。
+		adapters.push(await OpenTelemetryAdapter.create(otelForBackend));
+	}
+}
+
+export function captureMessage(message: string, opts: TelemetryCaptureMessageOptions): void {
+	// 有効なadapterすべてへ通知し、宛先ごとの差異はadapter内に閉じ込める。
+	for (const adapter of adapters) {
+		adapter.captureMessage(message, opts);
+	}
+}
+
+export function startSpan<T>(name: string, fn: () => T): T {
+	// 有効なadapterが無い/1つだけの場合(実運用上の大半のケース)は、
+	// 毎リクエスト/ジョブでreduceRightのclosureを組み立てる無駄を避ける。
+	if (adapters.length === 0) return fn();
+	if (adapters.length === 1) return adapters[0].startSpan(name, fn);
+
+	// 将来複数adapterを登録する場合でも同じ処理を入れ子にラップし、呼び出し側のAPIは1回のstartSpanに保つ。
+	const wrapped = adapters.reduceRight<() => T>(
+		(inner, adapter) => () => adapter.startSpan(name, inner),
+		fn,
+	);
+	return wrapped();
+}
+
+export function injectTraceContext(carrier: QueueTraceContextCarrier): void {
+	// Queue の carrier は共有データなので、通知と異なり全 adapter にブロードキャストしない。
+	// OTel provider は現在 1 つだけなので、同じ header を上書きしないよう最初の対応 adapter だけを使う。
+	adapters.find(adapter => adapter.injectTraceContext != null)?.injectTraceContext?.(carrier);
+}
+
+export function startSpanWithTraceContext<T>(name: string, jobData: object, fn: () => T): T {
+	// Queue context を解釈できる adapter に span 作成を任せる。
+	// 対応 adapter が無い構成では通常の startSpan へフォールバックする。
+	const adapter = adapters.find(adapter => adapter.startSpanWithTraceContext != null);
+	return adapter?.startSpanWithTraceContext?.(name, jobData, fn) ?? startSpan(name, fn);
+}
+
+export async function shutdownTelemetry(): Promise<void> {
+	// 終了時は登録済みadapterを並列にflush/shutdownする。
+	await Promise.allSettled(adapters.map(adapter => adapter.shutdown()));
+}

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

@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+/**
+ * Telemetry-specific shutdown is implemented by telemetry-registry.ts.
+ * Signal coordination belongs to boot/shutdown-handler.ts so telemetry and
+ * logging remain independent domains.
+ */
+export { shutdownTelemetry } from './telemetry-registry.js';

packages/backend/src/env.ts

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

packages/backend/src/logger.ts

@@ -3,83 +3,72 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import cluster from 'node:cluster';
-import chalk from 'chalk';
-import { default as convertColor } from 'color-convert';
-import { format as dateFormat } from 'date-fns';
 import { bindThis } from '@/decorators.js';
-import { envOption } from './env.js';
+import { logManager } from './logging/logging-runtime.js';
+import type { LogLevel, LoggerContext, LogWriteInput } from './logging/types.js';
 import type { Keyword } from 'color-convert';
 
-type Context = {
-	name: string;
-	color?: Keyword;
-};
-
-type Level = 'error' | 'success' | 'warning' | 'debug' | 'info';
-
+/**
+ * ロガー名の階層と従来の公開APIを提供する薄い窓口です。
+ * 出力条件の判断や整形はLogManagerとLogBackendへ委譲します。
+ */
 // eslint-disable-next-line import/no-default-export
 export default class Logger {
-	private context: Context;
-	private parentLogger: Logger | null = null;
+	private context: readonly LoggerContext[];
 
+	/** 指定した名前を起点とするLoggerを作成します。 */
 	constructor(context: string, color?: Keyword) {
-		this.context = {
+		this.context = [{
 			name: context,
-			color: color,
-		};
+			color,
+		}];
 	}
 
+	/**
+	 * 現在のロガーを親として、下位の名前を持つLoggerを作成します。
+	 */
 	@bindThis
 	public createSubLogger(context: string, color?: Keyword): Logger {
 		const logger = new Logger(context, color);
-		logger.parentLogger = this;
+		logger.context = [...this.context, ...logger.context];
 		return logger;
 	}
 
+	/**
+	 * 従来APIの引数を共通形式へ変換し、LogManagerへ渡します。
+	 */
 	@bindThis
-	private log(level: Level, message: string, data?: Record<string, any> | null, important = false, subContexts: Context[] = []): void {
-		if (envOption.quiet) return;
-
-		if (this.parentLogger) {
-			this.parentLogger.log(level, message, data, important, [this.context].concat(subContexts));
-			return;
-		}
-
-		const time = dateFormat(new Date(), 'HH:mm:ss');
-		const worker = cluster.isPrimary ? '*' : cluster.worker!.id;
-		const l =
-			level === 'error' ? important ? chalk.bgRed.white('ERR ') : chalk.red('ERR ') :
-			level === 'warning' ? chalk.yellow('WARN') :
-			level === 'success' ? important ? chalk.bgGreen.white('DONE') : chalk.green('DONE') :
-			level === 'debug' ? chalk.gray('VERB') :
-			level === 'info' ? chalk.blue('INFO') :
-			null;
-		const contexts = [this.context].concat(subContexts).map(d => d.color ? chalk.rgb(...convertColor.keyword.rgb(d.color))(d.name) : chalk.white(d.name));
-		const m =
-			level === 'error' ? chalk.red(message) :
-			level === 'warning' ? chalk.yellow(message) :
-			level === 'success' ? chalk.green(message) :
-			level === 'debug' ? chalk.gray(message) :
-			level === 'info' ? message :
-			null;
-
-		let log = `${l} ${worker}\t[${contexts.join(' ')}]\t${m}`;
-		if (envOption.withLogTime) log = chalk.gray(time) + ' ' + log;
-
-		const args: unknown[] = [important ? chalk.bold(log) : log];
-		if (data != null) {
-			args.push(data);
-		}
-		console.log(...args);
+	private log(level: LogLevel, message: string, data?: unknown, important = false, legacyLevel?: 'success', error?: unknown): void {
+		logManager.write({
+			level,
+			message,
+			context: this.context,
+			...(typeof error !== 'undefined' ? { error } : {}),
+			compatibility: {
+				legacyLevel,
+				important,
+				data,
+			},
+		});
 	}
 
+	/** 構造化ログをLoggerのcontext付きでLogManagerへ渡します。 */
 	@bindThis
-	public error(x: string | Error, data?: Record<string, any> | null, important = false): void { // 実行を継続できない状況で使う
+	public write(input: LogWriteInput): void {
+		logManager.write({
+			...input,
+			context: this.context,
+		});
+	}
+
+	/** 処理を継続できない状況を記録します。 */
+	@bindThis
+	public error(x: string | Error, data?: Record<string, any> | null, important = false): void {
 		if (x instanceof Error) {
+			// エラー本体も第2引数へ残し、従来どおりスタックなどを確認できるようにします。
 			data = data ?? {};
 			data.e = x;
-			this.log('error', x.toString(), data, important);
+			this.log('error', x.toString(), data, important, undefined, x);
 		} else if (typeof x === 'object') {
 			this.log('error', `${(x as any).message ?? (x as any).name ?? x}`, data, important);
 		} else {
@@ -87,25 +76,27 @@ export default class Logger {
 		}
 	}
 
+	/** 処理は継続できるものの、改善が必要な状況を記録します。 */
 	@bindThis
-	public warn(message: string, data?: Record<string, any> | null, important = false): void { // 実行を継続できるが改善すべき状況で使う
-		this.log('warning', message, data, important);
+	public warn(message: string, data?: Record<string, any> | null, important = false): void {
+		this.log('warn', message, data, important);
 	}
 
+	/** 処理が成功したことを、従来のDONE表示で記録します。 */
 	@bindThis
-	public succ(message: string, data?: Record<string, any> | null, important = false): void { // 何かに成功した状況で使う
-		this.log('success', message, data, important);
+	public succ(message: string, data?: Record<string, any> | null, important = false): void {
+		this.log('info', message, data, important, 'success');
 	}
 
+	/** 開発者向けの調査情報を記録します。 */
 	@bindThis
-	public debug(message: string, data?: Record<string, any> | null, important = false): void { // デバッグ用に使う(開発者に必要だが利用者に不要な情報)
-		if (process.env.NODE_ENV !== 'production' || envOption.verbose) {
-			this.log('debug', message, data, important);
-		}
+	public debug(message: string, data?: Record<string, any> | null, important = false): void {
+		this.log('debug', message, data, important);
 	}
 
+	/** 通常の動作状況を記録します。 */
 	@bindThis
-	public info(message: string, data?: Record<string, any> | null, important = false): void { // それ以外
+	public info(message: string, data?: Record<string, any> | null, important = false): void {
 		this.log('info', message, data, important);
 	}
 }

packages/backend/src/logging/BootstrapConsoleBackend.ts

@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { LogBackend } from './LogBackend.js';
+import type { LogRecord } from './types.js';
+
+/** 設定読込前の最小出力処理が外部から受け取る依存関係です。 */
+export type BootstrapConsoleBackendDependencies = {
+	readonly output: (...args: unknown[]) => void;
+};
+
+const defaultDependencies: BootstrapConsoleBackendDependencies = {
+	output: (...args) => console.log(...args),
+};
+
+/**
+ * 設定読込前でも利用できる、依存の少ないコンソール出力です。
+ * 設定ファイルの読み込み失敗を報告するため、Pretty backendやTelemetryには依存しません。
+ */
+export class BootstrapConsoleBackend implements LogBackend {
+	private readonly dependencies: BootstrapConsoleBackendDependencies;
+
+	constructor(dependencies: Partial<BootstrapConsoleBackendDependencies> = {}) {
+		this.dependencies = {
+			...defaultDependencies,
+			...dependencies,
+		};
+	}
+
+	public write(record: LogRecord): void {
+		const worker = record.isPrimary ? '*' : record.workerId ?? '?';
+		const line = `${record.timestamp} ${record.level.toUpperCase()} ${worker}\t[${record.loggerName}]\t${record.message}`;
+		const args: unknown[] = [line];
+
+		if (record.compatibility?.data != null) {
+			args.push(record.compatibility.data);
+		} else if (record.eventName != null || record.attributes != null || record.error != null) {
+			args.push({
+				...(record.eventName != null ? { eventName: record.eventName } : {}),
+				...(record.attributes != null ? { attributes: record.attributes } : {}),
+				...(record.error != null ? { error: record.error } : {}),
+			});
+		}
+
+		this.dependencies.output(...args);
+	}
+}

packages/backend/src/logging/JsonConsoleBackend.ts

@@ -0,0 +1,71 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { LogBackend } from './LogBackend.js';
+import type { LogRecord } from './types.js';
+
+/** JSON形式のログを1行で出力する処理が外部から受け取る依存関係です。 */
+export type JsonConsoleBackendDependencies = {
+	readonly output: (line: string) => void;
+};
+
+/** JSON形式で出力する項目を、運用上安定した形として定義します。 */
+type JsonLogRecord = {
+	readonly timestamp: string;
+	readonly level: LogRecord['level'];
+	readonly message: string;
+	readonly loggerName: string;
+	readonly eventName?: string;
+	readonly attributes?: LogRecord['attributes'];
+	readonly error?: LogRecord['error'];
+	readonly processId: number;
+	readonly isPrimary: boolean;
+	readonly workerId: number | null;
+};
+
+const defaultDependencies: JsonConsoleBackendDependencies = {
+	output: line => console.log(line),
+};
+
+/** LogRecordからJSONへ出す項目だけを選び、内部情報を誤って含めないようにします。 */
+function createJsonLogRecord(record: LogRecord): JsonLogRecord {
+	// 色や旧APIの生データは表示専用の情報なので、機械向け形式へは持ち込みません。
+	return {
+		timestamp: record.timestamp,
+		level: record.level,
+		message: record.message,
+		loggerName: record.loggerName,
+		// 任意項目は値がある場合だけ含め、空の項目を増やさないようにします。
+		...(record.eventName != null ? { eventName: record.eventName } : {}),
+		...(record.attributes != null ? { attributes: record.attributes } : {}),
+		...(record.error != null ? { error: record.error } : {}),
+		// 実行主体の情報は常に出し、ログを横断して検索できる形を保ちます。
+		processId: record.processId,
+		isPrimary: record.isPrimary,
+		workerId: record.workerId,
+	};
+}
+
+/**
+ * LogRecordを1行のJSONへ変換し、ログ収集基盤が扱える標準出力へ渡します。
+ * LoggerやLogManagerから出力形式を切り離し、Pretty形式と同じ記録を共有します。
+ */
+export class JsonConsoleBackend implements LogBackend {
+	private readonly dependencies: JsonConsoleBackendDependencies;
+
+	/** 出力処理を受け取り、テストや起動環境ごとに出力先を差し替えます。 */
+	constructor(dependencies: Partial<JsonConsoleBackendDependencies> = {}) {
+		this.dependencies = {
+			...defaultDependencies,
+			...dependencies,
+		};
+	}
+
+	/** 1件のログをJSON文字列へ変換し、改行を含まない1回の出力として渡します。 */
+	public write(record: LogRecord): void {
+		// JSON.stringifyが改行などをエスケープするため、1ログ1行の契約を保てます。
+		this.dependencies.output(JSON.stringify(createJsonLogRecord(record)));
+	}
+}

packages/backend/src/logging/LogBackend.ts

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { LogRecord } from './types.js';
+
+/**
+ * 整形済みのログを実際の出力先へ渡すための共通窓口です。
+ * Loggerを特定の出力形式へ依存させず、後から出力先を追加できるようにします。
+ */
+export interface LogBackend {
+	/** ログを一件出力します。 */
+	write(record: LogRecord): void;
+
+	/** 保留中の出力がある場合に、すべて書き出します。 */
+	flush?(): void | Promise<void>;
+
+	/** 出力先が持つ資源を解放します。 */
+	close?(): void | Promise<void>;
+}

packages/backend/src/logging/LogManager.ts

@@ -0,0 +1,237 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import cluster from 'node:cluster';
+import process from 'node:process';
+import { envOption } from '@/env.js';
+import {
+	findLegacyLogError,
+	normalizeLogAttributes,
+	serializeLogError,
+	type LogNormalizationProfile,
+} from './LogNormalizer.js';
+import type { LogBackend } from './LogBackend.js';
+import type { LogLevel, LogLevelSetting, LogRecord, LogRecordInput } from './types.js';
+
+/** ログを出力したプロセスを識別するための情報です。 */
+export type LogProcessInfo = {
+	readonly processId: number;
+	readonly isPrimary: boolean;
+	readonly workerId: number | null;
+};
+
+/**
+ * 実行環境から取得する値をまとめた依存関係です。
+ * テストでは固定値へ差し替え、時刻やプロセス状態に左右されないようにします。
+ */
+export type LogManagerDependencies = {
+	readonly now: () => Date;
+	readonly getProcessInfo: () => LogProcessInfo;
+	readonly isQuiet: () => boolean;
+	readonly isVerbose: () => boolean;
+	readonly getNodeEnv: () => string | undefined;
+};
+
+/** ログ管理の初期化時に指定できる正規化設定です。 */
+export type LogManagerOptions = {
+	readonly normalizationProfile?: LogNormalizationProfile;
+};
+
+/** 起動時に適用するログ出力設定です。 */
+export type LogManagerConfiguration = {
+	readonly level?: LogLevelSetting;
+	readonly domains?: Readonly<Record<string, LogLevelSetting>> | null;
+};
+
+const logLevelOrder: Readonly<Record<LogLevel, number>> = {
+	debug: 0,
+	info: 1,
+	warn: 2,
+	error: 3,
+	fatal: 4,
+};
+
+const validLogLevels = new Set<LogLevelSetting>(['debug', 'info', 'warn', 'error', 'fatal', 'off']);
+
+function validateLogLevel(value: unknown, path: string): LogLevelSetting | undefined {
+	if (typeof value === 'undefined') return undefined;
+	if (typeof value !== 'string' || !validLogLevels.has(value as LogLevelSetting)) {
+		throw new Error(`${path} must be one of debug, info, warn, error, fatal, or off`);
+	}
+	return value as LogLevelSetting;
+}
+
+function validateDomainName(domain: string): void {
+	if (domain.length === 0 || domain.trim() !== domain || domain.split('.').some(segment => segment.length === 0)) {
+		throw new Error(`logging.domains contains an invalid domain name: ${JSON.stringify(domain)}`);
+	}
+}
+
+function resolveConfiguration(configuration: LogManagerConfiguration | undefined): {
+	readonly level: LogLevelSetting | undefined;
+	readonly domains: readonly (readonly [string, LogLevelSetting])[];
+} {
+	if (configuration == null) return { level: undefined, domains: [] };
+
+	const level = validateLogLevel(configuration.level, 'logging.level');
+	if (configuration.domains == null) return { level, domains: [] };
+	if (typeof configuration.domains !== 'object' || configuration.domains === null || Array.isArray(configuration.domains)) {
+		throw new Error('logging.domains must be an object');
+	}
+
+	const domains = Object.entries(configuration.domains).map(([domain, value]) => {
+		validateDomainName(domain);
+		const level = validateLogLevel(value, `logging.domains.${domain}`);
+		if (typeof level === 'undefined') {
+			throw new Error(`logging.domains.${domain} must be configured`);
+		}
+		return [domain, level] as const;
+	}).sort((left, right) => right[0].length - left[0].length);
+
+	return { level, domains };
+}
+
+const defaultDependencies: LogManagerDependencies = {
+	now: () => new Date(),
+	getProcessInfo: () => ({
+		processId: process.pid,
+		isPrimary: cluster.isPrimary,
+		workerId: cluster.isPrimary ? null : (cluster.worker?.id ?? null),
+	}),
+	isQuiet: () => envOption.quiet,
+	isVerbose: () => envOption.verbose,
+	getNodeEnv: () => process.env.NODE_ENV,
+};
+
+/**
+ * ログの出力可否を判断し、すべての出力先で共通となる情報を付加します。
+ * Loggerと出力先の間に置くことで、設定や共通情報の扱いを一か所へ集約します。
+ */
+export class LogManager {
+	private backend: LogBackend;
+	private readonly dependencies: LogManagerDependencies;
+	private normalizationProfile: LogNormalizationProfile;
+	private configuredLevel: LogLevelSetting | undefined;
+	private configuredDomains: readonly (readonly [string, LogLevelSetting])[];
+	private shutdownPromise: Promise<void> | undefined;
+
+	/**
+	 * 出力先と実行環境から値を取得する処理を受け取ります。
+	 * 実行環境の取得処理は、必要な項目だけテスト用に差し替えられます。
+	 */
+	constructor(
+		backend: LogBackend,
+		dependencies: Partial<LogManagerDependencies> = {},
+		options: LogManagerOptions = {},
+	) {
+		this.backend = backend;
+		this.dependencies = {
+			...defaultDependencies,
+			...dependencies,
+		};
+		this.normalizationProfile = options.normalizationProfile ?? 'standard';
+		this.configuredLevel = undefined;
+		this.configuredDomains = [];
+	}
+
+	/**
+	 * 以後のログを書き込む出力先を切り替えます。
+	 * 作成済みのLoggerにも切り替えを反映するため、LogManager側で保持します。
+	 */
+	public setBackend(backend: LogBackend): void {
+		this.backend = backend;
+	}
+
+	/** 起動時の既定levelとdomain別levelを適用します。 */
+	public configure(configuration?: LogManagerConfiguration): void {
+		const resolved = resolveConfiguration(configuration);
+		this.configuredLevel = resolved.level;
+		this.configuredDomains = resolved.domains;
+	}
+
+	/** 正規化方式を切り替え、既に作成済みのLoggerにも反映します。 */
+	public setNormalizationProfile(profile: LogNormalizationProfile): void {
+		this.normalizationProfile = profile;
+	}
+
+	/** backendに残っているログをflushしてから終了処理を行います。 */
+	public shutdown(): Promise<void> {
+		if (this.shutdownPromise != null) return this.shutdownPromise;
+
+		this.shutdownPromise = (async () => {
+			try {
+				await this.backend.flush?.();
+			} finally {
+				await this.backend.close?.();
+			}
+		})();
+
+		return this.shutdownPromise;
+	}
+
+	private getDefaultLevel(): LogLevel {
+		if (this.dependencies.isVerbose()) return 'debug';
+		return this.dependencies.getNodeEnv() === 'production' ? 'info' : 'debug';
+	}
+
+	private getThreshold(loggerName: string): LogLevelSetting {
+		let threshold: LogLevelSetting | undefined;
+		for (const [domain, level] of this.configuredDomains) {
+			if (loggerName === domain || loggerName.startsWith(`${domain}.`)) {
+				threshold = level;
+				break;
+			}
+		}
+
+		threshold ??= this.configuredLevel ?? this.getDefaultLevel();
+
+		// verboseは障害調査用の緊急モードとして、明示されたoff以外をdebugまで下げる。
+		// offは意図的な無効化なので、verboseでも再有効化しない。
+		return threshold === 'off' || !this.dependencies.isVerbose() ? threshold : 'debug';
+	}
+
+	private shouldWrite(input: LogRecordInput, loggerName: string): boolean {
+		const threshold = this.getThreshold(loggerName);
+		if (threshold === 'off') return false;
+		return logLevelOrder[input.level] >= logLevelOrder[threshold];
+	}
+
+	/**
+	 * 出力条件を確認し、共通情報を付加して出力先へ渡します。
+	 */
+	public write(input: LogRecordInput): void {
+		// `quiet`は他の条件より優先し、ログに付随する情報の取得も行いません。
+		if (this.dependencies.isQuiet()) return;
+
+		const loggerName = input.context.map(segment => segment.name).join('.');
+		if (!this.shouldWrite(input, loggerName)) return;
+
+		const processInfo = this.dependencies.getProcessInfo();
+		// 呼び出し側の配列を共有せず、親から末端までの順序を固定します。
+		const context = [...input.context];
+		// 出力を実際に行う直前にだけ正規化し、捨てられるdebugログのコストを抑えます。
+		const { attributes, error: inputError, ...inputWithoutStructuredValues } = input;
+		const normalizedAttributes = typeof attributes !== 'undefined'
+			? normalizeLogAttributes(attributes, { profile: this.normalizationProfile })
+			: undefined;
+		const error = inputError ?? findLegacyLogError(input.compatibility?.data);
+		const normalizedError = typeof error !== 'undefined'
+			? serializeLogError(error, { profile: this.normalizationProfile })
+			: undefined;
+		const record = {
+			...inputWithoutStructuredValues,
+			context,
+			timestamp: this.dependencies.now().toISOString(),
+			loggerName,
+			processId: processInfo.processId,
+			isPrimary: processInfo.isPrimary,
+			workerId: processInfo.workerId,
+			...(normalizedAttributes ? { attributes: normalizedAttributes } : {}),
+			...(normalizedError ? { error: normalizedError } : {}),
+		} as LogRecord;
+
+		this.backend.write(record);
+	}
+}

packages/backend/src/logging/LogNormalizer.ts

@@ -0,0 +1,386 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Buffer } from 'node:buffer';
+import type { LogAttributeValue, LogAttributes, SerializedError } from './types.js';
+
+/** 正規化の粒度を表します。詳細指定でも秘匿処理は常に有効です。 */
+export type LogNormalizationProfile = 'standard' | 'detailed';
+
+/** 正規化で使う上限値です。 */
+export type LogNormalizationLimits = {
+	readonly maxDepth: number;
+	readonly maxEntries: number;
+	readonly maxStringBytes: number;
+	readonly maxBytes: number;
+};
+
+/** 属性のキーを秘匿すべきか判定する関数です。 */
+export type LogRedactor = (path: readonly string[], key: string) => boolean;
+
+/** 正規化処理へ渡す設定です。 */
+export type LogNormalizationOptions = {
+	readonly profile?: LogNormalizationProfile;
+	readonly limits?: Partial<LogNormalizationLimits>;
+	readonly redactor?: LogRedactor;
+};
+
+/** 通常運用でログが肥大化しないようにした上限です。 */
+export const STANDARD_LOG_NORMALIZATION_LIMITS: LogNormalizationLimits = {
+	maxDepth: 6,
+	maxEntries: 100,
+	maxStringBytes: 8 * 1024,
+	maxBytes: 64 * 1024,
+};
+
+/** 障害調査時により多くの情報を残す上限です。 */
+export const DETAILED_LOG_NORMALIZATION_LIMITS: LogNormalizationLimits = {
+	maxDepth: 10,
+	maxEntries: 1000,
+	maxStringBytes: 64 * 1024,
+	maxBytes: 256 * 1024,
+};
+
+const REDACTED = '[REDACTED]';
+const CIRCULAR = '[Circular]';
+const TRUNCATED = '[Truncated]';
+const UNSUPPORTED = '[Unsupported]';
+const TRUNCATED_KEY = '[Truncated]';
+
+const sensitiveKeyParts = [
+	'password',
+	'passwd',
+	'passphrase',
+	'token',
+	'secret',
+	'authorization',
+	'cookie',
+	'apikey',
+	'privatekey',
+	'credential',
+	'hcaptcharesponse',
+	'grecaptcharesponse',
+	'turnstileresponse',
+	'mcaptcharesponse',
+	'testcaptcharesponse',
+];
+
+/** キー名を比較用に揃え、区切り文字による表記揺れを吸収します。 */
+function normalizeKey(key: string): string {
+	return key.toLowerCase().replace(/[-_.\s]/g, '');
+}
+
+/** 既定の秘匿対象を判定します。Misskey APIの`i`も認証情報として扱います。 */
+export function defaultLogRedactor(_path: readonly string[], key: string): boolean {
+	const normalized = normalizeKey(key);
+	return normalized === 'i' || sensitiveKeyParts.some(part => normalized.includes(part));
+}
+
+/** 選択した方式と個別指定を合わせて、実際の上限値を決めます。 */
+export function resolveLogNormalizationLimits(options: LogNormalizationOptions = {}): LogNormalizationLimits {
+	const base = options.profile === 'detailed'
+		? DETAILED_LOG_NORMALIZATION_LIMITS
+		: STANDARD_LOG_NORMALIZATION_LIMITS;
+	const limits = {
+		...base,
+		...options.limits,
+	};
+	return {
+		maxDepth: Math.max(0, limits.maxDepth),
+		maxEntries: Math.max(0, limits.maxEntries),
+		maxStringBytes: Math.max(1, limits.maxStringBytes),
+		maxBytes: Math.max(2, limits.maxBytes),
+	};
+}
+
+/** 値が通常のオブジェクトとして読めるか判定します。 */
+function isObject(value: unknown): value is Record<string, unknown> {
+	return typeof value === 'object' && value !== null;
+}
+
+/** 外部入力のキーを安全に格納するため、prototypeを持たない属性領域を作成します。 */
+function createAttributeMap(): Record<string, LogAttributeValue> {
+	return Object.create(null) as Record<string, LogAttributeValue>;
+}
+
+/** 値を文字列化し、文字列化処理自体の例外もログ処理へ漏らさないようにします。 */
+function stringifySafely(value: unknown): string {
+	try {
+		return String(value);
+	} catch {
+		return UNSUPPORTED;
+	}
+}
+
+/** UTF-8のバイト数を測ります。ログの上限を文字数ではなく出力サイズで揃えるために使います。 */
+function byteLength(value: string): number {
+	return Buffer.byteLength(value, 'utf8');
+}
+
+/** 文字列をUTF-8の上限内へ切り詰めます。 */
+function normalizeString(value: string, maxBytes: number): string {
+	if (byteLength(value) <= maxBytes) return value;
+	const suffix = `…${TRUNCATED}`;
+	if (byteLength(suffix) > maxBytes) {
+		const end = findMaxPrefixLength(value, '', maxBytes);
+		return value.slice(0, end);
+	}
+	const end = findMaxPrefixLength(value, suffix, maxBytes);
+	return value.slice(0, end) + suffix;
+}
+
+/** 指定した後置文字列を含めて上限に収まる接頭辞の長さを二分探索します。 */
+function findMaxPrefixLength(value: string, suffix: string, maxBytes: number): number {
+	let lower = 0;
+	let upper = value.length;
+	while (lower < upper) {
+		const middle = Math.ceil((lower + upper) / 2);
+		if (byteLength(value.slice(0, middle) + suffix) <= maxBytes) {
+			lower = middle;
+		} else {
+			upper = middle - 1;
+		}
+	}
+	// UTF-16のサロゲート対を途中で切らないよう、必要なら1文字戻します。
+	if (lower > 0 && lower < value.length) {
+		const code = value.charCodeAt(lower - 1);
+		if (code >= 0xd800 && code <= 0xdbff) lower--;
+	}
+	return lower;
+}
+
+/** 特殊な値に対しても、エラー判定で例外を発生させないようにします。 */
+function isErrorValue(value: unknown): value is Error {
+	try {
+		return value instanceof Error;
+	} catch {
+		return false;
+	}
+}
+
+/** 値の読み出しを安全に行い、壊れたログ属性が本処理を中断しないようにします。 */
+function readProperty(value: Record<string, unknown>, key: string): unknown {
+	try {
+		return value[key];
+	} catch {
+		return `${UNSUPPORTED}: property access failed`;
+	}
+}
+
+/** 属性をJSONへ出力できる値へ変換します。 */
+function normalizeValue(
+	value: unknown,
+	path: readonly string[],
+	depth: number,
+	seen: WeakSet<object>,
+	limits: LogNormalizationLimits,
+	redactor: LogRedactor,
+): LogAttributeValue {
+	if (value === null) return null;
+	if (typeof value === 'string') return normalizeString(value, limits.maxStringBytes);
+	if (typeof value === 'boolean') return value;
+	if (typeof value === 'number') return Number.isFinite(value) ? value : stringifySafely(value);
+	if (typeof value === 'bigint') return value.toString(10);
+	if (typeof value === 'undefined') return `${UNSUPPORTED}: undefined`;
+	if (typeof value === 'function' || typeof value === 'symbol') return `${UNSUPPORTED}: ${typeof value}`;
+	let isArray = false;
+	try {
+		if (value instanceof Date) {
+			return normalizeString(value.toISOString(), limits.maxStringBytes);
+		}
+		isArray = Array.isArray(value);
+		if (!isArray) {
+			const prototype = Object.getPrototypeOf(value);
+			if (prototype !== Object.prototype && prototype !== null) return `${UNSUPPORTED}: object`;
+		}
+	} catch {
+		return `${UNSUPPORTED}: object access failed`;
+	}
+	if (seen.has(value)) return CIRCULAR;
+	if (depth >= limits.maxDepth) return TRUNCATED;
+	seen.add(value);
+
+	try {
+		if (isArray) {
+			const arrayValue = value as readonly unknown[];
+			const result: LogAttributeValue[] = [];
+			const entries = Math.min(arrayValue.length, limits.maxEntries);
+			for (let i = 0; i < entries; i++) {
+				result.push(normalizeValue(arrayValue[i], [...path, String(i)], depth + 1, seen, limits, redactor));
+			}
+			if (arrayValue.length > entries) result.push(TRUNCATED);
+			return result;
+		}
+
+		// 攻撃者が指定した`__proto__`を通常の属性として保持するため、null prototypeを使います。
+		const result = createAttributeMap();
+		const keys = Object.keys(value).sort();
+		const entries = Math.min(keys.length, limits.maxEntries);
+		for (let i = 0; i < entries; i++) {
+			const key = keys[i];
+			// 秘匿対象は値を読み出す前に置き換え、読み出し処理や巨大な値にも触れません。
+			result[key] = redactor(path, key)
+				? REDACTED
+				: normalizeValue(readProperty(value as Record<string, unknown>, key), [...path, key], depth + 1, seen, limits, redactor);
+		}
+		if (keys.length > entries) result[TRUNCATED_KEY] = TRUNCATED;
+		return result;
+	} catch {
+		return `${UNSUPPORTED}: object access failed`;
+	} finally {
+		seen.delete(value);
+	}
+}
+
+/** JSON文字列化した値のバイト数を測ります。正規化後の最終上限に使います。 */
+function serializedByteLength(value: LogAttributeValue): number {
+	return byteLength(JSON.stringify(value));
+}
+
+/** 正規化済みの値を上限内へ再帰的に縮めます。 */
+function trimToByteLimit(value: LogAttributeValue, maxBytes: number): LogAttributeValue {
+	if (serializedByteLength(value) <= maxBytes) return value;
+	if (typeof value === 'string') return normalizeString(value, maxBytes);
+	if (Array.isArray(value)) {
+		const result: LogAttributeValue[] = [];
+		for (const item of value) {
+			const trimmedItem = trimToByteLimit(item, maxBytes);
+			const candidate = [...result, trimmedItem];
+			if (serializedByteLength(candidate) > maxBytes) break;
+			result.push(trimmedItem);
+		}
+		if (result.length < value.length && serializedByteLength([...result, TRUNCATED]) <= maxBytes) result.push(TRUNCATED);
+		return result;
+	}
+	if (isObject(value)) {
+		// 上限調整中も`__proto__`を安全に属性として扱えるようにします。
+		const result = createAttributeMap();
+		for (const key of Object.keys(value).sort()) {
+			const candidate = Object.assign(createAttributeMap(), result, { [key]: trimToByteLimit(value[key], maxBytes) });
+			if (serializedByteLength(candidate) > maxBytes) break;
+			result[key] = candidate[key];
+		}
+		if (Object.keys(result).length < Object.keys(value).length) {
+			const candidate = Object.assign(createAttributeMap(), result, { [TRUNCATED_KEY]: TRUNCATED });
+			if (serializedByteLength(candidate) <= maxBytes) return candidate;
+		}
+		return result;
+	}
+	return TRUNCATED;
+}
+
+/** エラーらしい原因情報かを安全に判定します。特殊な値もログ処理を壊しません。 */
+function isErrorLike(value: unknown): value is Record<string, unknown> {
+	if (!isObject(value)) return false;
+	try {
+		return ['name', 'message', 'stack', 'cause'].some(key => key in value);
+	} catch {
+		return false;
+	}
+}
+
+/** 属性をJSONへ出力できるオブジェクトへ正規化します。 */
+export function normalizeLogAttributes(value: unknown, options: LogNormalizationOptions = {}): LogAttributes {
+	const limits = resolveLogNormalizationLimits(options);
+	const redactor = options.redactor ?? defaultLogRedactor;
+	const normalized = normalizeValue(value, [], 0, new WeakSet<object>(), limits, redactor);
+	const root = isObject(normalized) && !Array.isArray(normalized) ? normalized : { value: normalized };
+	return trimToByteLimit(root as LogAttributes, limits.maxBytes) as LogAttributes;
+}
+
+/** 旧APIのdata領域から、エラー本体を見つけて構造化した形へ渡します。 */
+export function findLegacyLogError(value: unknown): unknown {
+	if (isErrorValue(value)) return value;
+	if (!isObject(value)) return undefined;
+	for (const key of ['e', 'err', 'error', 'stack']) {
+		const candidate = readProperty(value, key);
+		if (isErrorValue(candidate)) return candidate;
+	}
+	return undefined;
+}
+
+/** エラーの原因情報を含めて、一定の形へ正規化します。 */
+function serializeErrorValue(
+	value: unknown,
+	depth: number,
+	seen: WeakSet<object>,
+	limits: LogNormalizationLimits,
+	redactor: LogRedactor,
+): SerializedError {
+	if (!isObject(value)) {
+		return {
+			type: value === null ? 'null' : typeof value,
+			message: normalizeString(stringifySafely(value), limits.maxStringBytes),
+		};
+	}
+	if (seen.has(value)) return { type: 'CircularError', message: CIRCULAR };
+	seen.add(value);
+
+	try {
+		const name = readProperty(value, 'name');
+		const message = readProperty(value, 'message');
+		const stack = readProperty(value, 'stack');
+		const cause = readProperty(value, 'cause');
+		const constructor = readProperty(value, 'constructor');
+		const constructorName = typeof constructor === 'function' || isObject(constructor)
+			? readProperty(constructor as Record<string, unknown>, 'name')
+			: undefined;
+		const type = normalizeString(
+			typeof name === 'string' && name.length > 0
+				? name
+				: typeof constructorName === 'string' && constructorName.length > 0 ? constructorName : 'Error',
+			limits.maxStringBytes,
+		);
+		const result: { type: string; message: string; stack?: string; cause?: SerializedError | LogAttributeValue } = {
+			type,
+			message: normalizeString(typeof message === 'string' ? message : stringifySafely(value), limits.maxStringBytes),
+		};
+		if (typeof stack === 'string') result.stack = normalizeString(stack, limits.maxStringBytes);
+		if (typeof cause !== 'undefined') {
+			result.cause = depth < limits.maxDepth
+				? isErrorValue(cause) || isErrorLike(cause)
+					? serializeErrorValue(cause, depth + 1, seen, limits, redactor)
+					: normalizeValue(cause, ['cause'], depth + 1, seen, limits, redactor)
+				: TRUNCATED;
+		}
+		return result;
+	} finally {
+		seen.delete(value);
+	}
+}
+
+/** エラーの必須項目を残したまま、全体の出力サイズを上限内へ縮めます。 */
+function trimSerializedError(value: SerializedError, maxBytes: number): SerializedError {
+	const requiredLimit = Math.max(0, Math.floor((maxBytes - 24) / 2));
+	const result: { type: string; message: string; stack?: string; cause?: SerializedError | LogAttributeValue } = {
+		type: normalizeString(value.type, requiredLimit),
+		message: normalizeString(value.message, requiredLimit),
+	};
+	if (serializedByteLength(result as unknown as LogAttributeValue) > maxBytes) {
+		return { type: '', message: '' };
+	}
+	if (value.stack != null) {
+		const candidate = { ...result, stack: value.stack };
+		if (serializedByteLength(candidate as unknown as LogAttributeValue) <= maxBytes) result.stack = value.stack;
+	}
+	if (value.cause != null) {
+		const cause = typeof value.cause === 'object'
+			? trimToByteLimit(value.cause as LogAttributeValue, maxBytes)
+			: value.cause;
+		const candidate = { ...result, cause };
+		if (serializedByteLength(candidate as unknown as LogAttributeValue) <= maxBytes) result.cause = cause as SerializedError | LogAttributeValue;
+	}
+	return result;
+}
+
+/** 任意のエラー入力を、ログへ安全に埋め込める形へ変換します。 */
+export function serializeLogError(value: unknown, options: LogNormalizationOptions = {}): SerializedError | undefined {
+	if (typeof value === 'undefined' || value === null) return undefined;
+	const limits = resolveLogNormalizationLimits(options);
+	// 必須項目を含む最小のJSON形すら収まらない場合は、上限を超えないよう出力しません。
+	if (limits.maxBytes < 24) return undefined;
+	const serialized = serializeErrorValue(value, 0, new WeakSet<object>(), limits, options.redactor ?? defaultLogRedactor);
+	return trimSerializedError(serialized, limits.maxBytes);
+}

packages/backend/src/logging/PrettyConsoleBackend.ts

@@ -0,0 +1,90 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import chalk from 'chalk';
+import { default as convertColor } from 'color-convert';
+import { format as dateFormat } from 'date-fns';
+import { envOption } from '@/env.js';
+import type { LogBackend } from './LogBackend.js';
+import type { LogRecord } from './types.js';
+
+/** 見やすい形式の出力処理が外部から受け取る依存関係です。 */
+export type PrettyConsoleBackendDependencies = {
+	readonly output: (...args: unknown[]) => void;
+	readonly withLogTime: () => boolean;
+};
+
+const defaultDependencies: PrettyConsoleBackendDependencies = {
+	output: (...args) => console.log(...args),
+	withLogTime: () => envOption.withLogTime,
+};
+
+/**
+ * 人が読みやすい従来形式へ整形し、コンソールへ出力します。
+ * 色、ラベル、時刻などの見た目だけを担当し、出力可否はLogManagerへ任せます。
+ */
+export class PrettyConsoleBackend implements LogBackend {
+	private readonly dependencies: PrettyConsoleBackendDependencies;
+
+	/**
+	 * 出力処理と時刻表示の判定処理を受け取ります。
+	 * 省略時は従来どおり、標準のコンソールと環境設定を使用します。
+	 */
+	constructor(dependencies: Partial<PrettyConsoleBackendDependencies> = {}) {
+		this.dependencies = {
+			...defaultDependencies,
+			...dependencies,
+		};
+	}
+
+	/**
+	 * 共通のログを従来形式へ整形して一件出力します。
+	 */
+	public write(record: LogRecord): void {
+		const legacyLevel = record.compatibility?.legacyLevel;
+		// `fatal`は重大なエラーとして扱い、従来の`important`と同じ強調表示にします。
+		const important = record.level === 'fatal' || (record.compatibility?.important ?? false);
+		const presentationLevel = record.level === 'fatal' ? 'error' : (legacyLevel ?? record.level);
+		const label =
+			presentationLevel === 'error' ? important ? chalk.bgRed.white('ERR ') : chalk.red('ERR ') :
+			presentationLevel === 'warn' ? chalk.yellow('WARN') :
+			presentationLevel === 'success' ? important ? chalk.bgGreen.white('DONE') : chalk.green('DONE') :
+			presentationLevel === 'debug' ? chalk.gray('VERB') :
+			presentationLevel === 'info' ? chalk.blue('INFO') :
+			null;
+		const contexts = record.context.map(context => context.color
+			? chalk.rgb(...convertColor.keyword.rgb(context.color))(context.name)
+			: chalk.white(context.name));
+		const message =
+			presentationLevel === 'error' ? chalk.red(record.message) :
+			presentationLevel === 'warn' ? chalk.yellow(record.message) :
+			presentationLevel === 'success' ? chalk.green(record.message) :
+			presentationLevel === 'debug' ? chalk.gray(record.message) :
+			presentationLevel === 'info' ? record.message :
+			null;
+		// 主プロセスは従来どおり「*」、子プロセスはワーカー番号で識別します。
+		const worker = record.isPrimary ? '*' : record.workerId;
+
+		let log = `${label} ${worker}\t[${contexts.join(' ')}]\t${message}`;
+		if (this.dependencies.withLogTime()) {
+			log = chalk.gray(dateFormat(new Date(record.timestamp), 'HH:mm:ss')) + ' ' + log;
+		}
+
+		// `data`は文字列へ埋め込まず、第2引数として渡す従来の挙動を維持します。
+		const args: unknown[] = [important ? chalk.bold(log) : log];
+		if (record.compatibility?.data != null) {
+			// 旧形式の値はそのまま第2引数へ渡し、既存の表示と調査方法を保ちます。
+			args.push(record.compatibility.data);
+		} else if (record.eventName != null || record.attributes != null || record.error != null) {
+			// 構造化ログは、専用の出力先がなくても調査情報を確認できるようにします。
+			args.push({
+				...(record.eventName != null ? { eventName: record.eventName } : {}),
+				...(record.attributes != null ? { attributes: record.attributes } : {}),
+				...(record.error != null ? { error: record.error } : {}),
+			});
+		}
+		this.dependencies.output(...args);
+	}
+}

packages/backend/src/logging/logging-runtime.ts

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { LogManager } from './LogManager.js';
+import { BootstrapConsoleBackend } from './BootstrapConsoleBackend.js';
+import { JsonConsoleBackend } from './JsonConsoleBackend.js';
+import { PrettyConsoleBackend } from './PrettyConsoleBackend.js';
+import type { LogManagerConfiguration } from './LogManager.js';
+import type { LogBackend } from './LogBackend.js';
+import type { LogFormat } from './types.js';
+
+/**
+ * プロセス内のすべてのLoggerが共有するLogManagerです。
+ * Logger作成後も同じLogManagerを参照するため、出力先の切り替えを一括で反映できます。
+ */
+export const logManager = new LogManager(new BootstrapConsoleBackend());
+
+/** ログ形式を検証し、指定された形式に対応する出力処理を作成します。 */
+function createLoggingBackend(format: unknown): LogBackend {
+	if (format == null || format === 'pretty') return new PrettyConsoleBackend();
+	if (format === 'json') return new JsonConsoleBackend();
+	throw new Error('logging.format must be either pretty or json');
+}
+
+/** 起動時のログ設定を適用し、選択した出力処理へ切り替えます。 */
+export function configureLogging(configuration?: LogManagerConfiguration & { readonly format?: LogFormat }): void {
+	// 出力処理を先に検証し、設定値が不正な場合は現在の出力処理を壊さないようにします。
+	const backend = createLoggingBackend(configuration?.format);
+	logManager.configure(configuration);
+	logManager.setBackend(backend);
+}
+
+/** プロセス終了前に現在のログ出力処理を保留分まで書き出して閉じます。 */
+export function shutdownLogging(): Promise<void> {
+	return logManager.shutdown();
+}

packages/backend/src/logging/types.ts

@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Keyword } from 'color-convert';
+
+/** ログの重要度を表します。 */
+export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+/** 設定で指定できるログの閾値です。`off`はログイベントのlevelには使用しません。 */
+export type LogLevelSetting = LogLevel | 'off';
+
+/** コンソールへ出すログ形式です。未指定時は見やすい形式を使用します。 */
+export type LogFormat = 'pretty' | 'json';
+
+/** 正規化後にログ属性として扱えるJSONの値です。 */
+export type LogAttributeValue =
+	| string
+	| number
+	| boolean
+	| null
+	| readonly LogAttributeValue[]
+	| { readonly [key: string]: LogAttributeValue };
+
+/** 正規化後のログ属性です。 */
+export type LogAttributes = Readonly<Record<string, LogAttributeValue>>;
+
+/** ロガーの呼び出し側が構造化ログとして指定する入力です。 */
+export type LogWriteInput = {
+	readonly level: LogLevel;
+	readonly message: string;
+	readonly eventName?: string;
+	readonly attributes?: Readonly<Record<string, unknown>>;
+	readonly error?: unknown;
+};
+
+/**
+ * ロガー名を構成する一要素です。
+ * 色は見やすい形式での表示だけに使い、ログの意味には影響させません。
+ */
+export type LoggerContext = {
+	readonly name: string;
+	readonly color?: Keyword;
+};
+
+/**
+ * 従来のコンソール表示を維持するための情報です。
+ * 構造化ログの項目と混同しないよう、互換用の領域へ分離しています。
+ * `data`は従来表示を保つため正規化せず、秘匿が必要な値は構造化属性へ移します。
+ */
+export type LogCompatibility = {
+	readonly legacyLevel?: 'success';
+	readonly important?: boolean;
+	readonly data?: unknown;
+};
+
+/**
+ * 呼び出し側からLogManagerへ渡す、時刻などを付加する前のログです。
+ */
+export type LogRecordInput = LogWriteInput & {
+	readonly context: readonly LoggerContext[];
+	readonly compatibility?: LogCompatibility;
+};
+
+/** エラーをJSONへ出力するために正規化した形です。 */
+export type SerializedError = {
+	readonly type: string;
+	readonly message: string;
+	readonly stack?: string;
+	readonly cause?: SerializedError | LogAttributeValue;
+};
+
+/**
+ * 出力先へ渡すログです。
+ * `compatibility.data`は見やすい形式だけが使う従来値で、構造化した出力先は属性とエラーを利用します。
+ */
+export type LogRecord = Omit<LogRecordInput, 'attributes' | 'error'> & {
+	readonly timestamp: string;
+	readonly loggerName: string;
+	readonly processId: number;
+	readonly isPrimary: boolean;
+	readonly workerId: number | null;
+	readonly attributes?: LogAttributes;
+	readonly error?: SerializedError;
+};

packages/backend/src/misc/cache.ts

@@ -204,14 +204,13 @@ 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
@@ -220,6 +219,25 @@ 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,
@@ -234,6 +252,11 @@ 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

@@ -672,6 +672,11 @@ export class MiMeta {
 	})
 	public urlPreviewUserAgent: string | null;
 
+	@Column('varchar', {
+		length: 3072, array: true, default: '{}',
+	})
+	public urlPreviewSensitiveList: string[];
+
 	@Column('varchar', {
 		length: 128,
 		default: 'none',

packages/backend/src/queue/QueueProcessorService.ts

@@ -9,6 +9,7 @@ import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
+import { TelemetryService } from '@/core/telemetry/TelemetryService.js';
 import { CheckModeratorsActivityProcessorService } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 import { UserWebhookDeliverProcessorService } from './processors/UserWebhookDeliverProcessorService.js';
 import { SystemWebhookDeliverProcessorService } from './processors/SystemWebhookDeliverProcessorService.js';
@@ -92,6 +93,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		private config: Config,
 
 		private queueLoggerService: QueueLoggerService,
+		private telemetryService: TelemetryService,
 		private userWebhookDeliverProcessorService: UserWebhookDeliverProcessorService,
 		private systemWebhookDeliverProcessorService: SystemWebhookDeliverProcessorService,
 		private endedPollNotificationProcessorService: EndedPollNotificationProcessorService,
@@ -156,13 +158,8 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 		}
 
-		let Sentry: typeof import('@sentry/node') | undefined;
-		if (this.config.sentryForBackend) {
-			import('@sentry/node').then((mod) => {
-				Sentry = mod;
-			});
-		}
-
+		// 以下の各 Worker は job.data に保存された enqueue 元の trace context を復元し、
+		// ジョブの実処理全体を Link または parent の worker span で囲む。
 		//#region system
 		{
 			const processer = (job: Bull.Job) => {
@@ -181,11 +178,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.systemQueueWorker = new Bull.Worker(QUEUE.SYSTEM, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: System: ' + job.name }, () => processer(job));
-				} else {
-					return processer(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: System: ' + job.name, job.data, () => processer(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.SYSTEM),
 				autorun: false,
@@ -198,12 +191,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err: Error) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: System: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: System: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -238,11 +229,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.dbQueueWorker = new Bull.Worker(QUEUE.DB, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: DB: ' + job.name }, () => processer(job));
-				} else {
-					return processer(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: DB: ' + job.name, job.data, () => processer(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.DB),
 				autorun: false,
@@ -255,12 +242,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: DB: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: DB: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -270,11 +255,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region deliver
 		{
 			this.deliverQueueWorker = new Bull.Worker(QUEUE.DELIVER, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: Deliver' }, () => this.deliverProcessorService.process(job));
-				} else {
-					return this.deliverProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: Deliver', job.data, () => this.deliverProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.DELIVER),
 				autorun: false,
@@ -295,12 +276,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: Deliver: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: Deliver: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -310,11 +289,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region inbox
 		{
 			this.inboxQueueWorker = new Bull.Worker(QUEUE.INBOX, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: Inbox' }, () => this.inboxProcessorService.process(job));
-				} else {
-					return this.inboxProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: Inbox', job.data, () => this.inboxProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.INBOX),
 				autorun: false,
@@ -335,12 +310,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} activity=${job ? (job.data.activity ? job.data.activity.id : 'none') : '-'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: Inbox: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: Inbox: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -350,11 +323,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region user-webhook deliver
 		{
 			this.userWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.USER_WEBHOOK_DELIVER, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: UserWebhookDeliver' }, () => this.userWebhookDeliverProcessorService.process(job));
-				} else {
-					return this.userWebhookDeliverProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: UserWebhookDeliver', job.data, () => this.userWebhookDeliverProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.USER_WEBHOOK_DELIVER),
 				autorun: false,
@@ -375,12 +344,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: UserWebhookDeliver: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: UserWebhookDeliver: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -390,11 +357,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region system-webhook deliver
 		{
 			this.systemWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.SYSTEM_WEBHOOK_DELIVER, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: SystemWebhookDeliver' }, () => this.systemWebhookDeliverProcessorService.process(job));
-				} else {
-					return this.systemWebhookDeliverProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: SystemWebhookDeliver', job.data, () => this.systemWebhookDeliverProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.SYSTEM_WEBHOOK_DELIVER),
 				autorun: false,
@@ -415,12 +378,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: SystemWebhookDeliver: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: SystemWebhookDeliver: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -440,11 +401,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.relationshipQueueWorker = new Bull.Worker(QUEUE.RELATIONSHIP, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: Relationship: ' + job.name }, () => processer(job));
-				} else {
-					return processer(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: Relationship: ' + job.name, job.data, () => processer(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.RELATIONSHIP),
 				autorun: false,
@@ -462,12 +419,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: Relationship: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: Relationship: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -485,11 +440,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.objectStorageQueueWorker = new Bull.Worker(QUEUE.OBJECT_STORAGE, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: ObjectStorage: ' + job.name }, () => processer(job));
-				} else {
-					return processer(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: ObjectStorage: ' + job.name, job.data, () => processer(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.OBJECT_STORAGE),
 				autorun: false,
@@ -503,12 +454,10 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
-						Sentry.captureMessage(`Queue: ObjectStorage: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
-							level: 'error',
-							extra: { job, err },
-						});
-					}
+					this.telemetryService.captureMessage(`Queue: ObjectStorage: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
+						level: 'error',
+						extra: { job, err },
+					});
 				})
 				.on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) }))
 				.on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`));
@@ -518,11 +467,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region ended poll notification
 		{
 			this.endedPollNotificationQueueWorker = new Bull.Worker(QUEUE.ENDED_POLL_NOTIFICATION, (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: EndedPollNotification' }, () => this.endedPollNotificationProcessorService.process(job));
-				} else {
-					return this.endedPollNotificationProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: EndedPollNotification', job.data, () => this.endedPollNotificationProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.ENDED_POLL_NOTIFICATION),
 				autorun: false,
@@ -533,11 +478,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region post scheduled note
 		{
 			this.postScheduledNoteQueueWorker = new Bull.Worker(QUEUE.POST_SCHEDULED_NOTE, async (job) => {
-				if (Sentry != null) {
-					return Sentry.startSpan({ name: 'Queue: PostScheduledNote' }, () => this.postScheduledNoteProcessorService.process(job));
-				} else {
-					return this.postScheduledNoteProcessorService.process(job);
-				}
+				return this.telemetryService.startSpanWithTraceContext('Queue: PostScheduledNote', job.data, () => this.postScheduledNoteProcessorService.process(job));
 			}, {
 				...baseWorkerOptions(this.config, QUEUE.POST_SCHEDULED_NOTE),
 				autorun: false,

packages/backend/src/server/ServerService.ts

@@ -21,6 +21,7 @@ import { genIdenticon } from '@/misc/gen-identicon.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { bindThis } from '@/decorators.js';
+import { envOption } from '@/env.js';
 import { ActivityPubServerService } from './ActivityPubServerService.js';
 import { NodeinfoServerService } from './NodeinfoServerService.js';
 import { ApiServerService } from './api/ApiServerService.js';
@@ -31,6 +32,7 @@ import { HealthServerService } from './HealthServerService.js';
 import { ClientServerService } from './web/ClientServerService.js';
 import { OpenApiServerService } from './api/openapi/OpenApiServerService.js';
 import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
+import { registerHttpServerInstrumentation } from './http-server-instrumentation.js';
 
 const _dirname = fileURLToPath(new URL('.', import.meta.url));
 
@@ -79,6 +81,7 @@ export class ServerService implements OnApplicationShutdown {
 			logger: false,
 		});
 		this.#fastify = fastify;
+		await registerHttpServerInstrumentation(fastify, this.config);
 
 		// HSTS
 		// 6months (15552000sec)
@@ -89,6 +92,15 @@ export class ServerService implements OnApplicationShutdown {
 			});
 		}
 
+		// for test
+		if (envOption.enableCrossOriginIsolation) {
+			fastify.addHook('onRequest', (request, reply, done) => {
+				reply.header('Cross-Origin-Opener-Policy', 'same-origin');
+				reply.header('Cross-Origin-Embedder-Policy', 'credentialless');
+				done();
+			});
+		}
+
 		// Register raw-body parser for ActivityPub HTTP signature validation.
 		await fastify.register(fastifyRawBody, {
 			global: false,

packages/backend/src/server/api/ApiCallService.ts

@@ -16,6 +16,7 @@ import type { MiMeta, UserIpsRepository } from '@/models/_.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
+import { TelemetryService } from '@/core/telemetry/TelemetryService.js';
 import type { Config } from '@/config.js';
 import { ApiError } from './error.js';
 import { RateLimiterService } from './RateLimiterService.js';
@@ -36,7 +37,6 @@ export class ApiCallService implements OnApplicationShutdown {
 	private logger: Logger;
 	private userIpHistories: Map<MiUser['id'], Set<string>>;
 	private userIpHistoriesClearIntervalId: NodeJS.Timeout;
-	private Sentry: typeof import('@sentry/node') | null = null;
 
 	constructor(
 		@Inject(DI.meta)
@@ -52,6 +52,7 @@ export class ApiCallService implements OnApplicationShutdown {
 		private rateLimiterService: RateLimiterService,
 		private roleService: RoleService,
 		private apiLoggerService: ApiLoggerService,
+		private telemetryService: TelemetryService,
 	) {
 		this.logger = this.apiLoggerService.logger;
 		this.userIpHistories = new Map<MiUser['id'], Set<string>>();
@@ -59,12 +60,6 @@ export class ApiCallService implements OnApplicationShutdown {
 		this.userIpHistoriesClearIntervalId = setInterval(() => {
 			this.userIpHistories.clear();
 		}, 1000 * 60 * 60);
-
-		if (this.config.sentryForBackend) {
-			import('@sentry/node').then((Sentry) => {
-				this.Sentry = Sentry;
-			});
-		}
 	}
 
 	#sendApiError(reply: FastifyReply, err: ApiError): void {
@@ -115,35 +110,31 @@ export class ApiCallService implements OnApplicationShutdown {
 			throw err;
 		} else {
 			const errId = randomUUID();
-			this.logger.error(`Internal error occurred in ${ep.name}: ${err.message}`, {
-				ep: ep.name,
-				ps: data,
-				e: {
-					message: err.message,
-					code: err.name,
-					stack: err.stack,
-					id: errId,
+			this.logger.write({
+				level: 'error',
+				eventName: 'api.endpoint.failed',
+				message: `Internal error occurred in ${ep.name}: ${err.message}`,
+				attributes: {
+					'api.endpoint': ep.name,
+					'error.id': errId,
+					'api.params': data,
 				},
+				error: err,
 			});
 
-			if (this.Sentry != null) {
-				this.Sentry.captureMessage(`Internal error occurred in ${ep.name}: ${err.message}`, {
-					level: 'error',
-					user: {
-						id: userId,
+			this.telemetryService.captureMessage(`Internal error occurred in ${ep.name}: ${err.message}`, {
+				level: 'error',
+				userId,
+				extra: {
+					ep: ep.name,
+					e: {
+						message: err.message,
+						code: err.name,
+						stack: err.stack,
+						id: errId,
 					},
-					extra: {
-						ep: ep.name,
-						ps: data,
-						e: {
-							message: err.message,
-							code: err.name,
-							stack: err.stack,
-							id: errId,
-						},
-					},
-				});
-			}
+				},
+			});
 
 			throw new ApiError(null, {
 				e: {
@@ -160,7 +151,7 @@ export class ApiCallService implements OnApplicationShutdown {
 		endpoint: IEndpoint & { exec: any },
 		request: FastifyRequest<{ Body: Record<string, unknown> | undefined, Querystring: Record<string, unknown> }>,
 		reply: FastifyReply,
-	): void {
+	): Promise<void> {
 		const body = request.method === 'GET'
 			? request.query
 			: request.body;
@@ -171,10 +162,11 @@ export class ApiCallService implements OnApplicationShutdown {
 			: body?.['i'];
 		if (token != null && typeof token !== 'string') {
 			reply.code(400);
-			return;
+			return Promise.resolve();
 		}
-		this.authenticateService.authenticate(token).then(([user, app]) => {
-			this.call(endpoint, user, app, body, null, request).then((res) => {
+
+		return this.telemetryService.startSpan('API: ' + endpoint.name, () => this.authenticateService.authenticate(token).then(([user, app]) => {
+			const call = this.call(endpoint, user, app, body, null, request).then((res) => {
 				if (request.method === 'GET' && endpoint.meta.cacheSec && !token && !user) {
 					reply.header('Cache-Control', `public, max-age=${endpoint.meta.cacheSec}`);
 				}
@@ -186,9 +178,11 @@ export class ApiCallService implements OnApplicationShutdown {
 			if (user) {
 				this.logIp(request, user);
 			}
+
+			return call;
 		}).catch(err => {
 			this.#sendAuthenticationError(reply, err);
-		});
+		}));
 	}
 
 	@bindThis
@@ -231,8 +225,9 @@ export class ApiCallService implements OnApplicationShutdown {
 			reply.code(400);
 			return;
 		}
-		this.authenticateService.authenticate(token).then(([user, app]) => {
-			this.call(endpoint, user, app, fields, {
+
+		return await this.telemetryService.startSpan('API: ' + endpoint.name, () => this.authenticateService.authenticate(token).then(([user, app]) => {
+			const call = this.call(endpoint, user, app, fields, {
 				name: multipartData.filename,
 				path: path,
 			}, request).then((res) => {
@@ -244,9 +239,11 @@ export class ApiCallService implements OnApplicationShutdown {
 			if (user) {
 				this.logIp(request, user);
 			}
+
+			return call;
 		}).catch(err => {
 			this.#sendAuthenticationError(reply, err);
-		});
+		}));
 	}
 
 	@bindThis
@@ -440,16 +437,10 @@ export class ApiCallService implements OnApplicationShutdown {
 			}
 		}
 
-		// API invoking
-		if (this.Sentry != null) {
-			return await this.Sentry.startSpan({
-				name: 'API: ' + ep.name,
-			}, () => ep.exec(data, user, token, file, request.ip, request.headers)
-				.catch((err: Error) => this.#onExecError(ep, data, err, user?.id)));
-		} else {
-			return await ep.exec(data, user, token, file, request.ip, request.headers)
-				.catch((err: Error) => this.#onExecError(ep, data, err, user?.id));
-		}
+		// The API span starts in handleRequest/handleMultipartRequest so it also covers
+		// authentication, rate limiting, and parameter validation.
+		return await ep.exec(data, user, token, file, request.ip, request.headers)
+			.catch((err: Error) => this.#onExecError(ep, data, err, user?.id));
 	}
 
 	@bindThis

packages/backend/src/server/api/endpoints/admin/meta.ts

@@ -544,6 +544,14 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			urlPreviewSensitiveList: {
+				type: 'array',
+				optional: false, nullable: false,
+				items: {
+					type: 'string',
+					optional: false, nullable: false,
+				},
+			},
 			federation: {
 				type: 'string',
 				enum: ['all', 'specified', 'none'],
@@ -760,6 +768,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				urlPreviewRequireContentLength: instance.urlPreviewRequireContentLength,
 				urlPreviewUserAgent: instance.urlPreviewUserAgent,
 				urlPreviewSummaryProxyUrl: instance.urlPreviewSummaryProxyUrl,
+				urlPreviewSensitiveList: instance.urlPreviewSensitiveList,
 				federation: instance.federation,
 				federationHosts: instance.federationHosts,
 				deliverSuspendedSoftware: instance.deliverSuspendedSoftware,

packages/backend/src/server/api/endpoints/admin/update-meta.ts

@@ -189,6 +189,12 @@ export const paramDef = {
 		urlPreviewRequireContentLength: { type: 'boolean' },
 		urlPreviewUserAgent: { type: 'string', nullable: true },
 		urlPreviewSummaryProxyUrl: { type: 'string', nullable: true },
+		urlPreviewSensitiveList: {
+			type: 'array', nullable: true,
+			items: {
+				type: 'string',
+			}
+		},
 		federation: {
 			type: 'string',
 			enum: ['all', 'none', 'specified'],
@@ -734,6 +740,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.urlPreviewSummaryProxyUrl = value === '' ? null : value;
 			}
 
+			if (Array.isArray(ps.urlPreviewSensitiveList)) {
+				set.urlPreviewSensitiveList = ps.urlPreviewSensitiveList.filter(Boolean);
+			}
+
 			if (ps.federation !== undefined) {
 				set.federation = ps.federation;
 			}

packages/backend/src/server/http-server-instrumentation.ts

@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Config } from '@/config.js';
+import type { FastifyInstance } from 'fastify';
+
+type TelemetryConfig = Pick<Config, 'otelForBackend' | 'sentryForBackend'>;
+
+export function shouldRegisterHttpServerInstrumentation(config: TelemetryConfig): boolean {
+	// Sentryもリクエストspanを作成するため、両方を登録すると重複して出力される。
+	return config.otelForBackend != null && config.sentryForBackend == null;
+}
+
+/**
+ * すべてのルート・フックより前にリクエスト計装を登録し、ActivityPubや
+ * well-knownを含む全HTTP受信経路を1つのroot spanとして計測する。
+ */
+export async function registerHttpServerInstrumentation(fastify: FastifyInstance, config: TelemetryConfig): Promise<void> {
+	if (!shouldRegisterHttpServerInstrumentation(config)) return;
+
+	const { FastifyOtelInstrumentation } = await import('@fastify/otel');
+	const instrumentation = new FastifyOtelInstrumentation({
+		requestHook: (span, request) => {
+			const route = request.routeOptions.url;
+			if (route != null) {
+				// デフォルトだとトレース名が「request」で固定されてしまうため、判別がつかなくなる。
+				// ルート名をspan名に設定することで、トレースビューでルートごとの処理時間を確認できるようになる。
+				span.updateName(`${request.method} ${route}`);
+			}
+		},
+	});
+	await fastify.register(instrumentation.plugin());
+}