Replace native overflow-menu and composer-asset extensions with LUI standard components

.github/actions/db-sync-server/action.yml

@@ -2,11 +2,8 @@ name: Start db-sync server
 description: >-
   Check out logseq@feature/native-mobile-app, build the db-sync node adapter,
   and start it on the given port (default 8787). The app e2e flows create sync
-  graphs against it.
+  graphs against it. logseq/logseq is public, so no credential is needed.
 inputs:
-  token:
-    description: GitHub token with access to the private logseq/logseq repo.
-    required: true
   ref:
     description: logseq/logseq ref to check out.
     required: false
@@ -35,7 +32,6 @@ runs:
         repository: logseq/logseq
         ref: ${{ inputs.ref }}
         path: logseq-server
-        token: ${{ inputs.token }}
         fetch-depth: 1
 
     - uses: actions/setup-java@v4

.github/workflows/ci.yml

@@ -10,7 +10,6 @@ jobs:
   ocaml-core:
     runs-on: ubuntu-latest
     env:
-      LOGSEQ_GITHUB_PAT: ${{ secrets.LOGSEQ_GITHUB_PAT }}
     steps:
       - uses: actions/checkout@v4
 
@@ -63,14 +62,13 @@ jobs:
         run: |
           eval $(opam env)
           # opam clears file-based git config for its fetch subprocesses, but
-          # GIT_CONFIG_* env pairs pass through; use them to authenticate the
-          # private pin-depends (git+ssh://github.com/logseq/...) via PAT.
+          # GIT_CONFIG_* env pairs pass through; rewrite the ssh pin-depends
+          # URLs to https (the pinned repos are public, no credential needed).
           export GIT_TERMINAL_PROMPT=0
           export GIT_CONFIG_COUNT=3
           export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_0="git@github.com:"
           export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_1="ssh://git@github.com/"
-          export GIT_CONFIG_KEY_2="credential.helper"
-          export GIT_CONFIG_VALUE_2='!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
+          export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_2="git+ssh://git@github.com/"
           opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main
@@ -113,12 +111,11 @@ jobs:
         run: |
           set -e
           eval $(opam env)
-          # The lockfile only lists public deps; private pin-depends are cloned
-          # at their pinned commits below. Authenticate clones with the PAT.
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "git@github.com:"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "ssh://git@github.com/"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "git+ssh://git@github.com/"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "https://github.com/"
+          # The lockfile only lists public deps; pin-depends are cloned at
+          # their pinned commits below over public https.
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
+          git config --global url."https://github.com/".insteadOf "git+ssh://git@github.com/"
           # Call the binary directly: the `opam monorepo` plugin shim rejects
           # plugins built under a different opam version (restored caches).
           # Retry: release-tarball downloads occasionally fail with HTTP 5xx.

.github/workflows/e2e.yml

@@ -35,7 +35,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      LOGSEQ_GITHUB_PAT: ${{ secrets.LOGSEQ_GITHUB_PAT }}
     steps:
       - uses: actions/checkout@v4
 
@@ -84,8 +83,7 @@ jobs:
           export GIT_CONFIG_COUNT=3
           export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_0="git@github.com:"
           export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_1="ssh://git@github.com/"
-          export GIT_CONFIG_KEY_2="credential.helper"
-          export GIT_CONFIG_VALUE_2='!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
+          export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_2="git+ssh://git@github.com/"
           opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main
@@ -115,10 +113,10 @@ jobs:
         run: |
           set -e
           eval $(opam env)
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "git@github.com:"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "ssh://git@github.com/"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "git+ssh://git@github.com/"
-          git config --global url."https://x-access-token:${LOGSEQ_GITHUB_PAT}@github.com/".insteadOf "https://github.com/"
+          # All pins are public; ssh URLs just need rewriting to https.
+          git config --global url."https://github.com/".insteadOf "git@github.com:"
+          git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
+          git config --global url."https://github.com/".insteadOf "git+ssh://git@github.com/"
           # Call the binary directly: the `opam monorepo` plugin shim rejects
           # plugins built under a different opam version (restored caches).
           # Retry: release-tarball downloads occasionally fail with HTTP 5xx.
@@ -154,16 +152,15 @@ jobs:
     runs-on: macos-15
     timeout-minutes: 90
     env:
-      LOGSEQ_GITHUB_PAT: ${{ secrets.LOGSEQ_GITHUB_PAT }}
       LOGSEQ_CHAT_OPAM_SWITCH: ${{ github.workspace }}
