From d979cd2c07d24270d03be29f8f1c5b6a3351798d Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:15:02 +0900
Subject: [PATCH 01/15] =?UTF-8?q?fix(frontend):=20=E6=8A=95=E7=A8=BF?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=A7=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AE=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=8C=E4=B8=AD=E6=AD=A2=E3=81=BE=E3=81=9F?=
 =?UTF-8?q?=E3=81=AF=E5=A4=B1=E6=95=97=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AE?=
 =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA=E3=83=B3=E3=82=B0=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                    | 1 +
 packages/frontend/src/components/MkPostForm.vue | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8fcb60a39..b0b23ed891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - Feat: ページのタブバーを下部に表示できるように
 - Enhance: コントロールパネルを検索できるように
 - Enhance: トルコ語 (tr-TR) に対応
+- Fix: 投稿フォームでファイルのアップロードが中止または失敗した際のハンドリングを修正
 - Fix: 一部の設定検索結果が存在しないパスになる問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1171)
 - Fix: テーマエディタが動作しない問題を修正
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 174a73e0fd..f1fa870991 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -907,6 +907,11 @@ async function post(ev?: MouseEvent) {
 
 	if (uploader.items.value.some(x => x.uploaded == null)) {
 		await uploadFiles();
+
+		// アップロード失敗したものがあったら中止
+		if (uploader.items.value.some(x => x.uploaded == null)) {
+			return;
+		}
 	}
 
 	let postData = {

From b4a0fdfaa14ea67e78be5ba1488ccbfd6edaaf73 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:35:42 +0900
Subject: [PATCH 02/15] fix type errors

---
 packages/frontend/src/pages/timeline.vue | 25 ++++++------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index b783f7ee0b..b8c3ebadd9 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -107,7 +107,7 @@ const withSensitive = computed<boolean>({
 
 async function chooseList(ev: MouseEvent): Promise<void> {
 	const lists = await userListsCache.fetch();
-	const items: MenuItem[] = [
+	const items: (MenuItem | undefined)[] = [
 		...lists.map(list => ({
 			type: 'link' as const,
 			text: list.name,
@@ -121,12 +121,12 @@ async function chooseList(ev: MouseEvent): Promise<void> {
 			to: '/my/lists',
 		},
 	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
+	os.popupMenu(items.filter(i => i != null), ev.currentTarget ?? ev.target);
 }
 
 async function chooseAntenna(ev: MouseEvent): Promise<void> {
 	const antennas = await antennasCache.fetch();
-	const items: MenuItem[] = [
+	const items: (MenuItem | undefined)[] = [
 		...antennas.map(antenna => ({
 			type: 'link' as const,
 			text: antenna.name,
@@ -141,12 +141,12 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 			to: '/my/antennas',
 		},
 	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
+	os.popupMenu(items.filter(i => i != null), ev.currentTarget ?? ev.target);
 }
 
 async function chooseChannel(ev: MouseEvent): Promise<void> {
 	const channels = await favoritedChannelsCache.fetch();
-	const items: MenuItem[] = [
+	const items: (MenuItem | undefined)[] = [
 		...channels.map(channel => {
 			const lastReadedAt = miLocalStorage.getItemAsJson(`channelLastReadedAt:${channel.id}`) ?? null;
 			const hasUnreadNote = (lastReadedAt && channel.lastNotedAt) ? Date.parse(channel.lastNotedAt) > lastReadedAt : !!(!lastReadedAt && channel.lastNotedAt);
@@ -166,7 +166,7 @@ async function chooseChannel(ev: MouseEvent): Promise<void> {
 			to: '/channels',
 		},
 	];
-	os.popupMenu(items, ev.currentTarget ?? ev.target);
+	os.popupMenu(items.filter(i => i != null), ev.currentTarget ?? ev.target);
 }
 
 function saveSrc(newSrc: TimelinePageSrc): void {
@@ -190,19 +190,6 @@ function saveTlFilter(key: keyof typeof store.s.tl.filter, newValue: boolean) {
 	}
 }
 
-async function timetravel(): Promise<void> {
-	const { canceled, result: date } = await os.inputDate({
-		title: i18n.ts.date,
-	});
-	if (canceled) return;
-
-	tlComponent.value.timetravel(date);
-}
-
-function focus(): void {
-	tlComponent.value.focus();
-}
-
 function switchTlIfNeeded() {
 	if (isBasicTimeline(src.value) && !isAvailableBasicTimeline(src.value)) {
 		src.value = availableBasicTimelines()[0];

From 9931fff35ba13f1ed5d7d949d29e0da5e29a050f Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:44:59 +0900
Subject: [PATCH 03/15] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/global/MkPageHeader.vue | 3 ++-
 packages/frontend/src/pages/timeline.vue                 | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue
index 542c3d8d12..2f4de840db 100644
--- a/packages/frontend/src/components/global/MkPageHeader.vue
+++ b/packages/frontend/src/components/global/MkPageHeader.vue
@@ -52,6 +52,7 @@ export type PageHeaderProps = {
 	actions?: PageHeaderItem[] | null;
 	thin?: boolean;
 	hideTitle?: boolean;
+	canOmitTitle?: boolean;
 	displayMyAvatar?: boolean;
 };
 </script>
@@ -77,7 +78,7 @@ const emit = defineEmits<{
 const injectedPageMetadata = inject(DI.pageMetadata, ref(null));
 const pageMetadata = computed(() => props.overridePageMetadata ?? injectedPageMetadata.value);
 
-const hideTitle = computed(() => inject('shouldOmitHeaderTitle', false) || props.hideTitle);
+const hideTitle = computed(() => inject('shouldOmitHeaderTitle', false) || props.hideTitle || (props.canOmitTitle && props.tabs.length > 0));
 const thin_ = props.thin || inject('shouldHeaderThin', false);
 
 const el = useTemplateRef('el');
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index b8c3ebadd9..3fe48b4d72 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<PageWithHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :swipable="true" :displayMyAvatar="true">
+<PageWithHeader v-model:tab="src" :actions="headerActions" :tabs="$i ? headerTabs : headerTabsWhenNotLogin" :swipable="true" :displayMyAvatar="true" :canOmitTitle="true">
 	<div class="_spacer" style="--MI_SPACER-w: 800px;">
 		<MkTip v-if="isBasicTimeline(src)" :k="`tl.${src}`" style="margin-bottom: var(--MI-margin);">
 			{{ i18n.ts._timelineDescription[src] }}
@@ -45,8 +45,6 @@ import { miLocalStorage } from '@/local-storage.js';
 import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
 import { prefer } from '@/preferences.js';
 
-provide('shouldOmitHeaderTitle', true);
-
 const tlComponent = useTemplateRef('tlComponent');
 
 type TimelinePageSrc = BasicTimelineType | `list:${string}`;

From 998beeae59bbe9c272e3248b29b89a07259a3624 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:32:59 +0900
Subject: [PATCH 04/15] =?UTF-8?q?feat(frontend):=20AiScript=E3=82=921.0?=
 =?UTF-8?q?=E3=81=AB=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Close #16277
---
 CHANGELOG.md                                  |  4 +++
 packages/frontend/package.json                |  3 +-
 packages/frontend/src/components/MkNote.vue   | 28 +++++++++----------
 .../src/components/MkNoteDetailed.vue         | 27 +++++++++---------
 .../frontend/src/pages/flash/flash-edit.vue   |  8 +++---
 packages/frontend/src/pages/flash/flash.vue   | 10 +++++--
 packages/frontend/src/plugin.ts               |  8 +++---
 pnpm-lock.yaml                                | 18 ++++++++++--
 8 files changed, 62 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b23ed891..4734033c54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,10 @@
   - Fix: Unicode絵文字に隣接する異体字セレクタ（`U+FE0F`）が絵文字として認識される問題を修正
 
 ### Client
+- Feat: AiScriptが1.0に更新されました
+	- プラグインは1.0に対応したものが必要です
+	- Playはそのまま動作しますが、新規に作られるプリセットは1.0になります
+	- 以前のバージョンから無効化されていた note_view_interruptor が有効になりました
 - Feat: セーフモード
 	- プラグイン・テーマ・カスタムCSSの使用でクライアントの起動に問題が発生した際に、これらを無効にして起動できます
 	- 以下の方法でセーフモードを起動できます
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index e2880bee7e..f4f72d944a 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -25,7 +25,8 @@
 		"@rollup/plugin-replace": "6.0.2",
 		"@rollup/pluginutils": "5.2.0",
 		"@sentry/vue": "10.0.0",
-		"@syuilo/aiscript": "0.19.0",
+		"@syuilo/aiscript": "1.0.0",
+		"@syuilo/aiscript-0-19-0": "npm:@syuilo/aiscript@^0.19.0",
 		"@twemoji/parser": "16.0.0",
 		"@vitejs/plugin-vue": "6.0.1",
 		"@vue/compiler-sfc": "3.5.18",
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index b9cb37e99a..043af4cc96 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -265,21 +265,19 @@ const currentClip = inject<Ref<Misskey.entities.Clip> | null>('currentClip', nul
 
 let note = deepClone(props.note);
 
-// コンポーネント初期化に非同期的な処理を行うとTransitionのレンダリングがバグるため同期的に実行できるメソッドが実装されるのを待つ必要がある
-// https://github.com/aiscript-dev/aiscript/issues/937
-//// plugin
-//const noteViewInterruptors = getPluginHandlers('note_view_interruptor');
-//if (noteViewInterruptors.length > 0) {
-//	let result: Misskey.entities.Note | null = deepClone(note);
-//	for (const interruptor of noteViewInterruptors) {
-//		try {
-//			result = await interruptor.handler(result!) as Misskey.entities.Note | null;
-//		} catch (err) {
-//			console.error(err);
-//		}
-//	}
-//	note = result as Misskey.entities.Note;
-//}
+// plugin
+const noteViewInterruptors = getPluginHandlers('note_view_interruptor');
+if (noteViewInterruptors.length > 0) {
+	let result: Misskey.entities.Note | null = deepClone(note);
+	for (const interruptor of noteViewInterruptors) {
+		try {
+			result = interruptor.handler(result!) as Misskey.entities.Note | null;
+		} catch (err) {
+			console.error(err);
+		}
+	}
+	note = result as Misskey.entities.Note;
+}
 
 const isRenote = Misskey.note.isPureRenote(note);
 const appearNote = getAppearNote(note) ?? note;
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index c04959b97a..f3e990e65a 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -287,20 +287,19 @@ const inChannel = inject('inChannel', null);
 
 let note = deepClone(props.note);
 
-// コンポーネント初期化に非同期的な処理を行うとTransitionのレンダリングがバグるため同期的に実行できるメソッドが実装されるのを待つ必要がある
-//// plugin
-//const noteViewInterruptors = getPluginHandlers('note_view_interruptor');
-//if (noteViewInterruptors.length > 0) {
-//	let result: Misskey.entities.Note | null = deepClone(note);
-//	for (const interruptor of noteViewInterruptors) {
-//		try {
-//			result = await interruptor.handler(result!) as Misskey.entities.Note | null;
-//		} catch (err) {
-//			console.error(err);
-//		}
-//	}
-//	note = result as Misskey.entities.Note;
-//}
+// plugin
+const noteViewInterruptors = getPluginHandlers('note_view_interruptor');
+if (noteViewInterruptors.length > 0) {
+	let result: Misskey.entities.Note | null = deepClone(note);
+	for (const interruptor of noteViewInterruptors) {
+		try {
+			result = interruptor.handler(result!) as Misskey.entities.Note | null;
+		} catch (err) {
+			console.error(err);
+		}
+	}
+	note = result as Misskey.entities.Note;
+}
 
 const isRenote = Misskey.note.isPureRenote(note);
 const appearNote = getAppearNote(note);
diff --git a/packages/frontend/src/pages/flash/flash-edit.vue b/packages/frontend/src/pages/flash/flash-edit.vue
index a964b33a52..bf4911f648 100644
--- a/packages/frontend/src/pages/flash/flash-edit.vue
+++ b/packages/frontend/src/pages/flash/flash-edit.vue
@@ -88,7 +88,7 @@ let choices = [
 ]
 
 // シードが「PlayID+ユーザーID+今日の日付」である乱数生成器を用意
-let random = Math:gen_rng(\`{THIS_ID}{USER_ID}{Date:year()}{Date:month()}{Date:day()}\`)
+let random = Math:gen_rng(\`{THIS_ID}{USER_ID}{Date:year()}{Date:month()}{Date:day()}\`, { algorithm: 'rc4_legacy' })
 
 // ランダムに選択肢を選ぶ
 let chosen = choices[random(0, (choices.len - 1))]
@@ -127,7 +127,7 @@ var results = []
 // どれだけ巻き戻しているか
 var cursor = 0
 
-@do() {
+@main() {
 	if (cursor != 0) {
 		results = results.slice(0, (cursor + 1))
 		cursor = 0
@@ -175,7 +175,7 @@ var cursor = 0
 						onClick: forward
 					}, {
 						text: "引き直す"
-						onClick: do
+						onClick: main
 					}]
 				})
 				Ui:C:postFormButton({
@@ -191,7 +191,7 @@ var cursor = 0
 	])
 }
 
-do()
+main()
 `;
 
 const PRESET_QUIZ = `/// @ ${AISCRIPT_VERSION}
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 8443293d34..560d2a46ea 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -63,11 +63,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { computed, onDeactivated, onUnmounted, ref, watch, shallowRef, defineAsyncComponent } from 'vue';
 import * as Misskey from 'misskey-js';
-import { Interpreter, Parser, values } from '@syuilo/aiscript';
 import { url } from '@@/js/config.js';
 import type { Ref } from 'vue';
 import type { AsUiComponent, AsUiRoot } from '@/aiscript/ui.js';
 import type { MenuItem } from '@/types/menu.js';
+import type { Interpreter } from '@syuilo/aiscript';
 import MkButton from '@/components/MkButton.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
@@ -180,8 +180,6 @@ async function unlike() {
 
 watch(() => props.id, fetchFlash, { immediate: true });
 
-const parser = new Parser();
-
 const started = ref(false);
 const aiscript = shallowRef<Interpreter | null>(null);
 const root = ref<AsUiRoot>();
@@ -196,6 +194,12 @@ async function run() {
 	if (aiscript.value) aiscript.value.abort();
 	if (!flash.value) return;
 
+	const isLegacy = !flash.value.script.replaceAll(' ', '').startsWith('///@1.0.0');
+
+	const { Interpreter, Parser, values } = isLegacy ? await import('@syuilo/aiscript-0-19-0') : await import('@syuilo/aiscript');
+
+	const parser = new Parser();
+
 	components.value = [];
 
 	aiscript.value = new Interpreter({
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index 5610ae7095..d47c6cd0e5 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -7,15 +7,15 @@ import { ref, defineAsyncComponent } from 'vue';
 import { Interpreter, Parser, utils, values } from '@syuilo/aiscript';
 import { compareVersions } from 'compare-versions';
 import { isSafeMode } from '@@/js/config.js';
-import { genId } from '@/utility/id.js';
 import * as Misskey from 'misskey-js';
+import type { FormWithDefault } from '@/utility/form.js';
+import { genId } from '@/utility/id.js';
 import { aiScriptReadline, createAiScriptEnv } from '@/aiscript/api.js';
 import { store } from '@/store.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { prefer } from '@/preferences.js';
-import type { FormWithDefault } from '@/utility/form.js';
 
 export type Plugin = {
 	installId: string;
@@ -394,8 +394,8 @@ function createPluginEnv(opts: { plugin: Plugin; storageKey: string }): Record<s
 		'Plugin:register:note_view_interruptor': values.FN_NATIVE(([handler]) => {
 			utils.assertFunction(handler);
 			addPluginHandler(id, 'note_view_interruptor', {
-				handler: withContext(ctx => async (note) => {
-					return utils.valToJs(await ctx.execFn(handler, [utils.jsToVal(note)]));
+				handler: withContext(ctx => (note) => {
+					return utils.valToJs(ctx.execFnSync(handler, [utils.jsToVal(note)]));
 				}),
 			});
 		}),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8249aa52e2..8121822fb7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -731,8 +731,11 @@ importers:
         specifier: 10.0.0
         version: 10.0.0(vue@3.5.18(typescript@5.9.2))
       '@syuilo/aiscript':
-        specifier: 0.19.0
-        version: 0.19.0
+        specifier: 1.0.0
+        version: 1.0.0
+      '@syuilo/aiscript-0-19-0':
+        specifier: npm:@syuilo/aiscript@^0.19.0
+        version: '@syuilo/aiscript@0.19.0'
       '@twemoji/parser':
         specifier: 16.0.0
         version: 16.0.0
@@ -4302,6 +4305,9 @@ packages:
   '@syuilo/aiscript@0.19.0':
     resolution: {integrity: sha512-ZWG4s1m6RrFjE7NeIMaxFz769YO1jW5ReTrOROrEO4IHheOrjxxJ/Ffe2TUNqX9/XxDloMwfWplKhfSzx8LGMA==}
 
+  '@syuilo/aiscript@1.0.0':
+    resolution: {integrity: sha512-m+Dxx0g2pDI198OCj/OJgiJnE4ajlbOFAMyh84FmbY1S8ss/MHytxY82dCnMZj5WVt7VE7a1rtW7biuRRfuyaA==}
+
   '@szmarczak/http-timer@5.0.1':
     resolution: {integrity: sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==}
     engines: {node: '>=14.16'}
@@ -14637,7 +14643,7 @@ snapshots:
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
       estraverse: 5.3.0
-      picomatch: 4.0.2
+      picomatch: 4.0.3
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -14735,6 +14741,12 @@ snapshots:
       stringz: 2.1.0
       uuid: 9.0.1
 
+  '@syuilo/aiscript@1.0.0':
+    dependencies:
+      seedrandom: 3.0.5
+      stringz: 2.1.0
+      uuid: 11.1.0
+
   '@szmarczak/http-timer@5.0.1':
     dependencies:
       defer-to-connect: 2.0.1

From ee9dc9406376e2a8112c89edd3843f5359e9aef8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 6 Aug 2025 14:22:21 +0900
Subject: [PATCH 05/15] =?UTF-8?q?enhance(frontend):=20=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=81=AE=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=81=AE?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E6=9C=89=E7=84=A1=E3=82=92=E5=88=87=E3=82=8A?=
 =?UTF-8?q?=E6=9B=BF=E3=81=88=E3=82=89=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/timeline.vue | 80 +++++++++++++-----------
 1 file changed, 44 insertions(+), 36 deletions(-)

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index 3fe48b4d72..1a5f3edc9e 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -103,6 +103,8 @@ const withSensitive = computed<boolean>({
 	set: (x) => saveTlFilter('withSensitive', x),
 });
 
+const showFixedPostForm = prefer.model('showFixedPostForm');
+
 async function chooseList(ev: MouseEvent): Promise<void> {
 	const lists = await userListsCache.fetch();
 	const items: (MenuItem | undefined)[] = [
@@ -202,49 +204,54 @@ onActivated(() => {
 });
 
 const headerActions = computed(() => {
-	const tmp = [
-		{
-			icon: 'ti ti-dots',
-			text: i18n.ts.options,
-			handler: (ev) => {
-				const menuItems: MenuItem[] = [];
+	const items = [{
+		icon: 'ti ti-dots',
+		text: i18n.ts.options,
+		handler: (ev) => {
+			const menuItems: MenuItem[] = [];
 
+			menuItems.push({
+				type: 'switch',
+				icon: 'ti ti-repeat',
+				text: i18n.ts.showRenotes,
+				ref: withRenotes,
+			});
+
+			if (isBasicTimeline(src.value) && hasWithReplies(src.value)) {
 				menuItems.push({
 					type: 'switch',
-					icon: 'ti ti-repeat',
-					text: i18n.ts.showRenotes,
-					ref: withRenotes,
+					icon: 'ti ti-messages',
+					text: i18n.ts.showRepliesToOthersInTimeline,
+					ref: withReplies,
+					disabled: onlyFiles,
 				});
+			}
 
-				if (isBasicTimeline(src.value) && hasWithReplies(src.value)) {
-					menuItems.push({
-						type: 'switch',
-						icon: 'ti ti-messages',
-						text: i18n.ts.showRepliesToOthersInTimeline,
-						ref: withReplies,
-						disabled: onlyFiles,
-					});
-				}
+			menuItems.push({
+				type: 'switch',
+				icon: 'ti ti-eye-exclamation',
+				text: i18n.ts.withSensitive,
+				ref: withSensitive,
+			}, {
+				type: 'switch',
+				icon: 'ti ti-photo',
+				text: i18n.ts.fileAttachedOnly,
+				ref: onlyFiles,
+				disabled: isBasicTimeline(src.value) && hasWithReplies(src.value) ? withReplies : false,
+			}, {
+				type: 'divider',
+			}, {
+				type: 'switch',
+				text: i18n.ts.showFixedPostForm,
+				ref: showFixedPostForm,
+			});
 
-				menuItems.push({
-					type: 'switch',
-					icon: 'ti ti-eye-exclamation',
-					text: i18n.ts.withSensitive,
-					ref: withSensitive,
-				}, {
-					type: 'switch',
-					icon: 'ti ti-photo',
-					text: i18n.ts.fileAttachedOnly,
-					ref: onlyFiles,
-					disabled: isBasicTimeline(src.value) && hasWithReplies(src.value) ? withReplies : false,
-				});
-
-				os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
-			},
+			os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
 		},
-	];
+	}];
+
 	if (deviceKind === 'desktop') {
-		tmp.unshift({
+		items.unshift({
 			icon: 'ti ti-refresh',
 			text: i18n.ts.reload,
 			handler: (ev: Event) => {
@@ -252,7 +259,8 @@ const headerActions = computed(() => {
 			},
 		});
 	}
-	return tmp;
+
+	return items;
 });
 
 const headerTabs = computed(() => [...(prefer.r.pinnedUserLists.value.map(l => ({

From f86239ab2f65386f27e69a41c14419f4070a3387 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 7 Aug 2025 17:21:43 +0900
Subject: [PATCH 06/15] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e10806686..95e6077d93 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -618,3 +618,23 @@ color: hsl(from var(--MI_THEME-accent) h s calc(l - 10));
 color: color(from var(--MI_THEME-accent) srgb r g b / 0.5);
 ```
 
+## 考え方
+### DRYに囚われるな
+必要なのは一般化ではなく抽象化と考えます。
+盲信せず、誤った・不必要な共通化は避け、それが自然だと感じる場合は重複させる勇気を持ちましょう。
+
+### Misskeyを複雑にしない実装
+それがいくら複雑であっても、Misskey固有のコンテキストと関心が分離されている(もしくは事実上分離されていると見做すことができる)実装であれば、それはMisskeyのコードベースに対する複雑性に影響を与えないと考えます。
+
+例えるなら、VueやAiScriptといったMisskeyが使用しているライブラリの内部実装がいくら複雑だったとしても、「それを使用しているからMisskeyの実装は複雑である」ということにはならないのと同じです。
+
+Misskeyのドメイン知識から関心が分離されているということは、Misskeyの実装について考える時にそれらの内部実装を考慮する必要が無く、認知負荷を増やさないからです。
+
+また重要な点は、その実装が、Misskeyリポジトリの外部にあるか・内部にあるかということや、Misskeyがメンテナンスするものか・第三者がメンテナンスするものかといったことは複雑性を考える上ではほとんど無視できるという点です。
+
+もちろんその実装がMisskeyリポジトリにあり、Misskeyがメンテナンスしなければならないものは、保守のコストはかかります。
+しかし、Misskeyの本質的な設計・実装という観点で見たときは、その実装は実質的に外部ライブラリのように振る舞います。
+換言すれば「たまたまMisskeyの開発者と同じ人たちがメンテナンスしているし、たまたまMisskeyのリポジトリ内に置いてあるだけの外部ライブラリ」です。
+
+そのため、実装をなるべくMisskeyのドメイン知識から独立したものにすれば、Misskeyのコードベースの複雑性を上げることなく機能実装を行うことができ、お得であると言えます。
+もちろんそれにこだわって、些細な実装でもそのように分離してしまうとかえって認知負荷が増えたり、実装量が増えてメリットをデメリットが上回る場合もあるので、ケースバイケースではあります。

From 8598f3912ecc16f9b7c3f502e09d9ea96f7e507d Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 8 Aug 2025 11:26:18 +0900
Subject: [PATCH 07/15] per-locale bundle & inline locale (#16369)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: split entry file by locale name

* chore: とりあえず transform hook で雑に分割

* chore: とりあえず transform 結果をいい感じに

* chore: concurrent buildで高速化

* chore: vite ではローケルのないものをビルドして後処理でどうにかするように

* chore: 後処理のためにi18n.jを単体になるように切り出す

* chore: use typescript

* chore: remove unref(i18n) in vite build process

* chore: inline variable

* fix: build error

* fix: i18n.ts.something.replaceAll() become error

* chore: ignore export specifier from error

* chore: support i18n.tsx as object

* chore: process literal for all files

* chore: split config and locale

* chore: inline locale name

* chore: remove updating locale in boot common

* chore: use top-level await to load locales

* chore: inline locale

* chore: remove loading locale from boot.js

* chore: remove loading locale from boot.js

* コメント追加

* fix test; fetchに失敗する

* import削除ログをdebugレベルに

* fix: watch pug

* chore: use hash for entry files

* chore: remove es-module-lexer from dependencies

* chore: move to frontend-builder

* chore: use inline locale in embed

* chore: refetch json on hot reload

* feat: store localization related to boot.js in backend in bootloaderLocales localstorage

* 応急処置を戻す

* fix spex

* fix `Using i18n identifier "e" directly. Skipping inlining.` warning

* refactor: use scriptsDir parameter

* chore: remove i18n from depmap

* chore: make build crash if errors

* error -> warn few conditions

* use inline object

* update localstorage keys

* remove accessing locale localstorage

* fix: failed to process i18n.tsx.aaa({x:i18n.bbb})
---
 packages/backend/scripts/dev.mjs              |   2 +-
 packages/backend/src/config.ts                |   8 +-
 packages/backend/src/server/web/boot.embed.js |  87 ++--
 packages/backend/src/server/web/boot.js       |  93 ++--
 .../src/server/web/views/base-embed.pug       |   3 +-
 .../backend/src/server/web/views/base.pug     |   3 +-
 packages/frontend-builder/README.txt          |   3 +
 packages/frontend-builder/eslint.config.js    |  98 ++++
 packages/frontend-builder/locale-inliner.ts   | 145 ++++++
 .../locale-inliner/apply-with-locale.ts       |  97 ++++
 .../locale-inliner/collect-modifications.ts   | 419 ++++++++++++++++++
 packages/frontend-builder/logger.ts           |  66 +++
 packages/frontend-builder/package.json        |  25 ++
 .../rollup-plugin-remove-unref-i18n.ts        |  53 +++
 packages/frontend-builder/tsconfig.json       |  29 ++
 packages/frontend-builder/utils.ts            |   7 +
 packages/frontend-embed/build.ts              |  51 +++
 packages/frontend-embed/package.json          |   5 +-
 packages/frontend-embed/src/boot.ts           |  19 +-
 packages/frontend-embed/src/i18n.ts           |   3 +-
 packages/frontend-embed/vite.config.ts        |  13 +-
 packages/frontend-shared/js/config.ts         |   8 -
 packages/frontend-shared/js/i18n.ts           |   6 +-
 packages/frontend-shared/js/locale.ts         |  14 +
 .../frontend-shared/js/store-boot-errors.ts   |  12 +
 packages/frontend/.gitignore                  |   1 +
 packages/frontend/.storybook/preview.ts       |   2 -
 packages/frontend/build.ts                    |  51 +++
 packages/frontend/package.json                |   4 +-
 packages/frontend/src/boot/common.ts          |  26 +-
 .../src/components/MkExtensionInstaller.vue   |   6 +-
 packages/frontend/src/i18n.ts                 |   3 +-
 packages/frontend/src/local-storage.ts        |   3 +-
 .../src/pages/settings/preferences.vue        |   2 -
 packages/frontend/src/utility/clear-cache.ts  |   2 -
 packages/frontend/tsconfig.json               |   1 +
 packages/frontend/vite.config.ts              |  13 +-
 pnpm-lock.yaml                                |  64 ++-
 pnpm-workspace.yaml                           |   1 +
 scripts/clean-all.js                          |   2 +
 40 files changed, 1247 insertions(+), 203 deletions(-)
 create mode 100644 packages/frontend-builder/README.txt
 create mode 100644 packages/frontend-builder/eslint.config.js
 create mode 100644 packages/frontend-builder/locale-inliner.ts
 create mode 100644 packages/frontend-builder/locale-inliner/apply-with-locale.ts
 create mode 100644 packages/frontend-builder/locale-inliner/collect-modifications.ts
 create mode 100644 packages/frontend-builder/logger.ts
 create mode 100644 packages/frontend-builder/package.json
 create mode 100644 packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
 create mode 100644 packages/frontend-builder/tsconfig.json
 create mode 100644 packages/frontend-builder/utils.ts
 create mode 100644 packages/frontend-embed/build.ts
 create mode 100644 packages/frontend-shared/js/locale.ts
 create mode 100644 packages/frontend-shared/js/store-boot-errors.ts
 create mode 100644 packages/frontend/build.ts

diff --git a/packages/backend/scripts/dev.mjs b/packages/backend/scripts/dev.mjs
index a3e0558abd..023eb7eae6 100644
--- a/packages/backend/scripts/dev.mjs
+++ b/packages/backend/scripts/dev.mjs
@@ -42,7 +42,7 @@ async function killProc() {
 		'./node_modules/nodemon/bin/nodemon.js',
 		[
 			'-w', 'src',
-			'-e', 'ts,js,mjs,cjs,json',
+			'-e', 'ts,js,mjs,cjs,json,pug',
 			'--exec', 'pnpm', 'run', 'build',
 		],
 		{
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 9031096745..f71f1d7e34 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -184,9 +184,9 @@ export type Config = {
 	authUrl: string;
 	driveUrl: string;
 	userAgent: string;
-	frontendEntry: string;
+	frontendEntry: { file: string | null };
 	frontendManifestExists: boolean;
-	frontendEmbedEntry: string;
+	frontendEmbedEntry: { file: string | null };
 	frontendEmbedManifestExists: boolean;
 	mediaProxy: string;
 	externalMediaProxyEnabled: boolean;
@@ -235,10 +235,10 @@ export function loadConfig(): Config {
 	const frontendEmbedManifestExists = fs.existsSync(_dirname + '/../../../built/_frontend_embed_vite_/manifest.json');
 	const frontendManifest = frontendManifestExists ?
 		JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_frontend_vite_/manifest.json`, 'utf-8'))
-		: { 'src/_boot_.ts': { file: 'src/_boot_.ts' } };
+		: { 'src/_boot_.ts': { file: null } };
 	const frontendEmbedManifest = frontendEmbedManifestExists ?
 		JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_frontend_embed_vite_/manifest.json`, 'utf-8'))
-		: { 'src/boot.ts': { file: 'src/boot.ts' } };
+		: { 'src/boot.ts': { file: null } };
 
 	const config = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
 
diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js
index 9de1275380..022ff064ad 100644
--- a/packages/backend/src/server/web/boot.embed.js
+++ b/packages/backend/src/server/web/boot.embed.js
@@ -32,61 +32,30 @@
 	}
 
 	//#region Detect language & fetch translations
-	if (!localStorage.hasOwnProperty('locale')) {
-		const supportedLangs = LANGS;
-		let lang = localStorage.getItem('lang');
-		if (lang == null || !supportedLangs.includes(lang)) {
-			if (supportedLangs.includes(navigator.language)) {
-				lang = navigator.language;
-			} else {
-				lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
-
-				// Fallback
-				if (lang == null) lang = 'en-US';
-			}
-		}
-
-		const metaRes = await window.fetch('/api/meta', {
-			method: 'POST',
-			body: JSON.stringify({}),
-			credentials: 'omit',
-			cache: 'no-cache',
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
-		if (metaRes.status !== 200) {
-			renderError('META_FETCH');
-			return;
-		}
-		const meta = await metaRes.json();
-		const v = meta.version;
-		if (v == null) {
-			renderError('META_FETCH_V');
-			return;
-		}
-
-		// for https://github.com/misskey-dev/misskey/issues/10202
-		if (lang == null || lang.toString == null || lang.toString() === 'null') {
-			console.error('invalid lang value detected!!!', typeof lang, lang);
-			lang = 'en-US';
-		}
-
-		const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
-		if (localRes.status === 200) {
-			localStorage.setItem('lang', lang);
-			localStorage.setItem('locale', await localRes.text());
-			localStorage.setItem('localeVersion', v);
+	const supportedLangs = LANGS;
+	/** @type { string } */
+	let lang = localStorage.getItem('lang');
+	if (lang == null || !supportedLangs.includes(lang)) {
+		if (supportedLangs.includes(navigator.language)) {
+			lang = navigator.language;
 		} else {
-			renderError('LOCALE_FETCH');
-			return;
+			lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+
+			// Fallback
+			if (lang == null) lang = 'en-US';
 		}
 	}
+
+	// for https://github.com/misskey-dev/misskey/issues/10202
+	if (lang == null || lang.toString == null || lang.toString() === 'null') {
+		console.error('invalid lang value detected!!!', typeof lang, lang);
+		lang = 'en-US';
+	}
 	//#endregion
 
 	//#region Script
 	async function importAppScript() {
-		await import(`/embed_vite/${CLIENT_ENTRY}`)
+		await import(CLIENT_ENTRY ? `/embed_vite/${CLIENT_ENTRY.replace('scripts', lang)}` : '/embed_vite/src/_boot_.ts')
 			.catch(async e => {
 				console.error(e);
 				renderError('APP_IMPORT');
@@ -115,10 +84,26 @@
 			await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
 		}
 
-		const locale = JSON.parse(localStorage.getItem('locale') || '{}');
+		let messages = null;
+		const bootloaderLocales = localStorage.getItem('bootloaderLocales');
+		if (bootloaderLocales) {
+			messages = JSON.parse(bootloaderLocales);
+		}
+		if (!messages) {
+			// older version of misskey does not store bootloaderLocales, stores locale as a whole
+			const legacyLocale = localStorage.getItem('locale');
+			if (legacyLocale) {
+				const parsed = JSON.parse(legacyLocale);
+				messages = {
+					...(parsed._bootErrors ?? {}),
+					reload: parsed.reload,
+				};
+			}
+		}
+		if (!messages) messages = {};
 
-		const title = locale?._bootErrors?.title || 'Failed to initialize Misskey';
-		const reload = locale?.reload || 'Reload';
+		const title = messages?.title || 'Failed to initialize Misskey';
+		const reload = messages?.reload || 'Reload';
 
 		document.body.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0" /><path d="M12 9v4" /><path d="M12 16v.01" /></svg>
 		<div class="message">${title}</div>
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index 1a30e9ed2b..0c0b46f82b 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -22,62 +22,31 @@
 		return;
 	}
 
-	//#region Detect language & fetch translations
-	if (!localStorage.hasOwnProperty('locale')) {
-		const supportedLangs = LANGS;
-		let lang = localStorage.getItem('lang');
-		if (lang == null || !supportedLangs.includes(lang)) {
-			if (supportedLangs.includes(navigator.language)) {
-				lang = navigator.language;
-			} else {
-				lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
-
-				// Fallback
-				if (lang == null) lang = 'en-US';
-			}
-		}
-
-		const metaRes = await window.fetch('/api/meta', {
-			method: 'POST',
-			body: JSON.stringify({}),
-			credentials: 'omit',
-			cache: 'no-cache',
-			headers: {
-				'Content-Type': 'application/json',
-			},
-		});
-		if (metaRes.status !== 200) {
-			renderError('META_FETCH');
-			return;
-		}
-		const meta = await metaRes.json();
-		const v = meta.version;
-		if (v == null) {
-			renderError('META_FETCH_V');
-			return;
-		}
-
-		// for https://github.com/misskey-dev/misskey/issues/10202
-		if (lang == null || lang.toString == null || lang.toString() === 'null') {
-			console.error('invalid lang value detected!!!', typeof lang, lang);
-			lang = 'en-US';
-		}
-
-		const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
-		if (localRes.status === 200) {
-			localStorage.setItem('lang', lang);
-			localStorage.setItem('locale', await localRes.text());
-			localStorage.setItem('localeVersion', v);
+	//#region Detect language
+	const supportedLangs = LANGS;
+	/** @type { string } */
+	let lang = localStorage.getItem('lang');
+	if (lang == null || !supportedLangs.includes(lang)) {
+		if (supportedLangs.includes(navigator.language)) {
+			lang = navigator.language;
 		} else {
-			renderError('LOCALE_FETCH');
-			return;
+			lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
+
+			// Fallback
+			if (lang == null) lang = 'en-US';
 		}
 	}
+
+	// for https://github.com/misskey-dev/misskey/issues/10202
+	if (lang == null || lang.toString == null || lang.toString() === 'null') {
+		console.error('invalid lang value detected!!!', typeof lang, lang);
+		lang = 'en-US';
+	}
 	//#endregion
 
 	//#region Script
 	async function importAppScript() {
-		await import(`/vite/${CLIENT_ENTRY}`)
+		await import(CLIENT_ENTRY ? `/vite/${CLIENT_ENTRY.replace('scripts', lang)}` : '/vite/src/_boot_.ts')
 			.catch(async e => {
 				console.error(e);
 				renderError('APP_IMPORT', e);
@@ -162,9 +131,25 @@
 			await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
 		}
 
-		const locale = JSON.parse(localStorage.getItem('locale') || '{}');
+		let messages = null;
+		const bootloaderLocales = localStorage.getItem('bootloaderLocales');
+		if (bootloaderLocales) {
+			messages = JSON.parse(bootloaderLocales);
+		}
+		if (!messages) {
+			// older version of misskey does not store bootloaderLocales, stores locale as a whole
+			const legacyLocale = localStorage.getItem('locale');
+			if (legacyLocale) {
+				const parsed = JSON.parse(legacyLocale);
+				messages = {
+					...(parsed._bootErrors ?? {}),
+					reload: parsed.reload,
+				};
+			}
+		}
+		if (!messages) messages = {};
 
-		const messages = Object.assign({
+		messages = Object.assign({
 			title: 'Failed to initialize Misskey',
 			solution: 'The following actions may solve the problem.',
 			solution1: 'Update your os and browser',
@@ -176,8 +161,8 @@
 			otherOption2: 'Start the simple client',
 			otherOption3: 'Start the repair tool',
 			otherOption4: 'Start Misskey in safe mode',
-		}, locale?._bootErrors || {});
-		const reload = locale?.reload || 'Reload';
+			reload: 'Reload',
+		}, messages);
 
 		const safeModeUrl = new URL(window.location.href);
 		safeModeUrl.searchParams.set('safemode', 'true');
@@ -193,7 +178,7 @@
 			</svg>
 			<h1>${messages.title}</h1>
 			<button class="button-big" onclick="location.reload(true);">
-				<span class="button-label-big">${reload}</span>
+				<span class="button-label-big">${messages?.reload}</span>
 			</button>
 			<p><b>${messages.solution}</b></p>
 			<p>${messages.solution1}</p>
diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug
index baa0909676..29de86b8b6 100644
--- a/packages/backend/src/server/web/views/base-embed.pug
+++ b/packages/backend/src/server/web/views/base-embed.pug
@@ -19,7 +19,6 @@ html(class='embed')
 		meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
 		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
-		link(rel='modulepreload' href=`/embed_vite/${entry.file}`)
 
 		if !config.frontendEmbedManifestExists
 				script(type="module" src="/embed_vite/@vite/client")
@@ -40,7 +39,7 @@ html(class='embed')
 
 		script.
 			var VERSION = "#{version}";
-			var CLIENT_ENTRY = "#{entry.file}";
+			var CLIENT_ENTRY = !{JSON.stringify(entry.file)};
 
 		script(type='application/json' id='misskey_meta' data-generated-at=now)
 			!= metaJson
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index 3883b5e5ab..a76c75fe5c 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -37,7 +37,6 @@ html
 		link(rel='prefetch' href=serverErrorImageUrl)
 		link(rel='prefetch' href=infoImageUrl)
 		link(rel='prefetch' href=notFoundImageUrl)
-		link(rel='modulepreload' href=`/vite/${entry.file}`)
 
 		if !config.frontendManifestExists
 				script(type="module" src="/vite/@vite/client")
@@ -69,7 +68,7 @@ html
 
 		script.
 			var VERSION = "#{version}";
-			var CLIENT_ENTRY = "#{entry.file}";
+			var CLIENT_ENTRY = !{JSON.stringify(entry.file)};
 
 		script(type='application/json' id='misskey_meta' data-generated-at=now)
 			!= metaJson
diff --git a/packages/frontend-builder/README.txt b/packages/frontend-builder/README.txt
new file mode 100644
index 0000000000..db878ffa83
--- /dev/null
+++ b/packages/frontend-builder/README.txt
@@ -0,0 +1,3 @@
+This package contains the common scripts that are used to build the frontend and frontend-embed packages.
+
+
diff --git a/packages/frontend-builder/eslint.config.js b/packages/frontend-builder/eslint.config.js
new file mode 100644
index 0000000000..5805c9924d
--- /dev/null
+++ b/packages/frontend-builder/eslint.config.js
@@ -0,0 +1,98 @@
+import globals from 'globals';
+import tsParser from '@typescript-eslint/parser';
+import pluginMisskey from '@misskey-dev/eslint-plugin';
+import sharedConfig from '../shared/eslint.config.js';
+
+// eslint-disable-next-line import/no-default-export
+export default [
+	...sharedConfig,
+	{
+		files: ['**/*.vue'],
+		...pluginMisskey.configs.typescript,
+	},
+	{
+		files: [
+			'@types/**/*.ts',
+			'js/**/*.ts',
+			'**/*.vue',
+		],
+		languageOptions: {
+			globals: {
+				...Object.fromEntries(Object.entries(globals.node).map(([key]) => [key, 'off'])),
+				...globals.browser,
+
+				// Node.js
+				module: false,
+				require: false,
+				__dirname: false,
+
+				// Misskey
+				_DEV_: false,
+				_LANGS_: false,
+				_VERSION_: false,
+				_ENV_: false,
+				_PERF_PREFIX_: false,
+			},
+			parserOptions: {
+				parser: tsParser,
+				project: ['./tsconfig.json'],
+				sourceType: 'module',
+				tsconfigRootDir: import.meta.dirname,
+			},
+		},
+		rules: {
+			'@typescript-eslint/no-unused-vars': 'off',
+			'@typescript-eslint/no-empty-interface': ['error', {
+				allowSingleExtends: true,
+			}],
+			'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
+			// window の禁止理由: グローバルスコープと衝突し、予期せぬ結果を招くため
+			// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
+			'id-denylist': ['error', 'window', 'e'],
+			'no-shadow': ['warn'],
+			'vue/attributes-order': ['error', {
+				alphabetical: false,
+			}],
+			'vue/no-use-v-if-with-v-for': ['error', {
+				allowUsingIterationVar: false,
+			}],
+			'vue/no-ref-as-operand': 'error',
+			'vue/no-multi-spaces': ['error', {
+				ignoreProperties: false,
+			}],
+			'vue/no-v-html': 'warn',
+			'vue/order-in-components': 'error',
+			'vue/html-indent': ['warn', 'tab', {
+				attribute: 1,
+				baseIndent: 0,
+				closeBracket: 0,
+				alignAttributesVertically: true,
+				ignores: [],
+			}],
+			'vue/html-closing-bracket-spacing': ['warn', {
+				startTag: 'never',
+				endTag: 'never',
+				selfClosingTag: 'never',
+			}],
+			'vue/multi-word-component-names': 'warn',
+			'vue/require-v-for-key': 'warn',
+			'vue/no-unused-components': 'warn',
+			'vue/no-unused-vars': 'warn',
+			'vue/no-dupe-keys': 'warn',
+			'vue/valid-v-for': 'warn',
+			'vue/return-in-computed-property': 'warn',
+			'vue/no-setup-props-reactivity-loss': 'warn',
+			'vue/max-attributes-per-line': 'off',
+			'vue/html-self-closing': 'off',
+			'vue/singleline-html-element-content-newline': 'off',
+			'vue/v-on-event-hyphenation': ['error', 'never', {
+				autofix: true,
+			}],
+			'vue/attribute-hyphenation': ['error', 'never'],
+		},
+	},
+	{
+		ignores: [
+		],
+	},
+];
diff --git a/packages/frontend-builder/locale-inliner.ts b/packages/frontend-builder/locale-inliner.ts
new file mode 100644
index 0000000000..ce3f59a81c
--- /dev/null
+++ b/packages/frontend-builder/locale-inliner.ts
@@ -0,0 +1,145 @@
+import * as fs from 'fs/promises';
+import * as path from 'node:path';
+import { type Locale } from '../../locales/index.js';
+import type { Manifest as ViteManifest } from 'vite';
+import MagicString from 'magic-string';
+import { collectModifications } from './locale-inliner/collect-modifications.js';
+import { applyWithLocale } from './locale-inliner/apply-with-locale.js';
+import { blankLogger, type Logger } from './logger.js';
+
+export class LocaleInliner {
+	outputDir: string;
+	scriptsDir: string;
+	i18nFile: string;
+	i18nFileName: string;
+	logger: Logger;
+	chunks: ScriptChunk[];
+
+	static async create(options: {
+		outputDir: string,
+		scriptsDir: string,
+		i18nFile: string,
+		logger: Logger,
+	}): Promise<LocaleInliner> {
+		const manifest: ViteManifest = JSON.parse(await fs.readFile(`${options.outputDir}/manifest.json`, 'utf-8'));
+		return new LocaleInliner({ ...options, manifest });
+	}
+
+	constructor(options: {
+		outputDir: string,
+		scriptsDir: string,
+		i18nFile: string,
+		manifest: ViteManifest,
+		logger: Logger,
+	}) {
+		this.outputDir = options.outputDir;
+		this.scriptsDir = options.scriptsDir;
+		this.i18nFile = options.i18nFile;
+		this.i18nFileName = this.stripScriptDir(options.manifest[this.i18nFile].file);
+		this.logger = options.logger;
+		this.chunks = Object.values(options.manifest).filter(chunk => this.isScriptFile(chunk.file)).map(chunk => ({
+			fileName: this.stripScriptDir(chunk.file),
+			chunkName: chunk.name,
+		}));
+	}
+
+	async loadFiles() {
+		await Promise.all(this.chunks.map(async chunk => {
+			const filePath = path.join(this.outputDir, this.scriptsDir, chunk.fileName);
+			chunk.sourceCode = await fs.readFile(filePath, 'utf-8');
+		}));
+	}
+
+	collectsModifications() {
+		for (const chunk of this.chunks) {
+			if (!chunk.sourceCode) {
+				throw new Error(`Source code for ${chunk.fileName} is not loaded.`);
+			}
+			const fileLogger = this.logger.prefixed(`${chunk.fileName} (${chunk.chunkName}): `);
+			chunk.modifications = collectModifications(chunk.sourceCode, chunk.fileName, fileLogger, this);
+		}
+	}
+
+	async saveAllLocales(locales: Record<string, Locale>) {
+		const localeNames = Object.keys(locales);
+		for (const localeName of localeNames) {
+			await this.saveLocale(localeName, locales[localeName]);
+		}
+	}
+
+	async saveLocale(localeName: string, localeJson: Locale) {
+		// create directory
+		await fs.mkdir(path.join(this.outputDir, localeName), { recursive: true });
+		const localeLogger = localeName == 'ja-JP' ? this.logger : blankLogger; // we want to log for single locale only
+		for (const chunk of this.chunks) {
+			if (!chunk.sourceCode || !chunk.modifications) {
+				throw new Error(`Source code or modifications for ${chunk.fileName} is not available.`);
+			}
+			const fileLogger = localeLogger.prefixed(`${chunk.fileName} (${chunk.chunkName}): `);
+			const magicString = new MagicString(chunk.sourceCode);
+			applyWithLocale(magicString, chunk.modifications, localeName, localeJson, fileLogger);
+
+			await fs.writeFile(path.join(this.outputDir, localeName, chunk.fileName), magicString.toString());
+		}
+	}
+
+	isScriptFile(fileName: string) {
+		return fileName.startsWith(this.scriptsDir + '/') && fileName.endsWith('.js');
+	}
+
+	stripScriptDir(fileName: string) {
+		if (!fileName.startsWith(this.scriptsDir + '/')) {
+			throw new Error(`${fileName} does not start with ${this.scriptsDir}/`);
+		}
+		return fileName.slice(this.scriptsDir.length + 1);
+	}
+}
+
+interface ScriptChunk {
+	fileName: string;
+	chunkName?: string;
+	sourceCode?: string;
+	modifications?: TextModification[];
+}
+
+export type TextModification = {
+	type: 'delete';
+	begin: number;
+	end: number;
+	localizedOnly: boolean;
+} | {
+	// can be used later to insert '../scripts' for common files
+	type: 'insert';
+	begin: number;
+	text: string;
+	localizedOnly: boolean;
+} | {
+	type: 'replace';
+	begin: number;
+	end: number;
+	text: string;
+	localizedOnly: boolean;
+} | {
+	type: 'localized';
+	begin: number;
+	end: number;
+	localizationKey: string[];
+	localizedOnly: true;
+} | {
+	type: 'parameterized-function';
+	begin: number;
+	end: number;
+	localizationKey: string[];
+	localizedOnly: true;
+} | {
+	type: 'locale-name';
+	begin: number;
+	end: number;
+	literal: boolean;
+	localizedOnly: true;
+} | {
+	type: 'locale-json';
+	begin: number;
+	end: number;
+	localizedOnly: true;
+};
diff --git a/packages/frontend-builder/locale-inliner/apply-with-locale.ts b/packages/frontend-builder/locale-inliner/apply-with-locale.ts
new file mode 100644
index 0000000000..a79ebb4253
--- /dev/null
+++ b/packages/frontend-builder/locale-inliner/apply-with-locale.ts
@@ -0,0 +1,97 @@
+import MagicString from 'magic-string';
+import type { Locale } from '../../../locales/index.js';
+import { assertNever } from '../utils.js';
+import type { TextModification } from '../locale-inliner.js';
+import type { Logger } from '../logger.js';
+
+export function applyWithLocale(
+	sourceCode: MagicString,
+	modifications: TextModification[],
+	localeName: string,
+	localeJson: Locale,
+	fileLogger: Logger,
+) {
+	for (const modification of modifications) {
+		switch (modification.type) {
+			case "delete":
+				sourceCode.remove(modification.begin, modification.end);
+				break;
+			case "insert":
+				sourceCode.appendRight(modification.begin, modification.text);
+				break;
+			case "replace":
+				sourceCode.update(modification.begin, modification.end, modification.text);
+				break;
+			case "localized": {
+				const accessed = getPropertyByPath(localeJson, modification.localizationKey);
+				if (accessed == null) {
+					fileLogger.warn(`Cannot find localization key ${modification.localizationKey.join('.')}`);
+				}
+				sourceCode.update(modification.begin, modification.end, JSON.stringify(accessed));
+				break;
+			}
+			case "parameterized-function": {
+				const accessed = getPropertyByPath(localeJson, modification.localizationKey);
+				let replacement: string;
+				if (typeof accessed === 'string') {
+					replacement = formatFunction(accessed);
+				} else if (typeof accessed === 'object' && accessed !== null) {
+					replacement = `({${Object.entries(accessed).map(([key, value]) => `${JSON.stringify(key)}:${formatFunction(value)}`).join(',')}})`;
+				} else {
+					fileLogger.warn(`Cannot find localization key ${modification.localizationKey.join('.')}`);
+					replacement = '(() => "")'; // placeholder for missing locale
+				}
+				sourceCode.update(modification.begin, modification.end, replacement);
+				break;
+
+				function formatFunction(accessed: string): string {
+					const params = new Set<string>();
+					const components: string[] = [];
+					let lastIndex = 0;
+					for (const match of accessed.matchAll(/\{(.+?)}/g)) {
+						const [fullMatch, paramName] = match;
+						if (lastIndex < match.index) {
+							components.push(JSON.stringify(accessed.slice(lastIndex, match.index)));
+						}
+						params.add(paramName);
+						components.push(paramName);
+						lastIndex = match.index + fullMatch.length;
+					}
+					components.push(JSON.stringify(accessed.slice(lastIndex)));
+
+					// we replace with `(({name,count})=>(name+count+"some"))`
+					const paramList = Array.from(params).join(',');
+					let body = components.filter(x => x != '""').join('+');
+					if (body == '') body = '""'; // if the body is empty, we return empty string
+					return `(({${paramList}})=>(${body}))`;
+				}
+			}
+			case "locale-name": {
+				sourceCode.update(modification.begin, modification.end, modification.literal ? JSON.stringify(localeName) : localeName);
+				break;
+			}
+			case "locale-json": {
+				// locale-json is inlined to place where initialize module-level variable which is executed only once.
+				// In such case we can use JSON.parse to speed up the parsing script.
+				// https://v8.dev/blog/cost-of-javascript-2019#json
+				sourceCode.update(modification.begin, modification.end, `JSON.parse(${JSON.stringify(JSON.stringify(localeJson))})`);
+				break;
+			}
+			default: {
+				assertNever(modification);
+			}
+		}
+	}
+}
+
+function getPropertyByPath(localeJson: any, localizationKey: string[]): string | object | null {
+	if (localizationKey.length === 0) return localeJson;
+	let current: any = localeJson;
+	for (const key of localizationKey) {
+		if (typeof current !== 'object' || current === null || !(key in current)) {
+			return null; // Key not found
+		}
+		current = current[key];
+	}
+	return current ?? null;
+}
diff --git a/packages/frontend-builder/locale-inliner/collect-modifications.ts b/packages/frontend-builder/locale-inliner/collect-modifications.ts
new file mode 100644
index 0000000000..0cbf6a504e
--- /dev/null
+++ b/packages/frontend-builder/locale-inliner/collect-modifications.ts
@@ -0,0 +1,419 @@
+import type { AstNode, ProgramNode } from 'rollup';
+import { parseAst } from 'vite';
+import * as estreeWalker from 'estree-walker';
+import type * as estree from 'estree';
+import type { LocaleInliner, TextModification } from '../locale-inliner.js';
+import type { Logger } from '../logger.js'
+import { assertNever, assertType } from '../utils.js';
+
+// WalkerContext is not exported from estree-walker, so we define it here
+interface WalkerContext {
+	skip: () => void;
+}
+
+export function collectModifications(sourceCode: string, fileName: string, fileLogger: Logger, inliner: LocaleInliner): TextModification[] {
+	let programNode: ProgramNode;
+	try {
+		programNode = parseAst(sourceCode);
+	} catch (e) {
+		fileLogger.error(`Failed to parse source code: ${e}`);
+		return [];
+	}
+	if (programNode.sourceType !== 'module') {
+		fileLogger.error(`Source code is not a module.`);
+		return [];
+	}
+
+	const modifications: TextModification[] = [];
+
+	// first
+	// 1) replace all `scripts/` path literals with locale code
+	// 2) replace all `localStorage.getItem("lang")` with `localeName` variable
+	// 3) replace all `await window.fetch(`/assets/locales/${d}.${x}.json`).then(u=>u.json())` with `localeJson` variable
+	estreeWalker.walk(programNode, {
+		enter(this: WalkerContext, node: Node) {
+			assertType<AstNode>(node)
+
+			if (node.type === 'Literal' && typeof node.value === 'string' && node.raw) {
+				if (node.raw.substring(1).startsWith(inliner.scriptsDir)) {
+					// we find `scripts/\w+\.js` literal and replace 'scripts' part with locale code
+					fileLogger.debug(`${lineCol(sourceCode, node)}: found ${inliner.scriptsDir}/ path literal ${node.raw}`);
+					modifications.push({
+						type: 'locale-name',
+						begin: node.start + 1,
+						end: node.start + 1 + inliner.scriptsDir.length,
+						literal: false,
+						localizedOnly: true,
+					});
+				}
+				if (node.raw.substring(1, node.raw.length - 1) == `${inliner.scriptsDir}/${inliner.i18nFileName}`) {
+					// we find `scripts/i18n.ts` literal.
+					// This is tipically in depmap and replace with this file name to avoid unnecessary loading i18n script
+					fileLogger.debug(`${lineCol(sourceCode, node)}: found ${inliner.i18nFileName} path literal ${node.raw}`);
+					modifications.push({
+						type: 'replace',
+						begin: node.end - 1 - inliner.i18nFileName.length,
+						end: node.end - 1,
+						text: fileName,
+						localizedOnly: true,
+					});
+				}
+			}
+
+			if (isLocalStorageGetItemLang(node)) {
+				fileLogger.debug(`${lineCol(sourceCode, node)}: found localStorage.getItem("lang") call`);
+				modifications.push({
+					type: 'locale-name',
+					begin: node.start,
+					end: node.end,
+					literal: true,
+					localizedOnly: true,
+				});
+			}
+
+			if (isAwaitFetchLocaleThenJson(node)) {
+				// await window.fetch(`/assets/locales/${d}.${x}.json`).then(u=>u.json(), () => null)
+				fileLogger.debug(`${lineCol(sourceCode, node)}: found await window.fetch(\`/assets/locales/\${d}.\${x}.json\`).then(u=>u.json()) call`);
+				modifications.push({
+					type: 'locale-json',
+					begin: node.start,
+					end: node.end,
+					localizedOnly: true,
+				});
+			}
+		}
+	})
+
+	const importSpecifierResult = findImportSpecifier(programNode, inliner.i18nFileName, 'i18n');
+
+	switch (importSpecifierResult.type) {
+		case 'no-import':
+			fileLogger.debug(`No import of i18n found, skipping inlining.`);
+			return modifications;
+		case 'no-specifiers':
+			fileLogger.debug(`Importing i18n without specifiers, removing the import.`);
+			modifications.push({
+				type: 'delete',
+				begin: importSpecifierResult.importNode.start,
+				end: importSpecifierResult.importNode.end,
+				localizedOnly: false,
+			});
+			return modifications;
+		case 'unexpected-specifiers':
+			fileLogger.info(`Importing ${inliner.i18nFileName} found but with unexpected specifiers. Skipping inlining.`);
+			return modifications;
+		case 'specifier':
+			fileLogger.debug(`Found import i18n as ${importSpecifierResult.localI18nIdentifier}`);
+			break;
+	}
+
+	const i18nImport = importSpecifierResult.importNode;
+	const localI18nIdentifier = importSpecifierResult.localI18nIdentifier;
+
+	// Check if the identifier is already declared in the file.
+	// If it is, we may overwrite it and cause issues so we skip inlining
+	let isSupported = true;
+	estreeWalker.walk(programNode, {
+		enter(node) {
+			if (node.type == 'VariableDeclaration') {
+				assertType<estree.VariableDeclaration>(node);
+				for (let id of node.declarations.flatMap(x => declsOfPattern(x.id))) {
+					if (id == localI18nIdentifier) {
+						isSupported = false;
+					}
+				}
+			}
+		}
+	})
+
+	if (!isSupported) {
+		fileLogger.error(`Duplicated identifier "${localI18nIdentifier}" in variable declaration. Skipping inlining.`);
+		return modifications;
+	}
+
+	fileLogger.debug(`imports i18n as ${localI18nIdentifier}`);
+
+	// In case of substitution failure, we will preserve the import statement
+	// otherwise we will remove it.
+	let preserveI18nImport = false;
+
+	const toSkip = new Set();
+	toSkip.add(i18nImport);
+	estreeWalker.walk(programNode, {
+		enter(this: WalkerContext, node, parent, property) {
+			assertType<AstNode>(node)
+			assertType<AstNode>(parent)
+			if (toSkip.has(node)) {
+				// This is the import specifier, skip processing it
+				this.skip();
+				return;
+			}
+
+			// We don't care original name part of the import declaration
+			if (node.type == 'ImportDeclaration') this.skip();
+
+			if (node.type === 'Identifier') {
+				assertType<estree.Identifier>(node)
+				assertType<estree.Property | estree.MemberExpression | estree.ExportSpecifier>(parent)
+				if (parent.type === 'Property' && !parent.computed && property == 'key') return; // we don't care 'id' part of { id: expr }
+				if (parent.type === 'MemberExpression' && !parent.computed && property == 'property') return; // we don't care 'id' part of { id: expr }
+				if (parent.type === 'ExportSpecifier' && property == 'exported') return; // we don't care 'id' part of { id: expr }
+				if (node.name == localI18nIdentifier) {
+					fileLogger.error(`${lineCol(sourceCode, node)}: Using i18n identifier "${localI18nIdentifier}" directly. Skipping inlining.`);
+					preserveI18nImport = true;
+				}
+			} else if (node.type === 'MemberExpression') {
+				assertType<estree.MemberExpression>(node);
+				const i18nPath = parseI18nPropertyAccess(node);
+				if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] == 'ts') {
+					if (parent.type === 'CallExpression' && property == 'callee') return; // we don't want to process `i18n.ts.property.stringBuiltinMethod()`
+					if (i18nPath.at(-1)?.startsWith('_')) fileLogger.debug(`found i18n grouped property access ${i18nPath.join('.')}`);
+					else fileLogger.debug(`${lineCol(sourceCode, node)}: found i18n property access ${i18nPath.join('.')}`);
+					// it's i18n.ts.propertyAccess
+					// i18n.ts.* will always be resolved to string or object containing strings
+					modifications.push({
+						type: 'localized',
+						begin: node.start,
+						end: node.end,
+						localizationKey: i18nPath.slice(1), // remove 'ts' prefix
+						localizedOnly: true,
+					});
+					this.skip();
+				} else if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] == 'tsx') {
+					// it's parameterized locale substitution (`i18n.tsx.property(parameters)`)
+					// we expect the parameter to be an object literal
+					fileLogger.debug(`${lineCol(sourceCode, node)}: found i18n function access (object) ${i18nPath.join('.')}`);
+					modifications.push({
+						type: 'parameterized-function',
+						begin: node.start,
+						end: node.end,
+						localizationKey: i18nPath.slice(1), // remove 'tsx' prefix
+						localizedOnly: true,
+					});
+					this.skip();
+				}
+			} else if (node.type === 'ArrowFunctionExpression') {
+				assertType<estree.ArrowFunctionExpression>(node);
+				// If there is 'i18n' in the parameters, we care interior of the function
+				if (node.params.flatMap(param => declsOfPattern(param)).includes(localI18nIdentifier)) this.skip();
+			}
+		}
+	})
+
+	if (!preserveI18nImport) {
+		fileLogger.debug(`removing i18n import statement`);
+		modifications.push({
+			type: 'delete',
+			begin: i18nImport.start,
+			end: i18nImport.end,
+			localizedOnly: true,
+		});
+	}
+
+	function parseI18nPropertyAccess(node: estree.Expression | estree.Super): string[] | null {
+		if (node.type === 'Identifier' && node.name == localI18nIdentifier) return []; // i18n itself
+		if (node.type !== 'MemberExpression') return null;
+		// super.*
+		if (node.object.type === 'Super') return null;
+
+		// i18n?.property is not supported
+		if (node.optional) return null;
+
+
+		let id: string | null = null;
+		if (node.computed) {
+			if (node.property.type === 'Literal' && typeof node.property.value === 'string') {
+				id = node.property.value;
+			}
+		} else {
+			if (node.property.type === 'Identifier') {
+				id = node.property.name;
+			}
+		}
+		// non-constant property access
+		if (id == null) return null;
+
+		const parentAccess = parseI18nPropertyAccess(node.object);
+		if (parentAccess == null) return null;
+		return [...parentAccess, id];
+	}
+
+	return modifications;
+}
+
+function declsOfPattern(pattern: estree.Pattern | null): string[] {
+	if (pattern == null) return [];
+	switch (pattern?.type) {
+		case "Identifier":
+			return [pattern.name];
+		case "ObjectPattern":
+			return pattern.properties.flatMap(prop => {
+				switch (prop.type) {
+					case 'Property':
+						return declsOfPattern(prop.value);
+					case 'RestElement':
+						return declsOfPattern(prop.argument);
+					default:
+						assertNever(prop)
+				}
+			});
+		case "ArrayPattern":
+			return pattern.elements.flatMap(p => declsOfPattern(p));
+		case "RestElement":
+			return declsOfPattern(pattern.argument);
+		case "AssignmentPattern":
+			return declsOfPattern(pattern.left);
+		case "MemberExpression":
+			// assignment pattern so no new variable is declared
+			return [];
+		default:
+			assertNever(pattern);
+	}
+}
+
+function lineCol(sourceCode: string, node: estree.Node): string {
+	assertType<AstNode>(node);
+	const leading = sourceCode.slice(0, node.start);
+	const lines = leading.split('\n');
+	const line = lines.length;
+	const col = lines[lines.length - 1].length + 1; // +1 for 1-based index
+	return `(${line}:${col})`;
+}
+
+//region checker functions
+
+type Node =
+	| estree.AssignmentProperty
+	| estree.CatchClause
+	| estree.Class
+	| estree.ClassBody
+	| estree.Expression
+	| estree.Function
+	| estree.Identifier
+	| estree.Literal
+	| estree.MethodDefinition
+	| estree.ModuleDeclaration
+	| estree.ModuleSpecifier
+	| estree.Pattern
+	| estree.PrivateIdentifier
+	| estree.Program
+	| estree.Property
+	| estree.PropertyDefinition
+	| estree.SpreadElement
+	| estree.Statement
+	| estree.Super
+	| estree.SwitchCase
+	| estree.TemplateElement
+	| estree.VariableDeclarator
+	;
+
+// localStorage.getItem("lang")
+function isLocalStorageGetItemLang(getItemCall: Node): boolean {
+	if (getItemCall.type !== 'CallExpression') return false;
+	if (getItemCall.arguments.length !== 1) return false;
+
+	const langLiteral = getItemCall.arguments[0];
+	if (!isStringLiteral(langLiteral, 'lang')) return false;
+
+	const getItemFunction = getItemCall.callee;
+	if (!isMemberExpression(getItemFunction, 'getItem')) return false;
+
+	const localStorageObject = getItemFunction.object;
+	if (!isIdentifier(localStorageObject, 'localStorage')) return false;
+
+	return true;
+}
+
+// await window.fetch(`/assets/locales/${d}.${x}.json`).then(u => u.json(), ....)
+function isAwaitFetchLocaleThenJson(awaitNode: Node): boolean {
+	if (awaitNode.type !== 'AwaitExpression') return false;
+
+	const thenCall = awaitNode.argument;
+	if (thenCall.type !== 'CallExpression') return false;
+	if (thenCall.arguments.length < 1) return false;
+
+	const arrowFunction = thenCall.arguments[0];
+	if (arrowFunction.type !== 'ArrowFunctionExpression') return false;
+	if (arrowFunction.params.length !== 1) return false;
+
+	const arrowBodyCall = arrowFunction.body;
+	if (arrowBodyCall.type !== 'CallExpression') return false;
+
+	const jsonFunction = arrowBodyCall.callee;
+	if (!isMemberExpression(jsonFunction, 'json')) return false;
+
+	const thenFunction = thenCall.callee;
+	if (!isMemberExpression(thenFunction, 'then')) return false;
+
+	const fetchCall = thenFunction.object;
+	if (fetchCall.type !== 'CallExpression') return false;
+	if (fetchCall.arguments.length !== 1) return false;
+
+	// `/assets/locales/${d}.${x}.json`
+	const assetLocaleTemplate = fetchCall.arguments[0];
+	if (assetLocaleTemplate.type !== 'TemplateLiteral') return false;
+	if (assetLocaleTemplate.quasis.length !== 3) return false;
+	if (assetLocaleTemplate.expressions.length !== 2) return false;
+	if (assetLocaleTemplate.quasis[0].value.cooked !== '/assets/locales/') return false;
+	if (assetLocaleTemplate.quasis[1].value.cooked !== '.') return false;
+	if (assetLocaleTemplate.quasis[2].value.cooked !== '.json') return false;
+
+	const fetchFunction = fetchCall.callee;
+	if (!isMemberExpression(fetchFunction, 'fetch')) return false;
+	const windowObject = fetchFunction.object;
+	if (!isIdentifier(windowObject, 'window')) return false;
+
+	return true;
+}
+
+type SpecifierResult =
+	| { type: 'no-import' }
+	| { type: 'no-specifiers', importNode: estree.ImportDeclaration & AstNode }
+	| { type: 'unexpected-specifiers', importNode: estree.ImportDeclaration & AstNode }
+	| { type: 'specifier', localI18nIdentifier: string, importNode: estree.ImportDeclaration & AstNode }
+	;
+
+function findImportSpecifier(programNode: ProgramNode, i18nFileName: string, i18nSymbol: string): SpecifierResult {
+	const imports = programNode.body.filter(x => x.type === 'ImportDeclaration');
+	const importNode = imports.find(x => x.source.value === `./${i18nFileName}`) as estree.ImportDeclaration;
+	if (!importNode) return { type: 'no-import' };
+	assertType<AstNode>(importNode);
+
+	if (importNode.specifiers.length == 0) {
+		return { type: 'no-specifiers', importNode };
+	}
+
+	if (importNode.specifiers.length != 1) {
+		return { type: 'unexpected-specifiers', importNode };
+	}
+	const i18nImportSpecifier = importNode.specifiers[0];
+	if (i18nImportSpecifier.type !== 'ImportSpecifier') {
+		return { type: 'unexpected-specifiers', importNode };
+	}
+
+	if (i18nImportSpecifier.imported.type !== 'Identifier') {
+		return { type: 'unexpected-specifiers', importNode };
+	}
+
+	const importingIdentifier = i18nImportSpecifier.imported.name;
+	if (importingIdentifier !== i18nSymbol) {
+		return { type: 'unexpected-specifiers', importNode };
+	}
+	const localI18nIdentifier = i18nImportSpecifier.local.name;
+	return { type: 'specifier', localI18nIdentifier, importNode };
+}
+
+// checker helpers
+function isMemberExpression(node: Node, property: string): node is estree.MemberExpression {
+	return node.type === 'MemberExpression' && !node.computed && node.property.type === 'Identifier' && node.property.name === property;
+}
+
+function isStringLiteral(node: Node, value: string): node is estree.Literal {
+	return node.type === 'Literal' && typeof node.value === 'string' && node.value === value;
+}
+
+function isIdentifier(node: Node, name: string): node is estree.Identifier {
+	return node.type === 'Identifier' && node.name === name;
+}
+
+//endregion
diff --git a/packages/frontend-builder/logger.ts b/packages/frontend-builder/logger.ts
new file mode 100644
index 0000000000..a3f66730e2
--- /dev/null
+++ b/packages/frontend-builder/logger.ts
@@ -0,0 +1,66 @@
+const debug = false;
+
+export interface Logger {
+	debug(message: string): void;
+
+	warn(message: string): void;
+
+	error(message: string): void;
+
+	info(message: string): void;
+
+	prefixed(newPrefix: string): Logger;
+}
+
+interface RootLogger extends Logger {
+	warningCount: number;
+	errorCount: number;
+}
+
+export function createLogger(): RootLogger {
+	return loggerFactory('', {
+		warningCount: 0,
+		errorCount: 0,
+	});
+}
+
+type LogContext = {
+	warningCount: number;
+	errorCount: number;
+}
+
+function loggerFactory(prefix: string, context: LogContext): RootLogger {
+	return {
+		debug: (message: string) => {
+			if (debug) console.log(`[DBG] ${prefix}${message}`);
+		},
+		warn: (message: string) => {
+			context.warningCount++;
+			console.log(`${debug ? '[WRN]' : 'w:'} ${prefix}${message}`);
+		},
+		error: (message: string) => {
+			context.errorCount++;
+			console.error(`${debug ? '[ERR]' : 'e:'} ${prefix}${message}`);
+		},
+		info: (message: string) => {
+			console.error(`${debug ? '[INF]' : 'i:'} ${prefix}${message}`);
+		},
+		prefixed: (newPrefix: string) => {
+			return loggerFactory(`${prefix}${newPrefix}`, context);
+		},
+		get warningCount() {
+			return context.warningCount;
+		},
+		get errorCount() {
+			return context.errorCount;
+		},
+	};
+}
+
+export const blankLogger: Logger = {
+	debug: () => void 0,
+	warn: () => void 0,
+	error: () => void 0,
+	info: () => void 0,
+	prefixed: () => blankLogger,
+}
diff --git a/packages/frontend-builder/package.json b/packages/frontend-builder/package.json
new file mode 100644
index 0000000000..5fdd25b32d
--- /dev/null
+++ b/packages/frontend-builder/package.json
@@ -0,0 +1,25 @@
+{
+	"name": "frontend-builder",
+	"type": "module",
+	"scripts": {
+		"eslint": "eslint './**/*.{js,jsx,ts,tsx}'",
+		"typecheck": "tsc --noEmit",
+		"lint": "pnpm typecheck && pnpm eslint"
+	},
+	"exports": {
+		"./*": "./js/*"
+	},
+	"devDependencies": {
+		"@types/estree": "1.0.8",
+		"@types/node": "22.17.0",
+		"@typescript-eslint/eslint-plugin": "8.38.0",
+		"@typescript-eslint/parser": "8.38.0",
+		"rollup": "4.46.2",
+		"typescript": "5.9.2"
+	},
+	"dependencies": {
+		"estree-walker": "3.0.3",
+		"magic-string": "0.30.17",
+		"vite": "7.0.6"
+	}
+}
diff --git a/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts b/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
new file mode 100644
index 0000000000..9010e6910c
--- /dev/null
+++ b/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import * as estreeWalker from 'estree-walker';
+import type { Plugin } from 'vite';
+import type { CallExpression, Expression, Program, } from 'estree';
+import MagicString from 'magic-string';
+import type { AstNode } from 'rollup';
+import { assertType } from './utils.js';
+
+// This plugin transforms `unref(i18n)` to `i18n` in the code, which is useful for removing unnecessary unref calls
+// and helps locale inliner runs after vite build to inline the locale data into the final build.
+//
+// locale inliner cannot know minifiedSymbol(i18n) is 'unref(i18n)' or 'otherFunctionsWithEffect(i18n)' so
+// it is necessary to remove unref calls before minification.
+export default function pluginRemoveUnrefI18n(
+	{
+		i18nSymbolName = 'i18n',
+	}: {
+		i18nSymbolName?: string
+	} = {}): Plugin {
+	return {
+		name: 'UnwindCssModuleClassName',
+		renderChunk(code) {
+			if (!code.includes('unref(i18n)')) return null;
+			const ast = this.parse(code) as Program;
+			const magicString = new MagicString(code);
+			estreeWalker.walk(ast, {
+				enter(node) {
+					if (node.type === 'CallExpression' && node.callee.type === 'Identifier' && node.callee.name === 'unref'
+						&& node.arguments.length === 1) {
+						// calls to unref with single argument
+						const arg = node.arguments[0];
+						if (arg.type === 'Identifier' && arg.name === i18nSymbolName) {
+							// this is unref(i18n) so replace it with i18n
+							// to replace, remove the 'unref(' and the trailing ')'
+							assertType<CallExpression & AstNode>(node);
+							assertType<Expression & AstNode>(arg);
+							magicString.remove(node.start, arg.start);
+							magicString.remove(arg.end, node.end);
+						}
+					}
+				}
+			});
+			return {
+				code: magicString.toString(),
+				map: magicString.generateMap({ hires: true }),
+			}
+		},
+	};
+}
diff --git a/packages/frontend-builder/tsconfig.json b/packages/frontend-builder/tsconfig.json
new file mode 100644
index 0000000000..9250b2f3da
--- /dev/null
+++ b/packages/frontend-builder/tsconfig.json
@@ -0,0 +1,29 @@
+{
+	"$schema": "https://json.schemastore.org/tsconfig",
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "nodenext",
+		"moduleResolution": "nodenext",
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": false,
+		"noEmit": true,
+		"removeComments": true,
+		"resolveJsonModule": true,
+		"strict": true,
+		"strictFunctionTypes": true,
+		"strictNullChecks": true,
+		"experimentalDecorators": true,
+		"noImplicitReturns": true,
+		"esModuleInterop": true,
+		"verbatimModuleSyntax": true,
+		"baseUrl": ".",
+		"typeRoots": [
+			"./@types",
+			"./node_modules/@types"
+		],
+		"lib": [
+			"esnext"
+		]
+	}
+}
diff --git a/packages/frontend-builder/utils.ts b/packages/frontend-builder/utils.ts
new file mode 100644
index 0000000000..1ce9f7fc76
--- /dev/null
+++ b/packages/frontend-builder/utils.ts
@@ -0,0 +1,7 @@
+
+export function assertNever(x: never): never {
+	throw new Error(`Unexpected type: ${(x as any)?.type ?? x}`);
+}
+
+export function assertType<T>(node: unknown): asserts node is T {
+}
diff --git a/packages/frontend-embed/build.ts b/packages/frontend-embed/build.ts
new file mode 100644
index 0000000000..737233a4d0
--- /dev/null
+++ b/packages/frontend-embed/build.ts
@@ -0,0 +1,51 @@
+import * as fs from 'fs/promises';
+import url from 'node:url';
+import path from 'node:path';
+import { execa } from 'execa';
+import locales from '../../locales/index.js';
+import { LocaleInliner } from '../frontend-builder/locale-inliner.js'
+import { createLogger } from '../frontend-builder/logger';
+
+// requires node 21 or later
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+const outputDir = __dirname + '/../../built/_frontend_embed_vite_';
+
+/**
+ * @return {Promise<void>}
+ */
+async function viteBuild() {
+	await execa('vite', ['build'], {
+		cwd: __dirname,
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+}
+
+
+async function buildAllLocale() {
+	const logger = createLogger()
+	const inliner = await LocaleInliner.create({
+		outputDir,
+		logger,
+		scriptsDir: 'scripts',
+		i18nFile: 'src/i18n.ts',
+	})
+
+	await inliner.loadFiles();
+
+	inliner.collectsModifications();
+
+	await inliner.saveAllLocales(locales);
+
+	if (logger.errorCount > 0) {
+		throw new Error(`Build failed with ${logger.errorCount} errors and ${logger.warningCount} warnings.`);
+	}
+}
+
+async function build() {
+	await fs.rm(outputDir, { recursive: true, force: true });
+	await viteBuild();
+	await buildAllLocale();
+}
+
+await build();
diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json
index e76046add3..f9d1330ae5 100644
--- a/packages/frontend-embed/package.json
+++ b/packages/frontend-embed/package.json
@@ -4,7 +4,7 @@
 	"type": "module",
 	"scripts": {
 		"watch": "vite",
-		"build": "vite build",
+		"build": "tsx build.ts",
 		"typecheck": "vue-tsc --noEmit",
 		"eslint": "eslint --quiet \"src/**/*.{ts,vue}\"",
 		"lint": "pnpm typecheck && pnpm eslint"
@@ -20,8 +20,8 @@
 		"astring": "1.9.0",
 		"buraha": "0.0.1",
 		"estree-walker": "3.0.3",
-		"icons-subsetter": "workspace:*",
 		"frontend-shared": "workspace:*",
+		"icons-subsetter": "workspace:*",
 		"json5": "2.2.3",
 		"mfm-js": "0.25.0",
 		"misskey-js": "workspace:*",
@@ -63,6 +63,7 @@
 		"nodemon": "3.1.10",
 		"prettier": "3.6.2",
 		"start-server-and-test": "2.0.12",
+		"tsx": "4.20.3",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vue-component-type-helpers": "3.0.5",
 		"vue-eslint-parser": "10.2.0",
diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts
index 459b283e23..9d69437c30 100644
--- a/packages/frontend-embed/src/boot.ts
+++ b/packages/frontend-embed/src/boot.ts
@@ -17,15 +17,16 @@ import { createApp, defineAsyncComponent } from 'vue';
 import defaultLightTheme from '@@/themes/l-light.json5';
 import defaultDarkTheme from '@@/themes/d-dark.json5';
 import { MediaProxy } from '@@/js/media-proxy.js';
+import { storeBootloaderErrors } from '@@/js/store-boot-errors';
 import { applyTheme, assertIsTheme } from '@/theme.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { DI } from '@/di.js';
 import { serverMetadata } from '@/server-metadata.js';
-import { url, version, locale, lang, updateLocale } from '@@/js/config.js';
+import { url, version, lang } from '@@/js/config.js';
 import { parseEmbedParams } from '@@/js/embed-page.js';
 import { postMessageToParentWindow, setIframeId } from '@/post-message.js';
 import { serverContext } from '@/server-context.js';
-import { i18n, updateI18n } from '@/i18n.js';
+import { i18n } from '@/i18n.js';
 
 import type { Theme } from '@/theme.js';
 
@@ -76,19 +77,7 @@ if (embedParams.colorMode === 'dark') {
 //#endregion
 
 //#region Detect language & fetch translations
-const localeVersion = localStorage.getItem('localeVersion');
-const localeOutdated = (localeVersion == null || localeVersion !== version || locale == null);
-if (localeOutdated) {
-	const res = await window.fetch(`/assets/locales/${lang}.${version}.json`);
-	if (res.status === 200) {
-		const newLocale = await res.text();
-		const parsedNewLocale = JSON.parse(newLocale);
-		localStorage.setItem('locale', newLocale);
-		localStorage.setItem('localeVersion', version);
-		updateLocale(parsedNewLocale);
-		updateI18n(parsedNewLocale);
-	}
-}
+storeBootloaderErrors({ ...i18n.ts._bootErrors, reload: i18n.ts.reload });
 //#endregion
 
 // サイズの制限
diff --git a/packages/frontend-embed/src/i18n.ts b/packages/frontend-embed/src/i18n.ts
index 6ad503b089..0b2b206b7e 100644
--- a/packages/frontend-embed/src/i18n.ts
+++ b/packages/frontend-embed/src/i18n.ts
@@ -5,11 +5,12 @@
 
 import { markRaw } from 'vue';
 import { I18n } from '@@/js/i18n.js';
+import { locale } from '@@/js/locale.js';
 import type { Locale } from '../../../locales/index.js';
-import { locale } from '@@/js/config.js';
 
 export const i18n = markRaw(new I18n<Locale>(locale, _DEV_));
 
+// test 以外では使わないこと。インライン化されてるのでだいたい意味がない
 export function updateI18n(newLocale: Locale) {
 	i18n.locale = newLocale;
 }
diff --git a/packages/frontend-embed/vite.config.ts b/packages/frontend-embed/vite.config.ts
index a057581b3a..eb57db9774 100644
--- a/packages/frontend-embed/vite.config.ts
+++ b/packages/frontend-embed/vite.config.ts
@@ -8,6 +8,7 @@ import locales from '../../locales/index.js';
 import meta from '../../package.json';
 import packageInfo from './package.json' with { type: 'json' };
 import pluginJson5 from './vite.json5.js';
+import pluginRemoveUnrefI18n from '../frontend-builder/rollup-plugin-remove-unref-i18n';
 
 const url = process.env.NODE_ENV === 'development' ? yaml.load(await fsp.readFile('../../.config/default.yml', 'utf-8')).url : null;
 const host = url ? (new URL(url)).hostname : undefined;
@@ -85,6 +86,7 @@ export function getConfig(): UserConfig {
 
 		plugins: [
 			pluginVue(),
+			pluginRemoveUnrefI18n(),
 			pluginJson5(),
 		],
 
@@ -135,15 +137,20 @@ export function getConfig(): UserConfig {
 			manifest: 'manifest.json',
 			rollupOptions: {
 				input: {
-					app: './src/boot.ts',
+					i18n: './src/i18n.ts',
+					entry: './src/boot.ts',
 				},
 				external: externalPackages.map(p => p.match),
+				preserveEntrySignatures: 'allow-extension',
 				output: {
 					manualChunks: {
 						vue: ['vue'],
+						// dependencies of i18n.ts
+						'config': ['@@/js/config.js'],
 					},
-					chunkFileNames: process.env.NODE_ENV === 'production' ? '[hash:8].js' : '[name]-[hash:8].js',
-					assetFileNames: process.env.NODE_ENV === 'production' ? '[hash:8][extname]' : '[name]-[hash:8][extname]',
+					entryFileNames: 'scripts/[hash:8].js',
+					chunkFileNames: 'scripts/[hash:8].js',
+					assetFileNames: 'assets/[hash:8][extname]',
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {
diff --git a/packages/frontend-shared/js/config.ts b/packages/frontend-shared/js/config.ts
index 4963d631f9..ac5c5629f3 100644
--- a/packages/frontend-shared/js/config.ts
+++ b/packages/frontend-shared/js/config.ts
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { Locale } from '../../../locales/index.js';
-
 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 const address = new URL(document.querySelector<HTMLMetaElement>('meta[property="instance_url"]')?.content || location.href);
 const siteName = document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
@@ -17,14 +15,8 @@ export const apiUrl = location.origin + '/api';
 export const wsOrigin = location.origin;
 export const lang = localStorage.getItem('lang') ?? 'en-US';
 export const langs = _LANGS_;
-const preParseLocale = localStorage.getItem('locale');
-export let locale: Locale = preParseLocale ? JSON.parse(preParseLocale) : null;
 export const version = _VERSION_;
 export const instanceName = (siteName === 'Misskey' || siteName == null) ? host : siteName;
 export const ui = localStorage.getItem('ui');
 export const debug = localStorage.getItem('debug') === 'true';
 export const isSafeMode = localStorage.getItem('isSafeMode') === 'true';
-
-export function updateLocale(newLocale: Locale): void {
-	locale = newLocale;
-}
diff --git a/packages/frontend-shared/js/i18n.ts b/packages/frontend-shared/js/i18n.ts
index 25581b969a..bd9ba0922a 100644
--- a/packages/frontend-shared/js/i18n.ts
+++ b/packages/frontend-shared/js/i18n.ts
@@ -39,11 +39,7 @@ export class I18n<T extends ILocale> {
 	private devMode: boolean;
 
 	constructor(public locale: T, devMode = false) {
-		// 場合によってはバージョンアップ前の翻訳データを参照した結果存在しないプロパティにアクセスしてクライアントが起動できなくなることがある問題の応急処置として非devモードでもプロキシする
-		// TODO: https://github.com/misskey-dev/misskey/issues/14453 が実装されたらそのようなことは発生し得なくなるため消す
-		const oukyuusyoti = true;
-
-		this.devMode = devMode || oukyuusyoti;
+		this.devMode = devMode;
 
 		//#region BIND
 		this.t = this.t.bind(this);
diff --git a/packages/frontend-shared/js/locale.ts b/packages/frontend-shared/js/locale.ts
new file mode 100644
index 0000000000..87e3922fd9
--- /dev/null
+++ b/packages/frontend-shared/js/locale.ts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { lang, version } from '@@/js/config.js';
+import type { Locale } from '../../../locales/index.js';
+
+// ここはビルド時に const locale = JSON.parse("...") みたいな感じで置き換えられるので top-level await は消える
+export let locale: Locale = await window.fetch(`/assets/locales/${lang}.${version}.json`).then(r => r.json(), () => null);
+
+export function updateLocale(newLocale: Locale): void {
+	locale = newLocale;
+}
diff --git a/packages/frontend-shared/js/store-boot-errors.ts b/packages/frontend-shared/js/store-boot-errors.ts
new file mode 100644
index 0000000000..31e6248445
--- /dev/null
+++ b/packages/frontend-shared/js/store-boot-errors.ts
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Locale } from '../../../locales/index.js';
+
+type BootLoaderLocaleBody = Locale['_bootErrors'] & { reload: Locale['reload'] };
+
+export function storeBootloaderErrors(locale: BootLoaderLocaleBody) {
+	localStorage.setItem('bootloaderLocales', JSON.stringify(locale));
+}
diff --git a/packages/frontend/.gitignore b/packages/frontend/.gitignore
index 1aa0ac14e8..4f8684c18e 100644
--- a/packages/frontend/.gitignore
+++ b/packages/frontend/.gitignore
@@ -1 +1,2 @@
 /storybook-static
+/build/
diff --git a/packages/frontend/.storybook/preview.ts b/packages/frontend/.storybook/preview.ts
index fb855c1410..2aac8af400 100644
--- a/packages/frontend/.storybook/preview.ts
+++ b/packages/frontend/.storybook/preview.ts
@@ -9,7 +9,6 @@ import { type Preview, setup } from '@storybook/vue3';
 import isChromatic from 'chromatic/isChromatic';
 import { initialize, mswLoader } from 'msw-storybook-addon';
 import { userDetailed } from './fakes.js';
-import locale from './locale.js';
 import { commonHandlers, onUnhandledRequest } from './mocks.js';
 import themes from './themes.js';
 import '../src/style.scss';
@@ -55,7 +54,6 @@ function initLocalStorage() {
 		...userDetailed(),
 		policies: {},
 	}));
-	localStorage.setItem('locale', JSON.stringify(locale));
 }
 
 initialize({
diff --git a/packages/frontend/build.ts b/packages/frontend/build.ts
new file mode 100644
index 0000000000..0401c2b9ba
--- /dev/null
+++ b/packages/frontend/build.ts
@@ -0,0 +1,51 @@
+import * as fs from 'fs/promises';
+import url from 'node:url';
+import path from 'node:path';
+import { execa } from 'execa';
+import locales from '../../locales/index.js';
+import { LocaleInliner } from '../frontend-builder/locale-inliner.js'
+import { createLogger } from '../frontend-builder/logger';
+
+// requires node 21 or later
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+const outputDir = __dirname + '/../../built/_frontend_vite_';
+
+/**
+ * @return {Promise<void>}
+ */
+async function viteBuild() {
+	await execa('vite', ['build'], {
+		cwd: __dirname,
+		stdout: process.stdout,
+		stderr: process.stderr,
+	});
+}
+
+
+async function buildAllLocale() {
+	const logger = createLogger()
+	const inliner = await LocaleInliner.create({
+		outputDir,
+		logger,
+		scriptsDir: 'scripts',
+		i18nFile: 'src/i18n.ts',
+	})
+
+	await inliner.loadFiles();
+
+	inliner.collectsModifications();
+
+	await inliner.saveAllLocales(locales);
+
+	if (logger.errorCount > 0) {
+		throw new Error(`Build failed with ${logger.errorCount} errors and ${logger.warningCount} warnings.`);
+	}
+}
+
+async function build() {
+	await fs.rm(outputDir, { recursive: true, force: true });
+	await viteBuild();
+	await buildAllLocale();
+}
+
+await build();
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index f4f72d944a..eaefe92612 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -4,7 +4,7 @@
 	"type": "module",
 	"scripts": {
 		"watch": "vite",
-		"build": "vite build",
+		"build": "tsx build.ts",
 		"storybook-dev": "nodemon --verbose --watch src --ext \"mdx,ts,vue\" --ignore \"*.stories.ts\" --exec \"pnpm build-storybook-pre && pnpm exec storybook dev -p 6006 --ci\"",
 		"build-storybook-pre": "(tsc -p .storybook || echo done.) && node .storybook/generate.js && node .storybook/preload-locale.js && node .storybook/preload-theme.js",
 		"build-storybook": "pnpm build-storybook-pre && storybook build --webpack-stats-json storybook-static",
@@ -47,6 +47,7 @@
 		"date-fns": "4.1.0",
 		"estree-walker": "3.0.3",
 		"eventemitter3": "5.0.1",
+		"execa": "9.6.0",
 		"frontend-shared": "workspace:*",
 		"icons-subsetter": "workspace:*",
 		"idb-keyval": "6.2.2",
@@ -137,6 +138,7 @@
 		"start-server-and-test": "2.0.12",
 		"storybook": "9.1.0",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
+		"tsx": "4.20.3",
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "3.2.4",
 		"vitest-fetch-mock": "0.4.5",
diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index ea41155ab0..395d1e5e7e 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -5,9 +5,10 @@
 
 import { computed, watch, version as vueVersion } from 'vue';
 import { compareVersions } from 'compare-versions';
-import { version, lang, updateLocale, locale, apiUrl, isSafeMode } from '@@/js/config.js';
+import { version, lang, apiUrl, isSafeMode } from '@@/js/config.js';
 import defaultLightTheme from '@@/themes/l-light.json5';
 import defaultDarkTheme from '@@/themes/d-green-lime.json5';
+import { storeBootloaderErrors } from '@@/js/store-boot-errors';
 import type { App } from 'vue';
 import widgets from '@/widgets/index.js';
 import directives from '@/directives/index.js';
@@ -79,25 +80,7 @@ export async function common(createVue: () => Promise<App<Element>>) {
 	//#endregion
 
 	//#region Detect language & fetch translations
-	const localeVersion = miLocalStorage.getItem('localeVersion');
-	const localeOutdated = (localeVersion == null || localeVersion !== version || locale == null);
-
-	async function fetchAndUpdateLocale({ useCache } = { useCache: true }) {
-		const fetchOptions: RequestInit | undefined = useCache ? undefined : { cache: 'no-store' };
-		const res = await window.fetch(`/assets/locales/${lang}.${version}.json`, fetchOptions);
-		if (res.status === 200) {
-			const newLocale = await res.text();
-			const parsedNewLocale = JSON.parse(newLocale);
-			miLocalStorage.setItem('locale', newLocale);
-			miLocalStorage.setItem('localeVersion', version);
-			updateLocale(parsedNewLocale);
-			updateI18n(parsedNewLocale);
-		}
-	}
-
-	if (localeOutdated) {
-		fetchAndUpdateLocale();
-	}
+	storeBootloaderErrors({ ...i18n.ts._bootErrors, reload: i18n.ts.reload });
 
 	if (import.meta.hot) {
 		import.meta.hot.on('locale-update', async (updatedLang: string) => {
@@ -106,7 +89,8 @@ export async function common(createVue: () => Promise<App<Element>>) {
 				await new Promise(resolve => {
 					window.setTimeout(resolve, 500);
 				});
-				await fetchAndUpdateLocale({ useCache: false });
+				// fetch with cache: 'no-store' to ensure the latest locale is fetched
+				await window.fetch(`/assets/locales/${lang}.${version}.json`, { cache: 'no-store' }).then(async res => res.status === 200 && await res.text());
 				window.location.reload();
 			}
 		});
diff --git a/packages/frontend/src/components/MkExtensionInstaller.vue b/packages/frontend/src/components/MkExtensionInstaller.vue
index a2247d844b..c9d18ee731 100644
--- a/packages/frontend/src/components/MkExtensionInstaller.vue
+++ b/packages/frontend/src/components/MkExtensionInstaller.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 	<MkInfo :warn="true">{{ i18n.ts._externalResourceInstaller.checkVendorBeforeInstall }}</MkInfo>
 
-	<div v-if="isPlugin" class="_gaps_s">
+	<div v-if="extension.type === 'plugin'" class="_gaps_s">
 		<MkFolder :defaultOpen="true">
 			<template #icon><i class="ti ti-info-circle"></i></template>
 			<template #label>{{ i18n.ts.metadata }}</template>
@@ -60,7 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkCode :code="extension.raw"/>
 		</MkFolder>
 	</div>
-	<div v-else-if="isTheme" class="_gaps_s">
+	<div v-else-if="extension.type === 'theme'" class="_gaps_s">
 		<MkFolder :defaultOpen="true">
 			<template #icon><i class="ti ti-info-circle"></i></template>
 			<template #label>{{ i18n.ts.metadata }}</template>
@@ -78,7 +78,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</FormSplit>
 				<MkKeyValue>
 					<template #key>{{ i18n.ts._externalResourceInstaller._meta.base }}</template>
-					<template #value>{{ i18n.ts[extension.meta.base ?? 'none'] }}</template>
+					<template #value>{{ { light: i18n.ts.light, dark: i18n.ts.dark, none: i18n.ts.none }[extension.meta.base ?? 'none'] }}</template>
 				</MkKeyValue>
 			</div>
 		</MkFolder>
diff --git a/packages/frontend/src/i18n.ts b/packages/frontend/src/i18n.ts
index 6ad503b089..0b2b206b7e 100644
--- a/packages/frontend/src/i18n.ts
+++ b/packages/frontend/src/i18n.ts
@@ -5,11 +5,12 @@
 
 import { markRaw } from 'vue';
 import { I18n } from '@@/js/i18n.js';
+import { locale } from '@@/js/locale.js';
 import type { Locale } from '../../../locales/index.js';
-import { locale } from '@@/js/config.js';
 
 export const i18n = markRaw(new I18n<Locale>(locale, _DEV_));
 
+// test 以外では使わないこと。インライン化されてるのでだいたい意味がない
 export function updateI18n(newLocale: Locale) {
 	i18n.locale = newLocale;
 }
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index b64a8c5dd5..687983bcdb 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -22,8 +22,7 @@ export type Keys = (
 	'fontSize' |
 	'ui' |
 	'ui_temp' |
-	'locale' |
-	'localeVersion' |
+	'bootloaderLocales' |
 	'theme' |
 	'themeId' |
 	'customCss' |
diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index ed4f36c0e5..fb1a409180 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -886,8 +886,6 @@ const useSystemFont = ref(miLocalStorage.getItem('useSystemFont') != null);
 
 watch(lang, () => {
 	miLocalStorage.setItem('lang', lang.value as string);
-	miLocalStorage.removeItem('locale');
-	miLocalStorage.removeItem('localeVersion');
 });
 
 watch(fontSize, () => {
diff --git a/packages/frontend/src/utility/clear-cache.ts b/packages/frontend/src/utility/clear-cache.ts
index b6ae254727..8a62265438 100644
--- a/packages/frontend/src/utility/clear-cache.ts
+++ b/packages/frontend/src/utility/clear-cache.ts
@@ -13,8 +13,6 @@ export async function clearCache() {
 	os.waiting();
 	miLocalStorage.removeItem('instance');
 	miLocalStorage.removeItem('instanceCachedAt');
-	miLocalStorage.removeItem('locale');
-	miLocalStorage.removeItem('localeVersion');
 	miLocalStorage.removeItem('theme');
 	miLocalStorage.removeItem('emojis');
 	miLocalStorage.removeItem('lastEmojisFetchedAt');
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
index 9c7c611e5b..c445ada034 100644
--- a/packages/frontend/tsconfig.json
+++ b/packages/frontend/tsconfig.json
@@ -46,6 +46,7 @@
 	},
 	"compileOnSave": false,
 	"include": [
+		"./build.ts",
 		"./lib/**/*.ts",
 		"./src/**/*.ts",
 		"./src/**/*.vue",
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index 7b6bf436b1..e9707d13d1 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -14,6 +14,7 @@ import pluginJson5 from './vite.json5.js';
 import pluginCreateSearchIndex from './lib/vite-plugin-create-search-index.js';
 import type { Options as SearchIndexOptions } from './lib/vite-plugin-create-search-index.js';
 import pluginWatchLocales from './lib/vite-plugin-watch-locales.js';
+import pluginRemoveUnrefI18n from '../frontend-builder/rollup-plugin-remove-unref-i18n.js';
 
 const url = process.env.NODE_ENV === 'development' ? yaml.load(await fsp.readFile('../../.config/default.yml', 'utf-8')).url : null;
 const host = url ? (new URL(url)).hostname : undefined;
@@ -111,6 +112,7 @@ export function getConfig(): UserConfig {
 			pluginWatchLocales(),
 			...searchIndexes.map(options => pluginCreateSearchIndex(options)),
 			pluginVue(),
+			pluginRemoveUnrefI18n(),
 			pluginUnwindCssModuleClassName(),
 			pluginJson5(),
 			...process.env.NODE_ENV === 'production'
@@ -174,16 +176,21 @@ export function getConfig(): UserConfig {
 			manifest: 'manifest.json',
 			rollupOptions: {
 				input: {
-					app: './src/_boot_.ts',
+					i18n: './src/i18n.ts',
+					entry: './src/_boot_.ts',
 				},
 				external: externalPackages.map(p => p.match),
+				preserveEntrySignatures: 'allow-extension',
 				output: {
 					manualChunks: {
 						vue: ['vue'],
 						photoswipe: ['photoswipe', 'photoswipe/lightbox', 'photoswipe/style.css'],
+						// dependencies of i18n.ts
+						'config': ['@@/js/config.js'],
 					},
-					chunkFileNames: process.env.NODE_ENV === 'production' ? '[hash:8].js' : '[name]-[hash:8].js',
-					assetFileNames: process.env.NODE_ENV === 'production' ? '[hash:8][extname]' : '[name]-[hash:8][extname]',
+					entryFileNames: 'scripts/[hash:8].js',
+					chunkFileNames: 'scripts/[hash:8].js',
+					assetFileNames: 'assets/[hash:8][extname]',
 					paths(id) {
 						for (const p of externalPackages) {
 							if (p.match.test(id)) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8121822fb7..b1d75fe2ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -796,6 +796,9 @@ importers:
       eventemitter3:
         specifier: 5.0.1
         version: 5.0.1
+      execa:
+        specifier: 9.6.0
+        version: 9.6.0
       frontend-shared:
         specifier: workspace:*
         version: link:../frontend-shared
@@ -1061,6 +1064,9 @@ importers:
       storybook-addon-misskey-theme:
         specifier: github:misskey-dev/storybook-addon-misskey-theme
         version: https://codeload.github.com/misskey-dev/storybook-addon-misskey-theme/tar.gz/cf583db098365b2ccc81a82f63ca9c93bc32b640(1169897c5e200f76aeb2e7696f1450e0)
+      tsx:
+        specifier: 4.20.3
+        version: 4.20.3
       vite-plugin-turbosnap:
         specifier: 1.0.3
         version: 1.0.3
@@ -1080,6 +1086,37 @@ importers:
         specifier: 3.0.5
         version: 3.0.5(typescript@5.9.2)
 
+  packages/frontend-builder:
+    dependencies:
+      estree-walker:
+        specifier: 3.0.3
+        version: 3.0.3
+      magic-string:
+        specifier: 0.30.17
+        version: 0.30.17
+      vite:
+        specifier: 7.0.6
+        version: 7.0.6(@types/node@22.17.0)(sass@1.89.2)(terser@5.43.1)(tsx@4.20.3)
+    devDependencies:
+      '@types/estree':
+        specifier: 1.0.8
+        version: 1.0.8
+      '@types/node':
+        specifier: 22.17.0
+        version: 22.17.0
+      '@typescript-eslint/eslint-plugin':
+        specifier: 8.38.0
+        version: 8.38.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0)(typescript@5.9.2))(eslint@9.31.0)(typescript@5.9.2)
+      '@typescript-eslint/parser':
+        specifier: 8.38.0
+        version: 8.38.0(eslint@9.31.0)(typescript@5.9.2)
+      rollup:
+        specifier: 4.46.2
+        version: 4.46.2
+      typescript:
+        specifier: 5.9.2
+        version: 5.9.2
+
   packages/frontend-embed:
     dependencies:
       '@discordapp/twemoji':
@@ -1236,6 +1273,9 @@ importers:
       start-server-and-test:
         specifier: 2.0.12
         version: 2.0.12
+      tsx:
+        specifier: 4.20.3
+        version: 4.20.3
       vite-plugin-turbosnap:
         specifier: 1.0.3
         version: 1.0.3
@@ -6771,14 +6811,6 @@ packages:
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
-  fdir@6.4.4:
-    resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-
   fdir@6.4.6:
     resolution: {integrity: sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==}
     peerDependencies:
@@ -15365,7 +15397,7 @@ snapshots:
   '@typescript-eslint/project-service@8.34.0(typescript@5.8.3)':
     dependencies:
       '@typescript-eslint/tsconfig-utils': 8.37.0(typescript@5.8.3)
-      '@typescript-eslint/types': 8.37.0
+      '@typescript-eslint/types': 8.38.0
       debug: 4.4.1(supports-color@10.0.0)
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -15373,8 +15405,8 @@ snapshots:
 
   '@typescript-eslint/project-service@8.37.0(typescript@5.8.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.37.0(typescript@5.8.3)
-      '@typescript-eslint/types': 8.37.0
+      '@typescript-eslint/tsconfig-utils': 8.38.0(typescript@5.8.3)
+      '@typescript-eslint/types': 8.38.0
       debug: 4.4.1(supports-color@10.0.0)
       typescript: 5.8.3
     transitivePeerDependencies:
@@ -15804,7 +15836,7 @@ snapshots:
       alien-signals: 2.0.6
       muggle-string: 0.4.1
       path-browserify: 1.0.1
-      picomatch: 4.0.2
+      picomatch: 4.0.3
     optionalDependencies:
       typescript: 5.9.2
 
@@ -18072,10 +18104,6 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
-  fdir@6.4.4(picomatch@4.0.2):
-    optionalDependencies:
-      picomatch: 4.0.2
-
   fdir@6.4.6(picomatch@4.0.3):
     optionalDependencies:
       picomatch: 4.0.3
@@ -22364,8 +22392,8 @@ snapshots:
 
   tinyglobby@0.2.14:
     dependencies:
-      fdir: 6.4.4(picomatch@4.0.2)
-      picomatch: 4.0.2
+      fdir: 6.4.6(picomatch@4.0.3)
+      picomatch: 4.0.3
 
   tinypool@1.1.1: {}
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 9a034e257b..0fadcc60f7 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,6 +2,7 @@ packages:
   - packages/backend
   - packages/frontend-shared
   - packages/frontend
+  - packages/frontend-builder
   - packages/frontend-embed
   - packages/icons-subsetter
   - packages/sw
diff --git a/scripts/clean-all.js b/scripts/clean-all.js
index dc391ecfd8..5a8f9eba23 100644
--- a/scripts/clean-all.js
+++ b/scripts/clean-all.js
@@ -13,6 +13,8 @@ const fs = require('fs');
 	fs.rmSync(__dirname + '/../packages/frontend-shared/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/frontend-shared/node_modules', { recursive: true, force: true });
 
+	fs.rmSync(__dirname + '/../packages/frontend-builder/node_modules', { recursive: true, force: true });
+
 	fs.rmSync(__dirname + '/../packages/frontend/built', { recursive: true, force: true });
 	fs.rmSync(__dirname + '/../packages/frontend/node_modules', { recursive: true, force: true });
 

From adb3ad6b7f2e4705d563ecdea65879db929a1971 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 8 Aug 2025 18:47:35 +0900
Subject: [PATCH 08/15] Follow up per locale bundle (#16381)

* fix docker build

* enable check spdx license id in frontend-builder

* fix eslint config

* run eslint for frontend-builder in ci

* fix eslint

* add license headers

* fix unnecessary comments

* update changelog

* fix generateDts

* fix tsx
---
 .github/workflows/check-spdx-license-id.yml   |  1 +
 .github/workflows/lint.yml                    |  3 +
 CHANGELOG.md                                  |  1 +
 Dockerfile                                    |  1 +
 locales/generateDTS.js                        | 28 +++---
 locales/index.d.ts                            |  4 +-
 packages/frontend-builder/README.txt          |  2 -
 packages/frontend-builder/eslint.config.js    | 48 +---------
 packages/frontend-builder/locale-inliner.ts   | 14 ++-
 .../locale-inliner/apply-with-locale.ts       | 41 ++++----
 .../locale-inliner/collect-modifications.ts   | 96 ++++++++++---------
 packages/frontend-builder/logger.ts           | 13 ++-
 .../rollup-plugin-remove-unref-i18n.ts        | 12 +--
 packages/frontend-builder/utils.ts            |  5 +
 packages/frontend-embed/vite.config.ts        |  2 +-
 packages/frontend-shared/js/i18n.ts           |  3 +-
 packages/frontend/vite.config.ts              |  2 +-
 17 files changed, 133 insertions(+), 143 deletions(-)

diff --git a/.github/workflows/check-spdx-license-id.yml b/.github/workflows/check-spdx-license-id.yml
index e40a4557df..cf1fd6007d 100644
--- a/.github/workflows/check-spdx-license-id.yml
+++ b/.github/workflows/check-spdx-license-id.yml
@@ -50,6 +50,7 @@ jobs:
             "packages/backend/test"
             "packages/frontend-shared/@types"
             "packages/frontend-shared/js"
+            "packages/frontend-builder"
             "packages/frontend/.storybook"
             "packages/frontend/@types"
             "packages/frontend/lib"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 235faeb807..550438e308 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,6 +9,7 @@ on:
       - packages/backend/**
       - packages/frontend/**
       - packages/frontend-shared/**
+      - packages/frontend-builder/**
       - packages/frontend-embed/**
       - packages/icons-subsetter/**
       - packages/sw/**
@@ -22,6 +23,7 @@ on:
       - packages/backend/**
       - packages/frontend/**
       - packages/frontend-shared/**
+      - packages/frontend-builder/**
       - packages/frontend-embed/**
       - packages/icons-subsetter/**
       - packages/sw/**
@@ -56,6 +58,7 @@ jobs:
         - backend
         - frontend
         - frontend-shared
+        - frontend-builder
         - frontend-embed
         - icons-subsetter
         - sw
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4734033c54..a1dc3e2fe9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - Feat: ページのタブバーを下部に表示できるように
 - Enhance: コントロールパネルを検索できるように
 - Enhance: トルコ語 (tr-TR) に対応
+- Enhance: 言語別のスクリプトバンドルを生成するように
 - Fix: 投稿フォームでファイルのアップロードが中止または失敗した際のハンドリングを修正
 - Fix: 一部の設定検索結果が存在しないパスになる問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1171)
diff --git a/Dockerfile b/Dockerfile
index 62b737c084..370bed5751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,7 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/frontend-shared/package.json", "./packages/frontend-shared/"]
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 COPY --link ["packages/frontend-embed/package.json", "./packages/frontend-embed/"]
+COPY --link ["packages/frontend-builder/package.json", "./packages/frontend-builder/"]
 COPY --link ["packages/icons-subsetter/package.json", "./packages/icons-subsetter/"]
 COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
diff --git a/locales/generateDTS.js b/locales/generateDTS.js
index 49807144ec..ab0613cc82 100644
--- a/locales/generateDTS.js
+++ b/locales/generateDTS.js
@@ -73,7 +73,7 @@ export default function generateDTS() {
 				ts.NodeFlags.Const,
 			),
 		),
-		ts.factory.createInterfaceDeclaration(
+		ts.factory.createTypeAliasDeclaration(
 			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
 			ts.factory.createIdentifier('ParameterizedString'),
 			[
@@ -84,20 +84,22 @@ export default function generateDTS() {
 					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
 				),
 			],
-			undefined,
-			[
-				ts.factory.createPropertySignature(
-					undefined,
-					ts.factory.createComputedPropertyName(
-						ts.factory.createIdentifier('kParameters'),
-					),
-					undefined,
-					ts.factory.createTypeReferenceNode(
-						ts.factory.createIdentifier('T'),
+			ts.factory.createIntersectionTypeNode([
+				ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+				ts.factory.createTypeLiteralNode([
+					ts.factory.createPropertySignature(
 						undefined,
+						ts.factory.createComputedPropertyName(
+							ts.factory.createIdentifier('kParameters'),
+						),
+						undefined,
+						ts.factory.createTypeReferenceNode(
+							ts.factory.createIdentifier('T'),
+							undefined,
+						),
 					),
-				),
-			],
+				])
+			]),
 		),
 		ts.factory.createInterfaceDeclaration(
 			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
diff --git a/locales/index.d.ts b/locales/index.d.ts
index cafa9012b9..b0a15e0ad1 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2,9 +2,9 @@
 // This file is generated by locales/generateDTS.js
 // Do not edit this file directly.
 declare const kParameters: unique symbol;
-export interface ParameterizedString<T extends string = string> {
+export type ParameterizedString<T extends string = string> = string & {
     [kParameters]: T;
-}
+};
 export interface ILocale {
     [_: string]: string | ParameterizedString | ILocale;
 }
diff --git a/packages/frontend-builder/README.txt b/packages/frontend-builder/README.txt
index db878ffa83..428166e792 100644
--- a/packages/frontend-builder/README.txt
+++ b/packages/frontend-builder/README.txt
@@ -1,3 +1 @@
 This package contains the common scripts that are used to build the frontend and frontend-embed packages.
-
-
diff --git a/packages/frontend-builder/eslint.config.js b/packages/frontend-builder/eslint.config.js
index 5805c9924d..a13490c97f 100644
--- a/packages/frontend-builder/eslint.config.js
+++ b/packages/frontend-builder/eslint.config.js
@@ -1,20 +1,13 @@
 import globals from 'globals';
 import tsParser from '@typescript-eslint/parser';
-import pluginMisskey from '@misskey-dev/eslint-plugin';
 import sharedConfig from '../shared/eslint.config.js';
 
 // eslint-disable-next-line import/no-default-export
 export default [
 	...sharedConfig,
-	{
-		files: ['**/*.vue'],
-		...pluginMisskey.configs.typescript,
-	},
 	{
 		files: [
-			'@types/**/*.ts',
-			'js/**/*.ts',
-			'**/*.vue',
+			'**/*.ts',
 		],
 		languageOptions: {
 			globals: {
@@ -50,45 +43,6 @@ export default [
 			// e の禁止理由: error や event など、複数のキーワードの頭文字であり分かりにくいため
 			'id-denylist': ['error', 'window', 'e'],
 			'no-shadow': ['warn'],
-			'vue/attributes-order': ['error', {
-				alphabetical: false,
-			}],
-			'vue/no-use-v-if-with-v-for': ['error', {
-				allowUsingIterationVar: false,
-			}],
-			'vue/no-ref-as-operand': 'error',
-			'vue/no-multi-spaces': ['error', {
-				ignoreProperties: false,
-			}],
-			'vue/no-v-html': 'warn',
-			'vue/order-in-components': 'error',
-			'vue/html-indent': ['warn', 'tab', {
-				attribute: 1,
-				baseIndent: 0,
-				closeBracket: 0,
-				alignAttributesVertically: true,
-				ignores: [],
-			}],
-			'vue/html-closing-bracket-spacing': ['warn', {
-				startTag: 'never',
-				endTag: 'never',
-				selfClosingTag: 'never',
-			}],
-			'vue/multi-word-component-names': 'warn',
-			'vue/require-v-for-key': 'warn',
-			'vue/no-unused-components': 'warn',
-			'vue/no-unused-vars': 'warn',
-			'vue/no-dupe-keys': 'warn',
-			'vue/valid-v-for': 'warn',
-			'vue/return-in-computed-property': 'warn',
-			'vue/no-setup-props-reactivity-loss': 'warn',
-			'vue/max-attributes-per-line': 'off',
-			'vue/html-self-closing': 'off',
-			'vue/singleline-html-element-content-newline': 'off',
-			'vue/v-on-event-hyphenation': ['error', 'never', {
-				autofix: true,
-			}],
-			'vue/attribute-hyphenation': ['error', 'never'],
 		},
 	},
 	{
diff --git a/packages/frontend-builder/locale-inliner.ts b/packages/frontend-builder/locale-inliner.ts
index ce3f59a81c..75bcdc5b3f 100644
--- a/packages/frontend-builder/locale-inliner.ts
+++ b/packages/frontend-builder/locale-inliner.ts
@@ -1,11 +1,17 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import * as fs from 'fs/promises';
 import * as path from 'node:path';
-import { type Locale } from '../../locales/index.js';
-import type { Manifest as ViteManifest } from 'vite';
 import MagicString from 'magic-string';
 import { collectModifications } from './locale-inliner/collect-modifications.js';
 import { applyWithLocale } from './locale-inliner/apply-with-locale.js';
-import { blankLogger, type Logger } from './logger.js';
+import { blankLogger } from './logger.js';
+import type { Logger } from './logger.js';
+import type { Locale } from '../../locales/index.js';
+import type { Manifest as ViteManifest } from 'vite';
 
 export class LocaleInliner {
 	outputDir: string;
@@ -70,7 +76,7 @@ export class LocaleInliner {
 	async saveLocale(localeName: string, localeJson: Locale) {
 		// create directory
 		await fs.mkdir(path.join(this.outputDir, localeName), { recursive: true });
-		const localeLogger = localeName == 'ja-JP' ? this.logger : blankLogger; // we want to log for single locale only
+		const localeLogger = localeName === 'ja-JP' ? this.logger : blankLogger; // we want to log for single locale only
 		for (const chunk of this.chunks) {
 			if (!chunk.sourceCode || !chunk.modifications) {
 				throw new Error(`Source code or modifications for ${chunk.fileName} is not available.`);
diff --git a/packages/frontend-builder/locale-inliner/apply-with-locale.ts b/packages/frontend-builder/locale-inliner/apply-with-locale.ts
index a79ebb4253..5e601cdf12 100644
--- a/packages/frontend-builder/locale-inliner/apply-with-locale.ts
+++ b/packages/frontend-builder/locale-inliner/apply-with-locale.ts
@@ -1,6 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import MagicString from 'magic-string';
-import type { Locale } from '../../../locales/index.js';
 import { assertNever } from '../utils.js';
+import type { Locale, ILocale } from '../../../locales/index.js';
 import type { TextModification } from '../locale-inliner.js';
 import type { Logger } from '../logger.js';
 
@@ -13,16 +18,16 @@ export function applyWithLocale(
 ) {
 	for (const modification of modifications) {
 		switch (modification.type) {
-			case "delete":
+			case 'delete':
 				sourceCode.remove(modification.begin, modification.end);
 				break;
-			case "insert":
+			case 'insert':
 				sourceCode.appendRight(modification.begin, modification.text);
 				break;
-			case "replace":
+			case 'replace':
 				sourceCode.update(modification.begin, modification.end, modification.text);
 				break;
-			case "localized": {
+			case 'localized': {
 				const accessed = getPropertyByPath(localeJson, modification.localizationKey);
 				if (accessed == null) {
 					fileLogger.warn(`Cannot find localization key ${modification.localizationKey.join('.')}`);
@@ -30,7 +35,7 @@ export function applyWithLocale(
 				sourceCode.update(modification.begin, modification.end, JSON.stringify(accessed));
 				break;
 			}
-			case "parameterized-function": {
+			case 'parameterized-function': {
 				const accessed = getPropertyByPath(localeJson, modification.localizationKey);
 				let replacement: string;
 				if (typeof accessed === 'string') {
@@ -44,33 +49,33 @@ export function applyWithLocale(
 				sourceCode.update(modification.begin, modification.end, replacement);
 				break;
 
-				function formatFunction(accessed: string): string {
+				function formatFunction(format: string): string {
 					const params = new Set<string>();
 					const components: string[] = [];
 					let lastIndex = 0;
-					for (const match of accessed.matchAll(/\{(.+?)}/g)) {
+					for (const match of format.matchAll(/\{(.+?)}/g)) {
 						const [fullMatch, paramName] = match;
 						if (lastIndex < match.index) {
-							components.push(JSON.stringify(accessed.slice(lastIndex, match.index)));
+							components.push(JSON.stringify(format.slice(lastIndex, match.index)));
 						}
 						params.add(paramName);
 						components.push(paramName);
 						lastIndex = match.index + fullMatch.length;
 					}
-					components.push(JSON.stringify(accessed.slice(lastIndex)));
+					components.push(JSON.stringify(format.slice(lastIndex)));
 
 					// we replace with `(({name,count})=>(name+count+"some"))`
 					const paramList = Array.from(params).join(',');
-					let body = components.filter(x => x != '""').join('+');
-					if (body == '') body = '""'; // if the body is empty, we return empty string
+					let body = components.filter(x => x !== '""').join('+');
+					if (body === '') body = '""'; // if the body is empty, we return empty string
 					return `(({${paramList}})=>(${body}))`;
 				}
 			}
-			case "locale-name": {
+			case 'locale-name': {
 				sourceCode.update(modification.begin, modification.end, modification.literal ? JSON.stringify(localeName) : localeName);
 				break;
 			}
-			case "locale-json": {
+			case 'locale-json': {
 				// locale-json is inlined to place where initialize module-level variable which is executed only once.
 				// In such case we can use JSON.parse to speed up the parsing script.
 				// https://v8.dev/blog/cost-of-javascript-2019#json
@@ -84,14 +89,14 @@ export function applyWithLocale(
 	}
 }
 
-function getPropertyByPath(localeJson: any, localizationKey: string[]): string | object | null {
+function getPropertyByPath(localeJson: ILocale, localizationKey: string[]): string | object | null {
 	if (localizationKey.length === 0) return localeJson;
-	let current: any = localeJson;
+	let current: ILocale | string = localeJson;
 	for (const key of localizationKey) {
-		if (typeof current !== 'object' || current === null || !(key in current)) {
+		if (typeof current !== 'object' || !(key in current)) {
 			return null; // Key not found
 		}
 		current = current[key];
 	}
-	return current ?? null;
+	return current;
 }
diff --git a/packages/frontend-builder/locale-inliner/collect-modifications.ts b/packages/frontend-builder/locale-inliner/collect-modifications.ts
index 0cbf6a504e..59e5d96517 100644
--- a/packages/frontend-builder/locale-inliner/collect-modifications.ts
+++ b/packages/frontend-builder/locale-inliner/collect-modifications.ts
@@ -1,10 +1,15 @@
-import type { AstNode, ProgramNode } from 'rollup';
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 import { parseAst } from 'vite';
 import * as estreeWalker from 'estree-walker';
+import { assertNever, assertType } from '../utils.js';
+import type { AstNode, ProgramNode } from 'rollup';
 import type * as estree from 'estree';
 import type { LocaleInliner, TextModification } from '../locale-inliner.js';
-import type { Logger } from '../logger.js'
-import { assertNever, assertType } from '../utils.js';
+import type { Logger } from '../logger.js';
 
 // WalkerContext is not exported from estree-walker, so we define it here
 interface WalkerContext {
@@ -15,12 +20,12 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 	let programNode: ProgramNode;
 	try {
 		programNode = parseAst(sourceCode);
-	} catch (e) {
-		fileLogger.error(`Failed to parse source code: ${e}`);
+	} catch (err) {
+		fileLogger.error(`Failed to parse source code: ${err}`);
 		return [];
 	}
 	if (programNode.sourceType !== 'module') {
-		fileLogger.error(`Source code is not a module.`);
+		fileLogger.error('Source code is not a module.');
 		return [];
 	}
 
@@ -32,7 +37,7 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 	// 3) replace all `await window.fetch(`/assets/locales/${d}.${x}.json`).then(u=>u.json())` with `localeJson` variable
 	estreeWalker.walk(programNode, {
 		enter(this: WalkerContext, node: Node) {
-			assertType<AstNode>(node)
+			assertType<AstNode>(node);
 
 			if (node.type === 'Literal' && typeof node.value === 'string' && node.raw) {
 				if (node.raw.substring(1).startsWith(inliner.scriptsDir)) {
@@ -46,7 +51,7 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 						localizedOnly: true,
 					});
 				}
-				if (node.raw.substring(1, node.raw.length - 1) == `${inliner.scriptsDir}/${inliner.i18nFileName}`) {
+				if (node.raw.substring(1, node.raw.length - 1) === `${inliner.scriptsDir}/${inliner.i18nFileName}`) {
 					// we find `scripts/i18n.ts` literal.
 					// This is tipically in depmap and replace with this file name to avoid unnecessary loading i18n script
 					fileLogger.debug(`${lineCol(sourceCode, node)}: found ${inliner.i18nFileName} path literal ${node.raw}`);
@@ -81,17 +86,17 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 					localizedOnly: true,
 				});
 			}
-		}
-	})
+		},
+	});
 
 	const importSpecifierResult = findImportSpecifier(programNode, inliner.i18nFileName, 'i18n');
 
 	switch (importSpecifierResult.type) {
 		case 'no-import':
-			fileLogger.debug(`No import of i18n found, skipping inlining.`);
+			fileLogger.debug('No import of i18n found, skipping inlining.');
 			return modifications;
 		case 'no-specifiers':
-			fileLogger.debug(`Importing i18n without specifiers, removing the import.`);
+			fileLogger.debug('Importing i18n without specifiers, removing the import.');
 			modifications.push({
 				type: 'delete',
 				begin: importSpecifierResult.importNode.start,
@@ -115,17 +120,18 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 	let isSupported = true;
 	estreeWalker.walk(programNode, {
 		enter(node) {
-			if (node.type == 'VariableDeclaration') {
+			if (node.type === 'VariableDeclaration') {
 				assertType<estree.VariableDeclaration>(node);
-				for (let id of node.declarations.flatMap(x => declsOfPattern(x.id))) {
-					if (id == localI18nIdentifier) {
+				for (const id of node.declarations.flatMap(x => declsOfPattern(x.id))) {
+					if (id === localI18nIdentifier) {
 						isSupported = false;
 					}
 				}
 			}
-		}
-	})
+		},
+	});
 
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	if (!isSupported) {
 		fileLogger.error(`Duplicated identifier "${localI18nIdentifier}" in variable declaration. Skipping inlining.`);
 		return modifications;
@@ -141,8 +147,8 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 	toSkip.add(i18nImport);
 	estreeWalker.walk(programNode, {
 		enter(this: WalkerContext, node, parent, property) {
-			assertType<AstNode>(node)
-			assertType<AstNode>(parent)
+			assertType<AstNode>(node);
+			assertType<AstNode>(parent);
 			if (toSkip.has(node)) {
 				// This is the import specifier, skip processing it
 				this.skip();
@@ -150,23 +156,23 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 			}
 
 			// We don't care original name part of the import declaration
-			if (node.type == 'ImportDeclaration') this.skip();
+			if (node.type === 'ImportDeclaration') this.skip();
 
 			if (node.type === 'Identifier') {
-				assertType<estree.Identifier>(node)
-				assertType<estree.Property | estree.MemberExpression | estree.ExportSpecifier>(parent)
-				if (parent.type === 'Property' && !parent.computed && property == 'key') return; // we don't care 'id' part of { id: expr }
-				if (parent.type === 'MemberExpression' && !parent.computed && property == 'property') return; // we don't care 'id' part of { id: expr }
-				if (parent.type === 'ExportSpecifier' && property == 'exported') return; // we don't care 'id' part of { id: expr }
-				if (node.name == localI18nIdentifier) {
+				assertType<estree.Identifier>(node);
+				assertType<estree.Property | estree.MemberExpression | estree.ExportSpecifier>(parent);
+				if (parent.type === 'Property' && !parent.computed && property === 'key') return; // we don't care 'id' part of { id: expr }
+				if (parent.type === 'MemberExpression' && !parent.computed && property === 'property') return; // we don't care 'id' part of { id: expr }
+				if (parent.type === 'ExportSpecifier' && property === 'exported') return; // we don't care 'id' part of { id: expr }
+				if (node.name === localI18nIdentifier) {
 					fileLogger.error(`${lineCol(sourceCode, node)}: Using i18n identifier "${localI18nIdentifier}" directly. Skipping inlining.`);
 					preserveI18nImport = true;
 				}
 			} else if (node.type === 'MemberExpression') {
 				assertType<estree.MemberExpression>(node);
 				const i18nPath = parseI18nPropertyAccess(node);
-				if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] == 'ts') {
-					if (parent.type === 'CallExpression' && property == 'callee') return; // we don't want to process `i18n.ts.property.stringBuiltinMethod()`
+				if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] === 'ts') {
+					if (parent.type === 'CallExpression' && property === 'callee') return; // we don't want to process `i18n.ts.property.stringBuiltinMethod()`
 					if (i18nPath.at(-1)?.startsWith('_')) fileLogger.debug(`found i18n grouped property access ${i18nPath.join('.')}`);
 					else fileLogger.debug(`${lineCol(sourceCode, node)}: found i18n property access ${i18nPath.join('.')}`);
 					// it's i18n.ts.propertyAccess
@@ -179,7 +185,7 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 						localizedOnly: true,
 					});
 					this.skip();
-				} else if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] == 'tsx') {
+				} else if (i18nPath != null && i18nPath.length >= 2 && i18nPath[0] === 'tsx') {
 					// it's parameterized locale substitution (`i18n.tsx.property(parameters)`)
 					// we expect the parameter to be an object literal
 					fileLogger.debug(`${lineCol(sourceCode, node)}: found i18n function access (object) ${i18nPath.join('.')}`);
@@ -197,11 +203,12 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 				// If there is 'i18n' in the parameters, we care interior of the function
 				if (node.params.flatMap(param => declsOfPattern(param)).includes(localI18nIdentifier)) this.skip();
 			}
-		}
-	})
+		},
+	});
 
+	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 	if (!preserveI18nImport) {
-		fileLogger.debug(`removing i18n import statement`);
+		fileLogger.debug('removing i18n import statement');
 		modifications.push({
 			type: 'delete',
 			begin: i18nImport.start,
@@ -211,7 +218,7 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 	}
 
 	function parseI18nPropertyAccess(node: estree.Expression | estree.Super): string[] | null {
-		if (node.type === 'Identifier' && node.name == localI18nIdentifier) return []; // i18n itself
+		if (node.type === 'Identifier' && node.name === localI18nIdentifier) return []; // i18n itself
 		if (node.type !== 'MemberExpression') return null;
 		// super.*
 		if (node.object.type === 'Super') return null;
@@ -219,7 +226,6 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 		// i18n?.property is not supported
 		if (node.optional) return null;
 
-
 		let id: string | null = null;
 		if (node.computed) {
 			if (node.property.type === 'Literal' && typeof node.property.value === 'string') {
@@ -243,10 +249,10 @@ export function collectModifications(sourceCode: string, fileName: string, fileL
 
 function declsOfPattern(pattern: estree.Pattern | null): string[] {
 	if (pattern == null) return [];
-	switch (pattern?.type) {
-		case "Identifier":
+	switch (pattern.type) {
+		case 'Identifier':
 			return [pattern.name];
-		case "ObjectPattern":
+		case 'ObjectPattern':
 			return pattern.properties.flatMap(prop => {
 				switch (prop.type) {
 					case 'Property':
@@ -254,16 +260,16 @@ function declsOfPattern(pattern: estree.Pattern | null): string[] {
 					case 'RestElement':
 						return declsOfPattern(prop.argument);
 					default:
-						assertNever(prop)
+						assertNever(prop);
 				}
 			});
-		case "ArrayPattern":
+		case 'ArrayPattern':
 			return pattern.elements.flatMap(p => declsOfPattern(p));
-		case "RestElement":
+		case 'RestElement':
 			return declsOfPattern(pattern.argument);
-		case "AssignmentPattern":
+		case 'AssignmentPattern':
 			return declsOfPattern(pattern.left);
-		case "MemberExpression":
+		case 'MemberExpression':
 			// assignment pattern so no new variable is declared
 			return [];
 		default:
@@ -375,15 +381,15 @@ type SpecifierResult =
 
 function findImportSpecifier(programNode: ProgramNode, i18nFileName: string, i18nSymbol: string): SpecifierResult {
 	const imports = programNode.body.filter(x => x.type === 'ImportDeclaration');
-	const importNode = imports.find(x => x.source.value === `./${i18nFileName}`) as estree.ImportDeclaration;
+	const importNode = imports.find(x => x.source.value === `./${i18nFileName}`) as estree.ImportDeclaration | undefined;
 	if (!importNode) return { type: 'no-import' };
 	assertType<AstNode>(importNode);
 
-	if (importNode.specifiers.length == 0) {
+	if (importNode.specifiers.length === 0) {
 		return { type: 'no-specifiers', importNode };
 	}
 
-	if (importNode.specifiers.length != 1) {
+	if (importNode.specifiers.length !== 1) {
 		return { type: 'unexpected-specifiers', importNode };
 	}
 	const i18nImportSpecifier = importNode.specifiers[0];
diff --git a/packages/frontend-builder/logger.ts b/packages/frontend-builder/logger.ts
index a3f66730e2..c619882380 100644
--- a/packages/frontend-builder/logger.ts
+++ b/packages/frontend-builder/logger.ts
@@ -1,4 +1,11 @@
-const debug = false;
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import * as process from 'node:process';
+
+const debug = process.env.BUILDER_DEBUG !== undefined && process.env.BUILDER_DEBUG !== '0';
 
 export interface Logger {
 	debug(message: string): void;
@@ -27,7 +34,7 @@ export function createLogger(): RootLogger {
 type LogContext = {
 	warningCount: number;
 	errorCount: number;
-}
+};
 
 function loggerFactory(prefix: string, context: LogContext): RootLogger {
 	return {
@@ -63,4 +70,4 @@ export const blankLogger: Logger = {
 	error: () => void 0,
 	info: () => void 0,
 	prefixed: () => blankLogger,
-}
+};
diff --git a/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts b/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
index 9010e6910c..4a2bfa67d9 100644
--- a/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
+++ b/packages/frontend-builder/rollup-plugin-remove-unref-i18n.ts
@@ -4,18 +4,18 @@
  */
 
 import * as estreeWalker from 'estree-walker';
-import type { Plugin } from 'vite';
-import type { CallExpression, Expression, Program, } from 'estree';
 import MagicString from 'magic-string';
-import type { AstNode } from 'rollup';
 import { assertType } from './utils.js';
+import type { Plugin } from 'vite';
+import type { CallExpression, Expression, Program } from 'estree';
+import type { AstNode } from 'rollup';
 
 // This plugin transforms `unref(i18n)` to `i18n` in the code, which is useful for removing unnecessary unref calls
 // and helps locale inliner runs after vite build to inline the locale data into the final build.
 //
 // locale inliner cannot know minifiedSymbol(i18n) is 'unref(i18n)' or 'otherFunctionsWithEffect(i18n)' so
 // it is necessary to remove unref calls before minification.
-export default function pluginRemoveUnrefI18n(
+export function pluginRemoveUnrefI18n(
 	{
 		i18nSymbolName = 'i18n',
 	}: {
@@ -42,12 +42,12 @@ export default function pluginRemoveUnrefI18n(
 							magicString.remove(arg.end, node.end);
 						}
 					}
-				}
+				},
 			});
 			return {
 				code: magicString.toString(),
 				map: magicString.generateMap({ hires: true }),
-			}
+			};
 		},
 	};
 }
diff --git a/packages/frontend-builder/utils.ts b/packages/frontend-builder/utils.ts
index 1ce9f7fc76..71ffebe03e 100644
--- a/packages/frontend-builder/utils.ts
+++ b/packages/frontend-builder/utils.ts
@@ -1,5 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 
 export function assertNever(x: never): never {
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	throw new Error(`Unexpected type: ${(x as any)?.type ?? x}`);
 }
 
diff --git a/packages/frontend-embed/vite.config.ts b/packages/frontend-embed/vite.config.ts
index eb57db9774..3ddee9b8a9 100644
--- a/packages/frontend-embed/vite.config.ts
+++ b/packages/frontend-embed/vite.config.ts
@@ -8,7 +8,7 @@ import locales from '../../locales/index.js';
 import meta from '../../package.json';
 import packageInfo from './package.json' with { type: 'json' };
 import pluginJson5 from './vite.json5.js';
-import pluginRemoveUnrefI18n from '../frontend-builder/rollup-plugin-remove-unref-i18n';
+import { pluginRemoveUnrefI18n } from '../frontend-builder/rollup-plugin-remove-unref-i18n';
 
 const url = process.env.NODE_ENV === 'development' ? yaml.load(await fsp.readFile('../../.config/default.yml', 'utf-8')).url : null;
 const host = url ? (new URL(url)).hostname : undefined;
diff --git a/packages/frontend-shared/js/i18n.ts b/packages/frontend-shared/js/i18n.ts
index bd9ba0922a..3b103c4714 100644
--- a/packages/frontend-shared/js/i18n.ts
+++ b/packages/frontend-shared/js/i18n.ts
@@ -28,7 +28,8 @@ type ParametersOf<T extends ILocale, TKey extends FlattenKeys<T, ParameterizedSt
 		: never;
 
 type Tsx<T extends ILocale> = {
-	readonly [K in keyof T as T[K] extends string ? never : K]: T[K] extends ParameterizedString<infer P>
+	// `string extends T[K] ? never : K` part removes non-parameterized string keys from Tsx type.
+	readonly [K in keyof T as string extends T[K] ? never : K]: T[K] extends ParameterizedString<infer P>
 		? (arg: { readonly [_ in P]: string | number }) => string
 		// @ts-expect-error -- 証明省略
 		: Tsx<T[K]>;
diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts
index e9707d13d1..9b54014b54 100644
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@@ -14,7 +14,7 @@ import pluginJson5 from './vite.json5.js';
 import pluginCreateSearchIndex from './lib/vite-plugin-create-search-index.js';
 import type { Options as SearchIndexOptions } from './lib/vite-plugin-create-search-index.js';
 import pluginWatchLocales from './lib/vite-plugin-watch-locales.js';
-import pluginRemoveUnrefI18n from '../frontend-builder/rollup-plugin-remove-unref-i18n.js';
+import { pluginRemoveUnrefI18n } from '../frontend-builder/rollup-plugin-remove-unref-i18n.js';
 
 const url = process.env.NODE_ENV === 'development' ? yaml.load(await fsp.readFile('../../.config/default.yml', 'utf-8')).url : null;
 const host = url ? (new URL(url)).hostname : undefined;

From 4a5751416a902f04798aa00f89406ef0eafaee47 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 09:50:54 +0000
Subject: [PATCH 09/15] Bump version to 2025.8.0-alpha.5

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a7e6cd4fdb..4ed9498433 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-alpha.4",
+	"version": "2025.8.0-alpha.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 95b6eaf83c..0b6ff82c0e 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-alpha.4",
+	"version": "2025.8.0-alpha.5",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From aaf3f343ea0a67adca545d78e2568a2896f295c9 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:20:23 +0900
Subject: [PATCH 10/15] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 057deec4cf..eadc6a2509 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -286,6 +286,9 @@ const patronsWithIcon = [{
 }, {
 	name: '井上千二十四',
 	icon: 'https://assets.misskey-hub.net/patrons/193afa1f039b4c339866039c3dcd74bf.jpg',
+}, {
+	name: 'NigN',
+	icon: 'https://assets.misskey-hub.net/patrons/1ccaef8e73ec4a50b59ff7cd688ceb84.jpg',
 }];
 
 const patrons = [
@@ -399,6 +402,7 @@ const patrons = [
 	'みりめい',
 	'東雲 琥珀',
 	'ほとラズ',
+	'スズカケン',
 ];
 
 const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

From 076a83466e9168929b34932a40b0d8fe42912f17 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:26:53 +0900
Subject: [PATCH 11/15] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/components/MkEmojiPicker.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index 654aceb8f5..0248d75f75 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -585,6 +585,14 @@ defineExpose({
 					grid-template-columns: var(--columns);
 					font-size: 30px;
 
+					> .config {
+						aspect-ratio: 1 / 1;
+						width: auto;
+						height: auto;
+						min-width: 0;
+						font-size: 14px;
+					}
+
 					> .item {
 						aspect-ratio: 1 / 1;
 						width: auto;

From 85e3e496880316c4b55199ea651c210a25420a6e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 8 Aug 2025 21:31:31 +0900
Subject: [PATCH 12/15] fix(backend): Fix and create unit test of
 CleanRemoteNotesProcessorService (#16368)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* test(backend): CleanRemoteNotesProcessorService (basic)

* test(backend): CleanRemoteNotesProcessorService (advanced)

* :v:

* a

* split initiator query

* no order by

* ???

* old → older
---
 .../CleanRemoteNotesProcessorService.ts       | 171 ++---
 .../CleanRemoteNotesProcessorService.ts       | 631 ++++++++++++++++++
 2 files changed, 726 insertions(+), 76 deletions(-)
 create mode 100644 packages/backend/test/unit/queue/processors/CleanRemoteNotesProcessorService.ts

diff --git a/packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts b/packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts
index 6c64d6aa39..da3bb804c2 100644
--- a/packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts
+++ b/packages/backend/src/queue/processors/CleanRemoteNotesProcessorService.ts
@@ -5,9 +5,8 @@
 
 import { setTimeout } from 'node:timers/promises';
 import { Inject, Injectable } from '@nestjs/common';
-import { And, Brackets, In, IsNull, LessThan, MoreThan, Not } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { MiMeta, MiNote, NoteFavoritesRepository, NotesRepository, UserNotePiningsRepository } from '@/models/_.js';
+import type { MiMeta, MiNote, NotesRepository } from '@/models/_.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
@@ -25,12 +24,6 @@ export class CleanRemoteNotesProcessorService {
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
-		@Inject(DI.noteFavoritesRepository)
-		private noteFavoritesRepository: NoteFavoritesRepository,
-
-		@Inject(DI.userNotePiningsRepository)
-		private userNotePiningsRepository: UserNotePiningsRepository,
-
 		private idService: IdService,
 		private queueLoggerService: QueueLoggerService,
 	) {
@@ -61,6 +54,69 @@ export class CleanRemoteNotesProcessorService {
 
 		const MAX_NOTE_COUNT_PER_QUERY = 50;
 
+		//#retion queries
+		// We use string literals instead of query builder for several reasons:
+		// - for removeCondition, we need to use it in having clause, which is not supported by Brackets.
+		// - for recursive part, we need to preserve the order of columns, but typeorm query builder does not guarantee the order of columns in the result query
+
+		// The condition for removing the notes.
+		// The note must be:
+		// - old enough (older than the newestLimit)
+		// - a remote note (userHost is not null).
+		// - not have clipped
+		// - not have pinned on the user profile
+		// - not has been favorite by any user
+		const removeCondition = 'note.id < :newestLimit'
+			+ ' AND note."clippedCount" = 0'
+			+ ' AND note."userHost" IS NOT NULL'
+			// using both userId and noteId instead of just noteId to use index on user_note_pining table.
+			// This is safe because notes are only pinned by the user who created them.
+			+ ' AND NOT EXISTS(SELECT 1 FROM "user_note_pining" WHERE "noteId" = note."id" AND "userId" = note."userId")'
+			// We cannot use userId trick because users can favorite notes from other users.
+			+ ' AND NOT EXISTS(SELECT 1 FROM "note_favorite" WHERE "noteId" = note."id")'
+			;
+
+		// The initiator query contains the oldest ${MAX_NOTE_COUNT_PER_QUERY} remote non-clipped notes
+		const initiatorQuery = this.notesRepository.createQueryBuilder('note')
+			.select('note.id', 'id')
+			.where(removeCondition)
+			.andWhere('note.id > :cursor')
+			.orderBy('note.id', 'ASC')
+			.limit(MAX_NOTE_COUNT_PER_QUERY);
+
+		// The union query queries the related notes and replies related to the initiator query
+		const unionQuery = `
+				SELECT "note"."id", "note"."replyId", "note"."renoteId", rn."initiatorId"
+				FROM "note" "note"
+					INNER JOIN "related_notes" "rn"
+						ON "note"."replyId" = rn.id
+						     OR "note"."renoteId" = rn.id
+						     OR "note"."id" = rn."replyId"
+						     OR "note"."id" = rn."renoteId"
+			`;
+
+		const selectRelatedNotesFromInitiatorIdsQuery = `
+				SELECT "note"."id" AS "id", "note"."replyId" AS "replyId", "note"."renoteId" AS "renoteId", "note"."id" AS "initiatorId"
+				FROM "note" "note" WHERE "note"."id" IN (:...initiatorIds)
+			`;
+
+		const recursiveQuery = `(${selectRelatedNotesFromInitiatorIdsQuery}) UNION (${unionQuery})`;
+
+		const removableInitiatorNotesQuery = this.notesRepository.createQueryBuilder('note')
+			.select('rn."initiatorId"')
+			.innerJoin('related_notes', 'rn', 'note.id = rn.id')
+			.groupBy('rn."initiatorId"')
+			.having(`bool_and(${removeCondition})`);
+
+		const notesQuery = this.notesRepository.createQueryBuilder('note')
+			.addCommonTableExpression(recursiveQuery, 'related_notes', { recursive: true })
+			.select('note.id', 'id')
+			.addSelect('rn."initiatorId"')
+			.innerJoin('related_notes', 'rn', 'note.id = rn.id')
+			.where(`rn."initiatorId" IN (${removableInitiatorNotesQuery.getQuery()})`)
+			.distinctOn(['note.id']);
+		//#endregion
+
 		const stats = {
 			deletedCount: 0,
 			oldest: null as number | null,
@@ -74,77 +130,45 @@ export class CleanRemoteNotesProcessorService {
 		let cursor = '0'; // oldest note ID to start from
 
 		while (true) {
+			//#region check time
 			const batchBeginAt = Date.now();
 
-			// We use string literals instead of query builder for several reasons:
-			// - for removeCondition, we need to use it in having clause, which is not supported by Brackets.
-			// - for recursive part, we need to preserve the order of columns, but typeorm query builder does not guarantee the order of columns in the result query
+			const elapsed = batchBeginAt - startAt;
 
-			// The condition for removing the notes.
-			// The note must be:
-			// - old enough (older than the newestLimit)
-			// - a remote note (userHost is not null).
-			// - not have clipped
-			// - not have pinned on the user profile
-			// - not has been favorite by any user
-			const removeCondition = 'note.id < :newestLimit'
-				+ ' AND note."clippedCount" = 0'
-				+ ' AND note."userHost" IS NOT NULL'
-				// using both userId and noteId instead of just noteId to use index on user_note_pining table.
-				// This is safe because notes are only pinned by the user who created them.
-				+ ' AND NOT EXISTS(SELECT 1 FROM "user_note_pining" WHERE "noteId" = note."id" AND "userId" = note."userId")'
-				// We cannot use userId trick because users can favorite notes from other users.
-				+ ' AND NOT EXISTS(SELECT 1 FROM "note_favorite" WHERE "noteId" = note."id")'
-			;
+			if (elapsed >= maxDuration) {
+				this.logger.info(`Reached maximum duration of ${maxDuration}ms, stopping...`);
+				job.log('Reached maximum duration, stopping cleaning.');
+				job.updateProgress(100);
+				break;
+			}
 
-			// The initiator query contains the oldest ${MAX_NOTE_COUNT_PER_QUERY} remote non-clipped notes
-			const initiatorQuery = `
-				SELECT "note"."id" AS "id", "note"."replyId" AS "replyId", "note"."renoteId" AS "renoteId", "note"."id" AS "initiatorId"
-				FROM "note" "note" WHERE ${removeCondition} AND "note"."id" > :cursor ORDER BY "note"."id" ASC LIMIT ${MAX_NOTE_COUNT_PER_QUERY}`;
+			job.updateProgress((elapsed / maxDuration) * 100);
+			//#endregion
 
-			// The union query queries the related notes and replies related to the initiator query
-			const unionQuery = `
-				SELECT "note"."id", "note"."replyId", "note"."renoteId", rn."initiatorId"
-				FROM "note" "note"
-					INNER JOIN "related_notes" "rn"
-						ON "note"."replyId" = rn.id
-						     OR "note"."renoteId" = rn.id
-						     OR "note"."id" = rn."replyId"
-						     OR "note"."id" = rn."renoteId"
-			`;
-			const recursiveQuery = `(${initiatorQuery}) UNION (${unionQuery})`;
-
-			const removableInitiatorNotesQuery = this.notesRepository.createQueryBuilder('note')
-				.select('rn."initiatorId"')
-				.innerJoin('related_notes', 'rn', 'note.id = rn.id')
-				.groupBy('rn."initiatorId"')
-				.having(`bool_and(${removeCondition})`);
-
-			const notesQuery = this.notesRepository.createQueryBuilder('note')
-				.addCommonTableExpression(recursiveQuery, 'related_notes', { recursive: true })
-				.select('note.id', 'id')
-				.addSelect('rn."initiatorId"')
-				.innerJoin('related_notes', 'rn', 'note.id = rn.id')
-				.where(`rn."initiatorId" IN (${ removableInitiatorNotesQuery.getQuery() })`)
-				.setParameters({ cursor, newestLimit });
-
-			const notes: { id: MiNote['id'], initiatorId: MiNote['id'] }[] = await notesQuery.getRawMany();
-
-			const fetchedCount = notes.length;
+			// First, we fetch the initiator notes that are older than the newestLimit.
+			const initiatorNotes: { id: MiNote['id'] }[] = await initiatorQuery.setParameters({ cursor, newestLimit }).getRawMany();
 
 			// update the cursor to the newest initiatorId found in the fetched notes.
-			// We don't use 'id' since the note can be newer than the initiator note.
-			for (const note of notes) {
-				if (cursor < note.initiatorId) {
-					cursor = note.initiatorId;
-				}
+			const newCursor = initiatorNotes.reduce((max, note) => note.id > max ? note.id : max, cursor);
+
+			if (initiatorNotes.length === 0 || cursor === newCursor || newCursor >= newestLimit) {
+				// If no notes were found or the cursor did not change, we can stop.
+				job.log('No more notes to clean. (no initiator notes found or cursor did not change.)');
+				break;
 			}
 
+			const notes: { id: MiNote['id'], initiatorId: MiNote['id'] }[] = await notesQuery.setParameters({
+				initiatorIds: initiatorNotes.map(note => note.id),
+				newestLimit,
+			}).getRawMany();
+
+			cursor = newCursor;
+
 			if (notes.length > 0) {
 				await this.notesRepository.delete(notes.map(note => note.id));
 
-				for (const note of notes) {
-					const t = this.idService.parse(note.id).date.getTime();
+				for (const { id } of notes) {
+					const t = this.idService.parse(id).date.getTime();
 					if (stats.oldest === null || t < stats.oldest) {
 						stats.oldest = t;
 					}
@@ -156,19 +180,14 @@ export class CleanRemoteNotesProcessorService {
 				stats.deletedCount += notes.length;
 			}
 
-			job.log(`Deleted ${notes.length} of ${fetchedCount}; ${Date.now() - batchBeginAt}ms`);
+			job.log(`Deleted ${notes.length} from ${initiatorNotes.length} initiators; ${Date.now() - batchBeginAt}ms`);
 
-			const elapsed = Date.now() - startAt;
-
-			if (elapsed >= maxDuration) {
-				this.logger.info(`Reached maximum duration of ${maxDuration}ms, stopping...`);
-				job.log('Reached maximum duration, stopping cleaning.');
-				job.updateProgress(100);
+			if (initiatorNotes.length < MAX_NOTE_COUNT_PER_QUERY) {
+				// If we fetched less than the maximum, it means there are no more notes to process.
+				job.log(`No more notes to clean. (fewer than MAX_NOTE_COUNT_PER_QUERY =${MAX_NOTE_COUNT_PER_QUERY}.)`);
 				break;
 			}
 
-			job.updateProgress((elapsed / maxDuration) * 100);
-
 			await setTimeout(1000 * 5); // Wait a moment to avoid overwhelming the db
 		}
 
diff --git a/packages/backend/test/unit/queue/processors/CleanRemoteNotesProcessorService.ts b/packages/backend/test/unit/queue/processors/CleanRemoteNotesProcessorService.ts
new file mode 100644
index 0000000000..15f8eda865
--- /dev/null
+++ b/packages/backend/test/unit/queue/processors/CleanRemoteNotesProcessorService.ts
@@ -0,0 +1,631 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { jest } from '@jest/globals';
+import { Test, TestingModule } from '@nestjs/testing';
+import ms from 'ms';
+import {
+	type MiNote,
+	type MiUser,
+	type NotesRepository,
+	type NoteFavoritesRepository,
+	type UserNotePiningsRepository,
+	type UsersRepository,
+	type UserProfilesRepository,
+	MiMeta,
+} from '@/models/_.js';
+import { CleanRemoteNotesProcessorService } from '@/queue/processors/CleanRemoteNotesProcessorService.js';
+import { DI } from '@/di-symbols.js';
+import { IdService } from '@/core/IdService.js';
+import { QueueLoggerService } from '@/queue/QueueLoggerService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+import { secureRndstr } from '@/misc/secure-rndstr.js';
+
+describe('CleanRemoteNotesProcessorService', () => {
+	let app: TestingModule;
+	let service: CleanRemoteNotesProcessorService;
+	let idService: IdService;
+	let notesRepository: NotesRepository;
+	let noteFavoritesRepository: NoteFavoritesRepository;
+	let userNotePiningsRepository: UserNotePiningsRepository;
+	let usersRepository: UsersRepository;
+	let userProfilesRepository: UserProfilesRepository;
+
+	// Local user
+	let alice: MiUser;
+	// Remote user 1
+	let bob: MiUser;
+	// Remote user 2
+	let carol: MiUser;
+
+	const meta = new MiMeta();
+
+	// Mock job object
+	const createMockJob = () => ({
+		log: jest.fn(),
+		updateProgress: jest.fn(),
+	});
+
+	async function createUser(data: Partial<MiUser> = {}) {
+		const id = idService.gen();
+		const un = data.username || secureRndstr(16);
+		const user = await usersRepository
+			.insert({
+				id,
+				username: un,
+				usernameLower: un.toLowerCase(),
+				...data,
+			})
+			.then(x => usersRepository.findOneByOrFail(x.identifiers[0]));
+
+		await userProfilesRepository.save({
+			userId: id,
+		});
+
+		return user;
+	}
+
+	async function createNote(data: Partial<MiNote>, user: MiUser, time?: number): Promise<MiNote> {
+		const id = idService.gen(time);
+		const note = await notesRepository
+			.insert({
+				id: id,
+				text: `note_${id}`,
+				userId: user.id,
+				userHost: user.host,
+				visibility: 'public',
+				...data,
+			})
+			.then(x => notesRepository.findOneByOrFail(x.identifiers[0]));
+		return note;
+	}
+
+	beforeAll(async () => {
+		app = await Test
+			.createTestingModule({
+				imports: [
+					GlobalModule,
+				],
+				providers: [
+					CleanRemoteNotesProcessorService,
+					IdService,
+					{
+						provide: QueueLoggerService,
+						useFactory: () => ({
+							logger: {
+								createSubLogger: () => ({
+									info: jest.fn(),
+									warn: jest.fn(),
+									succ: jest.fn(),
+								}),
+							},
+						}),
+					},
+				],
+			})
+			.overrideProvider(DI.meta).useFactory({ factory: () => meta })
+			.compile();
+
+		service = app.get(CleanRemoteNotesProcessorService);
+		idService = app.get(IdService);
+		notesRepository = app.get(DI.notesRepository);
+		noteFavoritesRepository = app.get(DI.noteFavoritesRepository);
+		userNotePiningsRepository = app.get(DI.userNotePiningsRepository);
+		usersRepository = app.get(DI.usersRepository);
+		userProfilesRepository = app.get(DI.userProfilesRepository);
+
+		alice = await createUser({ username: 'alice', host: null });
+		bob = await createUser({ username: 'bob', host: 'remote1.example.com' });
+		carol = await createUser({ username: 'carol', host: 'remote2.example.com' });
+
+		app.enableShutdownHooks();
+	});
+
+	beforeEach(() => {
+		// Reset mocks
+		jest.clearAllMocks();
+
+		// Set default meta values
+		meta.enableRemoteNotesCleaning = true;
+		meta.remoteNotesCleaningMaxProcessingDurationInMinutes = 0.3;
+		meta.remoteNotesCleaningExpiryDaysForEachNotes = 30;
+	}, 60 * 1000);
+
+	afterEach(async () => {
+		// Clean up test data
+		await Promise.all([
+			notesRepository.createQueryBuilder().delete().execute(),
+			userNotePiningsRepository.createQueryBuilder().delete().execute(),
+			noteFavoritesRepository.createQueryBuilder().delete().execute(),
+		]);
+	}, 60 * 1000);
+
+	afterAll(async () => {
+		await app.close();
+	});
+
+	describe('basic', () => {
+		test('should skip cleaning when enableRemoteNotesCleaning is false', async () => {
+			meta.enableRemoteNotesCleaning = false;
+			const job = createMockJob();
+
+			const result = await service.process(job as any);
+
+			expect(result).toEqual({
+				deletedCount: 0,
+				oldest: null,
+				newest: null,
+				skipped: true,
+			});
+		});
+
+		test('should return success result when enableRemoteNotesCleaning is true and no notes to clean', async () => {
+			const job = createMockJob();
+
+			await createNote({}, alice);
+			const result = await service.process(job as any);
+
+			expect(result).toEqual({
+				deletedCount: 0,
+				oldest: null,
+				newest: null,
+				skipped: false,
+			});
+		}, 3000);
+
+		test('should clean remote notes and return stats', async () => {
+			// Remote notes
+			const remoteNotes = await Promise.all([
+				createNote({}, bob),
+				createNote({}, carol),
+				createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000),
+				createNote({}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000), // Note older than expiry
+			]);
+
+			// Local notes
+			const localNotes = await Promise.all([
+				createNote({}, alice),
+				createNote({}, alice, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000),
+			]);
+
+			const job = createMockJob();
+
+			const result = await service.process(job as any);
+
+			expect(result).toEqual({
+				deletedCount: 2,
+				oldest: expect.any(Number),
+				newest: expect.any(Number),
+				skipped: false,
+			});
+
+			// Check side-by-side from all notes
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.length).toBe(4);
+			expect(remainingNotes.some(n => n.id === remoteNotes[0].id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === remoteNotes[1].id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === remoteNotes[2].id)).toBe(false);
+			expect(remainingNotes.some(n => n.id === remoteNotes[3].id)).toBe(false);
+			expect(remainingNotes.some(n => n.id === localNotes[0].id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === localNotes[1].id)).toBe(true);
+		});
+	});
+
+	describe('advanced', () => {
+		// お気に入り
+		test('should not delete note that is favorited by any user', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const olderRemoteNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Favorite the note
+			await noteFavoritesRepository.save({
+				id: idService.gen(),
+				userId: alice.id,
+				noteId: olderRemoteNote.id,
+			});
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0);
+			expect(result.skipped).toBe(false);
+
+			const remainingNote = await notesRepository.findOneBy({ id: olderRemoteNote.id });
+			expect(remainingNote).not.toBeNull();
+		});
+
+		// ピン留め
+		test('should not delete note that is pinned by the user', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const olderRemoteNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Pin the note by the user who created it
+			await userNotePiningsRepository.save({
+				id: idService.gen(),
+				userId: bob.id, // Same user as the note creator
+				noteId: olderRemoteNote.id,
+			});
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0);
+			expect(result.skipped).toBe(false);
+
+			const remainingNote = await notesRepository.findOneBy({ id: olderRemoteNote.id });
+			expect(remainingNote).not.toBeNull();
+		});
+
+		// クリップ
+		test('should not delete note that is clipped', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that is clipped
+			const clippedNote = await createNote({
+				clippedCount: 1, // Clipped
+			}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0);
+			expect(result.skipped).toBe(false);
+
+			const remainingNote = await notesRepository.findOneBy({ id: clippedNote.id });
+			expect(remainingNote).not.toBeNull();
+		});
+
+		// 古いreply, renoteが含まれている時の挙動
+		test('should handle reply/renote relationships correctly', async () => {
+			const job = createMockJob();
+
+			// Create old remote notes with reply/renote relationships
+			const originalNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+			const replyNote = await createNote({
+				replyId: originalNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000);
+			const renoteNote = await createNote({
+				renoteId: originalNote.id,
+			}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 3000);
+
+			const result = await service.process(job as any);
+
+			// Should delete all three notes as they are all old and remote
+			expect(result.deletedCount).toBe(3);
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === originalNote.id)).toBe(false);
+			expect(remainingNotes.some(n => n.id === replyNote.id)).toBe(false);
+			expect(remainingNotes.some(n => n.id === renoteNote.id)).toBe(false);
+		});
+
+		// 古いリモートノートに新しいリプライがある時、どちらも削除されない
+		test('should not delete both old remote note with new reply', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const oldNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Create a reply note that is newer than the expiry period
+			const recentReplyNote = await createNote({
+				replyId: oldNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) + 1000);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0); // Only the old note should be deleted
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === oldNote.id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === recentReplyNote.id)).toBe(true); // Recent reply note should remain
+		});
+
+		// 古いリモートノートに新しいリプライと古いリプライがある時、全て残る
+		test('should not delete old remote note with new reply and old reply', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const oldNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Create a reply note that is newer than the expiry period
+			const recentReplyNote = await createNote({
+				replyId: oldNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) + 1000);
+
+			// Create an old reply note that should be deleted
+			const oldReplyNote = await createNote({
+				replyId: oldNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0);
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === oldNote.id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === recentReplyNote.id)).toBe(true); // Recent reply note should remain
+			expect(remainingNotes.some(n => n.id === oldReplyNote.id)).toBe(true); // Old reply note should be deleted
+		});
+
+		// リプライがお気に入りされているとき、どちらも削除されない
+		test('should not delete reply note that is favorited', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const olderRemoteNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Create a reply note that is newer than the expiry period
+			const replyNote = await createNote({
+				replyId: olderRemoteNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000);
+
+			// Favorite the reply note
+			await noteFavoritesRepository.save({
+				id: idService.gen(),
+				userId: alice.id,
+				noteId: replyNote.id,
+			});
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0); // Only the old note should be deleted
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === olderRemoteNote.id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === replyNote.id)).toBe(true); // Recent reply note should remain
+		});
+
+		// リプライがピン留めされているとき、どちらも削除されない
+		test('should not delete reply note that is pinned', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const olderRemoteNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Create a reply note that is newer than the expiry period
+			const replyNote = await createNote({
+				replyId: olderRemoteNote.id,
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000);
+
+			// Pin the reply note
+			await userNotePiningsRepository.save({
+				id: idService.gen(),
+				userId: carol.id,
+				noteId: replyNote.id,
+			});
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0); // Only the old note should be deleted
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === olderRemoteNote.id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === replyNote.id)).toBe(true); // Reply note should remain
+		});
+
+		// リプライがクリップされているとき、どちらも削除されない
+		test('should not delete reply note that is clipped', async () => {
+			const job = createMockJob();
+
+			// Create old remote note that should be deleted
+			const olderRemoteNote = await createNote({}, bob, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000);
+
+			// Create a reply note that is old but clipped
+			const replyNote = await createNote({
+				replyId: olderRemoteNote.id,
+				clippedCount: 1, // Clipped
+			}, carol, Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 2000);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0); // Both notes should be kept because reply is clipped
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.some(n => n.id === olderRemoteNote.id)).toBe(true);
+			expect(remainingNotes.some(n => n.id === replyNote.id)).toBe(true);
+		});
+
+		test('should handle mixed scenarios with multiple conditions', async () => {
+			const job = createMockJob();
+
+			// Create various types of notes
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+
+			// Should be deleted: old remote note with no special conditions
+			const deletableNote = await createNote({}, bob, oldTime);
+
+			// Should NOT be deleted: old remote note but favorited
+			const favoritedNote = await createNote({}, carol, oldTime);
+			await noteFavoritesRepository.save({
+				id: idService.gen(),
+				userId: alice.id,
+				noteId: favoritedNote.id,
+			});
+
+			// Should NOT be deleted: old remote note but pinned
+			const pinnedNote = await createNote({}, bob, oldTime);
+			await userNotePiningsRepository.save({
+				id: idService.gen(),
+				userId: bob.id,
+				noteId: pinnedNote.id,
+			});
+
+			// Should NOT be deleted: old remote note but clipped
+			const clippedNote = await createNote({
+				clippedCount: 2,
+			}, carol, oldTime);
+
+			// Should NOT be deleted: old local note
+			const localNote = await createNote({}, alice, oldTime);
+
+			// Should NOT be deleted: new remote note
+			const newerRemoteNote = await createNote({}, bob);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(1); // Only deletableNote should be deleted
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.length).toBe(5);
+			expect(remainingNotes.some(n => n.id === deletableNote.id)).toBe(false); // Deleted
+			expect(remainingNotes.some(n => n.id === favoritedNote.id)).toBe(true); // Kept
+			expect(remainingNotes.some(n => n.id === pinnedNote.id)).toBe(true); // Kept
+			expect(remainingNotes.some(n => n.id === clippedNote.id)).toBe(true); // Kept
+			expect(remainingNotes.some(n => n.id === localNote.id)).toBe(true); // Kept
+			expect(remainingNotes.some(n => n.id === newerRemoteNote.id)).toBe(true); // Kept
+		});
+
+		// 大量のノート
+		test('should handle large number of notes correctly', async () => {
+			const AMOUNT = 130;
+			const job = createMockJob();
+
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+			const noteIds = [];
+			for (let i = 0; i < AMOUNT; i++) {
+				const note = await createNote({}, bob, oldTime - i);
+				noteIds.push(note.id);
+			}
+
+			const result = await service.process(job as any);
+
+			// Should delete all notes, but may require multiple batches
+			expect(result.deletedCount).toBe(AMOUNT);
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.length).toBe(0);
+		});
+
+		// 大量のノート + リプライ or リノート
+		test('should handle large number of notes with replies correctly', async () => {
+			const AMOUNT = 130;
+			const job = createMockJob();
+
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+			const noteIds = [];
+			for (let i = 0; i < AMOUNT; i++) {
+				const note = await createNote({}, bob, oldTime - i - AMOUNT);
+				noteIds.push(note.id);
+				if (i % 2 === 0) {
+					// Create a reply for every second note
+					await createNote({ replyId: note.id }, carol, oldTime - i);
+				} else {
+					// Create a renote for every second note
+					await createNote({ renoteId: note.id }, bob, oldTime - i);
+				}
+			}
+
+			const result = await service.process(job as any);
+			// Should delete all notes, but may require multiple batches
+			expect(result.deletedCount).toBe(AMOUNT * 2);
+			expect(result.skipped).toBe(false);
+		});
+
+		// 大量の古いノート + 新しいリプライ or リノート
+		test('should handle large number of old notes with new replies correctly', async () => {
+			const AMOUNT = 130;
+			const job = createMockJob();
+
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+			const newTime = Date.now();
+			const noteIds = [];
+			for (let i = 0; i < AMOUNT; i++) {
+				const note = await createNote({}, bob, oldTime - i);
+				noteIds.push(note.id);
+				if (i % 2 === 0) {
+					// Create a reply for every second note
+					await createNote({ replyId: note.id }, carol, newTime + i);
+				} else {
+					// Create a renote for every second note
+					await createNote({ renoteId: note.id }, bob, newTime + i);
+				}
+			}
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(0);
+			expect(result.skipped).toBe(false);
+		});
+
+		// 大量の残す対象(clippedCount: 1)と大量の削除対象
+		test('should handle large number of notes, mixed conditions with clippedCount', async () => {
+			const AMOUNT_BASE = 70;
+			const job = createMockJob();
+
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+			const noteIds = [];
+			for (let i = 0; i < AMOUNT_BASE; i++) {
+				const note = await createNote({ clippedCount: 1 }, bob, oldTime - i - AMOUNT_BASE);
+				noteIds.push(note.id);
+			}
+			for (let i = 0; i < AMOUNT_BASE; i++) {
+				const note = await createNote({}, carol, oldTime - i);
+				noteIds.push(note.id);
+			}
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(AMOUNT_BASE); // Assuming half are deletable
+			expect(result.skipped).toBe(false);
+		});
+
+		// 大量の残す対象(リプライ)と大量の削除対象
+		test('should handle large number of notes, mixed conditions with replies', async () => {
+			const AMOUNT_BASE = 70;
+			const job = createMockJob();
+			const oldTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 1000;
+			const newTime = Date.now();
+			for (let i = 0; i < AMOUNT_BASE; i++) {
+				// should remain
+				const note = await createNote({}, carol, oldTime - AMOUNT_BASE - i);
+				// should remain
+				await createNote({ replyId: note.id }, bob, newTime + i);
+			}
+
+			const noteIdsExpectedToBeDeleted = [];
+			for (let i = 0; i < AMOUNT_BASE; i++) {
+				// should be deleted
+				const note = await createNote({}, bob, oldTime - i);
+				noteIdsExpectedToBeDeleted.push(note.id);
+			}
+
+			const result = await service.process(job as any);
+			expect(result.deletedCount).toBe(AMOUNT_BASE); // Assuming all replies are deletable
+			expect(result.skipped).toBe(false);
+
+			const remainingNotes = await notesRepository.find();
+			expect(remainingNotes.length).toBe(AMOUNT_BASE * 2); // Only replies should remain
+			noteIdsExpectedToBeDeleted.forEach(id => {
+				expect(remainingNotes.some(n => n.id === id)).toBe(false); // All original notes should be deleted
+			});
+		});
+
+		test('should update cursor correctly during batch processing', async () => {
+			const job = createMockJob();
+
+			// Create notes with specific timing to test cursor behavior
+			const baseTime = Date.now() - ms(`${meta.remoteNotesCleaningExpiryDaysForEachNotes} days`) - 10000;
+
+			const note1 = await createNote({}, bob, baseTime);
+			const note2 = await createNote({}, carol, baseTime - 1000);
+			const note3 = await createNote({}, bob, baseTime - 2000);
+
+			const result = await service.process(job as any);
+
+			expect(result.deletedCount).toBe(3);
+			expect(result.newest).toBe(idService.parse(note1.id).date.getTime());
+			expect(result.oldest).toBe(idService.parse(note3.id).date.getTime());
+			expect(result.skipped).toBe(false);
+		});
+	});
+});

From 3da04fcae4edf197827a9ca6e8a2c38eb7990056 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:31:59 +0900
Subject: [PATCH 13/15] New Crowdin updates (#16360)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Spanish)
---
 locales/ca-ES.yml |  1 +
 locales/es-ES.yml |  1 +
 locales/it-IT.yml | 16 +++++++++++++++-
 locales/ko-KR.yml |  1 +
 locales/th-TH.yml |  1 +
 locales/tr-TR.yml | 31 ++++++++++++++++---------------
 locales/zh-CN.yml |  1 +
 locales/zh-TW.yml |  5 +++--
 8 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 65ac41edeb..7f26a96d37 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "Quan s'activa el mode en temps real, el contingut s'actualitza en temps real, independentment d'aquesta configuració."
   showUrlPreview: "Mostrar vista prèvia d'URL"
   showAvailableReactionsFirstInNote: "Mostra les reacciones que pots fer servir al damunt"
+  showPageTabBarBottom: "Mostrar les pestanyes de les línies de temps a la part inferior"
   _chat:
     showSenderName: "Mostrar el nom del remitent"
     sendOnEnter: "Introdueix per enviar"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 578c550296..20289f605c 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "Cuando el modo en tiempo real está activado, el contenido se actualiza en tiempo real independientemente de esta configuración."
   showUrlPreview: "Mostrar la vista previa de la URL"
   showAvailableReactionsFirstInNote: "Mostrar las reacciones disponibles en la parte superior."
+  showPageTabBarBottom: "Mostrar la barra de pestañas de la página en la parte inferior."
   _chat:
     showSenderName: "Mostrar el nombre del remitente"
     sendOnEnter: "Intro para enviar"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 53d52dbf7e..fb32deec50 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1198,7 +1198,7 @@ replies: "Risposte"
 renotes: "Rinota"
 loadReplies: "Leggi le risposte"
 loadConversation: "Leggi la conversazione"
-pinnedList: "Elenco in primo piano"
+pinnedList: "Lista in primo piano"
 keepScreenOn: "Mantenere lo schermo acceso"
 verifiedLink: "Abbiamo confermato la validità di questo collegamento"
 notifyNotes: "Notifica nuove Note"
@@ -1370,6 +1370,10 @@ defaultImageCompressionLevel: "Livello predefinito di compressione immagini"
 defaultImageCompressionLevel_description: "La compressione diminuisce la qualità dell'immagine, poca compressione mantiene alta qualità delle immagini. Aumentandola, si riducono le dimensioni del file, a discapito della qualità dell'immagine."
 inMinutes: "min"
 inDays: "giorni"
+safeModeEnabled: "La modalità sicura è attiva"
+pluginsAreDisabledBecauseSafeMode: "Tutti i plugin sono disattivati, poiché la modalità sicura è attiva."
+customCssIsDisabledBecauseSafeMode: "Il CSS personalizzato non è stato applicato, poiché la modalità sicura è attiva."
+themeIsDefaultBecauseSafeMode: "Quando la modalità sicura è attiva, viene utilizzato il tema predefinito. Quando la modalità sicura viene disattivata, il tema torna a essere quello precedente."
 _order:
   newest: "Prima i più recenti"
   oldest: "Meno recenti prima"
@@ -1461,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "Quando la modalità è in tempo reale, arriveranno a prescindere."
   showUrlPreview: "Mostra anteprima dell'URL"
   showAvailableReactionsFirstInNote: "Mostra le reazioni disponibili in alto"
+  showPageTabBarBottom: "Visualizza le schede della pagina nella parte inferiore"
   _chat:
     showSenderName: "Mostra il nome del mittente"
     sendOnEnter: "Invio spedisce"
@@ -1634,6 +1639,10 @@ _serverSettings:
   fanoutTimelineDbFallback: "Elaborazione dati alternativa"
   fanoutTimelineDbFallbackDescription: "Attivando l'elaborazione alternativa, verrà interrogato ulteriormente il database se la timeline non è nella cache. \nDisattivando, si può ridurre ulteriormente il carico del server, evitando l'elaborazione alternativa, ma limitando l'intervallo recuperabile delle timeline."
   reactionsBufferingDescription: "Attivando questa opzione, puoi migliorare significativamente le prestazioni durante la creazione delle reazioni e ridurre il carico sul database. Tuttavia, aumenterà l'impiego di memoria Redis."
+  remoteNotesCleaning: "Pulizia automatica dei contenuti remoti"
+  remoteNotesCleaning_description: "Se abilitata, verranno periodicamente rimosse le vecchie Note remote senza relazioni, per ridurre il sovraccarico del sistema."
+  remoteNotesCleaningMaxProcessingDuration: "Durata massima del processo di pulizia"
+  remoteNotesCleaningExpiryDaysForEachNotes: "Periodo minimo di conservazione delle note"
   inquiryUrl: "URL di contatto"
   inquiryUrlDescription: "Specificare l'URL al modulo di contatto, oppure le informazioni con i dati di contatto dell'amministrazione."
   openRegistration: "Registrazioni aperte"
@@ -1652,6 +1661,8 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor: "Visibilità dei contenuti generati dagli utenti ai non utenti"
   userGeneratedContentsVisibilityForVisitor_description: "Questa funzionalità è utile per impedire che contenuti remoti inappropriati e difficili da moderare vengano inavvertitamente resi pubblici su Internet tramite il proprio server."
   userGeneratedContentsVisibilityForVisitor_description2: "Esistono dei rischi nell'esporre incondizionatamente su internet tutto il contenuto del tuo server, incluso il contenuto remoto ricevuto da altri server. In particolare, occorre prestare attenzione, perché le persone non consapevoli della federazione potrebbero erroneamente credere che il contenuto remoto sia stato invece creato all'interno del proprio server."
+  restartServerSetupWizardConfirm_title: "Vuoi ripetere la procedura guidata di configurazione iniziale del server?"
+  restartServerSetupWizardConfirm_text: "Verranno ripristinate alcune tue impostazioni personalizzate."
   _userGeneratedContentsVisibilityForVisitor:
     all: "Tutto pubblico"
     localOnly: "Pubblica solo contenuti locali, mantieni privati ​​i contenuti remoti"
@@ -3062,6 +3073,7 @@ _bootErrors:
   otherOption1: "Nelle impostazioni, cancellare le impostazioni del client e svuotare la cache"
   otherOption2: "Avviare il client predefinito"
   otherOption3: "Avviare lo strumento di riparazione"
+  otherOption4: "Avvia Misskey in modalità sicura"
 _search:
   searchScopeAll: "Tutte"
   searchScopeLocal: "Locale"
@@ -3098,6 +3110,8 @@ _serverSetupWizard:
   doYouConnectToFediverse_description1: "Collegandosi a una rete di server distribuiti, denominata Fediverso, potrai scambiare contenuti con altri server, tramite il protocollo di comunicazione ActivityPub."
   doYouConnectToFediverse_description2: "Connettersi al Fediverso è anche detto \"federazione\"."
   youCanConfigureMoreFederationSettingsLater: "Puoi svolgere la configurazione avanzata anche dopo. Ad esempio specificando quali server possono federarsi."
+  remoteContentsCleaning: "Pulizia automatica dei contenuti in arrivo"
+  remoteContentsCleaning_description: "Con la federazione funzionante, riceverai sempre più contenuti. Abilitando la pulizia automatica, i contenuti non referenziati e obsoleti verranno rimossi automaticamente dai tuoi server, risparmiando spazio di archiviazione."
   adminInfo: "Informazioni sull'amministratore"
   adminInfo_description: "Imposta le informazioni dell'amministratore utilizzate per accettare le richieste."
   adminInfo_mustBeFilled: "Questa operazione è necessaria su un server aperto o se è attiva la federazione."
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index a06e1231b5..4950f78b4d 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "실시간 모드가 켜져 있을 때는 이 설정과 상관없이 실시간으로 콘텐츠가 업데이트됩니다."
   showUrlPreview: "URL 미리보기 표시"
   showAvailableReactionsFirstInNote: "이용 가능한 리액션을 선두로 표시"
+  showPageTabBarBottom: "페이지의 탭 바를 아래쪽에 표시"
   _chat:
     showSenderName: "발신자 이름 표시"
     sendOnEnter: "엔터로 보내기"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 110c089b39..519d10daa6 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1461,6 +1461,7 @@ _settings:
   contentsUpdateFrequency_description2: "เมื่อโหมดเรียลไทม์เปิดอยู่ เนื้อหาจะอัปเดตแบบเรียลไทม์โดยไม่ขึ้นกับการตั้งค่านี้"
   showUrlPreview: "แสดงตัวอย่าง URL"
   showAvailableReactionsFirstInNote: "แสดงรีแอคชั่นที่ใช้ได้ไว้หน้าสุด"
+  showPageTabBarBottom: "แสดงแท็บบาร์ของเพจที่ด้านล่าง"
   _chat:
     showSenderName: "แสดงชื่อผู้ส่ง"
     sendOnEnter: "กด Enter เพื่อส่ง"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index fd4aed4a28..8604cf1af6 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -1,6 +1,6 @@
 ---
 _lang_: "Türkçe"
-headlineMisskey: "Notlarla birbirine bağlanan bir ağ"
+headlineMisskey: "Notlarla birbirine bağlı bir ağ"
 introMisskey: "Hoş geldiniz! Misskey, açık kaynaklı, merkezi olmayan bir mikroblog hizmetidir.\nDüşüncelerinizi çevrenizdeki herkesle paylaşmak için “notlar” oluşturun. 📡\n“Tepkiler” ile herkesin notları hakkındaki duygularınızı hızlıca ifade edebilirsiniz. 👍\nYeni bir dünyayı keşfedelim! 🚀"
 poweredByMisskeyDescription: "{name}, açık kaynak platformu <b>Misskey</b> (kısaca “Misskey örneği” olarak anılır) tarafından desteklenen hizmetlerden biridir."
 monthAndDay: "{month}/{day}"
@@ -23,7 +23,7 @@ renotedBy: "{user} tarafından renot edildi"
 noNotes: "Not yok"
 noNotifications: "Bildirim yok"
 instance: "Sunucu"
-settings: "Ayarlarlar"
+settings: "Ayarlar"
 notificationSettings: "Bildirim Ayarları"
 basicSettings: "Temel Ayarlar"
 otherSettings: "Diğer Ayarlar"
@@ -237,7 +237,7 @@ clearQueueConfirmText: "Kuyrukta kalan teslim edilmemiş notlar birleştirilmeye
 clearCachedFiles: "Clear cache"
 clearCachedFilesConfirm: "Tüm önbelleğe alınmış uzak dosyaları silmek istediğinizden emin misiniz?"
 blockedInstances: "Engellenen Sunucu"
-blockedInstancesDescription: "Engellemek istediğiniz örneklerin ana bilgisayar adlarını satır sonlarıyla ayırarak listeleyin. Listelenen örnekler artık bu örnekle iletişim kuramayacaktır."
+blockedInstancesDescription: "Engellemek istediğiniz sunucuların ana bilgisayar adlarını satır sonlarıyla ayırarak listeleyin. Listelenen örnekler artık bu örnekle iletişim kuramayacaktır."
 silencedInstances: "Susturulmuş sunucular"
 silencedInstancesDescription: "Sessize almak istediğiniz sunucuların ana bilgisayar adlarını yeni bir satırla ayırarak listeleyin. Listelenen sunuculara ait tüm hesaplar sessize alınmış olarak kabul edilecek ve yalnızca takip isteklerinde bulunabilecek, takip edilmedikleri takdirde yerel hesapları etiketleyemeyeceklerdir. Bu, engellenen sunucuları etkilemeyecektir."
 mediaSilencedInstances: "Medya susturulmuş sunucular"
@@ -311,7 +311,7 @@ basicNotesBeforeCreateAccount: "Önemli notlar"
 termsOfService: "Hizmet Şartları"
 start: "Başla"
 home: "Ana sayfa"
-remoteUserCaution: "Bu kullanıcı uzak bir örnekten geldiği için, gösterilen bilgiler eksik olabilir."
+remoteUserCaution: "Bu kullanıcı uzak bir sunucudan geldiği için, gösterilen bilgiler eksik olabilir."
 activity: "Etkinlik"
 images: "Görseller"
 image: "Görsel"
@@ -499,8 +499,8 @@ signinOrContinueOnRemote: "Devam etmek için sunucunuzu taşıyın veya bu sunuc
 invitations: "Davetler"
 invitationCode: "Davet kodu"
 checking: "Kontrol ediliyor..."
-available: "Mevcut"
-unavailable: "Mevcut değil"
+available: "Kullanılabilir"
+unavailable: "Kullanılamaz"
 usernameInvalidFormat: "Büyük ve küçük harfler, rakamlar ve alt çizgi kullanabilirsiniz. (a~z、A~Z、0~9)"
 tooShort: "Çok kısa"
 tooLong: "Çok uzun"
@@ -619,7 +619,7 @@ unsetUserBannerConfirm: "Banner'ı kaldırmak istediğinizden emin misiniz?"
 deleteAllFiles: "Tüm dosyaları sil"
 deleteAllFilesConfirm: "Tüm dosyaları silmek istediğinizden emin misiniz?"
 removeAllFollowing: "Takip ettiğiniz tüm kullanıcıları takipten çıkarın"
-removeAllFollowingDescription: "Bu komutu çalıştırmak, {host} adresindeki tüm hesapları takipten çıkarır. Örneğin, örnek artık mevcut değilse bu komutu çalıştırın."
+removeAllFollowingDescription: "Bu komutu çalıştırmak, {host} adresindeki tüm hesapları takipten çıkarır. Örneğin, sunucu artık mevcut değilse bu komutu çalıştırın."
 userSuspended: "Bu kullanıcı askıya alınmıştır."
 userSilenced: "Bu kullanıcı susturuluyor."
 yourAccountSuspendedTitle: "Bu hesap askıya alınmıştır."
@@ -1066,19 +1066,19 @@ collapseRenotesDescription: "Daha önce tepki verdiğiniz veya yeniden not aldı
 internalServerError: "İç Sunucu Hatası"
 internalServerErrorDescription: "Sunucu beklenmedik bir hatayla karşılaştı."
 copyErrorInfo: "Hata ayrıntılarını kopyala"
-joinThisServer: "Bu örnekte kaydolun"
-exploreOtherServers: "Başka bir örnek arayın"
+joinThisServer: "Bu sunucuda kaydolun"
+exploreOtherServers: "Başka bir sunucu arayın"
 letsLookAtTimeline: "Timeline'a bir göz atın"
 disableFederationConfirm: "Federasyonu gerçekten devre dışı bırakmak mı?"
 disableFederationConfirmWarn: "Federasyondan ayrılsa bile, aksi belirtilmedikçe gönderiler herkese açık olmaya devam edecektir. Genellikle bunu yapmanız gerekmez."
 disableFederationOk: "Devre Dışı"
 invitationRequiredToRegister: "Bu etkinlik davetle katılımlıdır. Geçerli bir davet kodu girerek kaydolmanız gerekir."
-emailNotSupported: "Bu örnek, E-Posta göndermeyi desteklemiyor."
+emailNotSupported: "Bu sunucu, E-Posta göndermeyi desteklemiyor."
 postToTheChannel: "Kanalına gönder"
 cannotBeChangedLater: "Bu daha sonra değiştirilemez."
 reactionAcceptance: "Tepki Kabulü"
 likeOnly: "Sadece beğeniler"
-likeOnlyForRemote: "Tüm (Yalnızca uzak örnekler için beğeniler)"
+likeOnlyForRemote: "Tüm (Yalnızca uzak sunucu için beğeniler)"
 nonSensitiveOnly: "Hassas olmayanlar için"
 nonSensitiveOnlyForLocalLikeOnlyForRemote: "Yalnızca hassas olmayanlar (Yalnızca uzaktan beğeniler)"
 rolesAssignedToMe: "Bana atanan roller"
@@ -1100,7 +1100,7 @@ retryAllQueuesNow: "Tüm kuyrukları yeniden çalıştırmayı deneyin"
 retryAllQueuesConfirmTitle: "Gerçekten hepsini tekrar denemek istiyor musunuz?"
 retryAllQueuesConfirmText: "Bu, sunucu yükünü geçici olarak artıracaktır."
 enableChartsForRemoteUser: "Uzak kullanıcı veri grafikleri oluşturun"
-enableChartsForFederatedInstances: "Uzak örnek veri grafikleri oluşturun"
+enableChartsForFederatedInstances: "Uzak sunucu veri grafikleri oluşturun"
 enableStatsForFederatedInstances: "Uzak sunucu istatistiklerini alın"
 showClipButtonInNoteFooter: "Not eylem menüsüne “Klip” ekle"
 reactionsDisplaySize: "Tepki ekran boyutu"
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "Gerçek zamanlı mod açık olduğunda, bu ayardan bağımsız olarak içerik gerçek zamanlı olarak güncellenir."
   showUrlPreview: "URL önizlemesini göster"
   showAvailableReactionsFirstInNote: "Mevcut tepkileri en üstte göster."
+  showPageTabBarBottom: "Sayfa sekme çubuğunu aşağıda göster"
   _chat:
     showSenderName: "Gönderenin adını göster"
     sendOnEnter: "Enter tuşuna basarak gönderin"
@@ -1911,7 +1912,7 @@ _achievements:
     _loggedInOnNewYearsDay:
       title: "Yeni yılınız kutlu olsun!"
       description: "Yılın ilk gününde oturum açıldı"
-      flavor: "Bu örnekte bir başka harika yıla"
+      flavor: "Bu sunucuda bir başka harika yıla"
     _cookieClicked:
       title: "Çerezleri tıklayarak oynanan bir oyun"
       description: "Çerezi tıkladı"
@@ -1976,7 +1977,7 @@ _role:
     ltlAvailable: "Yerel zaman çizelgesini görüntüleyebilir"
     canPublicNote: "Halka açık notlar gönderebilir"
     mentionMax: "Bir notta maksimum bahsetme sayısı"
-    canInvite: "Örnek davet kodları oluşturabilir"
+    canInvite: "Sunucu davet kodları oluşturabilir"
     inviteLimit: "Davet sınırı"
     inviteLimitCycle: "Davet sınırı bekleme süresi"
     inviteExpirationTime: "Davet süresi dolma aralığı"
@@ -2072,7 +2073,7 @@ _ad:
   adsTooClose: "Mevcut reklam aralığı çok düşük olduğu için kullanıcı deneyimini önemli ölçüde kötüleştirebilir."
 _forgotPassword:
   enterEmail: "Kayıt olurken kullandığınız E-Posta adresini girin. Şifrenizi sıfırlayabileceğiniz bir bağlantı bu adrese gönderilecektir."
-  ifNoEmail: "Kayıt sırasında E-Posta kullanmadıysanız, lütfen bunun yerine örnek yöneticisiyle iletişime geçin."
+  ifNoEmail: "Kayıt sırasında E-Posta kullanmadıysanız, lütfen bunun yerine sunucu yöneticisiyle iletişime geçin."
   contactAdmin: "This instance does not support using email addresses, please contact the instance administrator to reset your password instead."
 _gallery:
   my: "Benim Galerim"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8843fc682e..c6a7e15bf5 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "当实时模式开启时，无论此设置如何，内容都会实时更新。"
   showUrlPreview: "显示 URL 预览"
   showAvailableReactionsFirstInNote: "在顶部显示可用的回应"
+  showPageTabBarBottom: "在下方显示页面标签栏"
   _chat:
     showSenderName: "显示发送者的名字"
     sendOnEnter: "回车键发送"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 00d4a3a9ac..1a2aaa6a12 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1373,7 +1373,7 @@ inDays: "日"
 safeModeEnabled: "啟用安全模式"
 pluginsAreDisabledBecauseSafeMode: "由於啟用安全模式，所有的外掛都被停用。"
 customCssIsDisabledBecauseSafeMode: "由於啟用安全模式，所有的客製 CSS 都被停用。"
-themeIsDefaultBecauseSafeMode: "啟用安全模式時將使用預設主題，關閉安全模式時將恢復預設主題。"
+themeIsDefaultBecauseSafeMode: "在安全模式啟用期間將使用預設主題。關閉安全模式後會恢復原本的設定。"
 _order:
   newest: "最新的在前"
   oldest: "最舊的在前"
@@ -1465,6 +1465,7 @@ _settings:
   contentsUpdateFrequency_description2: "當即時模式開啟時，不論此設定為何，內容都會即時更新。"
   showUrlPreview: "顯示網址預覽"
   showAvailableReactionsFirstInNote: "將可用的反應顯示在頂部"
+  showPageTabBarBottom: "在底部顯示頁面的標籤列"
   _chat:
     showSenderName: "顯示發送者的名稱"
     sendOnEnter: "按下 Enter 發送訊息"
@@ -1549,7 +1550,7 @@ _initialAccountSetting:
   theseSettingsCanEditLater: "這裡的設定可以在之後變更。"
   youCanEditMoreSettingsInSettingsPageLater: "除此之外，還可以在「設定」頁面進行各種設定。之後請確認看看。"
   followUsers: "為了構築時間軸，試著追隨您感興趣的使用者吧。"
-  pushNotificationDescription: "啟用推送通知後，就可以在裝置上接收來自{name}的通知了。"
+  pushNotificationDescription: "啟用推送通知後，就可以在裝置上接收來自 {name} 的通知了。"
   initialAccountSettingCompleted: "初始設定完成了！"
   haveFun: "盡情享受{name}吧！"
   youCanContinueTutorial: "您可以繼續學習如何使用{name}(Misskey)，也可以就此打住，立即開始使用。"

From 215725a3ace6938d9854d56f394771220c8221b2 Mon Sep 17 00:00:00 2001
From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Date: Fri, 8 Aug 2025 21:35:02 +0900
Subject: [PATCH 14/15] =?UTF-8?q?Fix:=20SystemWebhook=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=A7secret=E3=82=92=E7=A9=BA=E3=81=AB=E5=87=BA=E6=9D=A5?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20(#16371)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): allow system-webhook secret to be empty

* docs(changelog): update changelog

* chore: run build-misskey-js-with-types
---
 CHANGELOG.md                                                | 1 +
 .../src/server/api/endpoints/admin/system-webhook/create.ts | 3 +--
 .../src/server/api/endpoints/admin/system-webhook/update.ts | 3 +--
 packages/misskey-js/src/autogen/types.ts                    | 6 ++++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1dc3e2fe9..d6cb37162b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 ### Server
 - Enhance: ノートの削除処理の効率化
 - Enhance: 全体的なパフォーマンスの向上
+- Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
 
 
 ## 2025.7.0
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
index 28071e7a33..93d293ed41 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/create.ts
@@ -48,8 +48,8 @@ export const paramDef = {
 		},
 		secret: {
 			type: 'string',
-			minLength: 1,
 			maxLength: 1024,
+			default: '',
 		},
 	},
 	required: [
@@ -57,7 +57,6 @@ export const paramDef = {
 		'name',
 		'on',
 		'url',
-		'secret',
 	],
 } as const;
 
diff --git a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
index 8d68bb8f87..e021806398 100644
--- a/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/system-webhook/update.ts
@@ -52,8 +52,8 @@ export const paramDef = {
 		},
 		secret: {
 			type: 'string',
-			minLength: 1,
 			maxLength: 1024,
+			default: '',
 		},
 	},
 	required: [
@@ -62,7 +62,6 @@ export const paramDef = {
 		'name',
 		'on',
 		'url',
-		'secret',
 	],
 } as const;
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 50a96174c7..f0efd63d3a 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -11887,7 +11887,8 @@ export interface operations {
                     name: string;
                     on: ('abuseReport' | 'abuseReportResolved' | 'userCreated' | 'inactiveModeratorsWarning' | 'inactiveModeratorsInvitationOnlyChanged')[];
                     url: string;
-                    secret: string;
+                    /** @default  */
+                    secret?: string;
                 };
             };
         };
@@ -12231,7 +12232,8 @@ export interface operations {
                     name: string;
                     on: ('abuseReport' | 'abuseReportResolved' | 'userCreated' | 'inactiveModeratorsWarning' | 'inactiveModeratorsInvitationOnlyChanged')[];
                     url: string;
-                    secret: string;
+                    /** @default  */
+                    secret?: string;
                 };
             };
         };

From 96a165d729e2f72a8ab401983562273ac4415aba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 12:36:36 +0000
Subject: [PATCH 15/15] Bump version to 2025.8.0-alpha.6

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4ed9498433..9a9d178413 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-alpha.5",
+	"version": "2025.8.0-alpha.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 0b6ff82c0e..718cefa301 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-alpha.5",
+	"version": "2025.8.0-alpha.6",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",