Merge branch 'main' into generate-question-examples

Author: na-trium-144

.github/workflows/update-docs.yml

@@ -4,6 +4,9 @@ on:
     branches: [ "main" ]
 permissions:
   contents: write
+concurrency:
+  group: check-docs-main
+  cancel-in-progress: false
 jobs:
   check-docs:
     runs-on: ubuntu-latest

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 ut.code();
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/(docs)/@chat/chat/[chatId]/chatArea.tsx

@@ -20,42 +20,49 @@ export function ChatAreaContainer(props: {
     <aside
       className={clsx(
         // モバイルでは全画面表示する
-        "fixed inset-0 pt-20 bg-base-100",
+        "fixed inset-0 bg-base-100",
         // PCではスクロールで動かない右サイドバー
-        "has-chat-1:sticky has-chat-1:top-16 has-sidebar:top-0 has-chat-1:pt-4",
+        // 左にサイドバーがない=navvarがある とき、navbar分のスペースをあける(top-16, h-[100vh-4rem])
+        "has-chat-1:sticky has-chat-1:top-16 has-sidebar:top-0",
         "has-chat-1:basis-2/5 has-chat-1:max-w-chat-area has-chat-1:h-[calc(100vh-4rem)] has-sidebar:h-screen",
         "has-chat-1:shadow-md has-chat-1:bg-base-200",
         // navbar(z-40)よりは下、ChatListForSectionのdropdown(デフォルトでz-999だがz-30に変えている)よりも上
-        "z-35",
-        "p-4",
-        "flex flex-col",
-        "overflow-y-auto"
+        "z-35"
       )}
     >
-      <ChatAreaStateUpdater chatId={props.chatId} />
-      <div className="flex flex-row items-center">
-        <span className="flex-1 text-base font-bold opacity-40">
-          AIへの質問
-        </span>
-        <Link className="btn btn-ghost" href="/chat" scroll={false}>
-          <svg
-            className="w-8 h-8 -scale-x-100"
-            viewBox="0 0 24 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M18 17L13 12L18 7M11 17L6 12L11 7"
-              stroke="currentColor"
-              strokeWidth="1.5"
-              strokeLinecap="round"
-              strokeLinejoin="round"
-            />
-          </svg>
-          <span className="text-lg">閉じる</span>
-        </Link>
+      <div className="absolute inset-x-0 bottom-0 h-16 bg-linear-to-t from-base-200 to-base-200/0 z-1" />
+      <div
+        className={clsx(
+          "p-4 pb-16",
+          "pt-20 has-chat-1:pt-4",
+          "h-full flex flex-col overflow-y-auto"
+        )}
+      >
+        <ChatAreaStateUpdater chatId={props.chatId} />
+        <div className="flex flex-row items-center">
+          <span className="flex-1 text-base font-bold opacity-40">
+            AIへの質問
+          </span>
+          <Link className="btn btn-ghost" href="/chat" scroll={false}>
+            <svg
+              className="w-8 h-8 -scale-x-100"
+              viewBox="0 0 24 24"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M18 17L13 12L18 7M11 17L6 12L11 7"
+                stroke="currentColor"
+                strokeWidth="1.5"
+                strokeLinecap="round"
+                strokeLinejoin="round"
+              />
+            </svg>
+            <span className="text-lg">閉じる</span>
+          </Link>
+        </div>
+        {props.children}
       </div>
-      {props.children}
     </aside>
   );
 }

app/(docs)/@docs/[lang]/[pageId]/chatForm.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, FormEvent, useEffect, useMemo } from "react";
+import { useState, FormEvent, useEffect, useRef, useCallback, useMemo } from "react";
 // import useSWR from "swr";
 // import {
 //   getQuestionExample,
@@ -9,9 +9,10 @@ import { useState, FormEvent, useEffect, useMemo } from "react";
 // import { getLanguageName } from "../pagesList";
 import { useEmbedContext } from "@/terminal/embedContext";
 import { DynamicMarkdownSection, PagePath } from "@/lib/docs";
-import { useRouter } from "next/navigation";
+import { usePathname, useRouter } from "next/navigation";
 import { ChatStreamEvent } from "@/api/chat/route";
 import { useStreamingChatContext } from "@/(docs)/streamingChatContext";
