Merge branch 'develop' into feature/role-hidden-setting

* enhance: 構造化ログAPIと正規化

* fix changelog

* fixed copilot review

* fixed coderabbit review

.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,9 @@
+reviews:
+  profile: "chill"
+  high_level_summary: false
+  poem: true
+  auto_review:
+    enabled: true
+    drafts: false
+    base_branches:
+      - "develop"

.config/docker_example.yml

@@ -233,9 +233,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

.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

.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/frontend-js-size.mts

@@ -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,36 @@ function getChunkComparisonRows(keys: string[], before: Awaited<ReturnType<typeo
 	});
 }
 
+type ChunkAggregate = {
+	beforeSize: number;
+	afterSize: number;
+	beforeCount: number;
+	afterCount: number;
+};
+
+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 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,
@@ -349,60 +417,81 @@ function compareChunkComparisonRows(a: ReturnType<typeof getChunkComparisonRows>
 		|| 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: ReturnType<typeof getChunkComparisonRows>[number]) {
+	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,
+) {
+	if (rows.length === 0 && total == null && generated == null) return '_No data_';
 
 	const lines = [
 		'| Chunk | Before | After | Δ | Δ (%) |',
 		'| --- | ---: | ---: | ---: | ---: |',
 	];
+	let hasSummaryRow = false;
 	if (total != null) {
 		lines.push(`| (total) | ${util.formatBytes(total.beforeSize)} | ${util.formatBytes(total.afterSize)} | ${util.calcAndFormatDeltaBytes(total.beforeSize, total.afterSize, 1000)} | ${util.calcAndFormatDeltaPercent(total.beforeSize, total.afterSize, 0.1).replaceAll('\\%', '\\\\%')} |`);
-		lines.push('| | | | | |');
+		hasSummaryRow = true;
 	}
+	if (generated != null && (generated.beforeCount > 0 || generated.afterCount > 0)) {
+		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('\\%', '\\\\%')} |`);
+		hasSummaryRow = true;
+	}
+	if (hasSummaryRow && rows.length > 0) 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 (generated != null && (generated.beforeCount > 0 || generated.afterCount > 0)) {
+		lines.push('');
+		lines.push(`_${generated.beforeCount} before / ${generated.afterCount} after generated chunks are grouped._`);
+	}
 	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 diffGenerated = generatedAggregate(before.chunks, after.chunks);
 	const diffRows = changedRows.sort(compareChunkComparisonRows).slice(0, 30); // TODO: 実際に30を超えて切り捨てられたrowがあった場合はその旨をmarkdown内に表示するようにする
 
-	const startupKeys = new Set([
-		...before.startupKeys,
-		...after.startupKeys,
-	]);
-	const startupComparisonRows = getChunkComparisonRows([...startupKeys], before, after);
+	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 startupRows = startupComparisonRows.sort(compareChunkComparisonRows);
 	const startupSummary = summarizeChunkChanges(startupComparisonRows);
 	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 +501,14 @@ function renderFrontendChunkReport(before: Awaited<ReturnType<typeof collectRepo
 		'<details open>',
 		`<summary>${formatChunkChangeSummary('Chunk size diff', diffSummary)}</summary>`,
 		'',
-		chunkMarkdownTable(diffRows, diffTotal),
+		chunkMarkdownTable(diffRows, diffTotal, diffGenerated),
 		'',
 		'</details>',
 		'',
 		'<details>',
 		`<summary>${formatChunkChangeSummary('Startup chunk size', startupSummary)}</summary>`,
 		'',
-		chunkMarkdownTable(startupRows, startupTotal),
+		chunkMarkdownTable(startupRows, startupTotal, startupGenerated),
 		'',
 		`_Startup chunks are the Vite entry for \`src/_boot_.ts\` and its static imports._`,
 		'',

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

@@ -0,0 +1,233 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import assert from 'node:assert/strict';
+import { execFile } from 'node:child_process';
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import test, { type TestContext } from 'node:test';
+import * as util from './utility.mts';
+
+type Manifest = Record<string, {
+	file?: string;
+	src?: string;
+	name?: string;
+	isEntry?: boolean;
+	imports?: string[];
+}>;
+
+const repoDir = path.resolve(import.meta.dirname, '../..');
+const reportScript = path.join(repoDir, '.github/scripts/frontend-js-size.mts');
+
+async function writeBuild(repo: string, manifest: Manifest, sizes: Record<string, number>) {
+	const outDir = path.join(repo, 'built/_frontend_vite_/');
+	await fs.mkdir(path.join(outDir, 'ja-JP'), { recursive: true });
+	await fs.writeFile(path.join(outDir, 'manifest.json'), JSON.stringify(manifest));
+	for (const [file, size] of Object.entries(sizes)) {
+		const localizedFile = file.replace(/^scripts\//, '');
+		const outputFile = path.join(outDir, 'ja-JP', localizedFile);
+		await fs.mkdir(path.dirname(outputFile), { recursive: true });
+		await fs.writeFile(outputFile, Buffer.alloc(size));
+	}
+}
+
+async function runReport(t: TestContext, before: { manifest: Manifest; sizes: Record<string, number> }, after: { manifest: Manifest; sizes: Record<string, number> }, expectFailure = false) {
+	const root = await fs.mkdtemp(path.join(os.tmpdir(), 'frontend-js-size-'));
+	t.after(() => fs.rm(root, { recursive: true, force: true }));
+	const beforeDir = path.join(root, 'before');
+	const afterDir = path.join(root, 'after');
+	const beforeStats = path.join(root, 'before-stats.json');
+	const afterStats = path.join(root, 'after-stats.json');
+	const reportFile = path.join(root, 'report.md');
+	await writeBuild(beforeDir, before.manifest, before.sizes);
+	await writeBuild(afterDir, after.manifest, after.sizes);
+	await fs.writeFile(beforeStats, '{}');
+	await fs.writeFile(afterStats, '{}');
+	const args = [reportScript, beforeDir, afterDir, beforeStats, afterStats, reportFile];
+	if (expectFailure) {
+		return new Promise<string>((resolve, reject) => {
+			execFile(process.execPath, args, (error, _stdout, stderr) => {
+				if (error == null) {
+					reject(new Error('Expected frontend report script to fail'));
+				} else {
+					resolve(stderr);
+				}
+			});
+		});
+	}
+	await util.run(process.execPath, args);
+	return fs.readFile(reportFile, 'utf8');
+}
+
+function fixture(suffix: string, generatedName: string, sizes: { entry: number; generatedA: number; generatedB: number; vue: number; i18n: number }) {
+	const files = {
+		entry: `scripts/entry-${suffix}.js`,
+		generatedA: `scripts/generated-a-${suffix}.js`,
+		generatedB: `scripts/generated-b-${suffix}.js`,
+		vue: `scripts/vue-${suffix}.js`,
+		i18n: `scripts/i18n-${suffix}.js`,
+	};
+	return {
+		manifest: {
+			'src/_boot_.ts': { file: files.entry, src: 'src/_boot_.ts', name: 'entry', isEntry: true, imports: ['_generatedA', '_generatedB', '_vue', '_i18n'] },
+			_generatedA: { file: files.generatedA, name: generatedName },
+			_generatedB: { file: files.generatedB, name: generatedName },
+			_vue: { file: files.vue, name: 'vue' },
+			_i18n: { file: files.i18n, name: 'i18n' },
+		},
+		sizes: Object.fromEntries(Object.entries(files).map(([key, file]) => [file, sizes[key as keyof typeof sizes]])),
+	};
+}
+
+test('groups generated chunks while preserving full and startup totals', async t => {
+	const report = await runReport(
+		t,
+		fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 }),
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+	);
+
+	assert.match(report, /\| \(total\) \| 220 B \| 275 B \|/);
+	assert.equal(report.match(/\| \(other generated chunks\) \| 30 B \| 70 B \|/g)?.length, 2);
+	assert.equal(report.match(/_2 before \/ 2 after generated chunks are grouped\._/g)?.length, 2);
+	assert.doesNotMatch(report, /<summary>`(?:dist|esm)`<\/summary>/);
+	assert.match(report, /<summary>`src\/_boot_\.ts`<\/summary>/);
+	assert.match(report, /<summary>`vue`<\/summary>/);
+});
+
+test('fails instead of overwriting duplicate stable chunk keys', async t => {
+	const duplicateVue = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	duplicateVue.manifest._vueDuplicate = { file: 'scripts/vue-duplicate-before.js', name: 'vue' };
+	duplicateVue.sizes['scripts/vue-duplicate-before.js'] = 60;
+
+	const diagnostic = await runReport(
+		t,
+		duplicateVue,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+		true,
+	);
+	assert.match(diagnostic, /Duplicate stable chunk key "named:vue".*vue-before\.js.*vue-duplicate-before\.js/);
+});
+
+test('shows both filenames for an updated stable chunk', async t => {
+	const report = await runReport(
+		t,
+		fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 }),
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+	);
+
+	assert.match(report, /`ja-JP\/entry-before\.js → ja-JP\/entry-after\.js`/);
+	assert.match(report, /`ja-JP\/vue-before\.js → ja-JP\/vue-after\.js`/);
+});
+
+test('fails descriptively when the startup entry is missing', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	delete before.manifest['src/_boot_.ts'];
+	delete before.sizes['scripts/entry-before.js'];
+
+	const diagnostic = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+		true,
+	);
+	assert.match(diagnostic, /Unable to find frontend startup entry in Vite manifest/);
+});
+
+test('fails descriptively when a static import is missing from the manifest', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.manifest['src/_boot_.ts'].imports = ['_missing'];
+
+	const diagnostic = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+		true,
+	);
+	assert.match(diagnostic, /Startup manifest key "_missing".*is missing/);
+});
+
+test('fails descriptively when a static import has no output file', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.manifest['src/_boot_.ts'].imports = ['_malformed'];
+	before.manifest._malformed = { name: 'malformed' };
+
+	const diagnostic = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+		true,
+	);
+	assert.match(diagnostic, /Startup manifest key "_malformed".*has no output file/);
+});
+
+test('fails descriptively when a static import resolves to a non-JavaScript output', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.manifest['src/_boot_.ts'].imports = ['_malformed'];
+	before.manifest._malformed = { file: 'assets/malformed.css', name: 'malformed' };
+
+	const diagnostic = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+		true,
+	);
+	assert.match(diagnostic, /Startup manifest key "_malformed".*non-JavaScript output "assets\/malformed\.css"/);
+});
+
+test('keeps source-backed additions and removals as individual rows', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.manifest._removed = { file: 'scripts/removed-before.js', src: 'src/removed.ts' };
+	before.sizes['scripts/removed-before.js'] = 12;
+	const after = fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 });
+	after.manifest._added = { file: 'scripts/added-after.js', src: 'src/added.ts' };
+	after.sizes['scripts/added-after.js'] = 13;
+
+	const report = await runReport(t, before, after);
+
+	assert.match(report, /<summary>`src\/added\.ts`<\/summary> `ja-JP\/added-after\.js` <\/details> \| 0 B \| 13 B \|/);
+	assert.match(report, /<summary>`src\/removed\.ts`<\/summary> `ja-JP\/removed-before\.js` <\/details> \| 12 B \| 0 B \|/);
+});
+
+test('counts an unmanifested localized JavaScript file in totals and the generated aggregate', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.sizes['scripts/unmanifested-before.js'] = 15;
+
+	const report = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+	);
+
+	assert.match(report, /\| \(total\) \| 235 B \| 275 B \|/);
+	assert.match(report, /\| \(other generated chunks\) \| 45 B \| 70 B \|/);
+	assert.match(report, /_3 before \/ 2 after generated chunks are grouped\._/);
+});
+
+test('counts duplicate manifest entries for one physical output only once', async t => {
+	const before = fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 });
+	before.manifest._generatedAlias = { file: 'scripts/generated-a-before.js', name: 'dist' };
+
+	const report = await runReport(
+		t,
+		before,
+		fixture('after', 'esm', { entry: 110, generatedA: 30, generatedB: 40, vue: 45, i18n: 50 }),
+	);
+
+	assert.match(report, /\| \(total\) \| 220 B \| 275 B \|/);
+	assert.match(report, /_2 before \/ 2 after generated chunks are grouped\._/);
+});
+
+test('does not count generated-aggregate-only changes as individual chunk changes', async t => {
+	const report = await runReport(
+		t,
+		fixture('before', 'dist', { entry: 100, generatedA: 10, generatedB: 20, vue: 40, i18n: 50 }),
+		fixture('after', 'esm', { entry: 100, generatedA: 30, generatedB: 40, vue: 40, i18n: 50 }),
+	);
+
+	assert.match(report, /<summary>Chunk size diff \(0 updated, 0 added, 0 removed\)<\/summary>/);
+	assert.match(report, /<summary>Startup chunk size \(0 updated, 0 added, 0 removed\)<\/summary>/);
+	assert.equal(report.match(/\| \(other generated chunks\) \| 30 B \| 70 B \|/g)?.length, 2);
+});

