chore: phase1 pre-flight cleanup before 3.0.x branch normalization

Author: loong10k

README.md

@@ -8,9 +8,9 @@ Multi-adapter CLI integration SDK for OpenCLI: browser / desktop / public-API ad
 [简体中文](./README.zh-CN.md)
 
 > **Current branch**: `feature/3.0.x`
-> **Version**: `3.0.x.x.20260630-SNAPSHOT`
-> **JDK baseline**: 8
-> **Project status**: stable (1.0.x line). Not yet published to Maven Central; artifacts are distributed via the Aliyun Maven repository and GitHub Releases.
+> **Version**: `3.0.x.20260630-SNAPSHOT`
+> **JDK baseline**: 21
+> **Project status**: stable (3.0.x line). Not yet published to Maven Central; artifacts are distributed via the Aliyun Maven repository and GitHub Releases.
 
 ## Table of Contents
 
@@ -81,7 +81,7 @@ Version-line matrix:
 
 | Version line | Branch | JDK | Version pattern | Purpose |
 |---|---|---:|---|---|
-| 1.0.x | `feature/3.0.x` (this branch) | 8 | `1.0.x.*` | For Boot 2.x starters and legacy projects |
+| 1.0.x | `feature/1.0.x` | 8 | `1.0.x.*` | For Boot 2.x starters and legacy projects |
 | 2.0.x | `feature/2.0.x` | 17 | `2.0.x.*` | For Boot 3.x starters |
 | 3.0.x | `feature/3.0.x` | 21 | `3.0.x.*` | For Boot 4.x starters / new projects |
 
@@ -133,7 +133,7 @@ Maven:
 <dependency>
     <groupId>io.github.easy4j</groupId>
     <artifactId>opencli-java-sdk</artifactId>
-    <version>3.0.x.x.20260630-SNAPSHOT</version>
+    <version>3.0.x.20260630-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -231,7 +231,7 @@ Protocol: edge sends `register`; center replies `registered`; center sends `coll
 mvn clean verify
 ```
 
-- Unit tests cover the adapter registry, core execution, browser/meta/remote paths and WS helpers (14 test sources under `src/test`).
+- Unit tests cover the adapter registry, core execution, browser/meta/remote paths and WS helpers (19 Java test sources under `src/test`).
 - JaCoCo runs `prepare-agent`, `report` and `check` on the `verify` phase with a **90% line-coverage** rule (`haltOnFailure=false`).
 - `scripts/generate_opencli_adapter_ids.py` regenerates `OpenCliAdapterIds` / `OpenCliAdapterTaxonomy` from the upstream `opencli/docs/adapters/index.md` + `cli-manifest.json` (set `OPENCLI_ROOT` to point at the upstream tree).
 - Release packaging (`mvn -Prelease deploy`) attaches sources and javadoc jars, GPG-signs artifacts and is wired for Sonatype Central Publishing; plain `mvn deploy` routes SNAPSHOT/release artifacts to the Aliyun Maven repository per `distributionManagement`.
@@ -243,7 +243,7 @@ mvn clean verify
 |---|---|---|---|
 | `feature/1.0.x` (this branch) | `1.0.x.*` | 8 | Compatibility fixes and JDK-8-safe dependency upgrades only |
 | `feature/2.0.x` | `2.0.x.*` | 17 | JDK 17 line |
-| `feature/3.0.x` | `3.0.x.*` | 21 | JDK 21 line |
+| `feature/3.0.x` (this branch) | `3.0.x.*` | 21 | JDK 21 line |
 
 Branch POMs (JDK and dependency stack per line) are rendered by `scripts/render-branch-pom.py`.
 

README.zh-CN.md

@@ -7,9 +7,9 @@
 面向 OpenCLI 多适配器体系的 Java SDK：browser / desktop / public-api 适配器、远程 Agent 与中心 WebSocket
 
 > **当前分支**：`feature/3.0.x`