-      # SwiftPM clones lui over ssh://; rewrite to authenticated https.
+      # SwiftPM clones lui over ssh://; rewrite to https (repos are public).
       GIT_CONFIG_COUNT: 3
       GIT_CONFIG_KEY_0: url.https://github.com/.insteadOf
       GIT_CONFIG_VALUE_0: "git@github.com:"
       GIT_CONFIG_KEY_1: url.https://github.com/.insteadOf
       GIT_CONFIG_VALUE_1: "ssh://git@github.com/"
-      GIT_CONFIG_KEY_2: credential.helper
-      GIT_CONFIG_VALUE_2: '!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
+      GIT_CONFIG_KEY_2: url.https://github.com/.insteadOf
+      GIT_CONFIG_VALUE_2: "git+ssh://git@github.com/"
     steps:
       - uses: actions/checkout@v4
 
@@ -215,8 +212,7 @@ jobs:
           export GIT_CONFIG_COUNT=3
           export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_0="git@github.com:"
           export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_1="ssh://git@github.com/"
-          export GIT_CONFIG_KEY_2="credential.helper"
-          export GIT_CONFIG_VALUE_2='!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
+          export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_2="git+ssh://git@github.com/"
           opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main
@@ -271,7 +267,6 @@ jobs:
         # Builds while the iOS app build runs; "Wait for db-sync" polls it.
         uses: ./.github/actions/db-sync-server
         with:
-          token: ${{ secrets.LOGSEQ_GITHUB_PAT }}
           background: "true"
 
       - name: Restore iOS build artifacts
@@ -346,7 +341,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 90
     env:
-      LOGSEQ_GITHUB_PAT: ${{ secrets.LOGSEQ_GITHUB_PAT }}
       LOGSEQ_CHAT_OPAM_SWITCH: ${{ github.workspace }}
       LOGSEQ_CHAT_ANDROID_ABI: x86_64
       LOGSEQ_CHAT_E2E_BASE_URL: http://127.0.0.1:8787
@@ -401,8 +395,7 @@ jobs:
           export GIT_CONFIG_COUNT=3
           export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_0="git@github.com:"
           export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_1="ssh://git@github.com/"
-          export GIT_CONFIG_KEY_2="credential.helper"
-          export GIT_CONFIG_VALUE_2='!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
+          export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf" GIT_CONFIG_VALUE_2="git+ssh://git@github.com/"
           opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main
           opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main
@@ -468,24 +461,21 @@ jobs:
         # step polls the port before the flows run.
         uses: ./.github/actions/db-sync-server
         with:
-          token: ${{ secrets.LOGSEQ_GITHUB_PAT }}
           background: "true"
 
       - name: Run Android e2e module
         uses: reactivecircus/android-emulator-runner@v2
         env:
-          # pub get clones the lui git dep over ssh; rewrite to https + PAT
-          # credential helper (file-based git config doesn't reliably reach
-          # the emulator-runner's script environment).
-          GIT_CONFIG_COUNT: 4
+          # pub get clones the lui git dep over ssh; rewrite to https
+          # (file-based git config doesn't reliably reach the
+          # emulator-runner's script environment).
+          GIT_CONFIG_COUNT: 3
           GIT_CONFIG_KEY_0: url.https://github.com/.insteadOf
           GIT_CONFIG_VALUE_0: "git@github.com:"
           GIT_CONFIG_KEY_1: url.https://github.com/.insteadOf
           GIT_CONFIG_VALUE_1: ssh://git@github.com/
           GIT_CONFIG_KEY_2: url.https://github.com/.insteadOf
           GIT_CONFIG_VALUE_2: git+ssh://git@github.com/
-          GIT_CONFIG_KEY_3: credential.helper
-          GIT_CONFIG_VALUE_3: '!f() { [ -n "$LOGSEQ_GITHUB_PAT" ] || exit 0; echo username=x-access-token; echo "password=$LOGSEQ_GITHUB_PAT"; }; f'
         with:
           api-level: 34
           target: google_apis

apple/Package.swift

@@ -34,7 +34,7 @@ let package = Package(
         .library(name: "LogseqChatModel", type: .dynamic, targets: ["LogseqChatModel"]),
     ],
     dependencies: [
-        .package(url: "ssh://git@github.com/logseq/lui.git", revision: "55166025"),
+        .package(url: "ssh://git@github.com/logseq/lui.git", revision: "b7b7641"),
         .package(url: "https://github.com/gonzalezreal/swiftui-math", from: "0.1.0"),
         .package(url: "https://github.com/appstefan/highlightswift.git", from: "1.1.0")
     ],

apple/Sources/LogseqChat/LGChatEffects.swift