.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/lint.yml

@@ -16,10 +16,12 @@ on:
       - packages/misskey-js/**
       - packages/misskey-bubble-game/**
       - packages/misskey-reversi/**
-      - packages/misskey-world/**
-      - packages/frontend-misskey-world-engine/**
       - packages/shared/eslint.config.js
+      - scripts/check-dts*.mjs
+      - .github/scripts/frontend-js-size*.mts
+      - .github/scripts/utility.mts
       - .github/workflows/lint.yml
+      - package.json
   pull_request:
     paths:
       - packages/backend/**
@@ -32,10 +34,12 @@ on:
       - packages/misskey-js/**
       - packages/misskey-bubble-game/**
       - packages/misskey-reversi/**
-      - packages/misskey-world/**
-      - packages/frontend-misskey-world-engine/**
       - packages/shared/eslint.config.js
+      - scripts/check-dts*.mjs
+      - .github/scripts/frontend-js-size*.mts
+      - .github/scripts/utility.mts
       - .github/workflows/lint.yml
+      - package.json
 jobs:
   pnpm_install:
     runs-on: ubuntu-latest
@@ -69,8 +73,6 @@ jobs:
         - misskey-js
         - misskey-bubble-game
         - misskey-reversi
-        - misskey-world
-        - frontend-misskey-world-engine
     env:
       eslint-cache-version: v1
       eslint-cache-path: ${{ github.workspace }}/node_modules/.cache/eslint-${{ matrix.workspace }}
@@ -119,3 +121,31 @@ 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.2
+      with:
+        fetch-depth: 0
+        submodules: true
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v6.0.3
+    - 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
+
+  frontend-bundle-report-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6.0.3
+    - uses: actions/setup-node@v6.4.0
+      with:
+        node-version-file: '.node-version'
+    - run: node --test .github/scripts/frontend-js-size.test.mts

.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
 
@@ -14,20 +14,52 @@
 - バックエンドで画像処理に用いているライブラリ sharp のシステム要件の変更により、**SSE4.2 命令セットをサポートしていない x86_64 CPU では Misskey が正しく動作しなくなります**。仮想マシンに Misskey をデプロイしている場合や、古いハードウェアをお使いの場合は、アップデート前にお使いの環境をご確認ください。なお、ARM64 など x86_64 ではない環境においてはこの変更による影響はありません。
 
 ### General
+- Feat: 自分に表示する公開ロールとロールバッジをユーザー側で選べるように
+  - 必ず表示する必要があるロールを作成することもできます(既存のロールについてはすべて表示必須設定となります。必要に応じて設定を変更してください)
+  - 今後新規作成するロールのデフォルト値は表示必須設定なし（ユーザーが表示・非表示を選べる）となります。
 - 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内部エラーのログに構造化属性と正規化したエラー情報を付与し、認証情報を自動的に秘匿するように（従来形式の表示は維持）
 - Fix: `/stats` API のレスポンス型が正しくない問題を修正
 - Fix: ハッシュタグに関連するデータを更新する際のエラーハンドリングを修正
+- Fix: Sentry 使用環境下にて、Misskey が発行した SQL クエリが span に含まれない問題を修正
+- Fix: Sentry 使用環境下にて、外部送信リクエストへ `sentry-trace` / `baggage` ヘッダーが既定で付与されないように
 
 ## 2026.6.0
 

Dockerfile

@@ -30,8 +30,6 @@ COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
 COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
-COPY --link ["packages/misskey-world/package.json", "./packages/misskey-world/"]
-COPY --link ["packages/frontend-misskey-world-engine/package.json", "./packages/frontend-misskey-world-engine/"]
 
 ARG NODE_ENV=production
 
@@ -63,8 +61,6 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
 COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
-COPY --link ["packages/misskey-world/package.json", "./packages/misskey-world/"]
-COPY --link ["packages/frontend-misskey-world-engine/package.json", "./packages/frontend-misskey-world-engine/"]
 
 ARG NODE_ENV=production
 
@@ -103,18 +99,12 @@ COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/nod
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
 COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-world/node_modules ./packages/misskey-world/node_modules
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/frontend-misskey-world-engine/node_modules ./packages/frontend-misskey-world-engine/node_modules
-
 COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-world/built ./packages/misskey-world/built
-COPY --chown=misskey:misskey --from=target-builder /misskey/packages/frontend-misskey-world-engine/built ./packages/frontend-misskey-world-engine/built
-
 COPY --chown=misskey:misskey . ./
 
 ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so

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,153 @@
+# 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. When either build contains generated chunks, it then includes 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.
+
+The report includes a short note stating how many generated chunks were grouped on each side. This makes the scope of the aggregate explicit without listing noisy filenames.
+
+### 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; and
+- differing before/after filenames are rendered without attributing both sizes to one file.
+
+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

@@ -1414,13 +1414,13 @@ viewRenotedChannel: "リノート先のチャンネルを見る"
 previewingTheme: "テーマのプレビュー中"
 previewingThemeRestore: "元に戻す"
 accessToken: "アクセストークン"
-choose: "選択"
-rotate: "回転"
 chooseEmojiPalette: "絵文字パレットを選択"
 addToEmojiPalette: "絵文字パレットに追加"
 emojiPaletteAlreadyAddedConfirm: "この絵文字はすでにこの絵文字パレットに含まれています。追加しなおしますか？"
 append: "末尾に追加"
 prepend: "先頭に追加"
+urlPreviewSensitiveList: "サムネイルの表示を制限するURL"
+urlPreviewSensitiveListDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。一致した場合、サムネイルが表示されなくなります。"
 
 _imageEditing:
   _vars:
@@ -2083,6 +2083,8 @@ _role:
   isConditionalRole: "これはコンディショナルロールです。"
   isPublic: "公開ロール"
   descriptionOfIsPublic: "ユーザーのプロフィールでこのロールが表示されます。"
+  isPublicDisplayRequired: "非表示を許可しない（常に表示）"
+  descriptionOfIsPublicDisplayRequired: "有効にすると、ユーザーはこの公開ロール/ロールバッジを非表示にできません。"
   options: "オプション"
   policies: "ポリシー"
   baseRole: "ベースロール"
@@ -3245,6 +3247,12 @@ _gridComponent:
     patternNotMatch: "この値は{pattern}のパターンに一致しません"
     notUnique: "この値は一意である必要があります"
 
+_roleDisplay:
+  description: "自分に割り当てられているロールを確認したり、プロフィールやノート上で表示・公開するロールを選択したりできます。"
+  roleExplorableAlert: "このロールは、管理者により、{link}への表示とロールタイムラインの有効化が設定されています。プロフィール上で非表示にすることはできますが、あなたにこのロールが付与されていることが知られる可能性があります。"
+  displayToggle: "ロール/ロールバッジを表示する"
+  alwaysShownByAdmin: "管理者の設定により非表示にすることはできません。"
+
 _roleSelectDialog:
   notSelected: "選択されていません"
 
@@ -3580,476 +3588,3 @@ _qr:
   scanFile: "端末の画像をスキャン"
   raw: "テキスト"
   mfm: "MFM"
-
-worldAvatar: "Worldアバター"
-worldAvatar_description: "MisskeyWorld / MisskeyRoomsで使用可能な3Dアバターを作成できます。"
-
-_miWorld:
-  separateRenderingThread: "描画を別スレッドに分離"
-  separateRenderingThread_description: "有効にするとパフォーマンスが向上します。不安定になる場合は無効すると改善する可能性があります。"
-  graphicsQuality: "グラフィックの品質"
-  graphicsSettings: "グラフィック設定"
-  frameRateLimitation: "フレームレート制限"
-  higherValuePerformanceNote: "高くすると体験が向上しますが、消費電力が増加するなどパフォーマンスに影響を与えます。"
-  resolution: "解像度"
-  fov: "視野角"
-  failedToInitialize: "初期化に失敗しました"
-  crushed_description: "描画が継続できなくなりました。デバイスのリソース不足の可能性が考えられます。"
-  antialiasing: "アンチエイリアス"
-  avatar: "アバター"
-  advancedCustomize: "高度なアレンジ"
-  attachAccessory: "アクセサリーをつける"
-  takeScreenShot: "スクリーンショット"
-  onlineMenu: "オンラインメニュー"
-  connectToOnline: "オンラインに接続"
-  disconnectToOnline: "オンラインから切断"
-  character: "キャラクター"
-  sit: "座る"
-  lyingDown: "寝そべる"
-  standUp: "立ち上がる"
-  showUsernameOnAvatar: "アバターにユーザー名を表示"
-  show2dAvatarOnAvatar: "アバターにユーザーアイコンを表示"
-
-  _avatars:
-    _default:
-      body: "ボディ"
-      eyes: "目"
-      mouth: "口"
-
-  _avatarAccessories:
-    mug: "マグカップ"
-    _mug:
-      bodyMat: "コップの素材"
-      liquidMat: "液体の素材"
-    mikan: "みかん"
-    bolt: "ボルト"
-    _bolt:
-      mat: "素材"
-
-_miRoom:
-  snapToGrid: "グリッドにスナップ"
-  gridScale: "グリッドサイズ"
-  thereAreUnsavedChanges: "未保存の変更があります"
-  revertAllChangesConfirmation: "全ての変更を取り消し、部屋を最後に保存した状態まで戻しますか？"
-  yourDeviceNotSupported_title: "MisskeyRoomを起動できません"
-  yourDeviceNotSupported_description: "お使いのデバイスがMisskeyRoomをサポートしていないか、デバイスのリソース不足などにより一時的に利用できなくなっています。\nMisskeyRoomを動作させるには、WebGPUをサポートするデバイス・ブラウザが必要です。"
-  imageFit: "画像のはめ込み"
-  imageFit_cover: "覆う"
-  imageFit_contain: "収める"
-  imageFit_stretch: "伸縮"
-  material_metallic: "光沢"
-  material_roughness: "粗さ"
-  light_brightness: "明るさ"
-  advancedCustomize: "高度なアレンジ"
-  enterEditMode: "エディットモードを始める"
-  exitEditMode: "エディットモードを終了"
-  installFurniture: "家具を設置"
-  roomCustomize: "部屋のカスタマイズ"
-  changeRoomName: "ルーム名を編集"
-  roomInfo: "ルーム情報"
-  duplicate: "複製"
-  grab: "掴む"
-  furnitureCustomize: "家具のアレンジ"
-  uninstallFurniture: "しまう"
-  furnituresCount: "家具の数"
-  attachedFilesCount: "添付ファイル数"
-  _furniturePlacement:
-    top: "上面設置"
-    bottom: "下面設置"
-    side: "側面設置"
-
-  _furnitures:
-    haniwa: "はにわ"
-    _haniwa:
-      bodyMat: "本体の素材"
-      insideColor: "中身の色"
-    woodRingFloorLamp: "リングシェードフロアランプ"
-    _woodRingFloorLamp:
-      shadeMat: "シェードの素材"
-      bodyMat: "本体の素材"
-      light: "照明"
-    a4Case: "A4ケース"
-    _a4Case:
-      mat: "素材"
-    aircon: "エアコン"
-    allInOnePc: "一体型PC"
-    _allInOnePc:
-      bezelMat: "ベゼルの素材"
-      bodyMat: "本体の素材"
-      image: "画面の画像"
-      image_desktop: "デスクトップ"
-      screenBrightness: "画面の明るさ"
-    aquarium: "水槽"
-    aromaReedDiffuser: "アロマリードディフューザー"
-    _aromaReedDiffuser:
-      bottleMat: "ボトルの素材"
-      oilMat: "オイルの素材"
-    banknote: "紙幣"
-    beamLamp: "ビームランプ"
-    bed: "ベッド"
-    _bed:
-      frameMat: "フレームの素材"
-    blind: "ブラインド"
-    _blind:
-      angle: "羽根の回転角度"
-      blades: "羽根の枚数"
-      open: "開閉状態"
-    book: "本"
-    _book:
-      height: "高さ"
-      thickness: "厚み"
-      variation: "バリエーション"
-      width: "幅"
-    books: "本の束"
-    _books:
-      variation: "バリエーション"
-    boxWallShelf: "ボックス型ウォールシェルフ"
-    _boxWallShelf:
-      bodyMat: "本体の素材"
-      height: "高さ"
-      width: "幅"
-      withBack: "背板"
-    cactusS: "サボテン S"
-    _cactusS:
-      potMat: "鉢の素材"
-    cardboardBox: "段ボール箱"
-    _cardboardBox:
-      variation: "種類"
-      variation_aizon: "Aizon"
-      variation_default: "デフォルト"
-      variation_mikan: "みかん"
-    ceilingFanLight: "シーリングファンライト"
-    _ceilingFanLight:
-      shadeMat: "シェードの素材"
-      bodyMat: "本体の素材"
-    ceilingFan: "シーリングファン"
-    _ceilingFan:
-      shadeMat: "シェードの素材"
-      bodyMat: "本体の素材"
-    chair: "椅子"
-    _chair:
-      primaryMat: "メインの素材"
-      secondaryMat: "サブの素材"
-      frameMat: "フレームの素材"
-    clippedPicture: "留められた写真"
-    _clippedPicture:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    coffeeCup: "コーヒーカップ"
-    colorBox: "カラーボックス"
-    _colorBox:
-      mat: "素材"
-    cuboid: "直方体"
-    _cuboid:
-      mat: "素材"
-      x: "X"
-      y: "Y"
-      z: "Z"
-    cupNoodle: "インスタントラーメン"
-    curtain: "カーテン"
-    custardPudding: "プリン"
-    descriptionPlate: "説明が書かれたプレート"
-    desk: "デスク"
-    _desk:
-      boardMat: "天板の素材"
-      depth: "奥行き"
-      frameMat: "フレームの素材"
-      width: "幅"
-    desktopPc: "デスクトップPC"
-    _desktopPc:
-      bodyMat: "本体の素材"
-      coverMat: "カバーの素材"
-      inner1Mat: "内部素材1"
-      inner2Mat: "内部素材2"
-      inner3Mat: "内部素材3"
-      ledColor: "LEDの色"
-    djMixer: "DJミキサー"
-    djPlayer: "DJプレーヤー"
-    _djPlayer:
-      image: "画像"
-      "image:waveform": "波形"
-      screenBrightness: "画面の明るさ"
-    ductRailSpotLights: "スポットライト付きダクトレール"
-    _ductRailSpotLights:
-      angleH: "水平角度"
-      angleV: "垂直角度"
-      bodyMat: "本体の素材"
-      light: "照明"
-    ductTape: "ガムテープ"
-    herbarium: "ハーバリウム"
-    electronicDisplayBoard: "電光掲示板"
-    _electronicDisplayBoard:
-      frameMat: "フレームの素材"
-      ledBrightness: "LEDの明るさ"
-      ledColor: "LEDの色"
-      text: "テキスト"
-    emptyBento: "空の弁当容器"
-    energyDrink: "エナジードリンク"
-    envelope: "封筒"
-    facialTissue: "ティッシュ"
-    glassCylinderPotPlant: "ガラスシリンダーの鉢植えと植物"
-    handheldGameConsole: "携帯ゲーム機"
-    _handheldGameConsole:
-      bodyMat: "本体の素材"
-      image: "画像"
-      screenBrightness: "画面の明るさ"
-    hangingDuctRail: "吊り下げダクトレール"
-    _hangingDuctRail:
-      bodyMat: "本体の素材"
-      height: "高さ"
-      width: "幅"
-    hangingTShirt: "吊り下げTシャツ"
-    icosahedron: "正二十面体のオブジェ"
-    _icosahedron:
-      mat: "素材"
-    ironFrameTable: "アイアンフレームテーブル"
-    _ironFrameTable:
-      boardMat: "天板の素材"
-      depth: "奥行き"
-      frameMat: "フレームの素材"
-      height: "高さ"
-      width: "幅"
-    issyoubin: "一升瓶"
-    _issyoubin:
-      variation: "種類"
-    keyboard: "キーボード"
-    _keyboard:
-      bodyMat: "本体の素材"
-      keyMat: "キーの素材"
-    laptopPc: "ノートPC"
-    _laptopPc:
-      bezelMat: "ベゼルの素材"
-      bodyMat: "本体の素材"
-      image: "画像"
-      openAngle: "開き具合"
-      screenBrightness: "画面の明るさ"
-    largeMousepad: "大きいマウスパッド"
-    _largeMousepad:
-      image: "画像"
-    lavaLamp: "ラバランプ"
-    _lavaLamp:
-      bodyMat: "本体の素材"
-      glassMat: "ガラスの素材"
-      lavaColor: "オイルの色"
-      lightColor: "ランプの色"
-    letterCase: "レターケース"
-    lowPartitionBar: "低いパーティションバー"
-    _lowPartitionBar:
-      bodyMat: "本体の素材"
-      width: "幅"
-    miObjet: "Miオブジェ"
-    miPlate: "Miプレート"
-    miPlateDisplayed: "飾られたMiプレート"
-    milk: "牛乳"
-    mixer: "ミキサー"
-    monitor: "モニター"
-    _monitor:
-      bodyMat: "本体の素材"
-      image: "画像"
-      screenBrightness: "画面の明るさ"
-    monitorSpeaker: "モニタースピーカー"
-    _monitorSpeaker:
-      mat: "素材"
-    monstera: "モンステラ"
-    _monstera:
-      potMat: "鉢の素材"
-    mug: "マグカップ"
-    _mug:
-      bodyMat: "コップの素材"
-      liquidMat: "液体の素材"
-    newtonsCradle: "ニュートンクレードル"
-    _newtonsCradle:
-      frameMat: "フレームの素材"
-    openedCardboardBox: "開いた段ボール箱"
-    pachira: "パキラ"
-    _pachira:
-      potMat: "鉢の素材"
-    petBottle: "ペットボトル"
-    _petBottle:
-      empty: "空"
-      variation: "種類"
-      variation_greenTea: "緑茶"
-      variation_mineralWater: "ミネラルウォーター"
-      withCap: "キャップ"
-      withLabel: "ラベル"
-    piano: "ピアノ"
-    _piano:
-      bodyMat: "本体の素材"
-    pictureFrame: "シンプルな額縁"
-    _pictureFrame:
-      depth: "厚さ"
-      frameMat: "フレームの素材"
-      frameThickness: "フレームの幅"
-      height: "高さ"
-      image: "画像"
-      matHThickness: "マットの横幅"
-      matVThickness: "マットの縦幅"
-      width: "幅"
-      withCover: "カバーあり"
-    pizza: "ピザ"
-    plant: "植物"
-    plant2: "植物 2"
-    poster: "ポスター"
-    _poster:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    powerStrip: "電源タップ"
-    radiometer: "ラジオメーター"
-    randomBooks: "雑多な本"
-    _randomBooks:
-      count: "数"
-      seed: "シード"
-      stackVertically: "平積み"
-      variation: "バリエーション"
-      variation_mix: "いろいろ"
-      variation_mixPlain: "いろいろ（無地）"
-    recordPlayer: "レコードプレーヤー"
-    rolledUpPoster: "丸めたポスター"
-    roundRug: "円形のラグ"
-    router: "ルーター"
-    siphon: "サイフォン"
-    snakeplant: "サンセベリア"
-    _snakeplant:
-      potMat: "鉢の素材"
-    sofa: "ソファ"
-    _sofa:
-      bodyMat: "本体の素材"
-    speaker: "スピーカー"
-    _speaker:
-      innerMat: "内側の素材"
-      outerMat: "外側の素材"
-    speakerStand: "スピーカースタンド"
-    _speakerStand:
-      bodyMat: "本体の素材"
-      height: "高さ"
-    spotLight: "スポットライト"
-    _spotLight:
-      angleH: "横方向の角度"
-      angleV: "縦方向の角度"
-      bodyMat: "本体の素材"
-      light: "照明"
-    downlight: "ダウンライト"
-    _downlight:
-      bodyMat: "本体の素材"
-      light: "照明"
-    sprayer: "霧吹き"
-    stanchionPole: "スタンションポール"
-    _stanchionPole:
-      bodyMat: "本体の素材"
-      ropeMat: "ロープの素材"
-    steelRack: "スチールラック"
-    _steelRack:
-      height: "高さ"
-      numberOfShelfs: "シェルフの数"
-      poleMat: "ポールの素材"
-      shelfPositionOf: "シェルフの位置"
-      shelfMat: "シェルフの素材"
-      widthAndDepthVariation: "W x D"
-    stormGlass: "ストームグラス"
-    tableSalt: "食卓塩"
-    tabletopCalendar: "卓上カレンダー"
-    tabletopDigitalClock: "卓上デジタル時計"
-    _tabletopDigitalClock:
-      bodyMat: "本体の素材"
-      lcdColor: "LCDの色"
-    tabletopFlag: "卓上旗"
-    _tabletopFlag:
-      image: "画像"
-    tabletopGlassPictureFrame: "卓上ガラス製フォトフレーム"
-    _tabletopGlassPictureFrame:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    tabletopIronFrameStand: "卓上アイアンフレームスタンド"
-    _tabletopIronFrameStand:
-      boardMat: "板の素材"
-      depth: "奥行き"
-      frameMat: "フレームの素材"
-      height: "高さ"
-      width: "幅"
-    tabletopLcdButtonsController: "LCDボタン付き卓上コントローラー"
-    _tabletopLcdButtonsController:
-      bodyMat: "本体の素材"
-      image: "画像"
-      screenBrightness: "画面の明るさ"
-    tabletopPictureFrame: "卓上フォトフレーム"
-    _tabletopPictureFrame:
-      depth: "厚さ"
-      frameMat: "フレームの素材"
-      frameThickness: "フレームの幅"
-      height: "高さ"
-      image: "画像"
-      matHThickness: "マットの横幅"
-      matVThickness: "マットの縦幅"
-      width: "幅"
-    tapestry: "タペストリー"
-    _tapestry:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    tetrapod: "波消ブロックの置物"
-    tv: "テレビ"
-    _tv:
-      bodyMat: "本体の素材"
-      screenBrightness: "画面の明るさ"
-    twistedCubeObjet: "ねじれた立方体のオブジェ"
-    usedTissue: "使用済みティッシュ"
-    wallCanvas: "壁掛けキャンバス"
-    _wallCanvas:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    wallClock: "壁掛け時計"
-    _wallClock:
-      frameMat: "フレームの素材"
-      faceMat: "文字盤の素材"
-      handsMat: "針の素材"
-    wallGlassPictureFrame: "ガラスの壁掛けフォトフレーム"
-    _wallGlassPictureFrame:
-      height: "高さ"
-      image: "画像"
-      width: "幅"
-    wallMirror: "壁掛けミラー"
-    _wallMirror:
-      frameMat: "フレームの素材"
-      frameThickness: "フレームの厚み"
-      height: "高さ"
-      width: "幅"
-    wallMountSpotLight: "ウォールマウントスポットライト"
-    _wallMountSpotLight:
-      angleH: "横方向の角度"
-      angleV: "縦方向の角度"
-      bodyMat: "本体の素材"
-      light: "照明"
-    wallShelf: "ウォールシェルフ"
-    _wallShelf:
-      boardMat: "板の素材"
-      boardStyle: "板のスタイル"
-      "boardStyle:color": "単色"
-      "boardStyle:wood": "木目"
-      style: "スタイル"
-    wireBasket: "ワイヤーバスケット"
-    _wireBasket:
-      bodyMat: "本体の素材"
-    wireNet: "ワイヤーネット"
-    _wireNet:
-      bodyMat: "本体の素材"
-    woodRingsPendantLight: "リングペンダントライト"
-    _woodRingsPendantLight:
-      bodyMat: "本体の素材"
-      length: "長さ"
-      light: "照明"
-      shadeMat: "シェードの素材"
-    woodSoundAbsorbingPanel: "木製吸音パネル"
-    ironFrameShelf: "アイアンフレームシェルフ"
-    _ironFrameShelf:
-      boardMat: "板の素材"
-      frameMat: "フレームの素材"
-      height: "段数"
-      width: "幅"
-    kakejiku: "掛軸"
-    _kakejiku:
-      image: "画像"
-      "image:kitsuaishinsei": "喫藍心整"

package.json

@@ -1,20 +1,18 @@
 {
 	"name": "misskey",
-	"version": "2026.6.1-alpha.1",
+	"version": "2026.7.0-alpha.5",
 	"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",
 		"packages/misskey-reversi",
 		"packages/misskey-bubble-game",
-		"packages/misskey-world",
 		"packages/icons-subsetter",
-		"packages/frontend-misskey-world-engine",
 		"packages/frontend-shared",
 		"packages/frontend-builder",
 		"packages/sw",
@@ -41,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",
@@ -58,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/1778744540138-world-room.js

@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class WorldRoom1778744540138 {
-    name = 'WorldRoom1778744540138'
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "world_room" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "description" character varying(1024) NOT NULL, "userId" character varying(32) NOT NULL, "likedCount" integer NOT NULL DEFAULT '0', "visibility" character varying(128) NOT NULL DEFAULT 'public', "def" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_40cfacaf35b0b54bb2281c89767" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_88289375952050da4a7752a366" ON "world_room" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_f803a5efb4125c5fd8a414285e" ON "world_room" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "world_room" ADD CONSTRAINT "FK_f803a5efb4125c5fd8a414285ed" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "world_room" DROP CONSTRAINT "FK_f803a5efb4125c5fd8a414285ed"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_f803a5efb4125c5fd8a414285e"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_88289375952050da4a7752a366"`);
-        await queryRunner.query(`DROP TABLE "world_room"`);
-    }
-}

packages/backend/migration/1779921322355-world-avatar.js

@@ -1,30 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class WorldAvatar1779921322355 {
-    name = 'WorldAvatar1779921322355'
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async up(queryRunner) {
-        await queryRunner.query(`CREATE TABLE "world_avatar" ("id" character varying(32) NOT NULL, "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL, "name" character varying(256) NOT NULL, "userId" character varying(32) NOT NULL, "def" jsonb NOT NULL DEFAULT '{}', "active" boolean NOT NULL DEFAULT false, CONSTRAINT "PK_e7a27262285cc2c27114871f866" PRIMARY KEY ("id"))`);
-        await queryRunner.query(`CREATE INDEX "IDX_0f1d0bdfaca455cc2f13defabe" ON "world_avatar" ("updatedAt") `);
-        await queryRunner.query(`CREATE INDEX "IDX_4eba43c8e2540a92e99dd7f5a9" ON "world_avatar" ("userId") `);
-        await queryRunner.query(`ALTER TABLE "world_room" ADD "accessCount" integer NOT NULL DEFAULT '0'`);
-        await queryRunner.query(`ALTER TABLE "world_avatar" ADD CONSTRAINT "FK_4eba43c8e2540a92e99dd7f5a9a" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
-    }
-
-    /**
-     * @param {QueryRunner} queryRunner
-     */
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "world_avatar" DROP CONSTRAINT "FK_4eba43c8e2540a92e99dd7f5a9a"`);
-        await queryRunner.query(`ALTER TABLE "world_room" DROP COLUMN "accessCount"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_4eba43c8e2540a92e99dd7f5a9"`);
-        await queryRunner.query(`DROP INDEX "public"."IDX_0f1d0bdfaca455cc2f13defabe"`);
-        await queryRunner.query(`DROP TABLE "world_avatar"`);
-    }
-}

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/migration/1783059479536-RoleDisplayVisibility.js

