Merge pull request #4270 from RSSNext/sync/main-to-dev-20250729

Sync main branch to dev branch

Author: Innei

apps/desktop/layer/renderer/src/modules/entry-content/components/entry-content/EntryContent.ai.tsx

@@ -31,7 +31,6 @@ import { EntryHeader } from "../entry-header"
 import { EntryTimelineSidebar } from "../EntryTimelineSidebar"
 import { getEntryContentLayout } from "../layouts"
 import { SourceContentPanel } from "../SourceContentView"
-import { AISmartSidebar } from "./ai"
 import { EntryCommandShortcutRegister } from "./EntryCommandShortcutRegister"
 import { EntryContentLoading } from "./EntryContentLoading"
 import { EntryNoContent } from "./EntryNoContent"
@@ -199,7 +198,7 @@ const EntryContentImpl: Component<EntryContentProps> = ({
         <SourceContentPanel src={safeUrl ?? "#"} />
       </Focusable>
 
-      <React.Suspense>{!isInPeekModal && <AISmartSidebar entryId={entryId} />}</React.Suspense>
+      {/* <React.Suspense>{!isInPeekModal && <AISmartSidebar entryId={entryId} />}</React.Suspense> */}
     </div>
   )
 }

apps/desktop/layer/renderer/src/modules/entry-content/components/entry-content/EntryContent.legacy.tsx

@@ -42,7 +42,6 @@ import { EntryTitle } from "../EntryTitle"
 import { SourceContentPanel } from "../SourceContentView"
 import { SupportCreator } from "../SupportCreator"
 import { EntryContentAccessories } from "./accessories"
-import { AISmartSidebar } from "./ai"
 import { EntryCommandShortcutRegister } from "./EntryCommandShortcutRegister"
 import { EntryContentLoading } from "./EntryContentLoading"
 import { EntryNoContent } from "./EntryNoContent"
@@ -237,7 +236,7 @@ const EntryContentImpl: Component<EntryContentProps> = ({
         <SourceContentPanel src={safeUrl ?? "#"} />
       </Focusable>
 
-      <React.Suspense>{!isInPeekModal && <AISmartSidebar entryId={entryId} />}</React.Suspense>
+      {/* <React.Suspense>{!isInPeekModal && <AISmartSidebar entryId={entryId} />}</React.Suspense> */}
     </>
   )
 }

apps/desktop/layer/renderer/src/modules/entry-content/components/entry-content/ai/index.tsx

@@ -252,12 +252,14 @@ const useCreateEntryAIContext = (entryId: string) => {
 
   return ctxStore
 }
+// eslint-disable-next-line unicorn/no-thenable
+const infiniteThenable = { then() {} }
 export const AISmartSidebar = ({ entryId }: { entryId: string }) => {
   const [isExpanded, setIsExpanded] = useState(false)
 
   const hasAi = React.use(AIChatContext)
   if (!hasAi) {
-    throw Promise.reject("ai not enabled")
+    throw infiniteThenable
   }
 
   const ctxStore = useCreateEntryAIContext(entryId)

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Folo",
   "type": "module",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "private": true,
   "description": "Follow everything in one place",
   "author": "Folo Team",
@@ -21,15 +21,15 @@
     "build:electron-vite": "electron-vite build",
     "build:render": "vite build -c vite.config.electron-render.ts",
     "build:web": "rm -rf out/web && cross-env WEB_BUILD=1 vite build",
-    "bump": "vv",
+    "bump": "vv --minor",
     "dedupe:locales": "eslint --fix locales/**/*.json",
     "depcheck": "npx depcheck --quiet",
     "dev": "turbo run @follow/web#dev @follow/ssr#dev",
     "dev:debug": "export DEBUG=true && vite --debug",
     "dev:electron": "electron-vite dev",
     "dev:server": "pnpm run --filter=ssr dev",
     "dev:web": "cross-env WEB_BUILD=1 vite",
-    "hotfix": "vv -c bump.hotfix.config.js",
+    "hotfix": "vv -c bump.hotfix.config.js --patch",
     "publish": "electron-vite build && electron-forge publish",
     "start": "electron-vite preview",
     "update:main-hash": "tsx plugins/vite/generate-main-hash.ts"