chore: publish android release v2.5.8

README.md

@@ -94,7 +94,7 @@ Android APK：
 - 已生成 Android debug APK：`android/app/build/outputs/apk/debug/app-debug.apk`
 - 已生成 Android signed release APK：`android/app/build/outputs/apk/release/app-release.apk`
 - `npm run apk:release` 还会额外产出带版本号的文件：`android/app/build/outputs/apk/release/boss-android-v{versionName}-release.apk`
-- 当前最新 release 构建版本：`2.5.7`（`versionCode=20`）
+- 当前最新 release 构建版本：`2.5.8`（`versionCode=21`）
 - 当前 APK 已切到原生 Android 客户端：`MainActivity + BossApiClient + 原生 XML 布局`
 - 当前原生活动页已经覆盖：会话首页、项目详情、项目目标、版本记录、会话信息、群资料、发起群聊、消息转发、线程详情、设备详情、添加设备、账号与安全、设置、AI 账号、技能、运维中心、关于
 - 当前原生一级体验已回退到微信式交互：`会话 / 设备 / 我的` 固定底部 tab，会话首页是简单聊天列表，`主 Agent / 审计对话` 以普通置顶会话样式排在最前；项目详情页是聊天优先，只保留 `项目目标 / 版本记录` 两个轻入口

android/app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "com.hyzq.boss"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "2.5.7"
+        versionCode 21
+        versionName "2.5.8"
         buildConfigField "String", "BOSS_API_BASE_URL", "\"https://boss.hyzq.net\""
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

docs/architecture/current_runtime_and_deploy_status_cn.md

@@ -150,7 +150,7 @@ cd /Users/kris/code/boss
 - 当前已生成 Android debug APK：`android/app/build/outputs/apk/debug/app-debug.apk`
 - 当前已生成 Android signed release APK：`android/app/build/outputs/apk/release/app-release.apk`
 - 当前 release 构建还会额外生成带版本号的 APK：`android/app/build/outputs/apk/release/boss-android-v{versionName}-release.apk`
-- 当前最新 release 构建版本：`2.5.7`（`versionCode=20`）
+- 当前最新 release 构建版本：`2.5.8`（`versionCode=21`）
 - 当前 release keystore 位于本机 `android/keystores/boss-release.keystore`，签名参数位于 `android/signing/release-signing.properties`
 - `2.0.1` 已在本机连接的华为真机上复核通过，修复了 `Theme.SplashScreen` 导致的 `AppCompatActivity` 启动闪退
 - `2.1.0` 已把 Web 一级页和主要二级页全部补成原生活动页：`MainActivity / ProjectDetailActivity / ProjectGoalsActivity / ProjectVersionsActivity / ProjectForwardActivity / ThreadDetailActivity / DeviceDetailActivity / DeviceEnrollmentActivity / SkillInventoryActivity / SecurityActivity / SettingsActivity / AiAccountsActivity / OpsCenterActivity / AboutActivity`

src/lib/boss-master-agent.ts

@@ -38,6 +38,28 @@ type QueuedMasterAgentReplyEnvelope = {
   };
 };
 