@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class RoleDisplayVisibility1783059479536 {
+    name = 'RoleDisplayVisibility1783059479536';
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" ADD "hiddenRoleIds" character varying(32) array NOT NULL DEFAULT '{}'`);
+        await queryRunner.query(`ALTER TABLE "role" ADD "isPublicDisplayRequired" boolean NOT NULL DEFAULT false`);
+
+        // 既存のロールについてはすべて強制表示とする（新規作成分についてはfalse）
+        await queryRunner.query(`UPDATE "role" SET "isPublicDisplayRequired" = true`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "isPublicDisplayRequired"`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "hiddenRoleIds"`);
+    }
+}

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/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

@@ -13,6 +13,7 @@ import { writeHeapSnapshot } from 'node:v8';
 import chalk from 'chalk';
 import Xev from 'xev';
 import Logger from '@/logger.js';
+import { isTelemetryShutdownInProgress } from '@/core/telemetry/telemetry-shutdown.js';
 import { envOption } from '../env.js';
 import { readyRef } from './ready.js';
 
@@ -41,6 +42,11 @@ cluster.on('online', worker => {
 
 // Listen for dying workers
 cluster.on('exit', worker => {
+	if (isTelemetryShutdownInProgress()) {
+		clusterLogger.info(`Process exited during shutdown: [${worker.id}]`);
+		return;
+	}
+
 	// Replace the dead worker,
 	// we're not sentimental
 	clusterLogger.error(chalk.red(`[${worker.id}] died :(`));

packages/backend/src/boot/master.ts

@@ -13,6 +13,8 @@ import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
 import { envOption } from '@/env.js';
+import { initTelemetry } from '@/core/telemetry/telemetry-registry.js';
+import { installTelemetrySignalHandlers } from '@/core/telemetry/telemetry-shutdown.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
 
 const logger = new Logger('core', 'cyan');
@@ -66,26 +68,13 @@ 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);
 	}
+	installTelemetrySignalHandlers();
 
 	bootLogger.info(
 		`mode: [disableClustering: ${envOption.disableClustering}, onlyServer: ${envOption.onlyServer}, onlyQueue: ${envOption.onlyQueue}]`,

packages/backend/src/boot/worker.ts

@@ -4,10 +4,16 @@
  */
 
 import cluster from 'node:cluster';
+import Logger from '@/logger.js';
 import { envOption } from '@/env.js';
 import { loadConfig } from '@/config.js';
+import { initTelemetry } from '@/core/telemetry/telemetry-registry.js';
+import { installTelemetrySignalHandlers } from '@/core/telemetry/telemetry-shutdown.js';
 import { initExtraThreadPool, jobQueue, server } from './common.js';
 
+const logger = new Logger('core', 'cyan');
+const bootLogger = logger.createSubLogger('boot', 'magenta');
+
 /**
  * Init worker process
  */
@@ -16,26 +22,13 @@ export async function workerMain() {
 
 	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);
 	}
+	installTelemetrySignalHandlers();
 
 	if (envOption.onlyServer) {
 		await server();

packages/backend/src/config.ts

@@ -20,6 +20,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 +85,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;
@@ -201,7 +223,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 +330,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,15 +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 { WorldRoomService } from './WorldRoomService.js';
-import { WorldRoomEntityService } from './entities/WorldRoomEntityService.js';
-import { WorldRoomMultiplayService } from './WorldRoomMultiplayService.js';
-import { WorldAvatarService } from './WorldAvatarService.js';
-import { WorldAvatarEntityService } from './entities/WorldAvatarEntityService.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 };
@@ -234,9 +231,6 @@ const $ChatService: Provider = { provide: 'ChatService', useExisting: ChatServic
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
 const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
 const $PageService: Provider = { provide: 'PageService', useExisting: PageService };
-const $WorldRoomService: Provider = { provide: 'WorldRoomService', useExisting: WorldRoomService };
-const $WorldRoomMultiplayService: Provider = { provide: 'WorldRoomMultiplayService', useExisting: WorldRoomMultiplayService };
-const $WorldAvatarService: Provider = { provide: 'WorldAvatarService', useExisting: WorldAvatarService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -292,8 +286,6 @@ const $RoleEntityService: Provider = { provide: 'RoleEntityService', useExisting
 const $ReversiGameEntityService: Provider = { provide: 'ReversiGameEntityService', useExisting: ReversiGameEntityService };
 const $MetaEntityService: Provider = { provide: 'MetaEntityService', useExisting: MetaEntityService };
 const $SystemWebhookEntityService: Provider = { provide: 'SystemWebhookEntityService', useExisting: SystemWebhookEntityService };
-const $WorldRoomEntityService: Provider = { provide: 'WorldRoomEntityService', useExisting: WorldRoomEntityService };
-const $WorldAvatarEntityService: Provider = { provide: 'WorldAvatarEntityService', useExisting: WorldAvatarEntityService };
 
 const $ApAudienceService: Provider = { provide: 'ApAudienceService', useExisting: ApAudienceService };
 const $ApDbResolverService: Provider = { provide: 'ApDbResolverService', useExisting: ApDbResolverService };
@@ -392,9 +384,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		RegistryApiService,
 		ReversiService,
 		PageService,
-		WorldRoomService,
-		WorldRoomMultiplayService,
-		WorldAvatarService,
 
 		ChartLoggerService,
 		FederationChart,
@@ -450,8 +439,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ReversiGameEntityService,
 		MetaEntityService,
 		SystemWebhookEntityService,
-		WorldRoomEntityService,
-		WorldAvatarEntityService,
 
 		ApAudienceService,
 		ApDbResolverService,
@@ -473,6 +460,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
+		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -547,9 +535,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$RegistryApiService,
 		$ReversiService,
 		$PageService,
-		$WorldRoomService,
-		$WorldRoomMultiplayService,
-		$WorldAvatarService,
 
 		$ChartLoggerService,
 		$FederationChart,
@@ -605,8 +590,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ReversiGameEntityService,
 		$MetaEntityService,
 		$SystemWebhookEntityService,
-		$WorldRoomEntityService,
-		$WorldAvatarEntityService,
 
 		$ApAudienceService,
 		$ApDbResolverService,
@@ -626,6 +609,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ApNoteService,
 		$ApPersonService,
 		$ApQuestionService,
+		$TelemetryService,
 		//#endregion
 	],
 	exports: [
@@ -702,9 +686,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		RegistryApiService,
 		ReversiService,
 		PageService,
-		WorldRoomService,
-		WorldRoomMultiplayService,
-		WorldAvatarService,
 
 		FederationChart,
 		NotesChart,
@@ -759,8 +740,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ReversiGameEntityService,
 		MetaEntityService,
 		SystemWebhookEntityService,
-		WorldRoomEntityService,
-		WorldAvatarEntityService,
 
 		ApAudienceService,
 		ApDbResolverService,
@@ -782,6 +761,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		ApPersonService,
 		ApQuestionService,
 		QueueService,
+		TelemetryService,
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
@@ -855,9 +835,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$RegistryApiService,
 		$ReversiService,
 		$PageService,
-		$WorldRoomService,
-		$WorldRoomMultiplayService,
-		$WorldAvatarService,
 
 		$FederationChart,
 		$NotesChart,
@@ -912,8 +889,6 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$ReversiGameEntityService,
 		$MetaEntityService,
 		$SystemWebhookEntityService,
-		$WorldRoomEntityService,
-		$WorldAvatarEntityService,
 
 		$ApAudienceService,
 		$ApDbResolverService,
@@ -933,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/GlobalEventService.ts

@@ -173,16 +173,6 @@ export interface ChatEventTypes {
 	};
 }
 
-export interface WorldRoomEventTypes {
-	enter: {
-		user: Packed<'UserLite'>;
-		avatar: Packed<'WorldAvatarLite'>['def'] | null;
-	};
-	left: {
-		userId: MiUser['id'];
-	};
-}
-
 export interface ReversiEventTypes {
 	matched: {
 		game: Packed<'ReversiGameDetailed'>;
@@ -325,10 +315,6 @@ export type GlobalEvents = {
 		name: `chatRoomStream:${MiChatRoom['id']}`;
 		payload: EventTypesToEventPayload<ChatEventTypes>;
 	};
-	worldRoom: {
-		name: `worldRoomStream:${string}`;
-		payload: EventTypesToEventPayload<WorldRoomEventTypes>;
-	};
 	reversi: {
 		name: `reversiStream:${MiUser['id']}`;
 		payload: EventTypesToEventPayload<ReversiEventTypes>;
@@ -449,9 +435,4 @@ export class GlobalEventService {
 	public publishReversiGameStream<K extends keyof ReversiGameEventTypes>(gameId: MiReversiGame['id'], type: K, value?: ReversiGameEventTypes[K]): void {
 		this.publish(`reversiGameStream:${gameId}`, type, typeof value === 'undefined' ? null : value);
 	}
-
-	@bindThis
-	public publishWorldRoomStream<K extends keyof WorldRoomEventTypes>(roomId: string, type: K, value?: WorldRoomEventTypes[K]): void {
-		this.publish(`worldRoomStream:${roomId}`, type, typeof value === 'undefined' ? null : value);
-	}
 }

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/RoleService.ts

@@ -676,6 +676,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			target: values.target,
 			condFormula: values.condFormula,
 			isPublic: values.isPublic,
+			isPublicDisplayRequired: values.isPublicDisplayRequired ?? false,
 			isAdministrator: values.isAdministrator,
 			isModerator: values.isModerator,
 			isExplorable: values.isExplorable,

packages/backend/src/core/WebhookTestService.ts

@@ -55,6 +55,7 @@ function generateDummyUser(override?: Partial<MiUser>): MiUser {
 		makeNotesHiddenBefore: null,
 		chatScope: 'mutual',
 		emojis: [],
+		hiddenRoleIds: [],
 		score: 0,
 		host: null,
 		inbox: null,

packages/backend/src/core/WorldAvatarService.ts

@@ -1,148 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DataSource, In, Not } from 'typeorm';
-import { DI } from '@/di-symbols.js';
-import {
-	MiDriveFile,
-	MiWorldAvatar,
-} from '@/models/_.js';
-import type { DriveFilesRepository, WorldAvatarsRepository } from '@/models/_.js';
-import { bindThis } from '@/decorators.js';
-import { RoleService } from '@/core/RoleService.js';
-import { IdService } from '@/core/IdService.js';
-import type { MiUser } from '@/models/User.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { QueryService } from '@/core/QueryService.js';
-
-@Injectable()
-export class WorldAvatarService {
-	constructor(
-		@Inject(DI.db)
-		private db: DataSource,
-
-		@Inject(DI.worldAvatarsRepository)
-		private worldAvatarsRepository: WorldAvatarsRepository,
-
-		private roleService: RoleService,
-		private moderationLogService: ModerationLogService,
-		private queryService: QueryService,
-		private idService: IdService,
-	) {
-	}
-
-	public defaultAvatar = {
-		type: 'default',
-		body: {
-			color: [0.8, 0.8, 0.8],
-			roughness: 1,
-			metallic: 0,
-		},
-		eyes: {
-			type: 'a',
-			color: [0, 0, 0],
-		},
-		mouth: {
-			type: 'a',
-			color: [0, 0, 0],
-		},
-		accessories: [],
-	} satisfies MiWorldAvatar['def'];
-
-	@bindThis
-	public async validateDef(
-		me: MiUser,
-		def: MiWorldAvatar['def'],
-	): Promise<boolean> {
-		// TODO
-
-		return true;
-	}
-
-	@bindThis
-	public async findMyAvatarById(userId: MiUser['id'], avatarId: MiWorldAvatar['id']) {
-		return this.worldAvatarsRepository.findOneBy({ id: avatarId, userId: userId });
-	}
-
-	@bindThis
-	public async findAvatarById(avatarId: MiWorldAvatar['id']) {
-		return this.worldAvatarsRepository.findOne({ where: { id: avatarId }, relations: { user: true } });
-	}
-
-	@bindThis
-	public async getMyAvatarsWithPagination(userId: MiUser['id'], limit: number, sinceId?: MiWorldAvatar['id'] | null, untilId?: MiWorldAvatar['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.worldAvatarsRepository.createQueryBuilder('avatar'), sinceId, untilId)
-			.andWhere('avatar.userId = :userId', { userId });
-
-		const avatars = await query.take(limit).getMany();
-
-		return avatars;
-	}
-
-	@bindThis
-	public async create(
-		me: MiUser,
-		body: Partial<MiWorldAvatar>,
-	): Promise<MiWorldAvatar> {
-		const currentAvatarsCount = await this.worldAvatarsRepository.countBy({ userId: me.id });
-
-		// TODO: limit by role policy
-
-		const avatar = await this.worldAvatarsRepository.insertOne(new MiWorldAvatar({
-			id: this.idService.gen(),
-			updatedAt: new Date(),
-			name: body.name,
-			def: body.def,
-			userId: me.id,
-			active: currentAvatarsCount === 0,
-		}));
-
-		return avatar;
-	}
-
-	@bindThis
-	public async update(
-		avatar: MiWorldAvatar,
-		body: Partial<MiWorldAvatar>,
-	): Promise<void> {
-		body.updatedAt = new Date();
-		const updated = await this.worldAvatarsRepository.createQueryBuilder().update()
-			.set(body)
-			.where('id = :id', { id: avatar.id })
-			.returning('*')
-			.execute()
-			.then((response) => {
-				return response.raw[0];
-			});
-
-		if (body.active) {
-			await this.worldAvatarsRepository.createQueryBuilder().update()
-				.set({ active: false })
-				.where('userId = :userId', { userId: avatar.userId })
-				.andWhere('id != :id', { id: avatar.id })
-				.execute();
-		}
-
-		return updated;
-	}
-
-	@bindThis
-	public async delete(avatar: MiWorldAvatar, deleter?: MiUser): Promise<void> {
-		await this.worldAvatarsRepository.delete(avatar.id);
-	}
-
-	@bindThis
-	public async getActiveAvatarOfUser(userId: MiUser['id']) {
-		return this.worldAvatarsRepository.findOneBy({ userId, active: true });
-	}
-
-	@bindThis
-	public async getActiveAvatarOfUsers(userIds: MiUser['id'][]): Promise<MiWorldAvatar[]> {
-		if (userIds.length === 0) return [];
-		return this.worldAvatarsRepository.findBy({ userId: In(userIds), active: true });
-	}
-}

packages/backend/src/core/WorldRoomMultiplayService.ts

@@ -1,153 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DataSource, In, Not } from 'typeorm';
-import * as Redis from 'ioredis';
-import { DI } from '@/di-symbols.js';
-import {
-	MiWorldRoom,
-} from '@/models/_.js';
-import type { MiWorldAvatar, WorldRoomsRepository } from '@/models/_.js';
-import { bindThis } from '@/decorators.js';
-import { RoleService } from '@/core/RoleService.js';
-import { IdService } from '@/core/IdService.js';
-import type { MiUser } from '@/models/User.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { QueryService } from '@/core/QueryService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import type { Packed } from '@/misc/json-schema.js';
-import { WorldAvatarService } from '@/core/WorldAvatarService.js';
-import { WorldAvatarEntityService } from '@/core/entities/WorldAvatarEntityService.js';
-
-type PlayerState = {
-	position: [number, number, number],
-	rotation: [number, number, number],
-	sit?: string; // id
-};
-
-@Injectable()
-export class WorldRoomMultiplayService {
-	constructor(
-		@Inject(DI.db)
-		private db: DataSource,
-
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
-		@Inject(DI.worldRoomsRepository)
-		private worldRoomsRepository: WorldRoomsRepository,
-
-		private roleService: RoleService,
-		private queryService: QueryService,
-		private idService: IdService,
-		private globalEventService: GlobalEventService,
-		private userEntityService: UserEntityService,
-		private worldAvatarService: WorldAvatarService,
-		private worldAvatarEntityService: WorldAvatarEntityService,
-	) {
-	}
-
-	@bindThis
-	public async enter(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
-		console.log('enter', { userId, roomId });
-
-		// TODO: atomicにやる
-		const currentPlayers = await this.redisClient.hlen(`worldRoom:${roomId}:players`);
-		if (currentPlayers < 10) {
-			const redisPipeline = this.redisClient.pipeline();
-			redisPipeline.hset(`worldRoom:${roomId}:players`, userId, 1);
-			redisPipeline.hexpire(`worldRoom:${roomId}:players`, 30, 'FIELDS', 1, userId);
-			await redisPipeline.exec();
-		} else {
-			throw new Error('Room is full.');
-		}
-
-		// TODO: 既に入っていたらスキップ
-		const avatar = await this.worldAvatarService.getActiveAvatarOfUser(userId);
-		this.globalEventService.publishWorldRoomStream(roomId, 'enter', {
-			user: await this.userEntityService.pack(userId),
-			avatar: avatar?.def,
-		});
-	}
-
-	@bindThis
-	public async heartbeat(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
-		const exists = await this.redisClient.hexists(`worldRoom:${roomId}:players`, userId);
-		if (exists) {
-			const redisPipeline = this.redisClient.pipeline();
-			redisPipeline.hexpire(`worldRoom:${roomId}:players`, 30, 'FIELDS', 1, userId);
-			redisPipeline.hexpire(`worldRoom:${roomId}:playerStates`, 30, 'FIELDS', 1, userId);
-			await redisPipeline.exec();
-		} else {
-			throw new Error('Not in room.');
-		}
-	}
-
-	@bindThis
-	public async left(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
-		console.log('left', { userId, roomId });
-
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.hdel(`worldRoom:${roomId}:players`, userId);
-		redisPipeline.hdel(`worldRoom:${roomId}:playerStates`, userId);
-		await redisPipeline.exec();
-
-		this.globalEventService.publishWorldRoomStream(roomId, 'left', {
-			userId,
-		});
-	}
-
-	@bindThis
-	public async updatePlayerState(userId: MiUser['id'], roomId: MiWorldRoom['id'], state: PlayerState) {
-		const redisPipeline = this.redisClient.pipeline();
-		redisPipeline.hset(`worldRoom:${roomId}:playerStates`, userId, JSON.stringify(state));
-		redisPipeline.hexpire(`worldRoom:${roomId}:playerStates`, 30, 'FIELDS', 1, userId);
-		await redisPipeline.exec();
-	}
-
-	@bindThis
-	public async getPlayerStates(roomId: MiWorldRoom['id']): Promise<Record<string, PlayerState>> {
-		const entries = await this.redisClient.hgetall(`worldRoom:${roomId}:playerStates`);
-		return Object.fromEntries(Object.entries(entries).map(([userId, state]) => [userId, JSON.parse(state) as PlayerState]));
-	}
-
-	@bindThis
-	public getPlayerStatesAndHeatbeat(userId: MiUser['id'], roomId: MiWorldRoom['id']): Promise<Record<string, PlayerState>> {
-		// TODO: atomicにやる
-		this.heartbeat(userId, roomId);
-		return this.getPlayerStates(roomId);
-	}
-
-	@bindThis
-	public packPlayerProfile(user: Packed<'UserLite'>, avatar: Packed<'WorldAvatarLite'>['def'] | null) {
-		return {
-			user: {
-				name: user.name,
-				username: user.username,
-				avatarUrl: user.avatarUrl,
-			},
-			avatar: avatar ?? this.worldAvatarService.defaultAvatar,
-		};
-	}
-
-	@bindThis
-	public async getPlayerProfiles(roomId: MiWorldRoom['id'], userId?: MiUser['id']): Promise<Record<string, any>> {
-		let playerIds = await this.redisClient.hkeys(`worldRoom:${roomId}:players`);
-		playerIds = playerIds.filter(id => id !== userId);
-
-		const packedUsers = await this.userEntityService.packMany(playerIds);
-		const avatars = await this.worldAvatarService.getActiveAvatarOfUsers(playerIds);
-
-		const profiles: Record<string, any> = {};
-		for (const playerId of playerIds) {
-			const packedUser = packedUsers.find(u => u.id === playerId);
-			if (packedUser == null) continue;
-			profiles[playerId] = this.packPlayerProfile(packedUser, avatars.find(a => a.userId === playerId)?.def ?? null);
-		}
-		return profiles;
-	}
-}

packages/backend/src/core/WorldRoomService.ts

@@ -1,176 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DataSource, In, Not } from 'typeorm';
-import { DI } from '@/di-symbols.js';
-import {
-	MiDriveFile,
-	MiWorldRoom,
-} from '@/models/_.js';
-import type { DriveFilesRepository, WorldRoomsRepository } from '@/models/_.js';
-import { bindThis } from '@/decorators.js';
-import { RoleService } from '@/core/RoleService.js';
-import { IdService } from '@/core/IdService.js';
-import type { MiUser } from '@/models/User.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { ModerationLogService } from '@/core/ModerationLogService.js';
-import { QueryService } from '@/core/QueryService.js';
-
-const driveFileReferencingOptions = {
-	clippedPicture: ['image'],
-	tapestry: ['image'],
-	poster: ['image'],
-	pictureFrame: ['image'],
-	tabletopPictureFrame: ['image'],
-	tabletopGlassPictureFrame: ['image'],
-	wallCanvas: ['image'],
-	wallGlassPictureFrame: ['image'],
-	tabletopFlag: ['image'],
-	tabletopLcdButtonsController: ['image'],
-	djPlayer: ['image'],
-	monitor: ['image'],
-	allInOnePc: ['image'],
-	laptopPc: ['image'],
-	handheldGameConsole: ['image'],
-	largeMousepad: ['image'],
-	kakejiku: ['image'],
-} as Record<string, string[]>;
-
-@Injectable()
-export class WorldRoomService {
-	constructor(
-		@Inject(DI.db)
-		private db: DataSource,
-
-		@Inject(DI.worldRoomsRepository)
-		private worldRoomsRepository: WorldRoomsRepository,
-
-		@Inject(DI.driveFilesRepository)
-		private driveFilesRepository: DriveFilesRepository,
-
-		private roleService: RoleService,
-		private moderationLogService: ModerationLogService,
-		private queryService: QueryService,
-		private idService: IdService,
-	) {
-	}
-
-	@bindThis
-	public async validateDef(
-		me: MiUser,
-		def: MiWorldRoom['def'],
-	): Promise<boolean> {
-		// TODO: スキーマ検証(関係ないプロパティを入れたり不正な値を入れたりできないように)
-		// そのためにはJSON SchemaでRoomState/各objectのoptionsを定義する必要がある
-
-		const objectsLimit = 100; // TODO: ref role policy
-		if (def.installedFurnitures.length > objectsLimit) {
-			return false;
-		}
-
-		const attachedFilesLimit = 30; // TODO: ref role policy
-
-		const attachedFileIds = this.collectReferencedDriveFileIds(def);
-		if (attachedFileIds.size > attachedFilesLimit) {
-			return false;
-		}
-
-		const attachedFiles = attachedFileIds.size === 0 ? [] : await this.driveFilesRepository.findBy({ id: In([...attachedFileIds]), userId: me.id });
-		for (const file of attachedFiles) {
-			if (!file.type.startsWith('image/')) {
-				return false;
-			}
-			if (file.size > 5 * 1024 * 1024) {
-				return false;
-			}
-			if (Math.max(file.properties.width ?? 0, file.properties.height ?? 0) > 2048) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	@bindThis
-	public async findMyRoomById(userId: MiUser['id'], roomId: MiWorldRoom['id']) {
-		return this.worldRoomsRepository.findOneBy({ id: roomId, userId: userId });
-	}
-
-	@bindThis
-	public async findRoomById(roomId: MiWorldRoom['id']) {
-		return this.worldRoomsRepository.findOne({ where: { id: roomId }, relations: { user: true } });
-	}
-
-	@bindThis
-	public async getRoomsOfUserWithPagination(userId: MiUser['id'], self: boolean, limit: number, sinceId?: MiWorldRoom['id'] | null, untilId?: MiWorldRoom['id'] | null) {
-		const query = this.queryService.makePaginationQuery(this.worldRoomsRepository.createQueryBuilder('room'), sinceId, untilId)
-			.andWhere('room.userId = :userId', { userId });
-
-		if (!self) {
-			query.andWhere('room.visibility = :visibility', { visibility: 'public' });
-		}
-
-		const rooms = await query.take(limit).getMany();
-
-		return rooms;
-	}
-
-	@bindThis
-	public async create(
-		me: MiUser,
-		body: Partial<MiWorldRoom>,
-	): Promise<MiWorldRoom> {
-		const room = await this.worldRoomsRepository.insertOne(new MiWorldRoom({
-			id: this.idService.gen(),
-			updatedAt: new Date(),
-			name: body.name,
-			description: body.description,
-			def: body.def,
-			userId: me.id,
-			visibility: body.visibility,
-		}));
-
-		return room;
-	}
-
-	@bindThis
-	public async update(
-		room: MiWorldRoom,
-		body: Partial<MiWorldRoom>,
-	): Promise<void> {
-		body.updatedAt = new Date();
-		return this.worldRoomsRepository.createQueryBuilder().update()
-			.set(body)
-			.where('id = :id', { id: room.id })
-			.returning('*')
-			.execute()
-			.then((response) => {
-				return response.raw[0];
-			});
-	}
-
-	@bindThis
-	public async delete(room: MiWorldRoom, deleter?: MiUser): Promise<void> {
-		await this.worldRoomsRepository.delete(room.id);
-	}
-
-	@bindThis
-	public collectReferencedDriveFileIds(roomState: MiWorldRoom['def']): Set<MiDriveFile['id']> {
-		const fileIds = new Set<MiDriveFile['id']>();
-		const installedFurnitures = roomState.installedFurnitures ?? roomState.installedObjects; // 後方互換性のため
-		for (const o of installedFurnitures) {
-			const def = driveFileReferencingOptions[o.type];
-			if (def == null) continue;
-			for (const key of def) {
-				const optionValue = o.options[key];
-				if (optionValue != null && optionValue.driveFileId != null && optionValue.driveFileId !== '') {
-					fileIds.add(optionValue.driveFileId);
-				}
-			}
-		}
-		return fileIds;
-	}
-}

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

@@ -64,6 +64,7 @@ export class RoleEntityService {
 			target: role.target,
 			condFormula: role.condFormula,
 			isPublic: role.isPublic,
+			isPublicDisplayRequired: role.isPublicDisplayRequired,
 			isAdministrator: role.isAdministrator,
 			isModerator: role.isModerator,
 			isExplorable: role.isExplorable,
@@ -83,5 +84,32 @@ export class RoleEntityService {
 	) {
 		return Promise.all(roles.map(x => this.pack(x, me)));
 	}
-}
 
+	@bindThis
+	public async packLite(
+		src: MiRole['id'] | MiRole,
+	): Promise<Packed<'RoleLite'>> {
+		const role = typeof src === 'object' ? src : await this.rolesRepository.findOneByOrFail({ id: src });
+
+		return {
+			id: role.id,
+			name: role.name,
+			color: role.color,
+			iconUrl: role.iconUrl,
+			description: role.description,
+			isModerator: role.isModerator,
+			isAdministrator: role.isAdministrator,
+			asBadge: role.asBadge,
+			isPublicDisplayRequired: role.isPublicDisplayRequired,
+			isExplorable: role.isExplorable,
+			displayOrder: role.displayOrder,
+		};
+	}
+
+	@bindThis
+	public packLiteMany(
+		roles: (MiRole | MiRole['id'])[],
+	) {
+		return Promise.all(roles.map(x => this.packLite(x)));
+	}
+}

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

@@ -14,6 +14,7 @@ import type { Packed } from '@/misc/json-schema.js';
 import type { Promiseable } from '@/misc/prelude/await-all.js';
 import { awaitAll } from '@/misc/prelude/await-all.js';
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
+import type { MiRole } from '@/models/Role.js';
 import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
 import {
 	birthdaySchema,
@@ -51,6 +52,7 @@ import { ChatService } from '@/core/ChatService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { NoteEntityService } from './NoteEntityService.js';
 import type { PageEntityService } from './PageEntityService.js';
+import type { RoleEntityService } from './RoleEntityService.js';
 import { toArray } from '@/misc/prelude/array.js';
 
 const Ajv = _Ajv.default;
@@ -88,6 +90,7 @@ export class UserEntityService implements OnModuleInit {
 	private apPersonService: ApPersonService;
 	private noteEntityService: NoteEntityService;
 	private pageEntityService: PageEntityService;
+	private roleEntityService: RoleEntityService;
 	private customEmojiService: CustomEmojiService;
 	private announcementService: AnnouncementService;
 	private roleService: RoleService;
@@ -144,6 +147,7 @@ export class UserEntityService implements OnModuleInit {
 		this.apPersonService = this.moduleRef.get('ApPersonService');
 		this.noteEntityService = this.moduleRef.get('NoteEntityService');
 		this.pageEntityService = this.moduleRef.get('PageEntityService');
+		this.roleEntityService = this.moduleRef.get('RoleEntityService');
 		this.customEmojiService = this.moduleRef.get('CustomEmojiService');
 		this.announcementService = this.moduleRef.get('AnnouncementService');
 		this.roleService = this.moduleRef.get('RoleService');
@@ -402,6 +406,30 @@ export class UserEntityService implements OnModuleInit {
 		return `${this.config.url}/users/${userId}`;
 	}
 
+	@bindThis
+	private prepareRoles<T extends Pick<MiRole, 'id' | 'isPublic' | 'displayOrder' | 'isPublicDisplayRequired'>>(roles: T[], user: MiUser, iAmModerator: boolean, hideByUserPreference = true): T[] {
+		const hiddenRoleIds = new Set(user.hiddenRoleIds);
+		return roles.filter(role => (role.isPublic || iAmModerator) && (role.isPublicDisplayRequired || iAmModerator || !hideByUserPreference || !hiddenRoleIds.has(role.id))).sort((a, b) => b.displayOrder - a.displayOrder);
+	}
+
+	@bindThis
+	private sanitizeHiddenRoleIds(roles: Pick<MiRole, 'id' | 'isPublic' | 'isPublicDisplayRequired'>[], user: MiUser): MiRole['id'][] {
+		const hideableRoleIds = new Set(roles
+			.filter(role => role.isPublic && !role.isPublicDisplayRequired)
+			.map(role => role.id));
+		const sanitizedRoleIds: MiRole['id'][] = [];
+		const seenRoleIds = new Set<MiRole['id']>();
+
+		for (const roleId of user.hiddenRoleIds) {
+			if (!hideableRoleIds.has(roleId) || seenRoleIds.has(roleId)) continue;
+
+			sanitizedRoleIds.push(roleId);
+			seenRoleIds.add(roleId);
+		}
+
+		return sanitizedRoleIds;
+	}
+
 	public async pack<S extends 'MeDetailed' | 'UserDetailedNotMe' | 'UserDetailed' | 'UserLite' = 'UserLite'>(
 		src: MiUser['id'] | MiUser,
 		me?: { id: MiUser['id']; } | null | undefined,
@@ -425,6 +453,7 @@ export class UserEntityService implements OnModuleInit {
 		const meId = me ? me.id : null;
 		const isMe = meId === user.id;
 		const iAmModerator = me ? await this.roleService.isModerator(me as MiUser) : false;
+		const userRoles = isDetailed ? this.roleService.getUserRoles(user.id) : null;
 
 		const profile = isDetailed
 			? (opts.userProfile ?? await this.userProfilesRepository.findOneByOrFail({ userId: user.id }))
@@ -514,10 +543,9 @@ export class UserEntityService implements OnModuleInit {
 			emojis: this.customEmojiService.populateEmojis(user.emojis, user.host),
 			onlineStatus: this.getOnlineStatus(user),
 			// パフォーマンス上の理由で、明示的に設定しない場合はローカルユーザーのみ取得
-			badgeRoles: (this.meta.showRoleBadgesOfRemoteUsers || user.host == null) ? this.roleService.getUserBadgeRoles(user.id).then((rs) => rs
-				.filter((r) => r.isPublic || iAmModerator)
-				.sort((a, b) => b.displayOrder - a.displayOrder)
+			badgeRoles: (this.meta.showRoleBadgesOfRemoteUsers || user.host == null) ? this.roleService.getUserBadgeRoles(user.id).then((rs) => this.prepareRoles(rs, user, iAmModerator)
 				.map((r) => ({
+					id: r.id,
 					name: r.name,
 					iconUrl: r.iconUrl,
 					displayOrder: r.displayOrder,
@@ -560,16 +588,7 @@ export class UserEntityService implements OnModuleInit {
 				followingVisibility: profile!.followingVisibility,
 				chatScope: user.chatScope,
 				canChat: this.roleService.getUserPolicies(user.id).then(r => r.chatAvailability === 'available'),
-				roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).sort((a, b) => b.displayOrder - a.displayOrder).map(role => ({
-					id: role.id,
-					name: role.name,
-					color: role.color,
-					iconUrl: role.iconUrl,
-					description: role.description,
-					isModerator: role.isModerator,
-					isAdministrator: role.isAdministrator,
-					displayOrder: role.displayOrder,
-				}))),
+				roles: userRoles!.then(roles => this.roleEntityService.packLiteMany(this.prepareRoles(roles, user, iAmModerator, !isMe))),
 				memo: memo,
 				moderationNote: iAmModerator ? (profile!.moderationNote ?? '') : undefined,
 			} : {}),
@@ -598,6 +617,7 @@ export class UserEntityService implements OnModuleInit {
 				preventAiLearning: profile!.preventAiLearning,
 				isExplorable: user.isExplorable,
 				isDeleted: user.isDeleted,
+				hiddenRoleIds: userRoles!.then(roles => this.sanitizeHiddenRoleIds(roles, user)),
 				twoFactorBackupCodesStock: profile?.twoFactorBackupSecret?.length === 5 ? 'full' : (profile?.twoFactorBackupSecret?.length ?? 0) > 0 ? 'partial' : 'none',
 				hideOnlineStatus: user.hideOnlineStatus,
 				hasUnreadSpecifiedNotes: false, // 後方互換性のため

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

@@ -1,93 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository, MiWorldAvatar, WorldAvatarsRepository } from '@/models/_.js';
-import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from '@/misc/json-schema.js';
-import type { } from '@/models/Blocking.js';
-import type { MiUser } from '@/models/User.js';
-import type { MiDriveFile } from '@/models/DriveFile.js';
-import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
-import { WorldAvatarService } from '@/core/WorldAvatarService.js';
-import { UserEntityService } from './UserEntityService.js';
-import { DriveFileEntityService } from './DriveFileEntityService.js';
-import { In } from 'typeorm';
-
-@Injectable()
-export class WorldAvatarEntityService {
-	constructor(
-		@Inject(DI.worldAvatarsRepository)
-		private worldAvatarsRepository: WorldAvatarsRepository,
-
-		private worldAvatarService: WorldAvatarService,
-		private userEntityService: UserEntityService,
-		private idService: IdService,
-	) {
-	}
-
-	@bindThis
-	public async packLite(
-		src: MiWorldAvatar['id'] | MiWorldAvatar,
-		me?: { id: MiUser['id'] } | null | undefined,
-		hint?: {
-			packedUser?: Packed<'UserLite'>
-		},
-	): Promise<Packed<'WorldAvatarLite'>> {
-		const meId = me ? me.id : null;
-		const avatar = typeof src === 'object' ? src : await this.worldAvatarsRepository.findOneByOrFail({ id: src });
-
-		return await awaitAll({
-			id: avatar.id,
-			def: avatar.def,
-		});
-	}
-
-	@bindThis
-	public async packDetailed(
-		src: MiWorldAvatar['id'] | MiWorldAvatar,
-		me?: { id: MiUser['id'] } | null | undefined,
-		hint?: {
-			packedUser?: Packed<'UserLite'>
-		},
-	): Promise<Packed<'WorldAvatarDetailed'>> {
-		const meId = me ? me.id : null;
-		const avatar = typeof src === 'object' ? src : await this.worldAvatarsRepository.findOneByOrFail({ id: src });
-
-		return await awaitAll({
-			id: avatar.id,
-			createdAt: this.idService.parse(avatar.id).date.toISOString(),
-			updatedAt: avatar.updatedAt.toISOString(),
-			name: avatar.name,
-			def: avatar.def,
-			active: avatar.active,
-		});
-	}
-
-	@bindThis
-	public async packLiteMany(
-		avatars: MiWorldAvatar[],
-		me?: { id: MiUser['id'] } | null | undefined,
-	) {
-		const _users = avatars.map(({ user, userId }) => user ?? userId);
-		const _userMap = await this.userEntityService.packMany(_users, me)
-			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(avatars.map(avatar => this.packLite(avatar, me, { packedUser: _userMap.get(avatar.userId) })));
-	}
-
-	@bindThis
-	public async packDetailedMany(
-		avatars: MiWorldAvatar[],
-		me?: { id: MiUser['id'] } | null | undefined,
-	) {
-		const _users = avatars.map(({ user, userId }) => user ?? userId);
-		const _userMap = await this.userEntityService.packMany(_users, me)
-			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(avatars.map(avatar => this.packDetailed(avatar, me, { packedUser: _userMap.get(avatar.userId) })));
-	}
-}
-

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

@@ -1,97 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Inject, Injectable } from '@nestjs/common';
-import { DI } from '@/di-symbols.js';
-import type { DriveFilesRepository, MiWorldRoom, WorldRoomsRepository } from '@/models/_.js';
-import { awaitAll } from '@/misc/prelude/await-all.js';
-import type { Packed } from '@/misc/json-schema.js';
-import type { } from '@/models/Blocking.js';
-import type { MiUser } from '@/models/User.js';
-import type { MiDriveFile } from '@/models/DriveFile.js';
-import { bindThis } from '@/decorators.js';
-import { IdService } from '@/core/IdService.js';
-import { WorldRoomService } from '@/core/WorldRoomService.js';
-import { UserEntityService } from './UserEntityService.js';
-import { DriveFileEntityService } from './DriveFileEntityService.js';
-import { In } from 'typeorm';
-
-@Injectable()
-export class WorldRoomEntityService {
-	constructor(
-		@Inject(DI.worldRoomsRepository)
-		private worldRoomsRepository: WorldRoomsRepository,
-
-		@Inject(DI.driveFilesRepository)
-		private driveFilesRepository: DriveFilesRepository,
-
-		private worldRoomService: WorldRoomService,
-		private userEntityService: UserEntityService,
-		private driveFileEntityService: DriveFileEntityService,
-		private idService: IdService,
-	) {
-	}
-
-	@bindThis
-	public async packLite(
-		src: MiWorldRoom['id'] | MiWorldRoom,
-		me?: { id: MiUser['id'] } | null | undefined,
-		hint?: {
-			packedUser?: Packed<'UserLite'>
-		},
-	): Promise<Packed<'WorldRoomLite'>> {
-		const meId = me ? me.id : null;
-		const room = typeof src === 'object' ? src : await this.worldRoomsRepository.findOneByOrFail({ id: src });
-
-		return await awaitAll({
-			id: room.id,
-			createdAt: this.idService.parse(room.id).date.toISOString(),
-			updatedAt: room.updatedAt.toISOString(),
-			userId: room.userId,
-			user: hint?.packedUser ?? this.userEntityService.pack(room.user ?? room.userId, me),
-			name: room.name,
-			description: room.description,
-		});
-	}
-
-	@bindThis
-	public async packDetailed(
-		src: MiWorldRoom['id'] | MiWorldRoom,
-		me?: { id: MiUser['id'] } | null | undefined,
-		hint?: {
-			packedUser?: Packed<'UserLite'>
-		},
-	): Promise<Packed<'WorldRoomDetailed'>> {
-		const meId = me ? me.id : null;
-		const room = typeof src === 'object' ? src : await this.worldRoomsRepository.findOneByOrFail({ id: src });
-
-		const attachedFileIds = this.worldRoomService.collectReferencedDriveFileIds(room.def);
-		const attachedFiles = attachedFileIds.size === 0 ? [] : await this.driveFilesRepository.findBy({ id: In([...attachedFileIds]), userId: room.userId });
-
-		return await awaitAll({
-			id: room.id,
-			createdAt: this.idService.parse(room.id).date.toISOString(),
-			updatedAt: room.updatedAt.toISOString(),
-			userId: room.userId,
-			user: hint?.packedUser ?? this.userEntityService.pack(room.user ?? room.userId, me),
-			name: room.name,
-			description: room.description,
-			def: room.def,
-			attachedFiles: this.driveFileEntityService.packMany(attachedFiles),
-		});
-	}
-
-	@bindThis
-	public async packLiteMany(
-		rooms: MiWorldRoom[],
-		me?: { id: MiUser['id'] } | null | undefined,
-	) {
-		const _users = rooms.map(({ user, userId }) => user ?? userId);
-		const _userMap = await this.userEntityService.packMany(_users, me)
-			.then(users => new Map(users.map(u => [u.id, u])));
-		return Promise.all(rooms.map(room => this.packLite(room, me, { packedUser: _userMap.get(room.userId) })));
-	}
-}
-

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,66 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import Logger from '@/logger.js';
+import { shutdownTelemetry as defaultShutdownTelemetry } from './telemetry-registry.js';
+
+const logger = new Logger('telemetry', 'green');
+
+type SignalProcess = {
+	once(event: 'SIGTERM' | 'SIGINT', listener: () => Promise<void>): unknown;
+};
+
+type InstallTelemetrySignalHandlersOptions = {
+	process?: SignalProcess;
+	shutdownTelemetry?: () => Promise<void>;
+	exit?: (code: number) => void;
+};
+
+let shuttingDown = false;
+
+export function installTelemetrySignalHandlers(options: InstallTelemetrySignalHandlersOptions = {}): void {
+	// テストではprocess/exitを差し替え、本番では実processにSIGTERM/SIGINT handlerを登録する。
+	//
+	// 注意: このプロジェクトでは app.enableShutdownHooks() が一切呼ばれていないため、
+	// NestJSのOnApplicationShutdown経由のgraceful shutdown(GlobalModule.dispose()によるDB/Redis切断、
+	// QueueProcessorService.stop()によるqueue drain、ServerService.dispose()によるfastify/WebSocket close)は
+	// 本PR以前から実質的に無効(SIGTERM/SIGINTを起点に発火することが無い)だった。
+	// このhandlerはリポジトリで初めて有効になる本番SIGTERM/SIGINT handlerであり、telemetryのflushのみを行い
+	// 上記のgraceful shutdown処理を経由せずに即exitする。将来enableShutdownHooks()を配線する場合は、
+	// この即exitとNestJS側のshutdown sequenceが競合しないよう順序を設計すること。
+	const processLike = options.process ?? process;
+	const shutdownTelemetry = options.shutdownTelemetry ?? defaultShutdownTelemetry;
+	const exit = options.exit ?? ((code: number) => process.exit(code));
+
+	const handleSignal = async () => {
+		// 同時に複数signalが来てもflushを二重実行せず、cluster refork抑止用の状態もここで立てる。
+		if (shuttingDown) return;
+		shuttingDown = true;
+
+		try {
+			// 終了直前にBatchSpanProcessor/Sentryのbufferをflushする。
+			// (DB/Redis/queue/HTTPサーバーのgraceful closeはここでは行わない。上記の注意を参照。)
+			await shutdownTelemetry();
+		} catch {
+			// telemetry flushの失敗でプロセス終了が止まらないよう、ここでは握り潰す。
+		} finally {
+			// 既存挙動と同じく、telemetry flush後はプロセスを終了する。
+			exit(0);
+		}
+	};
+
+	// onceにして、同じsignalでhandlerが再入しないようにする。
+	processLike.once('SIGTERM', handleSignal);
+	processLike.once('SIGINT', handleSignal);
+
+	// app.enableShutdownHooks()未配線の現状、SIGTERM/SIGINT時の処理はtelemetry flushのみであることを
+	// 起動時に明示し、DB/Redis/queue/HTTPサーバーのgraceful closeが行われない点を運用者が把握できるようにする。
+	logger.info('Registered SIGTERM/SIGINT handler for telemetry flush (this process does not perform NestJS graceful shutdown on these signals).');
+}
+
+export function isTelemetryShutdownInProgress(): boolean {
+	// masterのcluster exit handlerが、意図したshutdown中のworker終了を再forkしないために参照する。
+	return shuttingDown;
+}

packages/backend/src/di-symbols.ts

@@ -91,7 +91,5 @@ export const DI = {
 	bubbleGameRecordsRepository: Symbol('bubbleGameRecordsRepository'),
 	reversiGamesRepository: Symbol('reversiGamesRepository'),
 	noteDraftsRepository: Symbol('noteDraftsRepository'),
-	worldRoomsRepository: Symbol('worldRoomsRepository'),
-	worldAvatarsRepository: Symbol('worldAvatarsRepository'),
 	//#endregion
 };

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/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,129 @@
+/*
+ * 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 { 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;
+};
+
+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;
+
+	/**
+	 * 出力先と実行環境から値を取得する処理を受け取ります。
+	 * 実行環境の取得処理は、必要な項目だけテスト用に差し替えられます。
+	 */
+	constructor(
+		backend: LogBackend,
+		dependencies: Partial<LogManagerDependencies> = {},
+		options: LogManagerOptions = {},
+	) {
+		this.backend = backend;
+		this.dependencies = {
+			...defaultDependencies,
+			...dependencies,
+		};
+		this.normalizationProfile = options.normalizationProfile ?? 'standard';
+	}
+
+	/**
+	 * 以後のログを書き込む出力先を切り替えます。
+	 * 作成済みのLoggerにも切り替えを反映するため、LogManager側で保持します。
+	 */
+	public setBackend(backend: LogBackend): void {
+		this.backend = backend;
+	}
+
+	/** 正規化方式を切り替え、既に作成済みのLoggerにも反映します。 */
+	public setNormalizationProfile(profile: LogNormalizationProfile): void {
+		this.normalizationProfile = profile;
+	}
+
+	/**
+	 * 出力条件を確認し、共通情報を付加して出力先へ渡します。
+	 */
+	public write(input: LogRecordInput): void {
+		// `quiet`は他の条件より優先し、ログに付随する情報の取得も行いません。
+		if (this.dependencies.isQuiet()) return;
+
+		// 本番環境のデバッグログは、明示的に`verbose`が指定された場合だけ出力します。
+		if (input.level === 'debug' && this.dependencies.getNodeEnv() === 'production' && !this.dependencies.isVerbose()) 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: context.map(segment => segment.name).join('.'),
+			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,13 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { LogManager } from './LogManager.js';
+import { PrettyConsoleBackend } from './PrettyConsoleBackend.js';
+
+/**
+ * プロセス内のすべてのLoggerが共有するLogManagerです。
+ * Logger作成後も同じLogManagerを参照するため、出力先の切り替えを一括で反映できます。
+ */
+export const logManager = new LogManager(new PrettyConsoleBackend());

packages/backend/src/logging/types.ts

@@ -0,0 +1,80 @@
+/*
+ * 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';
+
+/** 正規化後にログ属性として扱える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/misc/json-schema.ts

@@ -75,8 +75,6 @@ import { packedChatRoomInvitationSchema } from '@/models/json-schema/chat-room-i
 import { packedChatRoomMembershipSchema } from '@/models/json-schema/chat-room-membership.js';
 import { packedAchievementNameSchema, packedAchievementSchema } from '@/models/json-schema/achievement.js';
 import { packedNoteDraftSchema } from '@/models/json-schema/note-draft.js';
-import { packedWorldRoomDetailedSchema, packedWorldRoomLiteSchema } from '@/models/json-schema/world-room.js';
-import { packedWorldAvatarDetailedSchema, packedWorldAvatarLiteSchema } from '@/models/json-schema/world-avatar.js';
 
 export const refs = {
 	UserLite: packedUserLiteSchema,
@@ -149,10 +147,6 @@ export const refs = {
 	ChatRoom: packedChatRoomSchema,
 	ChatRoomInvitation: packedChatRoomInvitationSchema,
 	ChatRoomMembership: packedChatRoomMembershipSchema,
-	WorldRoomLite: packedWorldRoomLiteSchema,
-	WorldRoomDetailed: packedWorldRoomDetailedSchema,
-	WorldAvatarLite: packedWorldAvatarLiteSchema,
-	WorldAvatarDetailed: packedWorldAvatarDetailedSchema,
 };
 
 export type Packed<x extends keyof typeof refs> = SchemaType<typeof refs[x]>;

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/models/RepositoryModule.ts

@@ -84,8 +84,6 @@ import {
 	MiChatRoomMembership,
 	MiChatRoomInvitation,
 	MiChatApproval,
-	MiWorldRoom,
-	MiWorldAvatar,
 } from './_.js';
 import type { Provider } from '@nestjs/common';
 import type { DataSource } from 'typeorm';
@@ -546,18 +544,6 @@ const $reversiGamesRepository: Provider = {
 	inject: [DI.db],
 };
 
-const $worldRoomsRepository: Provider = {
-	provide: DI.worldRoomsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiWorldRoom).extend(miRepository as MiRepository<MiWorldRoom>),
-	inject: [DI.db],
-};
-
-const $worldAvatarsRepository: Provider = {
-	provide: DI.worldAvatarsRepository,
-	useFactory: (db: DataSource) => db.getRepository(MiWorldAvatar).extend(miRepository as MiRepository<MiWorldAvatar>),
-	inject: [DI.db],
-};
-
 @Module({
 	imports: [],
 	providers: [
@@ -637,8 +623,6 @@ const $worldAvatarsRepository: Provider = {
 		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
-		$worldRoomsRepository,
-		$worldAvatarsRepository,
 	],
 	exports: [
 		$usersRepository,
@@ -717,8 +701,6 @@ const $worldAvatarsRepository: Provider = {
 		$chatApprovalsRepository,
 		$bubbleGameRecordsRepository,
 		$reversiGamesRepository,
-		$worldRoomsRepository,
-		$worldAvatarsRepository,
 	],
 })
 export class RepositoryModule {

packages/backend/src/models/Role.ts

@@ -227,6 +227,11 @@ export class MiRole {
 	})
 	public isPublic: boolean;
 
+	@Column('boolean', {
+		default: false,
+	})
+	public isPublicDisplayRequired: boolean;
+
 	// trueの場合ユーザー名の横にバッジとして表示
 	@Column('boolean', {
 		default: false,

packages/backend/src/models/User.ts

@@ -6,6 +6,7 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
 import { id } from './util/id.js';
 import { MiDriveFile } from './DriveFile.js';
+import type { MiRole } from './Role.js';
 
 @Entity('user')
 @Index(['usernameLower', 'host'], { unique: true })
@@ -229,6 +230,11 @@ export class MiUser {
 	})
 	public emojis: string[];
 
+	@Column('varchar', {
+		length: 32, array: true, default: '{}',
+	})
+	public hiddenRoleIds: MiRole['id'][];
+
 	// チャットを許可する相手
 	// everyone: 誰からでも
 	// followers: フォロワーのみ

packages/backend/src/models/WorldAvatar.ts

@@ -1,54 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-
-@Entity('world_avatar')
-export class MiWorldAvatar {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column('timestamp with time zone', {
-	})
-	public updatedAt: Date;
-
-	@Column('varchar', {
-		length: 256,
-	})
-	public name: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public userId: MiUser['id'];
-
-	@ManyToOne(() => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public user: MiUser | null;
-
-	@Column('boolean', {
-		default: false,
-	})
-	public active: boolean;
-
-	@Column('jsonb', {
-		default: {},
-	})
-	public def: Record<string, any>;
-
-	constructor(data: Partial<MiWorldAvatar>) {
-		if (data == null) return;
-
-		for (const [k, v] of Object.entries(data)) {
-			(this as any)[k] = v;
-		}
-	}
-}

packages/backend/src/models/WorldRoom.ts

@@ -1,72 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { id } from './util/id.js';
-import { MiUser } from './User.js';
-
-export const worldRoomVisibility = ['public', 'private'] as const;
-export type WorldRoomVisibility = typeof worldRoomVisibility[number];
-
-@Entity('world_room')
-export class MiWorldRoom {
-	@PrimaryColumn(id())
-	public id: string;
-
-	@Index()
-	@Column('timestamp with time zone', {
-	})
-	public updatedAt: Date;
-
-	@Column('varchar', {
-		length: 256,
-	})
-	public name: string;
-
-	@Column('varchar', {
-		length: 1024,
-	})
-	public description: string;
-
-	@Index()
-	@Column({
-		...id(),
-	})
-	public userId: MiUser['id'];
-
-	@ManyToOne(() => MiUser, {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn()
-	public user: MiUser | null;
-
-	@Column('integer', {
-		default: 0,
-	})
-	public likedCount: number;
-
-	@Column('integer', {
-		default: 0,
-	})
-	public accessCount: number;
-
-	@Column('varchar', {
-		length: 128, default: 'public',
-	})
-	public visibility: WorldRoomVisibility;
-
-	@Column('jsonb', {
-		default: {},
-	})
-	public def: Record<string, any>;
-
-	constructor(data: Partial<MiWorldRoom>) {
-		if (data == null) return;
-
-		for (const [k, v] of Object.entries(data)) {
-			(this as any)[k] = v;
-		}
-	}
-}

packages/backend/src/models/_.ts

@@ -23,7 +23,7 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiChannel } from '@/models/Channel.js';
 import { MiChannelFavorite } from '@/models/ChannelFavorite.js';
 import { MiChannelFollowing } from '@/models/ChannelFollowing.js';
-import { MiChannelMuting } from '@/models/ChannelMuting.js';
+import { MiChannelMuting } from "@/models/ChannelMuting.js";
 import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiChatMessage } from '@/models/ChatMessage.js';
 import { MiChatRoom } from '@/models/ChatRoom.js';
@@ -84,8 +84,6 @@ import { MiUserProfile } from '@/models/UserProfile.js';
 import { MiUserPublickey } from '@/models/UserPublickey.js';
 import { MiUserSecurityKey } from '@/models/UserSecurityKey.js';
 import { MiWebhook } from '@/models/Webhook.js';
-import { MiWorldRoom } from '@/models/WorldRoom.js';
-import { MiWorldAvatar } from '@/models/WorldAvatar.js';
 import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity.js';
 
 export interface MiRepository<T extends ObjectLiteral> {
@@ -175,8 +173,6 @@ export {
 	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
-	MiWorldRoom,
-	MiWorldAvatar,
 };
 
 export type AbuseUserReportsRepository = Repository<MiAbuseUserReport> & MiRepository<MiAbuseUserReport>;
@@ -257,5 +253,3 @@ export type ChatRoomInvitationsRepository = Repository<MiChatRoomInvitation> & M
 export type ChatApprovalsRepository = Repository<MiChatApproval> & MiRepository<MiChatApproval>;
 export type BubbleGameRecordsRepository = Repository<MiBubbleGameRecord> & MiRepository<MiBubbleGameRecord>;
 export type ReversiGamesRepository = Repository<MiReversiGame> & MiRepository<MiReversiGame>;
-export type WorldRoomsRepository = Repository<MiWorldRoom> & MiRepository<MiWorldRoom>;
-export type WorldAvatarsRepository = Repository<MiWorldAvatar> & MiRepository<MiWorldAvatar>;

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

@@ -369,6 +369,21 @@ export const packedRoleLiteSchema = {
 			optional: false, nullable: false,
 			example: false,
 		},
+		asBadge: {
+			type: 'boolean',
+			optional: false, nullable: false,
+			example: false,
+		},
+		isPublicDisplayRequired: {
+			type: 'boolean',
+			optional: false, nullable: false,
+			example: false,
+		},
+		isExplorable: {
+			type: 'boolean',
+			optional: false, nullable: false,
+			example: false,
+		},
 		displayOrder: {
 			type: 'integer',
 			optional: false, nullable: false,
@@ -412,6 +427,11 @@ export const packedRoleSchema = {
 					optional: false, nullable: false,
 					example: false,
 				},
+				isPublicDisplayRequired: {
+					type: 'boolean',
+					optional: false, nullable: false,
+					example: false,
+				},
 				isExplorable: {
 					type: 'boolean',
 					optional: false, nullable: false,

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

@@ -176,6 +176,11 @@ export const packedUserLiteSchema = {
 				type: 'object',
 				nullable: false, optional: false,
 				properties: {
+					id: {
+						type: 'string',
+						nullable: false, optional: false,
+						format: 'id',
+					},
 					name: {
 						type: 'string',
 						nullable: false, optional: false,
@@ -511,6 +516,15 @@ export const packedMeDetailedOnlySchema = {
 			type: 'boolean',
 			nullable: false, optional: false,
 		},
+		hiddenRoleIds: {
+			type: 'array',
+			nullable: false, optional: false,
+			items: {
+				type: 'string',
+				nullable: false, optional: false,
+				format: 'id',
+			},
+		},
 		twoFactorBackupCodesStock: {
 			type: 'string',
 			enum: ['full', 'partial', 'none'],

packages/backend/src/models/json-schema/world-avatar.ts

@@ -1,52 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedWorldAvatarLiteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		def: {
-			type: 'object',
-			optional: false, nullable: false,
-		},
-	},
-} as const;
-
-export const packedWorldAvatarDetailedSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		def: {
-			type: 'object',
-			optional: false, nullable: false,
-		},
-		active: {
-			type: 'boolean',
-			optional: false, nullable: false,
-		},
-	},
-} as const;

packages/backend/src/models/json-schema/world-room.ts

@@ -1,95 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export const packedWorldRoomLiteSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-	},
-} as const;
-
-export const packedWorldRoomDetailedSchema = {
-	type: 'object',
-	properties: {
-		id: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		createdAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		updatedAt: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'date-time',
-		},
-		userId: {
-			type: 'string',
-			optional: false, nullable: false,
-			format: 'id',
-		},
-		user: {
-			type: 'object',
-			ref: 'UserLite',
-			optional: false, nullable: false,
-		},
-		name: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		description: {
-			type: 'string',
-			optional: false, nullable: false,
-		},
-		def: {
-			type: 'object',
-			optional: false, nullable: false,
-		},
-		attachedFiles: {
-			type: 'array',
-			optional: false, nullable: false,
-			items: {
-				type: 'object',
-				optional: false, nullable: false,
-				ref: 'DriveFile',
-			},
-		},
-	},
-} as const;

packages/backend/src/postgres.ts

@@ -87,8 +87,6 @@ import { MiBubbleGameRecord } from '@/models/BubbleGameRecord.js';
 import { MiReversiGame } from '@/models/ReversiGame.js';
 import { MiChatApproval } from '@/models/ChatApproval.js';
 import { MiSystemAccount } from '@/models/SystemAccount.js';
-import { MiWorldRoom } from '@/models/WorldRoom.js';
-import { MiWorldAvatar } from '@/models/WorldAvatar.js';
 
 pg.types.setTypeParser(20, Number);
 
@@ -256,8 +254,6 @@ export const entities = [
 	MiChatApproval,
 	MiBubbleGameRecord,
 	MiReversiGame,
-	MiWorldRoom,
-	MiWorldAvatar,
 	...charts,
 ];
 

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/ServerModule.ts

@@ -6,7 +6,6 @@
 import { Module } from '@nestjs/common';
 import { EndpointsModule } from '@/server/api/EndpointsModule.js';
 import { CoreModule } from '@/core/CoreModule.js';
-import MainStreamConnection from '@/server/api/stream/Connection.js';
 import { ApiCallService } from './api/ApiCallService.js';
 import { FileServerService } from './FileServerService.js';
 import { HealthServerService } from './HealthServerService.js';
@@ -31,6 +30,7 @@ import { UrlPreviewService } from './web/UrlPreviewService.js';
 import { ClientLoggerService } from './web/ClientLoggerService.js';
 import { OAuth2ProviderService } from './oauth/OAuth2ProviderService.js';
 
+import MainStreamConnection from '@/server/api/stream/Connection.js';
 import { MainChannel } from './api/stream/channels/main.js';
 import { AdminChannel } from './api/stream/channels/admin.js';
 import { AntennaChannel } from './api/stream/channels/antenna.js';
@@ -49,7 +49,6 @@ import { ChatUserChannel } from './api/stream/channels/chat-user.js';
 import { ChatRoomChannel } from './api/stream/channels/chat-room.js';
 import { ReversiChannel } from './api/stream/channels/reversi.js';
 import { ReversiGameChannel } from './api/stream/channels/reversi-game.js';
-import { WorldRoomChannel } from './api/stream/channels/world-room.js';
 import { NoteStreamingHidingService } from './api/stream/NoteStreamingHidingService.js';
 import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.js';
 
@@ -100,7 +99,6 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
 		QueueStatsChannel,
 		ServerStatsChannel,
 		UserListChannel,
-		WorldRoomChannel,
 		NoteStreamingHidingService,
 		OpenApiServerService,
 		OAuth2ProviderService,

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/endpoint-list.ts

@@ -447,14 +447,4 @@ export * as 'chat/rooms/invitations/inbox' from './endpoints/chat/rooms/invitati
 export * as 'chat/rooms/invitations/outbox' from './endpoints/chat/rooms/invitations/outbox.js';
 export * as 'chat/history' from './endpoints/chat/history.js';
 export * as 'chat/read-all' from './endpoints/chat/read-all.js';
-export * as 'world/rooms/create' from './endpoints/world/rooms/create.js';
-export * as 'world/rooms/update' from './endpoints/world/rooms/update.js';
-export * as 'world/rooms/delete' from './endpoints/world/rooms/delete.js';
-export * as 'world/rooms/list-by-user' from './endpoints/world/rooms/list-by-user.js';
-export * as 'world/rooms/show' from './endpoints/world/rooms/show.js';
-export * as 'world/avatars/create' from './endpoints/world/avatars/create.js';
-export * as 'world/avatars/update' from './endpoints/world/avatars/update.js';
-export * as 'world/avatars/delete' from './endpoints/world/avatars/delete.js';
-export * as 'world/avatars/list' from './endpoints/world/avatars/list.js';
-export * as 'world/avatars/show' from './endpoints/world/avatars/show.js';
 export * as 'v2/admin/emoji/list' from './endpoints/v2/admin/emoji/list.js';

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,