[Phone][ZeroTermux][Bug][Github(/)]：

 优化LSP逻辑
    RootCause: /
    Modify: /
    update: #hanxinhao000
    Known problem: /
    ApplyTo: All

Author: hanxinhao000

app/src/main/java/com/termux/zerocore/activity/EditTextActivity.kt

@@ -223,6 +223,15 @@ object ZtAiDebugApiDocs {
                 "path" to "/api/editor/lsp/stderr",
                 "desc" to if (lang == "zh") "jdt-ls stderr 尾部 ?lines=" else "jdt-ls stderr tail ?lines="
             ),
+            mapOf(
+                "method" to "POST",
+                "path" to "/api/editor/lsp/definition",
+                "desc" to if (lang == "zh") {
+                    "探测转到定义 {path?,line?,column?,word?,occurrence?}，需编辑器已打开"
+                } else {
+                    "Probe go-to-definition {path?,line?,column?,word?,occurrence?}; editor must be open"
+                }
+            ),
             mapOf("method" to "GET", "path" to "/api/llm/tools", "desc" to if (lang == "zh") "列出全部 LLM/智能体工具名" else "List all LLM agent tool names"),
             mapOf("method" to "POST", "path" to "/api/llm/tool", "desc" to if (lang == "zh") "执行 LLM 工具 {tool, arguments}" else "Run LLM tool {tool, arguments}"),
             mapOf("method" to "POST", "path" to "/api/config/get", "desc" to if (lang == "zh") "读 ZeroTermux 配置 {group?, keys?}" else "Get ZT config {group?, keys?}"),

app/src/main/java/com/termux/zerocore/aidebug/ZtAiDebugApiDocs.kt

@@ -2,11 +2,15 @@ package com.termux.zerocore.aidebug
 
 import android.content.Context
 import com.google.gson.Gson
+import com.termux.shared.termux.TermuxConstants
 import com.termux.zerocore.editor.lsp.EditorClangdSupport
+import com.termux.zerocore.editor.lsp.EditorJdtClassFileSupport
 import com.termux.zerocore.editor.lsp.EditorJdtLsSupport
 import com.termux.zerocore.editor.lsp.EditorLspDebugStore
 import com.termux.zerocore.editor.lsp.EditorLspInstaller
 import com.termux.zerocore.editor.lsp.EditorLspManager
+import com.termux.zerocore.editor.lsp.EditorLspUris
+import java.io.File
 
 object ZtAiDebugEditorLspHelper {
     private val gson = Gson()
@@ -30,7 +34,8 @@ object ZtAiDebugEditorLspHelper {
                     "launcher" to EditorJdtLsSupport.findLauncherJar()?.absolutePath,
                     "config_template" to EditorJdtLsSupport.findConfigTemplateDir()?.absolutePath,
                     "config_runtime" to EditorJdtLsSupport.ensureRuntimeConfigDir()?.absolutePath,
-                    "arch" to (System.getProperty("os.arch") ?: "unknown")
+                    "arch" to (System.getProperty("os.arch") ?: "unknown"),
+                    "navigation_timeout_ms" to EditorJdtLsSupport.NAVIGATION_TIMEOUT_MILLIS
                 ),
                 "c_clangd" to mapOf(
                     "package_id" to EditorClangdSupport.PACKAGE_ID,
@@ -48,7 +53,7 @@ object ZtAiDebugEditorLspHelper {
                 "diagnostics" to EditorLspDebugStore.diagnosticsSnapshot(),
                 "recent_events" to EditorLspDebugStore.recentEvents(50),
                 "stderr_tail" to EditorLspDebugStore.stderrTail(80),
-                "hint_zh" to "打开编辑器并启用 LSP 后，diagnostics 会随 publishDiagnostics 更新；stderr_tail 为 jdt-ls 日志（不再 Toast）。"
+                "hint_zh" to "打开编辑器并启用 LSP 后可用 POST /api/editor/lsp/definition 探测转到定义。"
             )
         )
     }
@@ -73,4 +78,164 @@ object ZtAiDebugEditorLspHelper {
             )
         )
     }