+export async function resolveMasterAgentExecutionConfig(projectId: string) {
+  const runtime = await getMasterAgentRuntimeAccount();
+  if (!runtime?.account) {
+    throw new Error("NO_MASTER_AGENT_RUNTIME_ACCOUNT");
+  }
+
+  const agentControls = await getProjectAgentControls(projectId);
+  const reasoningEffort =
+    agentControls?.reasoningEffortOverride ||
+    (runtime.account as typeof runtime.account & { reasoningEffort?: ReasoningEffort }).reasoningEffort ||
+    "medium";
+
+  return {
+    runtime,
+    account: runtime.account,
+    agentControls,
+    provider: runtime.account.provider,
+    model: agentControls?.modelOverride || runtime.account.model || "gpt-5.4",
+    reasoningEffort,
+  };
+}
+
 function buildAgentControlsDigest(agentControls?: ProjectAgentControls | null) {
   if (!agentControls) {
     return "当前对话覆盖：无";
@@ -1129,7 +1151,6 @@ export async function replyToMasterAgentUserMessage(params: {
   mode?: "wait" | "enqueue";
 }) {
   const runtime = await getMasterAgentRuntimeAccount();
-  const agentControls = await getProjectAgentControls("master-agent");
 
   if (!runtime?.account) {
     await appendMasterAgentSystemReply(
@@ -1138,6 +1159,9 @@ export async function replyToMasterAgentUserMessage(params: {
     return { ok: false as const, reason: "NO_AI_ACCOUNT" };
   }
 
+  const executionConfig = await resolveMasterAgentExecutionConfig("master-agent");
+  const agentControls = executionConfig.agentControls;
+
   if (params.mode === "enqueue") {
     if (runtime.account.provider === "master_codex_node") {
       const state = await readState();
@@ -1221,8 +1245,8 @@ export async function replyToMasterAgentUserMessage(params: {
         requestedByAccount: params.requestedByAccount,
         currentSessionExpiresAt: params.currentSessionExpiresAt,
         apiKey: runtime.account.apiKey,
-        model: agentControls?.modelOverride || runtime.account.model || "gpt-5.4",
-        reasoningEffort: agentControls?.reasoningEffortOverride || "medium",
+        model: executionConfig.model,
+        reasoningEffort: executionConfig.reasoningEffort,
         agentControls,
       });
     }
@@ -1338,8 +1362,8 @@ export async function replyToMasterAgentUserMessage(params: {
   try {
     const generated = await generateOpenAiReply({
       apiKey: runtime.account.apiKey,
-      model: agentControls?.modelOverride || runtime.account.model || "gpt-5.4",
-      reasoningEffort: agentControls?.reasoningEffortOverride || "medium",
+      model: executionConfig.model,
+      reasoningEffort: executionConfig.reasoningEffort,
       requestText: params.requestText,
       currentSessionExpiresAt: params.currentSessionExpiresAt,
       agentControls,

tests/master-agent-config-resolution.test.ts

@@ -0,0 +1,65 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import os from "node:os";
+import path from "node:path";
+import { mkdtemp, rm } from "node:fs/promises";
+
+let runtimeRoot = "";
+let saveAiAccount: (typeof import("../src/lib/boss-data"))["saveAiAccount"];
+let updateProjectAgentControls: (typeof import("../src/lib/boss-data"))["updateProjectAgentControls"];
+let resolveMasterAgentExecutionConfig: (typeof import("../src/lib/boss-master-agent"))["resolveMasterAgentExecutionConfig"];
+
+async function setup() {
+  if (runtimeRoot) return;
+
+  runtimeRoot = await mkdtemp(path.join(os.tmpdir(), "boss-master-agent-config-"));
+  process.env.BOSS_RUNTIME_ROOT = runtimeRoot;
+  process.env.BOSS_STATE_FILE = path.join(runtimeRoot, "boss-state.json");
+
+  const [data, masterAgent] = await Promise.all([
+    import("../src/lib/boss-data.ts"),
+    import("../src/lib/boss-master-agent.ts"),
+  ]);
+
+  saveAiAccount = data.saveAiAccount;
+  updateProjectAgentControls = data.updateProjectAgentControls;
+  resolveMasterAgentExecutionConfig = masterAgent.resolveMasterAgentExecutionConfig;
+}
+
+test.after(async () => {
+  if (runtimeRoot) {
+    await rm(runtimeRoot, { recursive: true, force: true });
+  }
+});
+
+test("当前对话 override 优先于主控账号默认值", async () => {
+  await setup();
+
+  await saveAiAccount({
+    accountId: "master-codex-primary",
+    label: "主 GPT",
+    role: "primary",
+    provider: "master_codex_node",
+    displayName: "Mac 上的 Master Codex Node",
+    nodeId: "local-codex-node",
+    nodeLabel: "本机 Codex",
+    model: "gpt-4.1-mini",
+    enabled: true,
+    setActive: true,
+    loginStatusNote: "通过绑定的 Master Codex Node 对话。",
+  });
+
+  await updateProjectAgentControls("master-agent", {
+    modelOverride: "gpt-5.4",
+    reasoningEffortOverride: "high",
+  });
+
+  assert.equal(typeof resolveMasterAgentExecutionConfig, "function");
+
+  const resolved = await resolveMasterAgentExecutionConfig("master-agent");
+
+  assert.equal(resolved.model, "gpt-5.4");
+  assert.equal(resolved.reasoningEffort, "high");
+  assert.equal(resolved.account.accountId, "master-codex-primary");
+  assert.equal(resolved.account.model, "gpt-4.1-mini");
+});