Merge pull request #775 from synonymdev/fix/stale-graph-reset

fix: delete vss network graph using new ffi client

Author: ovitrif

.claude/commands/pr.md

@@ -1,5 +1,5 @@
 ---
-description: Create a PR on GitHub for the current branch
+description: "Create a PR on GitHub, e.g. /pr --draft -- focus on the new wallet sync logic"
 argument_hint: "[branch] [--dry] [--draft] [-- instructions]"
 allowed_tools: Bash, Read, Glob, Grep, Write, AskUserQuestion, mcp__github__create_pull_request, mcp__github__list_pull_requests, mcp__github__get_file_contents, mcp__github__issue_read
 ---
@@ -49,6 +49,15 @@ If no base branch argument provided, detect the repo's default branch:
   - If instructions reference a specific commit SHA (pattern like `commit [a-f0-9]{7,40}`):
     - Read full commit message: `git log -1 --format='%B' <commit_sha>`
   - Store instructions for use in description generation
+- **Read instruction files from `.ai/pr/`:**
+  - Scan `.ai/pr/` for markdown files: `ls .ai/pr/*.md 2>/dev/null`
+  - Read each `.md` file found (using the Read tool)
+  - Treat their contents as supplementary instructions for description generation, merged with any `--` instructions
+  - These file-based instructions follow the same priority rules as custom `--` instructions (see Step 6, "Custom Instructions")
+- **Scan for media files in `.ai/pr/`:**
+  - List non-markdown files: `ls .ai/pr/* 2>/dev/null | grep -vE '\.md$'`
+  - Supported types: `.png`, `.jpg`, `.jpeg`, `.gif`, `.mp4`, `.mov`, `.webm`, `.webp`
+  - Store the list of found media files with their paths for use in Preview section (Step 6)
 
 ### 4. Extract Linked Issues
 Scan commits for issue references:
@@ -142,9 +151,22 @@ Example:
 
 **Preview Section (conditional):**
 Only include if the PR template (`.github/pull_request_template.md`) contains a `### Preview` heading:
-- Create placeholders for media: `IMAGE_1`, `VIDEO_2`, etc.
-- Add code comment under each placeholder describing what it should show
-- Example: `<!-- VIDEO_1: Record the send flow by scanning a LN invoice and setting amount to 5000 sats -->`
+
+- **If media files were found in `.ai/pr/`:**
+  - For each media file, add a labeled markdown placeholder in the Preview section
+  - Use format: `<!-- MEDIA: .ai/pr/filename.ext — Upload this file here via GitHub web UI -->` as a marker
+  - Add a brief description comment based on the filename (e.g., `pay2blink.mp4` -> "Pay to Blink flow recording")
+  - Example output:
+    ```
+    ### Preview
+
+    <!-- MEDIA: .ai/pr/pay2blink.mp4 — Upload this file here via GitHub web UI -->
+    ```
+
+- **If no media files found in `.ai/pr/`:**
+  - Fall back to generated placeholders: `IMAGE_1`, `VIDEO_2`, etc.
+  - Add code comment under each placeholder describing what it should show
+  - Example: `<!-- VIDEO_1: Record the send flow by scanning a LN invoice and setting amount to 5000 sats -->`
 
 ### 7. Save PR Description
 Before creating the PR:
@@ -159,6 +181,10 @@ gh pr create --base $base --title "..." --body "..." [--draft]
 ```
 - Add `--draft` flag if draft mode selected
 - If actual PR number differs from predicted, rename the saved file
+- **If media files exist in `.ai/pr/`:**
+  - Output the PR edit URL for easy access (append `/edit` to the PR URL)
+  - Instruct the user to drag-and-drop each media file into the Preview section via the GitHub web UI
+  - Note: GitHub does not support programmatic media upload to PR bodies
 
 ### 9. Output Summary
 
@@ -185,7 +211,16 @@ Suggested reviewers:
 ```
 
 **Media TODOs (only if Preview section was included):**