+
+    /**
+     * 探测 textDocument/definition（及 typeDefinition 回退）与 class 源码解析。
+     * JSON: {path?, line?, column?, word?, occurrence?}
+     */
+    fun definitionJson(
+        path: String?,
+        line: Int?,
+        column: Int?,
+        word: String?,
+        occurrence: Int = 0,
+        navigate: Boolean = false
+    ): String {
+        val manager = EditorLspManager.activeInstance
+            ?: return gson.toJson(
+                mapOf(
+                    "ok" to false,
+                    "error" to "editor_lsp_inactive",
+                    "hint_zh" to "先 POST /api/editor/open 打开 Java 文件并等待 LSP 就绪（GET /api/editor/lsp/status）"
+                )
+            )
+        val file = resolveProbeFile(path, manager)
+            ?: return gson.toJson(mapOf("ok" to false, "error" to "file_not_found", "path" to path))
+        val languageId = EditorLspManager.languageIdForExtension(file.extension)
+            ?: return gson.toJson(
+                mapOf(
+                    "ok" to false,
+                    "error" to "unsupported_language",
+                    "file" to file.absolutePath
+                )
+            )
+        val content = runCatching { file.readText() }.getOrElse {
+            return gson.toJson(
+                mapOf(
+                    "ok" to false,
+                    "error" to "read_failed",
+                    "detail" to (it.message ?: "")
+                )
+            )
+        }
+        val pos = resolveProbePosition(content, line, column, word, occurrence)
+            ?: return gson.toJson(
+                mapOf(
+                    "ok" to false,
+                    "error" to "position_not_found",
+                    "word" to word,
+                    "line" to line,
+                    "column" to column
+                )
+            )
+        runCatching { manager.openDocument(file, languageId, content) }
+        val started = System.currentTimeMillis()
+        val probe = manager.definitionDetailed(file, languageId, pos.first, pos.second)
+        val locations = probe.locations
+        val resolved = locations.map { loc ->
+            val target = manager.resolveNavigationLocation(file, languageId, loc)
+            mapOf(
+                "raw_uri" to loc.uri,
+                "raw_file" to loc.file.absolutePath,
+                "raw_line" to loc.line,
+                "raw_column" to loc.column,
+                "needs_class_contents" to EditorJdtClassFileSupport.needsClassFileContents(loc),
+                "resolved_file" to target?.file?.absolutePath,
+                "resolved_exists" to (target?.file?.isFile == true),
+                "resolved_size" to (target?.file?.takeIf { it.isFile }?.length() ?: -1L),
+                "resolved_line" to target?.line,
+                "resolved_column" to target?.column
+            )
+        }
+        val elapsed = System.currentTimeMillis() - started
+        val snippetLine = content.lineSequence().elementAtOrNull(pos.first).orEmpty()
+        var navigated = false
+        var navigateError: String? = null
+        if (navigate) {
+            val target = locations.firstOrNull()?.let { loc ->
+                manager.resolveNavigationLocation(file, languageId, loc)
+            }
+            if (target != null && target.file.isFile) {
+                navigated = manager.openLocationInHost(target)
+                if (!navigated) navigateError = "host_open_failed"
+            } else {
+                navigateError = "no_resolved_target"
+            }
+        }
+        return gson.toJson(
+            mapOf(
+                "ok" to true,
+                "file" to file.absolutePath,
+                "language_id" to languageId,
+                "query" to mapOf(
+                    "line" to pos.first,
+                    "column" to pos.second,
+                    "word" to word,
+                    "line_text" to snippetLine,
+                    "uri" to EditorLspUris.forFile(file)
+                ),
+                "count" to locations.size,
+                "elapsed_ms" to elapsed,
+                "probe_source" to probe.source,
+                "prefer_type" to probe.preferType,
+                "raw_definition" to probe.rawDefinition,
+                "raw_typeDefinition" to probe.rawTypeDefinition,
+                "locations" to resolved,
+                "navigate" to navigate,
+                "navigated" to navigated,
+                "navigate_error" to navigateError,
+                "hint_zh" to if (locations.isEmpty()) {
+                    "定义为空：看 raw_definition；方法名应走 definition，类型名才走 typeDefinition"
+                } else {
+                    "resolved_line/column 即为方法在源码中的位置；navigate=true 可在编辑器打开"
+                },
+                "recent_events" to EditorLspDebugStore.recentEvents(15)
+            )
+        )
+    }
+
+    private fun resolveProbeFile(path: String?, manager: EditorLspManager): File? {
+        val trimmed = path?.trim().orEmpty()
+        if (trimmed.isNotEmpty()) {
+            val direct = File(trimmed)
+            if (direct.isFile) return direct
+            val underHome = File(TermuxConstants.TERMUX_HOME_DIR, trimmed.removePrefix("/"))
+            if (underHome.isFile) return underHome
+            return null
+        }
+        val open = manager.debugStatus()["open_documents"] as? List<*>
+        val firstUri = open?.firstOrNull()?.toString().orEmpty()
+        if (firstUri.isBlank()) return null
+        val p = EditorLspUris.pathOf(firstUri)
+        return p.takeIf { it.isNotEmpty() }?.let { File(it) }?.takeIf { it.isFile }
+    }
+
+    private fun resolveProbePosition(
+        content: String,
+        line: Int?,
+        column: Int?,
+        word: String?,
+        occurrence: Int
+    ): Pair<Int, Int>? {
+        val w = word?.trim().orEmpty()
+        if (w.isNotEmpty()) {
+            var seen = 0
+            content.lineSequence().forEachIndexed { idx, text ->
+                var from = 0
+                while (true) {
+                    val at = text.indexOf(w, from)
+                    if (at < 0) break
+                    if (seen == occurrence.coerceAtLeast(0)) {
+                        val mid = at + w.length / 2
+                        return idx to mid
+                    }
+                    seen++
+                    from = at + w.length
+                }
+            }
+            return null
+        }
+        if (line == null || column == null) return null
+        return line.coerceAtLeast(0) to column.coerceAtLeast(0)
+    }
 }