@@ -107,7 +107,7 @@ public final class LGChatPlatformEffectHandler: LGChatEffectExecuting {
     private let exportGraphDatabase: (@MainActor () async -> Bool)?
     private let graphEffect: (@MainActor (LGChatEffect) async -> LGChatEffectResolution)?
     private let presentAttachment: (@MainActor (String) async -> Bool)?
-    private let presentAsset: (@MainActor (LGChatAssetPresentationPayload) async -> Bool)?
+    private let presentAsset: (@MainActor (LGChatAssetPresentationPayload) async -> URL?)?
     private let presentPageShare: (@MainActor (LGChatPageSharePayload) async -> Bool)?
     private let syncNow: (@MainActor () -> Void)?
 
@@ -122,7 +122,7 @@ public final class LGChatPlatformEffectHandler: LGChatEffectExecuting {
         exportGraphDatabase: (@MainActor () async -> Bool)? = nil,
         graphEffect: (@MainActor (LGChatEffect) async -> LGChatEffectResolution)? = nil,
         presentAttachment: (@MainActor (String) async -> Bool)? = nil,
-        presentAsset: (@MainActor (LGChatAssetPresentationPayload) async -> Bool)? = nil,
+        presentAsset: (@MainActor (LGChatAssetPresentationPayload) async -> URL?)? = nil,
         presentPageShare: (@MainActor (LGChatPageSharePayload) async -> Bool)? = nil,
         syncNow: (@MainActor () -> Void)? = nil
     ) {
@@ -301,11 +301,24 @@ public final class LGChatPlatformEffectHandler: LGChatEffectExecuting {
                     LGChatAssetPresentationPayload.self,
                     from: Data(metadata.utf8)
                 )
-                let succeeded = await presentAsset(asset)
+                guard let url = await presentAsset(asset) else {
+                    return LGChatEffectResolution(
+                        succeeded: false,
+                        message: "The local asset is unavailable",
+                        output: .discard
+                    )
+                }
+                let payload = String(
+                    data: try JSONEncoder().encode([
+                        "title": asset.title,
+                        "path": url.path,
+                    ]),
+                    encoding: .utf8
+                ) ?? "{}"
                 return LGChatEffectResolution(
-                    succeeded: succeeded,
-                    message: succeeded ? "" : "The local asset is unavailable",
-                    output: .discard
+                    succeeded: true,
+                    message: payload,
+                    output: .hostUpdate("asset-preview-resolved")
                 )
             case "present-page-share":
                 guard let presentPageShare, let metadata = effect.metadata else {
@@ -687,7 +700,7 @@ public final class LGChatCoreEffectExecutor: LGChatEffectExecuting {
             }
             return Self.resolution(from: await deleteLocalGraph(effect.text))
         case "persist-ui-session", "persist-composer-draft", "sign-in", "save-settings", "refresh-runtime-log",
-             "copy-runtime-log", "sign-out",
+             "copy-runtime-log", "sign-out", "export-graph-database", "open-external-url",
              "present-attachment", "present-asset", "present-page-share", "sync-now":
             guard let platformEffect else {
                 return LGChatEffectResolution(

apple/Sources/LogseqChat/LGChatGraphLifecycle.swift

@@ -203,7 +203,7 @@ final class LGChatGraphLifecycle {
             || store.snapshot.selectedGraphId == graphID
         if deletingSelected {
             await syncCoordinator.stopForeground()
-            await store.resetToCatalog()
+            await store.resetToCatalog(applyResponse: false)
         }
         do {
             try LogseqGraphLocalStorage.delete(databasePath: databasePath, graphID: graphID)

apple/Sources/LogseqChat/LGChatNative.swift

@@ -26,6 +26,9 @@ public protocol LGChatNativeCalling {
         text: String,
         value: Int
     ) -> String
+    func picked(node: Int, payload: String) -> String
+    func visibleRange(node: Int, first: Int, last: Int) -> String
+    func scrollCompleted(node: Int, token: Int, outcome: String) -> String
     func dispose() -> String
     func takeEffect() -> String
     func resolveEffect(id: Int, succeeded: Bool, message: String) -> String
@@ -79,6 +82,15 @@ public final class LGChatCoreNativeCaller: LGChatNativeCalling {
     ) -> String {
         core.logseq_chat_lui_extension_event(node, identifier, name, text, value)
     }
+    public func picked(node: Int, payload: String) -> String {
+        core.logseq_chat_lui_picked(node, payload)
+    }
+    public func visibleRange(node: Int, first: Int, last: Int) -> String {
+        core.logseq_chat_lui_visible_range(node, first, last)
+    }
+    public func scrollCompleted(node: Int, token: Int, outcome: String) -> String {
+        core.logseq_chat_lui_scroll_completed(node, token, outcome)
+    }
     public func dispose() -> String { core.logseq_chat_lui_dispose() }
     public func takeEffect() -> String { core.logseq_chat_lui_take_effect() }
     public func resolveEffect(id: Int, succeeded: Bool, message: String) -> String {