-> **版本**：`3.0.x.x.20260630-SNAPSHOT`
-> **JDK 基线**：8
-> **项目状态**：稳定（1.0.x 线）。尚未发布 Maven Central；制品通过 Aliyun Maven 仓库与 GitHub Releases 分发。
+> **版本**：`3.0.x.20260630-SNAPSHOT`
+> **JDK 基线**：21
+> **项目状态**：稳定（3.0.x 线）。尚未发布 Maven Central；制品通过 Aliyun Maven 仓库与 GitHub Releases 分发。
 
 ## 目录
 
@@ -80,7 +80,7 @@
 
 | 版本线 | 分支 | JDK | 版本模式 | 用途 |
 |---|---|---:|---|---|
-| 1.0.x | `feature/3.0.x`（当前分支） | 8 | `1.0.x.*` | 供 Boot 2.x Starter 与存量项目使用 |
+| 1.0.x | `feature/1.0.x` | 8 | `1.0.x.*` | 供 Boot 2.x Starter 与存量项目使用 |
 | 2.0.x | `feature/2.0.x` | 17 | `2.0.x.*` | 供 Boot 3.x Starter 使用 |
 | 3.0.x | `feature/3.0.x` | 21 | `3.0.x.*` | 供 Boot 4.x Starter / 新项目使用 |
 
@@ -132,7 +132,7 @@ Maven：
 <dependency>
     <groupId>io.github.easy4j</groupId>
     <artifactId>opencli-java-sdk</artifactId>
-    <version>3.0.x.x.20260630-SNAPSHOT</version>
+    <version>3.0.x.20260630-SNAPSHOT</version>
 </dependency>
 ```
 
@@ -230,7 +230,7 @@ agent.close();
 mvn clean verify
 ```
 
-- 单元测试覆盖适配器注册表、核心执行、browser / meta / remote 路径与 WS 工具（`src/test` 下 14 个测试源文件）。
+- 单元测试覆盖适配器注册表、核心执行、browser / meta / remote 路径与 WS 工具（`src/test` 下 19 个 Java 测试源文件）。
 - JaCoCo 在 `verify` 阶段执行 `prepare-agent`、`report` 与 `check`，行覆盖率规则为 **90%**（`haltOnFailure=false`）。
 - `scripts/generate_opencli_adapter_ids.py` 依据上游 `opencli/docs/adapters/index.md` + `cli-manifest.json` 重新生成 `OpenCliAdapterIds` / `OpenCliAdapterTaxonomy`（可用 `OPENCLI_ROOT` 指定上游源码树）。
 - 发布打包（`mvn -Prelease deploy`）附带 sources 与 javadoc 构件并执行 GPG 签名，对接 Sonatype Central Publishing；普通 `mvn deploy` 按版本后缀路由到 Aliyun Maven 仓库（见 `distributionManagement`）。
@@ -242,7 +242,7 @@ mvn clean verify
 |---|---|---|---|
 | `feature/1.0.x`（当前分支） | `1.0.x.*` | 8 | 仅接受兼容性修复与 JDK 8 安全的依赖升级 |
 | `feature/2.0.x` | `2.0.x.*` | 17 | JDK 17 线 |
-| `feature/3.0.x` | `3.0.x.*` | 21 | JDK 21 线 |
+| `feature/3.0.x`（当前分支） | `3.0.x.*` | 21 | JDK 21 线 |
 
 各分支 POM（JDK 与依赖栈随线变化）由 `scripts/render-branch-pom.py` 渲染。
 

pom.xml

@@ -343,7 +343,7 @@
                     <configuration>
                         <skip>false</skip>
                         <skipTests>false</skipTests>
-                        <argLine>-Xmx1024m -Dfile.encoding=UTF-8</argLine>
+                        <argLine>@{argLine} -Xmx1024m -Dfile.encoding=UTF-8</argLine>
                         <additionalClasspathElements>
                             <additionalClasspathElement>${basedir}/target/test-classes</additionalClasspathElement>
                         </additionalClasspathElements>

scripts/generate_opencli_adapter_ids.py

@@ -79,11 +79,11 @@ def main() -> None:
     # 重新划分 browser：未命中 desktop 的 manifest / index 条目一律视为 browser 类。
     browser = {x for x in all_ids if x not in desktop}
 