app/src/main/java/com/termux/zerocore/aidebug/ZtAiDebugEditorLspHelper.kt

@@ -110,6 +110,8 @@ class ZtAiDebugHttpServer(
                     val lines = session.parms["lines"]?.toIntOrNull() ?: 120
                     textResponse(ZtAiDebugEditorLspHelper.stderrJson(lines), MIME_JSON)
                 }
+                uri == "/api/editor/lsp/definition" && method == Method.POST ->
+                    handleEditorLspDefinition(session)
                 uri == "/api/root/status" && method == Method.GET ->
                     textResponse(ZtAiDebugRootHelper.statusJson(appContext), MIME_JSON)
                 uri == "/api/root/exec" && method == Method.POST ->
@@ -640,6 +642,37 @@ class ZtAiDebugHttpServer(
         )
     }
 
+    private fun handleEditorLspDefinition(session: IHTTPSession): Response {
+        val body = readBody(session)
+        var path: String? = session.parms["path"]
+        var line: Int? = session.parms["line"]?.toIntOrNull()
+        var column: Int? = session.parms["column"]?.toIntOrNull()
+        var word: String? = session.parms["word"]
+        var occurrence = session.parms["occurrence"]?.toIntOrNull() ?: 0
+        var navigate = session.parms["navigate"]?.equals("true", true) == true ||
+            session.parms["navigate"] == "1"
+        if (body.isNotBlank()) {
+            try {
+                val obj = JsonParser.parseString(body).asJsonObject
+                if (obj.has("path")) path = obj.get("path").asString
+                if (obj.has("line") && !obj.get("line").isJsonNull) line = obj.get("line").asInt
+                if (obj.has("column") && !obj.get("column").isJsonNull) column = obj.get("column").asInt
+                if (obj.has("word")) word = obj.get("word").asString
+                if (obj.has("occurrence") && !obj.get("occurrence").isJsonNull) {
+                    occurrence = obj.get("occurrence").asInt
+                }
+                if (obj.has("navigate") && !obj.get("navigate").isJsonNull) {
+                    navigate = obj.get("navigate").asBoolean
+                }
+            } catch (_: Exception) {
+            }
+        }
+        return textResponse(
+            ZtAiDebugEditorLspHelper.definitionJson(path, line, column, word, occurrence, navigate),
+            MIME_JSON
+        )
+    }
+
     private fun parseBool(session: IHTTPSession, body: String, vararg keys: String): Boolean {
         keys.forEach { key ->
             session.parms[key]?.trim()?.let {

app/src/main/java/com/termux/zerocore/aidebug/ZtAiDebugHttpServer.kt

@@ -18,6 +18,7 @@ object EditorJdtClassFileSupport {
         val u = uri.trim()
         if (u.isEmpty()) return false
         if (u.startsWith("jdt:", ignoreCase = true)) return true
+        if (u.startsWith("jar:", ignoreCase = true) && u.contains(".class", ignoreCase = true)) return true
         if (u.contains(".class?", ignoreCase = true)) return true
         if (u.endsWith(".class", ignoreCase = true)) return true
         val path = EditorLspUris.pathOf(u)
@@ -26,7 +27,19 @@ object EditorJdtClassFileSupport {
 
     fun needsClassFileContents(location: EditorLspLocation): Boolean {
         if (location.uri.isNotBlank() && isClassContentUri(location.uri)) return true
-        return location.file.name.endsWith(".class", ignoreCase = true)
+        if (location.file.name.endsWith(".class", ignoreCase = true)) return true
+        // 本地文件不存在时：JDK/依赖里的类型常只有 URI，需走 classFileContents 拉源码
+        if (!location.file.isFile && location.uri.isNotBlank()) {
+            val u = location.uri
+            if (u.startsWith("jdt:", ignoreCase = true)) return true
+            if (u.contains(".class", ignoreCase = true)) return true
+            if (u.startsWith("jar:", ignoreCase = true)) return true
+            // file:///…/src.zip!/java.base/java/lang/System.java
+            if (u.contains("!/") || u.contains(".zip!", ignoreCase = true) || u.contains(".jar!", ignoreCase = true)) {
+                return true
+            }
+        }
+        return false
     }
 
     fun cacheFileFor(uri: String): File {
@@ -60,18 +73,77 @@ object EditorJdtClassFileSupport {
                 ""
             }
         }
-        if (uri.isBlank() || !isClassContentUri(uri)) {
+        if (uri.isBlank()) {
             return location.takeIf { it.file.isFile }
         }
-        val cache = cacheFileFor(uri)
-        if (!cache.isFile || cache.length() == 0L) {
-            val contents = client.classFileContents(uri)?.takeIf { it.isNotBlank() } ?: return null
-            runCatching {
-                cache.parentFile?.mkdirs()
-                cache.writeText(contents)
-            }.getOrElse { return null }
+        if (location.file.isFile && !isClassContentUri(uri) && !uri.contains("!/")) {
+            return location
+        }
+        // zip/jar 内 .java：优先解压到缓存
+        extractZipEntryToCache(uri)?.let { cached ->
+            return location.copy(file = cached, uri = uri)
         }
-        return location.copy(file = cache, uri = uri)
+        // jdt:// 或 *.class：java/classFileContents（反编译或附着源码）
+        if (isClassContentUri(uri) || uri.startsWith("jdt:", ignoreCase = true)) {
+            val cache = cacheFileFor(uri)
+            if (!cache.isFile || cache.length() == 0L) {
+                val contents = client.classFileContents(uri)?.takeIf { it.isNotBlank() }
+                if (contents.isNullOrBlank()) {
+                    EditorLspDebugStore.recordEvent(
+                        "error",
+                        "classFileContents failed",
+                        mapOf("uri" to uri.take(240))
+                    )
+                    return null
+                }
+                runCatching {
+                    cache.parentFile?.mkdirs()
+                    cache.writeText(contents)
+                }.getOrElse { return null }
+            }
+            return location.copy(file = cache, uri = uri)
+        }
+        return location.takeIf { it.file.isFile }
+    }
+
+    /** file:///path/src.zip!/entry 或 jar:file:///path.jar!/entry → 缓存 .java */
+    private fun extractZipEntryToCache(uri: String): File? {
+        val decoded = runCatching {
+            URLDecoder.decode(uri, StandardCharsets.UTF_8.name())
+        }.getOrDefault(uri)
+        val marker = "!/"
+        val idx = decoded.indexOf(marker)
+        if (idx < 0) return null
+        var archivePart = decoded.substring(0, idx)
+        val entryName = decoded.substring(idx + marker.length).trimStart('/')
+        if (entryName.isBlank()) return null
+        if (archivePart.startsWith("jar:", ignoreCase = true)) {
+            archivePart = archivePart.removePrefix("jar:").removePrefix("JAR:")
+        }
+        val archivePath = when {
+            archivePart.startsWith("file:", ignoreCase = true) -> EditorLspUris.pathOf(archivePart)
+            archivePart.startsWith("/") -> archivePart
+            else -> EditorLspUris.pathOf(archivePart)
+        }
+        if (archivePath.isBlank()) return null
+        val archive = File(archivePath)
+        if (!archive.isFile) return null
+        val cache = cacheFileFor(uri)
+        if (cache.isFile && cache.length() > 0L) return cache
+        return runCatching {
+            java.util.zip.ZipFile(archive).use { zip ->
+                val entry = zip.getEntry(entryName)
+                    ?: zip.getEntry(entryName.removePrefix("/"))
+                    ?: return@use null
+                zip.getInputStream(entry).bufferedReader(StandardCharsets.UTF_8).use { reader ->
+                    val text = reader.readText()
+                    if (text.isBlank()) return@use null
+                    cache.parentFile?.mkdirs()
+                    cache.writeText(text)
+                    cache
+                }
+            }
+        }.getOrNull()
     }
 
     private fun sha1Hex(text: String): String {

app/src/main/java/com/termux/zerocore/editor/lsp/EditorJdtClassFileSupport.kt

@@ -21,6 +21,8 @@ object EditorJdtLsSupport {
     const val INIT_TIMEOUT_MILLIS = 120_000L
     /** 补全请求超时：过长会导致编辑器补全面板进度条一直转。 */
     const val COMPLETION_TIMEOUT_MILLIS = 8_000L
+    /** 转到定义 / 引用 / class 源码拉取：JDK 类型首次解析较慢。 */
+    const val NAVIGATION_TIMEOUT_MILLIS = 25_000L
 
     fun installDir(): File = File(EditorLspInstaller.baseDir(), INSTALL_DIR_NAME)