+import { revalidateChatAction } from "@/actions/revalidateChat";
 
 interface ChatFormProps {
   path: PagePath;
@@ -30,6 +31,37 @@ export function ChatForm({ path, sectionContent, close }: ChatFormProps) {
   const router = useRouter();
   const streamingChatContext = useStreamingChatContext();
 
+  const pathname = usePathname();
+  const pendingRouterPushTarget = useRef<null | string>(null);
+  const pendingRouterPushResolver = useRef<null | (() => void)>(null);
+  // router.pushの完了を待つ関数。pathnameの変化でページ遷移の完了を検知し、解決する。
+  const asyncRouterPush = useCallback(
+    (url: string, options?: { scroll?: boolean }) => {
+      if (pendingRouterPushTarget.current) {
+        console.error(
+          "Already navigating to",
+          pendingRouterPushTarget.current,
+          "can't navigate to",
+          url
+        );
+        return;
+      }
+      pendingRouterPushTarget.current = url;
+      return new Promise<void>((resolve) => {
+        pendingRouterPushResolver.current = resolve;
+        router.push(url, options);
+      });
+    },
+    [router]
+  );
+  useEffect(() => {
+    if (pendingRouterPushTarget.current === pathname) {
+      pendingRouterPushResolver.current?.();
+      pendingRouterPushTarget.current = null;
+      pendingRouterPushResolver.current = null;
+    }
+  }, [pathname]);
+
   const exampleData = useMemo(
     () =>
       sectionContent
@@ -97,6 +129,7 @@ export function ChatForm({ path, sectionContent, close }: ChatFormProps) {
     const reader = response.body!.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
+    let chatId: string | null = null;
     let navigated = false;
 
     // ストリームを非同期で読み続ける（ナビゲーション後もバックグラウンドで継続）
@@ -117,11 +150,16 @@ export function ChatForm({ path, sectionContent, close }: ChatFormProps) {
               const event = JSON.parse(line) as ChatStreamEvent;
 
               if (event.type === "chat") {
+                // revalidateChatは/api/chatの中では呼ばず、別のServerActionとして呼び出す
+                await revalidateChatAction(event.chatId, path);
+                chatId = event.chatId;
                 streamingChatContext.startStreaming(event.chatId);
                 document.getElementById(event.sectionId)?.scrollIntoView({
                   behavior: "smooth",
                 });
-                router.push(`/chat/${event.chatId}`, { scroll: false });
+                await asyncRouterPush(`/chat/${event.chatId}`, {
+                  scroll: false,
+                });
                 router.refresh();
                 navigated = true;
                 setIsLoading(false);
@@ -130,14 +168,21 @@ export function ChatForm({ path, sectionContent, close }: ChatFormProps) {
               } else if (event.type === "chunk") {
                 streamingChatContext.appendChunk(event.text);
               } else if (event.type === "done") {
+                if (chatId) {
+                  await revalidateChatAction(chatId, path);
+                }
                 streamingChatContext.finishStreaming();
                 router.refresh();
               } else if (event.type === "error") {
                 if (!navigated) {
                   setErrorMessage(event.message);
                   setIsLoading(false);
                 }
+                if (chatId) {
+                  await revalidateChatAction(chatId, path);
+                }
                 streamingChatContext.finishStreaming();
+                router.refresh();
               }
             } catch {
               // ignore JSON parse errors

app/(docs)/@docs/[lang]/[pageId]/pageContent.tsx

@@ -146,7 +146,7 @@ export function PageContent(props: PageContentProps) {
   const [isFormVisible, setIsFormVisible] = useState(false);
 
   return (
-    <div className="flex-1 p-4 flex flex-col">
+    <div className="flex-1 p-4 pb-16 flex flex-col">
       <div
         className="max-w-full mx-auto grid"
         style={{

app/actions/deleteChat.ts

@@ -1,10 +1,22 @@
 "use server";
 
 import { z } from "zod";
-import { deleteChat, initContext } from "@/lib/chatHistory";
+import { deleteChat, initContext, revalidateChat } from "@/lib/chatHistory";
+import { section } from "@/schema/chat";
+import { eq } from "drizzle-orm";
 
 export async function deleteChatAction(chatId: string) {
   chatId = z.uuid().parse(chatId);
   const ctx = await initContext();
-  await deleteChat(chatId, ctx);
+  if (!ctx.userId) {
+    throw new Error("Not authenticated");
+  }
+  const deletedChat = await deleteChat(chatId, ctx);
+
+  const targetSection = await ctx.drizzle.query.section.findFirst({
+    where: eq(section.sectionId, deletedChat[0].sectionId),
+  });
+  if (targetSection) {
+    await revalidateChat(chatId, ctx.userId, targetSection.pagePath);
+  }
 }

app/actions/revalidateChat.ts

@@ -0,0 +1,26 @@
+"use server";
+
+import { initContext, revalidateChat } from "@/lib/chatHistory";
+import { PagePath, PagePathSchema } from "@/lib/docs";
+import { z } from "zod";
+
+export async function revalidateChatAction(
+  chatId: string,
+  pagePath: string | PagePath
+) {
+  chatId = z.uuid().parse(chatId);
+  if (typeof pagePath === "string") {
+    if (!/^[a-z0-9_-]+\/[a-z0-9_-]+$/.test(pagePath)) {
+      throw new Error("Invalid pagePath format");
+    }
+    const [lang, page] = pagePath.split("/");
+    pagePath = PagePathSchema.parse({ lang, page });
+  } else {
+    pagePath = PagePathSchema.parse(pagePath);
+  }
+  const ctx = await initContext();
+  if (!ctx.userId) {
+    throw new Error("Not authenticated");
+  }
+  await revalidateChat(chatId, ctx.userId, pagePath);
+}