-    out = root / "src/main/java/io/github/hiwepy/opencli/registry/OpenCliAdapterIds.java"
+    out = root / "src/main/java/io/github/easy4j/opencli/registry/OpenCliAdapterIds.java"
     out.parent.mkdir(parents=True, exist_ok=True)
 
     lines = [
-        "package io.github.hiwepy.opencli.registry;",
+        "package io.github.easy4j.opencli.registry;",
         "",
         "/**",
         " * OpenCLI 适配器标识常量（由脚本从 docs/adapters/index.md + cli-manifest.json 生成）。",
@@ -126,7 +126,7 @@ def main() -> None:
     desk_sorted = sorted(desktop)
     brows_sorted = sorted(browser)
     tax_lines = [
-        "package io.github.hiwepy.opencli.registry;",
+        "package io.github.easy4j.opencli.registry;",
         "",
         "import java.util.Collections;",
         "import java.util.Arrays;",

scripts/generate_opencli_command_tests.py

@@ -33,8 +33,8 @@
     os.environ.get("OPENCLI_MANIFEST", _DEFAULT_MANIFEST)
 ).resolve()
 
-COVERAGE_PKG = "io.github.hiwepy.opencli.coverage"
-COVERAGE_DIR = _SDK_ROOT / "src/test/java/io/github/hiwepy/opencli/coverage"
+COVERAGE_PKG = "io.github.easy4j.opencli.coverage"
+COVERAGE_DIR = _SDK_ROOT / "src/test/java/io/github/easy4j/opencli/coverage"
 RESOURCES_DIR = _SDK_ROOT / "src/test/resources/opencli"
 
 PLACEHOLDER_STR = "__coverage__"

scripts/render-branch-pom.py

@@ -270,13 +270,13 @@ def write_pom(
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.github.hiwepy</groupId>
+    <groupId>io.github.easy4j</groupId>
     <artifactId>opencli-java-sdk</artifactId>
     <version>{version}</version>
     <packaging>jar</packaging>
     <name>${{project.groupId}}:${{project.artifactId}}</name>
     <description>{description}</description>
-    <url>https://github.com/hiwepy/${{project.artifactId}}</url>
+    <url>https://github.com/easy-4-java/${{project.artifactId}}</url>
 
 {COMMON_META}
 {ALIYUN_DM}

src/main/java/io/github/easy4j/opencli/adapter/browser/chatgpt/ChatgptOpenCliClient.java

@@ -35,11 +35,22 @@ public static class ChatgptCommonOptions {
 
         private Integer historyLimit;
 
+        private Integer stableSeconds;
+
         private Boolean readAsMarkdown;
 
-        /** 文档：{@code --new} 开启新会话。 */
         private Boolean newConversation;
 
+        private String conversation;
+
+        private String project;
+
+        private Boolean waitForResponse;
+
+        private Boolean deepResearch;
+
+        private Boolean webSearch;
+
         private Boolean jsonOutput;
 
         public void appendTo(List<String> target) {
@@ -52,9 +63,27 @@ public void appendTo(List<String> target) {
             if (historyLimit != null) {
                 OpenCliArgSupport.addOptionPair(target, "--limit", String.valueOf(historyLimit));
             }
+            if (stableSeconds != null) {
+                OpenCliArgSupport.addOptionPair(target, "--stable", String.valueOf(stableSeconds));
+            }
             if (readAsMarkdown != null) {
                 OpenCliArgSupport.addOptionPair(target, "--markdown", String.valueOf(readAsMarkdown));
             }
+            if (conversation != null) {
+                OpenCliArgSupport.addOptionPair(target, "--conversation", conversation);
+            }
+            if (project != null) {
+                OpenCliArgSupport.addOptionPair(target, "--project", project);
+            }
+            if (waitForResponse != null) {
+                OpenCliArgSupport.addOptionPair(target, "--wait", String.valueOf(waitForResponse));
+            }
+            if (Boolean.TRUE.equals(deepResearch)) {
+                target.add("--deep-research");
+            }
+            if (Boolean.TRUE.equals(webSearch)) {
+                target.add("--web-search");
+            }
             if (Boolean.TRUE.equals(jsonOutput)) {
                 target.add("-f");
                 target.add("json");
@@ -118,6 +147,63 @@ public OpenCliResult status(List<String> more) {
         return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("status"), more));
     }
 
+    public OpenCliResult deepResearchResult(String id, Boolean wait, Integer timeoutSeconds,
+        Integer stableSeconds, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("deep-research-result");
+        args.add(id);
+        if (wait != null) {
+            OpenCliArgSupport.addOptionPair(args, "--wait", String.valueOf(wait));
+        }
+        if (timeoutSeconds != null) {
+            OpenCliArgSupport.addOptionPair(args, "--timeout", String.valueOf(timeoutSeconds));
+        }
+        if (stableSeconds != null) {
+            OpenCliArgSupport.addOptionPair(args, "--stable", String.valueOf(stableSeconds));
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult login(Integer timeoutSeconds, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("login");
+        if (timeoutSeconds != null) {
+            OpenCliArgSupport.addOptionPair(args, "--timeout", String.valueOf(timeoutSeconds));
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult model(String model, String project, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("model");
+        args.add(model);
+        if (project != null) {
+            OpenCliArgSupport.addOptionPair(args, "--project", project);
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult projectFileAdd(String file, String id, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("project-file-add");
+        args.add(file);
+        OpenCliArgSupport.addOptionPair(args, "--id", id);
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult projectList(Integer limit, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("project-list");
+        if (limit != null) {
+            OpenCliArgSupport.addOptionPair(args, "--limit", String.valueOf(limit));
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult whoami(List<String> more) {
+        return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("whoami"), more));
+    }
+
     /**
      * {@code chatgpt image} 文生图参数。
      */
@@ -144,7 +230,7 @@ public void appendTo(List<String> target) {
                 OpenCliArgSupport.addOptionPair(target, "--op", outputDir);
             }
             if (Boolean.TRUE.equals(skipDownload)) {
-                OpenCliArgSupport.addOptionPair(target, "--sd", "true");
+                target.add("--sd");
             }
             if (timeoutSeconds != null) {
                 OpenCliArgSupport.addOptionPair(target, "--timeout", String.valueOf(timeoutSeconds));

src/main/java/io/github/easy4j/opencli/adapter/browser/claude/ClaudeOpenCliClient.java

@@ -98,6 +98,18 @@ public OpenCliResult send(String prompt, ClaudeAskOptions options, List<String>
         return ch().invoke(OpenCliArgSupport.merge(args, more));
     }
 
+    public OpenCliResult login(Integer timeoutSeconds, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("login");
+        if (timeoutSeconds != null) {
+            OpenCliArgSupport.addOptionPair(args, "--timeout", String.valueOf(timeoutSeconds));
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult whoami(List<String> more) {
+        return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("whoami"), more));
+    }
     public OpenCliResult newChat(List<String> more) {
         return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("new"), more));
     }

src/main/java/io/github/easy4j/opencli/adapter/browser/deepseek/DeepseekOpenCliClient.java

@@ -103,7 +103,20 @@ public OpenCliResult send(String conversationId, String prompt, DeepseekAskOptio
         return ch().invoke(OpenCliArgSupport.merge(args, more));
     }
 
-    /** {@code deepseek new}。 */
+    public OpenCliResult login(Integer timeoutSeconds, List<String> more) {
+        List<String> args = new ArrayList<>();
+        args.add("login");
+        if (timeoutSeconds != null) {
+            OpenCliArgSupport.addOptionPair(args, "--timeout", String.valueOf(timeoutSeconds));
+        }
+        return ch().invoke(OpenCliArgSupport.merge(args, more));
+    }
+
+    public OpenCliResult whoami(List<String> more) {
+        return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("whoami"), more));
+    }
+
+
     public OpenCliResult newChat(List<String> more) {
         return ch().invoke(OpenCliArgSupport.merge(OpenCliLists.of("new"), more));
     }