@carlonicora/nextjs-jsonapi 1.77.3 → 1.79.0

package/dist/server/index.js

@@ -15,7 +15,7 @@ var _chunk3ZPK4QOBjs = require('../chunk-3ZPK4QOB.js');
 
 
 
-var _chunkFKLP4NEDjs = require('../chunk-FKLP4NED.js');
+var _chunk5IEWLLLDjs = require('../chunk-5IEWLLLD.js');
 require('../chunk-LXKSUWAV.js');
 require('../chunk-IBS6NI7D.js');
 
@@ -86,7 +86,7 @@ var ServerSession = class {
     if (!rawModules) return false;
     const modules = JSON.parse(_pako2.default.ungzip(Buffer.from(rawModules, "base64"), { to: "string" }));
     const selectedModule = modules.find((module) => module.id === params.module.moduleId);
-    return _chunkFKLP4NEDjs.checkPermissionsFromServer.call(void 0, {
+    return _chunk5IEWLLLDjs.checkPermissionsFromServer.call(void 0, {
       module: params.module,
       action: params.action,
       data: params.data,
@@ -296,5 +296,5 @@ _chunk7QVYU63Ejs.__name.call(void 0, ServerJsonApiDelete, "ServerJsonApiDelete")
 
 
 
-exports.ServerAuthService = _chunkFKLP4NEDjs.AuthService; exports.ServerCompanyService = _chunkFKLP4NEDjs.CompanyService; exports.ServerContentService = _chunkFKLP4NEDjs.ContentService; exports.ServerFeatureService = _chunkFKLP4NEDjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunkFKLP4NEDjs.NotificationService; exports.ServerPushService = _chunkFKLP4NEDjs.PushService; exports.ServerRoleService = _chunkFKLP4NEDjs.RoleService; exports.ServerS3Service = _chunkFKLP4NEDjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunkFKLP4NEDjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
+exports.ServerAuthService = _chunk5IEWLLLDjs.AuthService; exports.ServerCompanyService = _chunk5IEWLLLDjs.CompanyService; exports.ServerContentService = _chunk5IEWLLLDjs.ContentService; exports.ServerFeatureService = _chunk5IEWLLLDjs.FeatureService; exports.ServerJsonApiDelete = ServerJsonApiDelete; exports.ServerJsonApiGet = ServerJsonApiGet; exports.ServerJsonApiPatch = ServerJsonApiPatch; exports.ServerJsonApiPost = ServerJsonApiPost; exports.ServerJsonApiPut = ServerJsonApiPut; exports.ServerNotificationService = _chunk5IEWLLLDjs.NotificationService; exports.ServerPushService = _chunk5IEWLLLDjs.PushService; exports.ServerRoleService = _chunk5IEWLLLDjs.RoleService; exports.ServerS3Service = _chunk5IEWLLLDjs.S3Service; exports.ServerSession = ServerSession; exports.ServerUserService = _chunk5IEWLLLDjs.UserService; exports.configureServerJsonApi = configureServerJsonApi; exports.getServerApiUrl = getServerApiUrl; exports.getServerAppUrl = getServerAppUrl; exports.getServerToken = _chunkYUO55Q5Ajs.getServerToken; exports.getServerTrackablePages = getServerTrackablePages; exports.invalidateCacheTag = invalidateCacheTag; exports.invalidateCacheTags = invalidateCacheTags; exports.serverRequest = _chunk3ZPK4QOBjs.serverRequest;
 //# sourceMappingURL=index.js.map

package/dist/server/index.mjs

@@ -15,7 +15,7 @@ import {
   S3Service,
   UserService,
   checkPermissionsFromServer
-} from "../chunk-XI35ALWY.mjs";
+} from "../chunk-BKM5U3DE.mjs";
 import "../chunk-AUXK7QSA.mjs";
 import "../chunk-C7C7VY4F.mjs";
 import {

package/dist/useDataListRetriever-BqJSFBck.d.mts

@@ -0,0 +1,33 @@
+type PageInfo = {
+    startItem: number;
+    endItem: number;
+    pageSize: number;
+};
+type DataListRetriever<T> = {
+    ready?: boolean;
+    setReady: (state: boolean) => void;
+    isLoaded: boolean;
+    data: T[] | undefined;
+    total?: number;
+    next?: (onlyNewRecords?: boolean) => Promise<void>;
+    previous?: (onlyNewRecords?: boolean) => Promise<void>;
+    search: (search: string) => Promise<void>;
+    refresh: () => Promise<void>;
+    addAdditionalParameter: (key: string, value: any | null) => void;
+    removeAdditionalParameter: (key: string) => void;
+    setRefreshedElement: (element: T) => void;
+    removeElement: (element: T) => void;
+    isSearch: boolean;
+    pageInfo?: PageInfo;
+};
+declare function useDataListRetriever<T>(params: {
+    ready?: boolean;
+    retriever: (params: any) => Promise<T[]>;
+    retrieverParams?: any;
+    search?: string;
+    addAdditionalParameter?: (key: string, value: any | null) => void;
+    requiresSearch?: boolean;
+    module: any;
+}): DataListRetriever<T>;
+
+export { type DataListRetriever as D, useDataListRetriever as u };

package/dist/useDataListRetriever-BqJSFBck.d.ts

@@ -0,0 +1,33 @@
+type PageInfo = {
+    startItem: number;
+    endItem: number;
+    pageSize: number;
+};
+type DataListRetriever<T> = {
+    ready?: boolean;
+    setReady: (state: boolean) => void;
+    isLoaded: boolean;
+    data: T[] | undefined;
+    total?: number;
+    next?: (onlyNewRecords?: boolean) => Promise<void>;
+    previous?: (onlyNewRecords?: boolean) => Promise<void>;
+    search: (search: string) => Promise<void>;
+    refresh: () => Promise<void>;
+    addAdditionalParameter: (key: string, value: any | null) => void;
+    removeAdditionalParameter: (key: string) => void;
+    setRefreshedElement: (element: T) => void;
+    removeElement: (element: T) => void;
+    isSearch: boolean;
+    pageInfo?: PageInfo;
+};
+declare function useDataListRetriever<T>(params: {
+    ready?: boolean;
+    retriever: (params: any) => Promise<T[]>;
+    retrieverParams?: any;
+    search?: string;
+    addAdditionalParameter?: (key: string, value: any | null) => void;
+    requiresSearch?: boolean;
+    module: any;
+}): DataListRetriever<T>;
+
+export { type DataListRetriever as D, useDataListRetriever as u };

package/dist/{useSocket-CmzVtg32.d.mts → useSocket-BkxHHujj.d.mts}

@@ -1,4 +1,4 @@
-import { N as NotificationInterface } from './notification.interface-DG6obXUH.mjs';
+import { N as NotificationInterface } from './notification.interface-DLZGtV7Z.mjs';
 
 interface UseSocketOptions {
     token: string;

package/dist/{useSocket-8eUtnL7J.d.ts → useSocket-CMDjWFYm.d.ts}

@@ -1,4 +1,4 @@
-import { N as NotificationInterface } from './notification.interface-DcSuc9CL.js';
+import { N as NotificationInterface } from './notification.interface-aLEJbA_g.js';
 
 interface UseSocketOptions {
     token: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carlonicora/nextjs-jsonapi",
-  "version": "1.77.3",
+  "version": "1.79.0",
   "description": "Next.js JSON:API client with server/client support and caching",
   "author": "Carlo Nicora",
   "license": "GPL-3.0-or-later",

package/src/client/index.ts

@@ -27,10 +27,6 @@ export * from "../features/user/hooks";
 export * from "../features/oauth/hooks";
 export * from "../features/company/hooks/useSubscriptionStatus";
 
-// RBAC hooks and utils
-export { useRbacState } from "../features/rbac/hooks/useRbacState";
-export { generateMigrationFile, downloadMigrationFile } from "../features/rbac/utils/RbacMigrationGenerator";
-
 registerTableGenerator("roles", useRoleTableStructure);
 registerTableGenerator("users", useUserTableStructure);
 registerTableGenerator("companies", useCompanyTableStructure);

package/src/components/index.ts

@@ -20,6 +20,8 @@ export * from "../features/auth/components";
 export * from "../features/company/components";
 export * from "../features/content/components";
 export * from "../features/how-to/components";
+export * from "../features/assistant/components";
+export * from "../features/assistant-message/components";
 export * from "../features/feature/components";
 export * from "../features/notification/components";
 export * from "../features/onboarding/components";
@@ -29,9 +31,6 @@ export * from "../features/user/components";
 export * from "../features/oauth/components";
 export * from "../features/waitlist/components";
 export { RbacContainer } from "../features/rbac/components/RbacContainer";
-export { RbacToolbar } from "../features/rbac/components/RbacToolbar";
-export { RbacFeatureSection } from "../features/rbac/components/RbacFeatureSection";
-export { RbacModuleTable } from "../features/rbac/components/RbacModuleTable";
 export { RbacPermissionCell } from "../features/rbac/components/RbacPermissionCell";
 export { RbacPermissionPicker } from "../features/rbac/components/RbacPermissionPicker";
 

package/src/contexts/index.ts

@@ -4,6 +4,8 @@ export * from "../features/onboarding/contexts";
 export * from "../features/role/contexts/RoleContext";
 export * from "../features/user/contexts";
 export * from "../features/how-to/contexts/HowToContext";
+export * from "../features/rbac/contexts/RbacContext";
+export * from "../features/assistant/contexts/AssistantContext";
 export * from "./CommonContext";
 export * from "./HeaderChildrenContext";
 export * from "./HeaderLeftContentContext";

package/src/core/index.ts

@@ -61,6 +61,10 @@ export * from "../features/content/content.module";
 export * from "../features/content/data";
 export * from "../features/how-to/HowToModule";
 export * from "../features/how-to/data";
+export * from "../features/assistant/AssistantModule";
+export * from "../features/assistant/data";
+export * from "../features/assistant-message/AssistantMessageModule";
+export * from "../features/assistant-message/data";
 export * from "../features/feature/data";
 export * from "../features/feature/feature.module";
 export * from "../features/module";

package/src/core/registry/ModuleRegistry.ts

@@ -16,6 +16,8 @@ export interface FoundationModuleDefinitions {
   Module: ModuleWithPermissions;
   Content: ModuleWithPermissions;
   HowTo: ModuleWithPermissions;
+  Assistant: ModuleWithPermissions;
+  AssistantMessage: ModuleWithPermissions;
   // Billing modules - READ: all users, UPDATE: CompanyAdministrator, ADMIN: Administrator
   Billing: ModuleWithPermissions;
   StripeCustomer: ModuleWithPermissions;
@@ -52,6 +54,7 @@ export interface FoundationModuleDefinitions {
   // RBAC modules
   PermissionMapping: ModuleWithPermissions;
   ModulePaths: ModuleWithPermissions;
+  RbacMatrix: ModuleWithPermissions;
   // Audit modules
   AuditLog: ModuleWithPermissions;
 }
@@ -171,6 +174,13 @@ class ModuleRegistryClass {
 
     return response;
   }
+
+  getAll(): ApiRequestDataTypeInterface[] {
+    if (this._modules.size === 0) {
+      tryBootstrap();
+    }
+    return Array.from(this._modules.values());
+  }
 }
 
 export const ModuleRegistry = new ModuleRegistryClass();

package/src/features/assistant/AssistantModule.ts

@@ -0,0 +1,19 @@
+import { BotIcon } from "lucide-react";
+import { createJsonApiInclusion } from "../../core";
+import { ModuleFactory } from "../../permissions";
+import { Assistant } from "./data/Assistant";
+
+export const AssistantModule = (factory: ModuleFactory) =>
+  factory({
+    pageUrl: "/assistants",
+    name: "assistants",
+    model: Assistant,
+    moduleId: "2b39fd68-6a41-4f73-a2d0-4c8e8e3f9a42",
+    icon: BotIcon,
+    identifier: ["title"],
+    inclusions: {
+      lists: {
+        fields: [createJsonApiInclusion("assistants", [`title`])],
+      },
+    },
+  });

package/src/features/assistant/components/containers/AssistantContainer.tsx

@@ -0,0 +1,56 @@
+"use client";
+
+import { RoundPageContainer } from "../../../../components/containers/RoundPageContainer";
+import { Modules } from "../../../../core";
+import { useAssistantContext } from "../../contexts/AssistantContext";
+import { AssistantSidebar } from "../parts/AssistantSidebar";
+import { AssistantEmptyState } from "../parts/AssistantEmptyState";
+import { AssistantThreadHeader } from "../parts/AssistantThreadHeader";
+import { AssistantThread } from "../parts/AssistantThread";
+import { AssistantComposer } from "../parts/AssistantComposer";
+
+export function AssistantContainer() {
+  const ctx = useAssistantContext();
+  const showThread = !!ctx.assistant || ctx.sending || ctx.messages.length > 0;
+
+  return (
+    <RoundPageContainer module={Modules.Assistant} fullWidth>
+      <div className="bg-background flex h-full w-full overflow-hidden rounded-lg border">
+        <AssistantSidebar
+          threads={ctx.threads}
+          activeId={ctx.assistant?.id}
+          onSelect={ctx.selectThread}
+          onNew={ctx.startNew}
+        />
+        <main className="flex flex-1 flex-col">
+          {!showThread ? (
+            <AssistantEmptyState onSend={ctx.sendMessage} />
+          ) : (
+            <>
+              {ctx.assistant ? (
+                <AssistantThreadHeader
+                  assistant={ctx.assistant}
+                  onRename={(title) => ctx.renameThread(ctx.assistant!.id, title)}
+                  onDelete={() => ctx.deleteThread(ctx.assistant!.id)}
+                />
+              ) : (
+                <div className="flex items-center justify-between border-b px-5 py-3" aria-hidden>
+                  <div className="h-5" />
+                </div>
+              )}
+              <AssistantThread
+                messages={ctx.messages}
+                sending={ctx.sending}
+                status={ctx.status}
+                onSelectFollowUp={ctx.sendMessage}
+                failedMessageIds={ctx.failedMessageIds}
+                onRetry={ctx.retrySend}
+              />
+              <AssistantComposer onSend={ctx.sendMessage} disabled={ctx.sending} />
+            </>
+          )}
+        </main>
+      </div>
+    </RoundPageContainer>
+  );
+}

package/src/features/assistant/components/containers/__tests__/AssistantContainer.spec.tsx

@@ -0,0 +1,101 @@
+vi.mock("../../../../../contexts/SocketContext", () => ({
+  useSocketContext: () => ({ socket: null, isConnected: false }),
+}));
+
+vi.mock("../../../../../components/containers/RoundPageContainer", () => ({
+  RoundPageContainer: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+}));
+
+import { describe, it, expect, vi, beforeAll, beforeEach } from "vitest";
+import { render, screen, waitFor } from "@testing-library/react";
+import { AssistantProvider } from "../../../contexts/AssistantContext";
+import { AssistantService } from "../../../data/AssistantService";
+import type { JsonApiHydratedDataInterface } from "../../../../../core";
+import { AssistantContainer } from "../AssistantContainer";
+import { ModuleRegistry } from "../../../../../core/registry/ModuleRegistry";
+import { DataClassRegistry } from "../../../../../core/registry/DataClassRegistry";
+import { Assistant } from "../../../data/Assistant";
+import { AssistantMessage } from "../../../../assistant-message/data/AssistantMessage";
+
+beforeAll(() => {
+  Element.prototype.scrollIntoView = vi.fn();
+  const assistantModule = { name: "assistants", model: Assistant } as any;
+  const assistantMessageModule = { name: "assistant-messages", model: AssistantMessage } as any;
+  DataClassRegistry.registerObjectClass(assistantModule, Assistant);
+  DataClassRegistry.registerObjectClass(assistantMessageModule, AssistantMessage);
+  ModuleRegistry.register("Assistant" as any, assistantModule as any);
+  ModuleRegistry.register("AssistantMessage" as any, assistantMessageModule as any);
+});
+
+beforeEach(() => {
+  AssistantService.findMany = vi.fn().mockResolvedValue([]);
+});
+
+function buildAssistantDehydrated({
+  id,
+  title = "Stub",
+}: {
+  id: string;
+  title?: string;
+}): JsonApiHydratedDataInterface {
+  return {
+    jsonApi: {
+      type: "assistants",
+      id,
+      attributes: { title, messageCount: 0 },
+    },
+    included: [],
+  };
+}
+
+describe("AssistantContainer", () => {
+  it("shows empty state when no assistant is active", async () => {
+    render(
+      <AssistantProvider>
+        <AssistantContainer />
+      </AssistantProvider>,
+    );
+    // AssistantEmptyState renders heading with translation key
+    await waitFor(() =>
+      expect(screen.getByRole("heading", { name: "features.assistant.empty_state.title" })).toBeInTheDocument(),
+    );
+  });
+
+  it("shows thread header + composer when an assistant is active", async () => {
+    const active = buildAssistantDehydrated({ id: "a1", title: "T" });
+    render(
+      <AssistantProvider dehydratedAssistant={active}>
+        <AssistantContainer />
+      </AssistantProvider>,
+    );
+    // Header shows the assistant title
+    expect(screen.getByText("T")).toBeInTheDocument();
+    // Composer has a textarea
+    expect(screen.getByRole("textbox")).toBeInTheDocument();
+  });
+
+  it("shows thread view (not empty state) when sending a first message before assistant resolves", async () => {
+    // Keep `AssistantService.create` pending so the assistant is never set.
+    AssistantService.create = vi.fn().mockImplementation(() => new Promise(() => {}));
+
+    render(
+      <AssistantProvider>
+        <AssistantContainer />
+      </AssistantProvider>,
+    );
+
+    // Kick off a send via the composer. The AssistantEmptyState renders its own composer.
+    const textarea = await screen.findByRole("textbox");
+    const user = (await import("@testing-library/user-event")).default.setup();
+    await user.type(textarea, "first one");
+    await user.keyboard("{Enter}");
+
+    // Empty-state title disappears; optimistic user bubble visible.
+    await waitFor(() => {
+      expect(screen.queryByRole("heading", { name: "features.assistant.empty_state.title" })).not.toBeInTheDocument();
+    });
+    expect(screen.getByText("first one")).toBeInTheDocument();
+    // Status line is showing ("thinking…" translation key renders literally in tests).
+    expect(screen.getByText("features.assistant.thinking")).toBeInTheDocument();
+  });
+});

package/src/features/assistant/components/index.ts

@@ -0,0 +1 @@
+export * from "./containers/AssistantContainer";

package/src/features/assistant/components/parts/AssistantComposer.tsx

@@ -0,0 +1,56 @@
+"use client";
+
+import { useState, type KeyboardEvent } from "react";
+import { useTranslations } from "next-intl";
+import { ArrowUp } from "lucide-react";
+import { Button, Textarea } from "../../../../shadcnui";
+
+interface Props {
+  onSend: (content: string) => Promise<void>;
+  disabled?: boolean;
+  value?: string;
+  onValueChange?: (v: string) => void;
+}
+
+export function AssistantComposer({ onSend, disabled, value: controlled, onValueChange }: Props) {
+  const t = useTranslations();
+  const [internal, setInternal] = useState("");
+  const value = controlled ?? internal;
+  const setValue = onValueChange ?? setInternal;
+
+  const canSend = value.trim().length > 0 && !disabled;
+
+  const submit = async () => {
+    if (!canSend) return;
+    const payload = value.trim();
+    setValue("");
+    await onSend(payload);
+  };
+
+  const onKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
+    if (e.key === "Enter" && !e.shiftKey) {
+      e.preventDefault();
+      void submit();
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-1 border-t p-4">
+      <div className="bg-muted/30 flex items-end gap-2 rounded-lg border p-2">
+        <Textarea
+          value={value}
+          onChange={(e) => setValue(e.target.value)}
+          onKeyDown={onKeyDown}
+          placeholder={t("features.assistant.composer_placeholder")}
+          disabled={disabled}
+          rows={2}
+          className="min-h-[48px] resize-none border-0 bg-transparent focus-visible:ring-0"
+        />
+        <Button onClick={submit} disabled={!canSend} size="sm" className="h-8">
+          <ArrowUp className="mr-1 h-4 w-4" /> {t("ui.buttons.save")}
+        </Button>
+      </div>
+      <div className="text-muted-foreground text-right text-xs">{t("features.assistant.keyboard_hint")}</div>
+    </div>
+  );
+}

package/src/features/assistant/components/parts/AssistantEmptyState.tsx

@@ -0,0 +1,47 @@
+"use client";
+
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+import { Sparkles } from "lucide-react";
+import { AssistantComposer } from "./AssistantComposer";
+
+interface Props {
+  onSend: (content: string) => Promise<void>;
+}
+
+const STARTER_KEYS = ["a", "b", "c", "d"] as const;
+
+export function AssistantEmptyState({ onSend }: Props) {
+  const t = useTranslations();
+  const [draft, setDraft] = useState("");
+
+  return (
+    <div className="flex h-full w-full items-center justify-center p-10">
+      <div className="flex w-full max-w-2xl flex-col gap-6">
+        <div className="text-center">
+          <div className="mx-auto mb-3 flex h-10 w-10 items-center justify-center rounded-full bg-gradient-to-br from-blue-400 to-violet-500 text-white">
+            <Sparkles className="h-5 w-5" />
+          </div>
+          <h3 className="text-foreground text-xl font-semibold">{t("features.assistant.empty_state.title")}</h3>
+          <p className="text-muted-foreground mt-1 text-sm">{t("features.assistant.empty_state.subtitle")}</p>
+        </div>
+        <AssistantComposer value={draft} onValueChange={setDraft} onSend={onSend} />
+        <div className="grid grid-cols-2 gap-2">
+          {STARTER_KEYS.map((k) => {
+            const text = t(`features.assistant.starters.${k}`);
+            return (
+              <button
+                key={k}
+                type="button"
+                className="border-border bg-muted/30 hover:bg-muted rounded-lg border p-3 text-left text-sm"
+                onClick={() => setDraft(text)}
+              >
+                {text}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+}

package/src/features/assistant/components/parts/AssistantSidebar.tsx

@@ -0,0 +1,64 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { Plus } from "lucide-react";
+import { Button } from "../../../../shadcnui";
+import type { AssistantInterface } from "../../data/AssistantInterface";
+import { groupThreadsByBucket } from "../../utils/groupThreadsByBucket";
+
+interface Props {
+  threads: AssistantInterface[];
+  activeId?: string;
+  onSelect: (id: string) => void;
+  onNew: () => void;
+}
+
+export function AssistantSidebar({ threads, activeId, onSelect, onNew }: Props) {
+  const t = useTranslations();
+  const groups = groupThreadsByBucket(threads);
+
+  const renderSection = (label: string, items: AssistantInterface[]) => {
+    if (items.length === 0) return null;
+    return (
+      <div className="mb-2">
+        <div className="text-muted-foreground px-2 py-1 text-[10px] font-semibold uppercase tracking-wider">
+          {label}
+        </div>
+        {items.map((thread) => (
+          <button
+            key={thread.id}
+            type="button"
+            onClick={() => onSelect(thread.id)}
+            className={
+              "block w-full truncate rounded-md px-2 py-1.5 text-left text-sm " +
+              (activeId === thread.id ? "bg-primary/10 text-primary" : "hover:bg-muted text-foreground")
+            }
+          >
+            {thread.title}
+          </button>
+        ))}
+      </div>
+    );
+  };
+
+  return (
+    <aside className="bg-muted/30 flex w-64 flex-col border-r">
+      <div className="border-b p-3">
+        <Button onClick={onNew} className="w-full" size="sm">
+          <Plus className="mr-1 h-4 w-4" /> {t("features.assistant.new")}
+        </Button>
+      </div>
+      <div className="flex-1 overflow-y-auto p-2">
+        {threads.length === 0 ? (
+          <div className="text-muted-foreground mt-6 text-center text-xs">{t("features.assistant.empty_sidebar")}</div>
+        ) : (
+          <>
+            {renderSection(t("features.assistant.bucket_today"), groups.today)}
+            {renderSection(t("features.assistant.bucket_week"), groups.thisWeek)}
+            {renderSection(t("features.assistant.bucket_earlier"), groups.earlier)}
+          </>
+        )}
+      </div>
+    </aside>
+  );
+}

package/src/features/assistant/components/parts/AssistantStatusLine.tsx

@@ -0,0 +1,19 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { Loader2 } from "lucide-react";
+
+interface Props {
+  status?: string;
+}
+
+export function AssistantStatusLine({ status }: Props) {
+  const t = useTranslations();
+  const text = status ?? t("features.assistant.thinking");
+  return (
+    <div className="text-muted-foreground flex items-center gap-2 px-4 py-2 text-sm">
+      <Loader2 className="h-4 w-4 animate-spin" />
+      <span>{text}</span>
+    </div>
+  );
+}

package/src/features/assistant/components/parts/AssistantThread.tsx

@@ -0,0 +1,36 @@
+"use client";
+
+import { useEffect, useRef } from "react";
+import type { AssistantMessageInterface } from "../../../assistant-message/data/AssistantMessageInterface";
+import { MessageList } from "../../../assistant-message/components/MessageList";
+import { AssistantStatusLine } from "./AssistantStatusLine";
+
+interface Props {
+  messages: AssistantMessageInterface[];
+  sending: boolean;
+  status?: string;
+  onSelectFollowUp: (q: string) => void;
+  failedMessageIds?: Set<string>;
+  onRetry?: (tempId: string) => void;
+}
+
+export function AssistantThread({ messages, sending, status, onSelectFollowUp, failedMessageIds, onRetry }: Props) {
+  const endRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    endRef.current?.scrollIntoView({ behavior: "smooth" });
+  }, [messages.length, sending]);
+
+  return (
+    <div className="flex-1 overflow-y-auto px-6 py-5">
+      <MessageList
+        messages={messages}
+        onSelectFollowUp={onSelectFollowUp}
+        failedMessageIds={failedMessageIds}
+        onRetry={onRetry}
+      />
+      {sending && <AssistantStatusLine status={status} />}
+      <div ref={endRef} />
+    </div>
+  );
+}