Release: develop を main にマージ

.github/workflows/dependabot-bun-lock.yml

@@ -0,0 +1,137 @@
+# Dependabot bun.lock 同期ワークフロー
+# Sync bun.lock for Dependabot pull requests.
+#
+# Dependabot は npm エコシステムを使うため `package.json` は更新できるが、
+# Bun のロックファイル (`bun.lock`) は更新できない。その結果、CI の
+# `bun install --frozen-lockfile` がロック不一致で即座に失敗する。
+# 本ワークフローは dependabot が作成した PR を検知し、対応する
+# `bun install` を実行して `bun.lock` を再生成し、PR ブランチに
+# 自動コミット・プッシュする。
+#
+# Dependabot updates `package.json` via the npm ecosystem but cannot regenerate
+# Bun's `bun.lock`. CI then fails immediately at `bun install --frozen-lockfile`
+# because the lockfile and manifest disagree. This workflow detects such PRs,
+# runs `bun install` in each affected directory, and pushes the regenerated
+# lockfile back to the PR branch so CI can pass.
+name: Dependabot bun.lock sync
+
+on:
+  pull_request:
+    # bun.lock を持つ全ディレクトリの package.json を監視する。
+    # dependabot.yml は現在 root / server/api / server/hocuspocus を対象にしているが、
+    # 過去 (PR #374) には admin/package.json も dependabot に更新されており、
+    # 将来 dependabot.yml が拡張されてもカバーできるよう全ロックを対象にする。
+    # Watch every package.json that has a sibling bun.lock. Although the
+    # current dependabot.yml only tracks root / server/api / server/hocuspocus,
+    # admin/package.json was once updated by Dependabot (PR #374), and this
+    # list also future-proofs the workflow against expansions of dependabot.yml.
+    paths:
+      - "package.json"
+      - "admin/package.json"
+      - "server/api/package.json"
+      - "server/hocuspocus/package.json"
+      - "server/mcp/package.json"
+
+# bun install で書き戻すため contents: write が必要。
+# Needs `contents: write` to push the regenerated lockfile back to the PR branch.
+permissions:
+  contents: write
+
+concurrency:
+  group: dependabot-bun-lock-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  sync:
+    name: Sync bun.lock
+    if: github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6.0.2
+        with:
+          # PR ブランチに直接書き戻すため、head ref をチェックアウトする。
+          # Check out the PR head ref so we can push commits back to it.
+          ref: ${{ github.event.pull_request.head.ref }}
+          # ベースブランチとの差分計算用に履歴を全部取る。
+          # Fetch full history so we can diff against the PR base.
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: ".nvmrc"
+
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: "1.3"
+
+      - name: Detect changed package.json directories
+        id: detect
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+        run: |
+          set -euo pipefail
+          git fetch --no-tags --depth=1 origin "$BASE_REF"
+          changed=$(git diff --name-only "origin/${BASE_REF}...HEAD")
+          echo "Changed files in PR:"
+          echo "$changed"
+
+          dirs=()
+          # bun.lock を持つ全ディレクトリ。`on.paths` と一致させる。
+          # Every directory with a sibling bun.lock; keep in sync with `on.paths`.
+          for path in \
+            "package.json" \
+            "admin/package.json" \
+            "server/api/package.json" \
+            "server/hocuspocus/package.json" \
+            "server/mcp/package.json"; do
+            if printf '%s\n' "$changed" | grep -Fxq "$path"; then
+              dir=$(dirname "$path")
+              dirs+=("$dir")
+            fi
+          done
+
+          if [ ${#dirs[@]} -eq 0 ]; then
+            echo "No tracked package.json changed; nothing to do."
+            echo "dirs=" >> "$GITHUB_OUTPUT"
+          else
+            echo "dirs=${dirs[*]}" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Regenerate bun.lock
+        if: steps.detect.outputs.dirs != ''
+        run: |
+          set -euo pipefail
+          for dir in ${{ steps.detect.outputs.dirs }}; do
+            echo "::group::bun install ($dir)"
+            (cd "$dir" && bun install --no-summary)
+            echo "::endgroup::"
+          done
+
+      - name: Commit and push bun.lock changes
+        if: steps.detect.outputs.dirs != ''
+        env:
+          HEAD_REF: ${{ github.event.pull_request.head.ref }}
+        run: |
+          set -euo pipefail
+          # bun.lock 以外の変更（例: node_modules メタ情報）は無視。
+          # Only stage bun.lock files; ignore any other side effects.
+          git add -- ':(glob)**/bun.lock' bun.lock 2>/dev/null || true
+
+          if git diff --cached --quiet; then
+            echo "bun.lock is already in sync; nothing to commit."
+            exit 0
+          fi
+
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git commit -m "chore(deps): sync bun.lock with package.json changes"
+          # GITHUB_TOKEN による push は新規ワークフロー実行をトリガーしないため、
+          # 無限ループは発生しない (GitHub Actions の組み込み安全機構)。
+          # PAT や GitHub App トークンに切り替える場合は、コミッタを確認する等の
+          # 別途ループ防止ロジックが必要になる。
+          # Pushes made with GITHUB_TOKEN do not trigger new workflow runs, so
+          # no infinite loop occurs (built-in GitHub Actions safety feature).
+          # If switching to a PAT or GitHub App token, add separate
+          # loop-prevention logic (e.g. checking the committer).
+          git push origin "HEAD:${HEAD_REF}"

.github/workflows/release-please.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Run Release Please
         id: rp
-        uses: googleapis/release-please-action@v4
+        uses: googleapis/release-please-action@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config-file: .release-please-config.json

admin/package.json

@@ -12,9 +12,12 @@
   },
   "dependencies": {
     "@zedi/ui": "workspace:*",
+    "i18next": "^26.0.1",
+    "i18next-browser-languagedetector": "^8.2.1",
     "lucide-react": "^1.7.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
+    "react-i18next": "^17.0.1",
     "react-router-dom": "^7.13.2"
   },
   "devDependencies": {

admin/src/components/ConfirmActionDialog.tsx

@@ -1,4 +1,5 @@
 import { useState, useCallback } from "react";
+import { useTranslation } from "react-i18next";
 import {
   AlertDialog,
   AlertDialogContent,
@@ -71,14 +72,16 @@ export function ConfirmActionDialog({
   onOpenChange,
   title,
   description,
-  confirmLabel = "確認",
+  confirmLabel,
   destructive = false,
   loading = false,
   confirmPhrase,
   confirmPhraseLabel,
   onConfirm,
   children,
 }: ConfirmActionDialogProps) {
+  const { t } = useTranslation();
+  const resolvedConfirmLabel = confirmLabel ?? t("common.confirm");
   const [phraseInput, setPhraseInput] = useState("");
 
   // ダイアログ閉じ時に確認フレーズ入力をリセット / Reset phrase input when dialog closes
@@ -116,7 +119,7 @@ export function ConfirmActionDialog({
               <div className="grid gap-2">
                 <Label htmlFor="confirm-phrase-input">
                   {confirmPhraseLabel ??
-                    `確認のため「${confirmPhrase}」を入力してください / Type "${confirmPhrase}" to confirm`}
+                    t("common.confirmPhraseDefault", { phrase: confirmPhrase })}
                 </Label>
                 <Input
                   id="confirm-phrase-input"
@@ -131,7 +134,7 @@ export function ConfirmActionDialog({
         )}
 
         <AlertDialogFooter>
-          <AlertDialogCancel disabled={loading}>キャンセル</AlertDialogCancel>
+          <AlertDialogCancel disabled={loading}>{t("common.cancel")}</AlertDialogCancel>
           <AlertDialogAction
             className={cn(
               destructive && "bg-destructive text-destructive-foreground hover:bg-destructive/90",
@@ -148,7 +151,7 @@ export function ConfirmActionDialog({
               handleConfirm();
             }}
           >
-            {loading ? "処理中..." : confirmLabel}
+            {loading ? t("common.processing") : resolvedConfirmLabel}
           </AlertDialogAction>
         </AlertDialogFooter>
       </AlertDialogContent>

admin/src/i18n/index.ts

@@ -0,0 +1,72 @@
+import i18n from "i18next";
+import { initReactI18next } from "react-i18next";
+import LanguageDetector from "i18next-browser-languagedetector";
+
+// 翻訳をドメインごとに分割（1ファイルあたりのコード量を抑える）
+// Translations are split per domain to keep individual files small.
+import jaCommon from "./locales/ja/common.json";
+import jaNav from "./locales/ja/nav.json";
+import jaAuth from "./locales/ja/auth.json";
+import jaUsers from "./locales/ja/users.json";
+import jaAudit from "./locales/ja/audit.json";
+import jaWikiHealth from "./locales/ja/wikiHealth.json";
+import jaActivityLog from "./locales/ja/activityLog.json";
+import jaAiModels from "./locales/ja/aiModels.json";
+import enCommon from "./locales/en/common.json";
+import enNav from "./locales/en/nav.json";
+import enAuth from "./locales/en/auth.json";
+import enUsers from "./locales/en/users.json";
+import enAudit from "./locales/en/audit.json";
+import enWikiHealth from "./locales/en/wikiHealth.json";
+import enActivityLog from "./locales/en/activityLog.json";
+import enAiModels from "./locales/en/aiModels.json";
+
+const ja = {
+  common: jaCommon,
+  nav: jaNav,
+  auth: jaAuth,
+  users: jaUsers,
+  audit: jaAudit,
+  wikiHealth: jaWikiHealth,
+  activityLog: jaActivityLog,
+  aiModels: jaAiModels,
+};
+
+const en = {
+  common: enCommon,
+  nav: enNav,
+  auth: enAuth,
+  users: enUsers,
+  audit: enAudit,
+  wikiHealth: enWikiHealth,
+  activityLog: enActivityLog,
+  aiModels: enAiModels,
+};
+
+/**
+ * 管理画面用 i18n インスタンス。
+ * 本体アプリと同じ localStorage キー（`zedi-i18next-lng`）を共有して、
+ * 言語設定が両画面間で一貫するようにする。
+ *
+ * Admin i18n instance. Shares the same localStorage key as the main app
+ * (`zedi-i18next-lng`) so language preference stays consistent across surfaces.
+ */
+i18n
+  .use(LanguageDetector)
+  .use(initReactI18next)
+  .init({
+    resources: {
+      ja: { translation: ja },
+      en: { translation: en },
+    },
+    fallbackLng: "ja",
+    interpolation: {
+      escapeValue: false,
+    },
+    detection: {
+      order: ["localStorage", "navigator"],
+      lookupLocalStorage: "zedi-i18next-lng",
+    },
+  });
+
+export default i18n;

admin/src/i18n/locales/en/activityLog.json

@@ -0,0 +1,29 @@
+{
+  "title": "Activity Log",
+  "filters": {
+    "kind": "Kind",
+    "actor": "Actor"
+  },
+  "columns": {
+    "kind": "Kind",
+    "actor": "Actor",
+    "detail": "Detail",
+    "relatedPages": "Related pages",
+    "createdAt": "Recorded at"
+  },
+  "empty": "No activity logs yet.",
+  "showing": "Showing {{shown}} of {{total}}",
+  "kinds": {
+    "clip_ingest": "Clip ingest",
+    "chat_promote": "Chat promote",
+    "lint_run": "Lint run",
+    "wiki_generate": "Wiki generate",
+    "index_build": "Index build",
+    "wiki_schema_update": "Schema update"
+  },
+  "actors": {
+    "user": "User",
+    "ai": "AI",
+    "system": "System"
+  }
+}

admin/src/i18n/locales/en/aiModels.json

@@ -0,0 +1,30 @@
+{
+  "title": "AI Model Management",
+  "syncing": "Syncing...",
+  "syncWithProvider": "Sync with provider",
+  "syncResult": "Sync result:",
+  "syncStat": "Added {{added}} / Deactivated {{deactivated}}",
+  "columns": {
+    "reorder": "Reorder",
+    "provider": "Provider",
+    "modelId": "Model ID",
+    "displayName": "Display name",
+    "tier": "Tier",
+    "active": "Active",
+    "sortOrder": "Order"
+  },
+  "summary": "{{total}} models (active: {{active}})",
+  "dragHint": "Drag to reorder",
+  "displayNameAriaLabel": "Display name for {{modelId}}",
+  "tierAriaLabel": "Tier for {{name}}",
+  "preview": {
+    "title": "Sync preview",
+    "description": "New models will be added, and existing models no longer in scope will be deactivated. Existing models' display names and pricing are not overwritten. Sonnet-family models are added as inactive.",
+    "noChanges": "No changes",
+    "addLabel": "Add: {{name}}",
+    "deactivateLabel": "Deactivate: {{name}}",
+    "inactiveTag": "(inactive)",
+    "errorWarning": "Some providers reported errors. Providers with errors will not be synced.",
+    "confirm": "Run sync (Add {{added}} / Deactivate {{deactivated}})"
+  }
+}

admin/src/i18n/locales/en/audit.json

@@ -0,0 +1,20 @@
+{
+  "title": "Audit Logs",
+  "filters": {
+    "action": "Filter by action",
+    "from": "From",
+    "to": "To"
+  },
+  "columns": {
+    "createdAt": "Timestamp",
+    "actor": "Actor",
+    "action": "Action",
+    "target": "Target",
+    "diff": "Changes",
+    "ipAddress": "IP"
+  },
+  "empty": "No audit logs.",
+  "actions": {
+    "user.role.update": "User: Role change"
+  }
+}

admin/src/i18n/locales/en/auth.json

@@ -0,0 +1,7 @@
+{
+  "title": "Zedi Admin",
+  "description": "To log in as an administrator, please sign in to the main app first.",
+  "signInButton": "Sign in to continue",
+  "afterSignIn": "After signing in, return to this page.",
+  "guardLoading": "Loading..."
+}

admin/src/i18n/locales/en/common.json

@@ -0,0 +1,19 @@
+{
+  "cancel": "Cancel",
+  "confirm": "Confirm",
+  "loading": "Loading...",
+  "saving": "Saving...",
+  "processing": "Processing...",
+  "previous": "Previous",
+  "next": "Next",
+  "all": "All",
+  "save": "Save",
+  "delete": "Delete",
+  "reload": "Reload",
+  "running": "Running...",
+  "page": "Page {{page}} / {{count}}",
+  "showingRange": "Showing {{rangeStart}}-{{rangeEnd}} of {{total}}",
+  "showingZero": "Showing 0 of {{total}}",
+  "totalCount": "Total: {{count}}",
+  "confirmPhraseDefault": "Type \"{{phrase}}\" to confirm"
+}