-If the PR description includes a Preview section with media placeholders, append:
+If the PR description includes a Preview section, append media action items:
+
+If media files were found in `.ai/pr/`:
+```
+Media to upload (drag-and-drop into Preview section on GitHub):
+- .ai/pr/pay2blink.mp4
+- .ai/pr/screenshot.png
+```
+
+If no media files were found (generated placeholders):
 ```
 ## TODOs
 - [ ] IMAGE_1: [description]

AGENTS.md

@@ -214,6 +214,24 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS add imports instead of inline fully-qualified names
 - PREFER to place `@Suppress()` annotations at the narrowest possible scope
 - ALWAYS wrap suspend functions in `withContext(bgDispatcher)` if in domain layer, using ctor injected prop `@BgDispatcher private val bgDispatcher: CoroutineDispatcher`
+- ALWAYS position companion object at the top of the class
+
+### Device Debugging (adb)
+
+- App IDs per flavor: `to.bitkit.dev` (dev/regtest), `to.bitkit.tnet` (testnet), `to.bitkit` (mainnet)
+- ALWAYS use `adb shell "run-as to.bitkit.dev ..."` to access the app's private data directory (debug builds only)
+- App files root: `files/` (relative, inside `run-as` context)
+- Key paths:
+  - `files/logs/` — app log files (e.g. `bitkit_2026-02-09_21-04-16.log`)
+  - `files/bitcoin/wallet0/ldk/` — LDK node storage (graph cache, dumps)
+  - `files/bitcoin/wallet0/core/` — bitkit-core storage
+  - `files/datastore/` — DataStore preferences and JSON stores
+- To read a file: `adb shell "run-as to.bitkit.dev cat files/logs/bitkit_YYYY-MM-DD_HH-MM-SS.log"`
+- To list files: `adb shell "run-as to.bitkit.dev ls -la files/logs/"`
+- To find files: `adb shell "run-as to.bitkit.dev find files/ -name '*.log' -o -name '*.txt'"`
+- ALWAYS download device files to `.ai/{name}_{timestamp}/` when needed for debugging (e.g. `.ai/logs_1770671066/`)
+- To download: `adb shell "run-as to.bitkit.dev cat files/path/to/file" > .ai/folder_timestamp/filename`
+- ALWAYS try reading device logs automatically via adb BEFORE asking user to provide log files
 
 ### Architecture Guidelines
 

app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt

@@ -119,6 +119,7 @@ class VssBackupClient @Inject constructor(
         vssStoreIdProvider.clearCache()
         Logger.debug("VSS client reset", context = TAG)
     }
+
     suspend fun putObject(
         key: String,
         data: ByteArray,

app/src/main/java/to/bitkit/data/backup/VssBackupClientLdk.kt

@@ -0,0 +1,130 @@
+package to.bitkit.data.backup
+
+import com.synonym.vssclient.KeyVersion
+import com.synonym.vssclient.LdkNamespace
+import com.synonym.vssclient.VssItem
+import com.synonym.vssclient.vssLdkDelete
+import com.synonym.vssclient.vssLdkGet
+import com.synonym.vssclient.vssLdkListKeys
+import com.synonym.vssclient.vssNewLdkClientWithLnurlAuth
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeout
+import to.bitkit.data.keychain.Keychain
+import to.bitkit.di.IoDispatcher
+import to.bitkit.env.Env
+import to.bitkit.utils.Logger
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.time.Duration.Companion.seconds
+
+@Suppress("TooManyFunctions")
+@Singleton
+class VssBackupClientLdk @Inject constructor(
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val vssStoreIdProvider: VssStoreIdProvider,
+    private val keychain: Keychain,
+) {
+    companion object {
+        private const val TAG = "VssBackupClientLdk"
+
+        private val NAMESPACES = listOf(
+            LdkNamespace.Default,
+            LdkNamespace.Monitors,
+            LdkNamespace.ArchivedMonitors,
+        )
+    }
+
+    private var isSetup = CompletableDeferred<Unit>()
+    private val setupMutex = Mutex()
+
+    suspend fun setup(walletIndex: Int = 0): Result<Unit> = withContext(ioDispatcher) {
+        setupMutex.withLock {
+            runCatching {
+                if (isSetup.isCompleted && !isSetup.isCancelled) {
+                    runCatching { isSetup.await() }.onSuccess { return@runCatching }
+                }
+
+                val mnemonic = keychain.loadString(Keychain.Key.BIP39_MNEMONIC.name)
+                    ?: throw MnemonicNotAvailableException()
+
+                withTimeout(30.seconds) {
+                    val passphrase = keychain.loadString(Keychain.Key.BIP39_PASSPHRASE.name)
+                    vssNewLdkClientWithLnurlAuth(
+                        baseUrl = Env.vssServerUrl,
+                        storeId = vssStoreIdProvider.getVssStoreId(walletIndex),
+                        mnemonic = mnemonic,
+                        passphrase = passphrase,
+                        lnurlAuthServerUrl = Env.lnurlAuthServerUrl,
+                    )
+                    isSetup.complete(Unit)
+                    Logger.info("VSS LDK client setup", context = TAG)
+                }
+            }.onFailure {
+                isSetup.completeExceptionally(it)
+                Logger.error("VSS LDK client setup error", it, context = TAG)
+            }
+        }
+    }
+
+    fun reset() {
+        synchronized(this) {
+            isSetup.cancel()
+            isSetup = CompletableDeferred()
+        }
+        Logger.debug("VSS LDK client reset", context = TAG)
+    }
+
+    suspend fun getObject(
+        key: String,
+        namespace: LdkNamespace = LdkNamespace.Default,
+    ): Result<VssItem?> = withContext(ioDispatcher) {
+        isSetup.await()
+        Logger.verbose("VSS LDK 'getObject' call for '$key'", context = TAG)
+        runCatching {
+            vssLdkGet(key = key, namespace = namespace)
+        }.onSuccess {
+            if (it == null) {
+                Logger.verbose("VSS LDK 'getObject' success null for '$key'", context = TAG)
+            } else {
+                Logger.verbose("VSS LDK 'getObject' success for '$key'", context = TAG)
+            }
+        }.onFailure {
+            Logger.verbose("VSS LDK 'getObject' error for '$key'", it, context = TAG)
+        }
+    }
+
+    suspend fun deleteObject(
+        key: String,
+        namespace: LdkNamespace = LdkNamespace.Default,
+    ): Result<Boolean> = withContext(ioDispatcher) {
+        isSetup.await()
+        Logger.verbose("VSS LDK 'deleteObject' call for '$key'", context = TAG)
+        runCatching {
+            vssLdkDelete(key = key, namespace = namespace)
+        }.onSuccess { wasDeleted ->
+            if (wasDeleted) {
+                Logger.verbose("VSS LDK 'deleteObject' success for '$key' - key was deleted", context = TAG)
+            } else {
+                Logger.verbose("VSS LDK 'deleteObject' success for '$key' - key did not exist", context = TAG)
+            }
+        }.onFailure {
+            Logger.verbose("VSS LDK 'deleteObject' error for '$key'", it, context = TAG)
+        }
+    }
+
+    suspend fun listAllKeysTagged(): Result<List<Pair<LdkNamespace, KeyVersion>>> = withContext(ioDispatcher) {
+        isSetup.await()
+        Logger.verbose("VSS LDK 'listAllKeysTagged' call", context = TAG)
+        runCatching {
+            NAMESPACES.flatMap { ns -> vssLdkListKeys(namespace = ns).map { ns to it } }
+        }.onSuccess {
+            Logger.verbose("VSS LDK 'listAllKeysTagged' success - found ${it.size} key(s)", context = TAG)
+        }.onFailure {
+            Logger.verbose("VSS LDK 'listAllKeysTagged' error", it, context = TAG)
+        }
+    }
+}

app/src/main/java/to/bitkit/repositories/BackupRepo.kt

@@ -31,6 +31,7 @@ import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
 import to.bitkit.data.WidgetsStore
 import to.bitkit.data.backup.VssBackupClient
+import to.bitkit.data.backup.VssBackupClientLdk
 import to.bitkit.data.resetPin
 import to.bitkit.di.IoDispatcher
 import to.bitkit.di.json
@@ -78,6 +79,7 @@ class BackupRepo @Inject constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     private val cacheStore: CacheStore,
     private val vssBackupClient: VssBackupClient,
+    private val vssBackupClientLdk: VssBackupClientLdk,
     private val settingsStore: SettingsStore,
     private val widgetsStore: WidgetsStore,
     private val blocktankRepo: BlocktankRepo,
@@ -107,6 +109,7 @@ class BackupRepo @Inject constructor(
     fun reset() {
         stopObservingBackups()
         vssBackupClient.reset()
+        vssBackupClientLdk.reset()
     }
 
     fun setWiping(isWiping: Boolean) = _isWiping.update { isWiping }
@@ -134,6 +137,8 @@ class BackupRepo @Inject constructor(
                 onExhausted = { maxAttempts ->
                     Logger.warn("VSS client setup failed after $maxAttempts attempts", context = TAG)
                 }
+            }.onSuccess {
+                scope.launch { vssBackupClientLdk.setup() }
             }
         }
 

app/src/main/java/to/bitkit/repositories/LightningRepo.kt

@@ -45,7 +45,7 @@ import org.lightningdevkit.ldknode.SpendableUtxo
 import org.lightningdevkit.ldknode.Txid
 import to.bitkit.data.CacheStore
 import to.bitkit.data.SettingsStore
-import to.bitkit.data.backup.VssBackupClient
+import to.bitkit.data.backup.VssBackupClientLdk
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
@@ -93,7 +93,7 @@ class LightningRepo @Inject constructor(
     private val cacheStore: CacheStore,
     private val preActivityMetadataRepo: PreActivityMetadataRepo,
     private val connectivityRepo: ConnectivityRepo,
-    private val vssBackupClient: VssBackupClient,
+    private val vssBackupClientLdk: VssBackupClientLdk,
 ) {
     private val _lightningState = MutableStateFlow(LightningState())
     val lightningState = _lightningState.asStateFlow()
@@ -325,19 +325,20 @@ class LightningRepo @Inject constructor(
                 updateGeoBlockState()
                 refreshChannelCache()
 
-                // Validate network graph has trusted peers (RGS cache can become stale)
-                if (shouldValidateGraph && !lightningService.validateNetworkGraph()) {
+                if (shouldValidateGraph && !lightningService.aresRequiredPeersInNetworkGraph()) {
                     Logger.warn("Network graph is stale, resetting and restarting...", context = TAG)
+
                     lightningService.stop()
                     lightningService.resetNetworkGraph(walletIndex)
-                    // Also clear stale graph from VSS to prevent fallback restoration
+
                     runCatching {
-                        vssBackupClient.setup(walletIndex).getOrThrow()
-                        vssBackupClient.deleteObject("network_graph").getOrThrow()
-                        Logger.info("Cleared stale network graph from VSS", context = TAG)
+                        vssBackupClientLdk.setup(walletIndex).getOrThrow()
+                        vssBackupClientLdk.deleteObject("network_graph").getOrThrow()
+                        Logger.info("Cleared stale network graph from VSS (first delete)", context = TAG)
                     }.onFailure {
-                        Logger.warn("Failed to clear graph from VSS", it, context = TAG)
+                        Logger.warn("Failed to clear graph from VSS (first delete)", it, context = TAG)
                     }
+
                     _lightningState.update { it.copy(nodeLifecycleState = NodeLifecycleState.Stopped) }
                     shouldRestartForGraphReset = true
                     return@withLock Result.success(Unit)