chore(ios): fix ios version

.github/deployment/node/Dockerfile

@@ -7,10 +7,7 @@ COPY ./packages/frontend/apps/mobile/dist /app/static/mobile
 WORKDIR /app
 
 RUN apt-get update && \
-  apt-get install -y --no-install-recommends openssl libjemalloc2 && \
+  apt-get install -y --no-install-recommends openssl && \
   rm -rf /var/lib/apt/lists/*
 
-# Enable jemalloc by preloading the library
-ENV LD_PRELOAD=libjemalloc.so.2
-
 CMD ["node", "./dist/main.js"]

.github/workflows/release-mobile.yml

@@ -78,7 +78,7 @@ jobs:
           path: packages/frontend/apps/android/dist
 
   ios:
-    runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || 'blaze/macos-14' }}
+    runs-on: 'macos-15'
     needs:
       - build-ios-web
     steps:
@@ -106,7 +106,7 @@ jobs:
           enableScripts: false
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 16.2
+          xcode-version: 16.4
       - name: Install Swiftformat
         run: brew install swiftformat
       - name: Cap sync

blocksuite/affine/inlines/comment/src/inline-comment-manager.ts

@@ -43,14 +43,10 @@ export class InlineCommentManager extends LifeCycleWatcher {
 
     this._disposables.add(provider.onCommentAdded(this._handleAddComment));
     this._disposables.add(
-      provider.onCommentDeleted(id =>
-        this._handleDeleteAndResolve(id, 'delete')
-      )
+      provider.onCommentDeleted(this._handleDeleteAndResolve)
     );
     this._disposables.add(
-      provider.onCommentResolved(id =>
-        this._handleDeleteAndResolve(id, 'resolve')
-      )
+      provider.onCommentResolved(this._handleDeleteAndResolve)
     );
     this._disposables.add(
       provider.onCommentHighlighted(this._handleHighlightComment)
@@ -68,16 +64,15 @@ export class InlineCommentManager extends LifeCycleWatcher {
     const provider = this._provider;
     if (!provider) return;
 
-    const commentsInProvider = await provider.getComments('all');
+    const commentsInProvider = await provider.getComments('unresolved');
 
     const commentsInEditor = this.getCommentsInEditor();
 
     // remove comments that are in editor but not in provider
     // which means the comment may be removed or resolved in provider side
     difference(commentsInEditor, commentsInProvider).forEach(comment => {
-      this.std
-        .get(BlockElementCommentManager)
-        .handleDeleteAndResolve(comment, 'delete');
+      this._handleDeleteAndResolve(comment);
+      this.std.get(BlockElementCommentManager).handleDeleteAndResolve(comment);
     });
   }
 
@@ -167,10 +162,7 @@ export class InlineCommentManager extends LifeCycleWatcher {
     });
   };
 
-  private readonly _handleDeleteAndResolve = (
-    id: CommentId,
-    type: 'delete' | 'resolve'
-  ) => {
+  private readonly _handleDeleteAndResolve = (id: CommentId) => {
     const commentedTexts = findCommentedTexts(this.std.store, id);
     if (commentedTexts.length === 0) return;
 
@@ -184,7 +176,7 @@ export class InlineCommentManager extends LifeCycleWatcher {
         inlineEditor?.formatText(
           selection.from,
           {
-            [`comment-${id}`]: type === 'delete' ? null : false,
+            [`comment-${id}`]: null,
           },
           {
             withoutTransact: true,

blocksuite/affine/inlines/comment/src/inline-comment.ts

@@ -22,7 +22,7 @@ import { isEqual } from 'lodash-es';
 })
 export class InlineComment extends WithDisposable(ShadowlessElement) {
   static override styles = css`
-    inline-comment.unresolved {
+    inline-comment {
       display: inline-block;
       background-color: ${unsafeCSSVarV2('block/comment/highlightDefault')};
       border-bottom: 2px solid
@@ -41,9 +41,6 @@ export class InlineComment extends WithDisposable(ShadowlessElement) {
   })
   accessor commentIds!: string[];
 
-  @property({ attribute: false })
-  accessor unresolved = false;
-
   private _index: number = 0;
 
   @consume({ context: stdContext })
@@ -57,10 +54,8 @@ export class InlineComment extends WithDisposable(ShadowlessElement) {
   }
 
   private readonly _handleClick = () => {
-    if (this.unresolved) {
-      this._provider?.highlightComment(this.commentIds[this._index]);
-      this._index = (this._index + 1) % this.commentIds.length;
-    }
+    this._provider?.highlightComment(this.commentIds[this._index]);
+    this._index = (this._index + 1) % this.commentIds.length;
   };
 
   private readonly _handleHighlight = (id: CommentId | null) => {
@@ -94,13 +89,6 @@ export class InlineComment extends WithDisposable(ShadowlessElement) {
         this.classList.remove('highlighted');
       }
     }
-    if (_changedProperties.has('unresolved')) {
-      if (this.unresolved) {
-        this.classList.add('unresolved');
-      } else {
-        this.classList.remove('unresolved');
-      }
-    }
   }
 
   override render() {

blocksuite/affine/inlines/comment/src/inline-spec.ts

@@ -21,25 +21,19 @@ export const CommentInlineSpecExtension =
     ),
     match: delta => {
       if (!delta.attributes) return false;
-      const comments = Object.keys(delta.attributes).filter(isInlineCommendId);
-      return comments.length > 0;
-    },
-    renderer: ({ delta, children }) => {
-      if (!delta.attributes) return html`${nothing}`;
-
-      const unresolved = Object.entries(delta.attributes).some(
+      const comments = Object.entries(delta.attributes).filter(
         ([key, value]) => isInlineCommendId(key) && value === true
       );
-      return html`<inline-comment
-        .unresolved=${unresolved}
-        .commentIds=${extractCommentIdFromDelta(delta)}
+      return comments.length > 0;
+    },
+    renderer: ({ delta, children }) =>
+      html`<inline-comment .commentIds=${extractCommentIdFromDelta(delta)}
         >${when(
           children,
           () => html`${children}`,
           () => nothing
         )}</inline-comment
-      >`;
-    },
+      >`,
     wrapper: true,
   });
 

blocksuite/affine/shared/src/services/comment-service/block-element-comment-manager.ts

@@ -57,12 +57,10 @@ export class BlockElementCommentManager extends LifeCycleWatcher {
 
     this._disposables.add(provider.onCommentAdded(this._handleAddComment));
     this._disposables.add(
-      provider.onCommentDeleted(id => this.handleDeleteAndResolve(id, 'delete'))
+      provider.onCommentDeleted(this.handleDeleteAndResolve)
     );
     this._disposables.add(
-      provider.onCommentResolved(id =>
-        this.handleDeleteAndResolve(id, 'resolve')
-      )
+      provider.onCommentResolved(this.handleDeleteAndResolve)
     );
     this._disposables.add(
       provider.onCommentHighlighted(this._handleHighlightComment)
@@ -148,29 +146,18 @@ export class BlockElementCommentManager extends LifeCycleWatcher {
     }
   };
 
-  readonly handleDeleteAndResolve = (
-    id: CommentId,
-    type: 'delete' | 'resolve'
-  ) => {
+  readonly handleDeleteAndResolve = (id: CommentId) => {
     const commentedBlocks = findCommentedBlocks(this.std.store, id);
     this.std.store.withoutTransact(() => {
       commentedBlocks.forEach(block => {
-        if (type === 'delete') {
-          delete block.props.comments[id];
-        } else {
-          block.props.comments[id] = false;
-        }
+        delete block.props.comments[id];
       });
     });
 
     const commentedElements = findCommentedElements(this.std.store, id);
     this.std.store.withoutTransact(() => {
       commentedElements.forEach(element => {
-        if (type === 'delete') {
-          delete element.comments[id];
-        } else {
-          element.comments[id] = false;
-        }
+        delete element.comments[id];
       });
     });
   };

packages/backend/server/src/plugins/copilot/providers/gemini/gemini.ts

@@ -239,16 +239,12 @@ export abstract class GeminiProvider<T> extends CopilotProvider<T> {
         taskType: 'RETRIEVAL_DOCUMENT',
       });
 
-      const embeddings = await Promise.allSettled(
-        messages.map(m =>
-          embedMany({ model: modelInstance, values: [m], maxRetries: 3 })
-        )
-      );
+      const { embeddings } = await embedMany({
+        model: modelInstance,
+        values: messages,
+      });
 
-      return embeddings
-        .map(e => (e.status === 'fulfilled' ? e.value.embeddings : null))
-        .flat()
-        .filter((v): v is number[] => !!v && Array.isArray(v));
+      return embeddings.filter(v => v && Array.isArray(v));
     } catch (e: any) {
       metrics.ai
         .counter('generate_embedding_errors')

packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj

@@ -541,7 +541,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 0.22.2;
+				MARKETING_VERSION = 0.23.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -577,7 +577,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 0.22.2;
+				MARKETING_VERSION = 0.23.1;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = app.affine.pro;
 				PRODUCT_NAME = "$(TARGET_NAME)";

scripts/set-version.sh

@@ -108,4 +108,5 @@ update_app_version_in_helm_charts ".github/helm/affine/charts/doc/Chart.yaml" "$
 
 update_app_stream_version "packages/frontend/apps/electron/resources/affine.metainfo.xml" "$new_version"
 
-update_ios_marketing_version "packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj" "$new_version"
+# Disable iOS version update temporarily, add it back when iOS version and affine version are unified
+# update_ios_marketing_version "packages/frontend/apps/ios/App/App.xcodeproj/project.pbxproj" "$new_version"