@buaa_smat/hometrans 0.1.15 → 0.1.16

package/dist/cli/config-store.js

@@ -6,6 +6,7 @@
  * `ht config` 只读不改。
  */
 import fs from 'node:fs/promises';
+import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 /** 由 DEVECO_SDK_HOME 派生其余三个 SDK 相关路径。输入为空时全部返回空串。 */
@@ -50,6 +51,42 @@ export function getConfigPath() {
 export function getToolsDir() {
     return path.join(getConfigDir(), 'tools');
 }
+/**
+ * 最佳努力地「同步」读取 ~/.hometrans/config.json 中某个 `env.*` 字段，供运行时按
+ * 统一链路「环境变量 → config.json → 询问用户」做中间一层回落。
+ * 读不到 / 解析失败 / 字段不是字符串时返回 ''（绝不抛错，调用方继续走下一层）。
+ */
+export function readConfigEnvFieldSync(key) {
+    try {
+        const raw = readFileSync(getConfigPath(), 'utf-8');
+        const parsed = JSON.parse(raw);
+        const v = parsed?.env?.[key];
+        return typeof v === 'string' ? v : '';
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * 最佳努力地「同步」读取统一多模态模型字段（autotest.unified_model.*）。
+ * 字段名取 'api_key' | 'name' | 'base_url' | 'provider'。读不到返回 ''。
+ */
+export function readConfigModelFieldSync(field) {
+    try {
+        const raw = readFileSync(getConfigPath(), 'utf-8');
+        const parsed = JSON.parse(raw);
+        const v = parsed?.autotest?.unified_model?.[field];
+        if (typeof v !== 'string')
+            return '';
+        // A placeholder api_key counts as "not set" so callers fall through to ask.
+        if (field === 'api_key' && isPlaceholderApiKey(v))
+            return '';
+        return v;
+    }
+    catch {
+        return '';
+    }
+}
 /** 把 ~/foo 展开为 $HOME/foo；非 ~ 开头原样返回。 */
 export function expandHome(p) {
     if (!p)
@@ -109,8 +146,6 @@ export function defaultEditors() {
                 path: '~/.config/deveco/deveco.jsonc',
                 keyPath: ['mcp', 'hometrans'],
             },
-            // DevEco Code 校验 agent color，命名色会导致启动失败 → 安装时删除 color 行。
-            stripAgentColors: true,
         },
         {
             name: 'Codex',
@@ -158,11 +193,59 @@ export function defaultEnv() {
         DEVECO_HOME: '',
         OHOS_SDK_PATH: '',
         HMS_SDK_PATH: '',
-        TEST_API_KEY: '',
-        GLM_API_KEY: '',
         HOMETRANS_TOOL_PATH: '',
+        HOMETRANS_MODEL_API_KEY: '',
+        HOMETRANS_MODEL_NAME: '',
+        HOMETRANS_MODEL_BASE_URL: '',
     };
 }
+/**
+ * 占位/未设置的 api_key 判定：空串或历史占位符 'YOUR_API_KEY_HERE'。
+ */
+export function isPlaceholderApiKey(key) {
+    const k = (key ?? '').trim();
+    return !k || k === 'YOUR_API_KEY_HERE';
+}
+/**
+ * 统一多模态模型的机器环境变量名。UI 对齐（phone-agent）与自测（self-test）
+ * 共用同一套配置：`ht init` 把 `autotest.unified_model` 的核心字段写成这些 OS
+ * 环境变量，运行时各脚本直接从环境变量读取。provider 不导出（默认 openai）。
+ */
+export const MODEL_ENV_KEYS = [
+    'HOMETRANS_MODEL_API_KEY',
+    'HOMETRANS_MODEL_NAME',
+    'HOMETRANS_MODEL_BASE_URL',
+];
+/**
+ * 由 `autotest.unified_model` 生成 (name, value) 环境变量对（顺序与 MODEL_ENV_KEYS
+ * 一致）。api_key 仍是占位符/空时取空串（不写入环境变量）。provider 不导出为环境
+ * 变量（默认 openai，仅存于 unified_model）。
+ */
+export function modelEnvPairs(autotest) {
+    const um = autotest?.unified_model ?? defaultAutotest().unified_model;
+    return [
+        ['HOMETRANS_MODEL_API_KEY', isPlaceholderApiKey(um.api_key) ? '' : um.api_key.trim()],
+        ['HOMETRANS_MODEL_NAME', (um.name ?? '').trim()],
+        ['HOMETRANS_MODEL_BASE_URL', (um.base_url ?? '').trim()],
+    ];
+}
+/**
+ * 把 `autotest.unified_model` 镜像进 `config.env` 的 HOMETRANS_MODEL_* 四项，让
+ * config.json 的 `env` 块与 `ht init` 实际写入机器环境变量的集合保持一致。
+ * `autotest.unified_model` 是唯一事实来源，这里只做单向派生（env 侧的手改会被覆盖）。
+ * 返回是否有字段发生变化（供调用方决定是否落盘）。
+ */
+export function syncModelEnvIntoConfig(config) {
+    let changed = false;
+    const envRec = config.env;
+    for (const [key, value] of modelEnvPairs(config.autotest)) {
+        if (envRec[key] !== value) {
+            envRec[key] = value;
+            changed = true;
+        }
+    }
+    return changed;
+}
 /** AutoTest 自测默认配置（单层模式）。`ht init` 的「测试配置」环节会填充 api_key。 */
 export function defaultAutotest() {
     return {
@@ -170,7 +253,8 @@ export function defaultAutotest() {
             name: '',
             base_url: '',
             api_key: '',
-            provider: '',
+            // provider 不在 `ht init` 中询问，默认 openai（OpenAI 兼容协议）。
+            provider: 'openai',
             temperature: 0.1,
             top_p: 0.9,
             frequency_penalty: 0.5,
@@ -216,7 +300,7 @@ export async function loadHomeTransConfig() {
     const config = parsed;
     const anyParsed = parsed;
     // Migrate legacy fields into `env`:
-    //   - `sdkPaths` / `params` held OHOS_SDK_PATH / HMS_SDK_PATH / TEST_API_KEY.
+    //   - `sdkPaths` / `params` held OHOS_SDK_PATH / HMS_SDK_PATH (+ now-removed keys).
     //   - `tool_path` held the tools dir, now env.HOMETRANS_TOOL_PATH.
     const legacyParams = (anyParsed.params ?? anyParsed.sdkPaths);
     const legacyToolPath = typeof anyParsed.tool_path === 'string' ? anyParsed.tool_path : undefined;
@@ -245,9 +329,12 @@ export async function loadHomeTransConfig() {
         delete envRecord.DEVECO_PATH;
         envDirty = true;
     }
-    // 移除已废弃的派生字段：JAVA_HOME / NODE_HOME 不再写入 env（构建时由
-    // build agent 自行从 DEVECO_HOME 推导），清理老配置里残留的同名键。
-    for (const legacyKey of ['JAVA_HOME', 'NODE_HOME']) {
+    // 移除已废弃的派生字段：JAVA_HOME / NODE_HOME 不再写入 env（构建时由 build agent
+    // 从 DEVECO_HOME 推导）；HOMETRANS_MODEL_PROVIDER 不再导出为环境变量（provider 默认
+    // openai，仅存于 unified_model）。清理老配置里残留的同名键。
+    // 注意：GLM_API_KEY / TEST_API_KEY 不在这里删——它们走下面的「向后兼容迁移」，
+    // 先把值迁进 autotest.unified_model.api_key 再清键，避免丢掉老用户已配置的 key。
+    for (const legacyKey of ['JAVA_HOME', 'NODE_HOME', 'HOMETRANS_MODEL_PROVIDER']) {
         if (legacyKey in envRecord) {
             delete envRecord[legacyKey];
             envDirty = true;
@@ -288,17 +375,33 @@ export async function loadHomeTransConfig() {
         config.autotest = defaultAutotest();
         await saveHomeTransConfig(config);
     }
-    // Migrate a legacy env.TEST_API_KEY into the autotest block. The self-test
-    // api_key now lives in autotest.unified_model.api_key (configured by the Test
-    // Configuration step) and is no longer a machine env var. Carry the old value
-    // over (when the block still holds the placeholder) and clear it from env.
-    const legacyTestKey = (config.env.TEST_API_KEY || '').trim();
-    if (legacyTestKey) {
+    // 向后兼容老版本：老配置把 key 存在 env.TEST_API_KEY（自测）/ env.GLM_API_KEY（UI
+    // 对齐）。统一模型迁移后这些字段已废弃，但为兼容老配置——当 unified_model.api_key
+    // 仍是占位符/空时，用它们兜底填充（优先 TEST_API_KEY，其次 GLM_API_KEY），随后把旧键
+    // 从 env 中清掉（值已迁入 unified_model；运行时仍可读 OS 环境变量做兜底，见各脚本）。
+    const legacyApiKey = (typeof envRecord.TEST_API_KEY === 'string' ? envRecord.TEST_API_KEY : '').trim() ||
+        (typeof envRecord.GLM_API_KEY === 'string' ? envRecord.GLM_API_KEY : '').trim();
+    let legacyDirty = false;
+    if (legacyApiKey) {
         const um = config.autotest.unified_model;
-        if (um && (!um.api_key || um.api_key === 'YOUR_API_KEY_HERE')) {
-            um.api_key = legacyTestKey;
+        if (um && isPlaceholderApiKey(um.api_key)) {
+            um.api_key = legacyApiKey;
+            legacyDirty = true;
         }
-        config.env.TEST_API_KEY = '';
+    }
+    for (const legacyKey of ['TEST_API_KEY', 'GLM_API_KEY']) {
+        if (legacyKey in envRecord) {
+            delete envRecord[legacyKey];
+            legacyDirty = true;
+        }
+    }
+    if (legacyDirty) {
+        await saveHomeTransConfig(config);
+    }
+    // Mirror the unified model into config.env.HOMETRANS_MODEL_* so the `env` block
+    // in config.json matches exactly the machine env vars `ht init` persists. Runs
+    // after the legacy migration so a migrated api_key is reflected too.
+    if (syncModelEnvIntoConfig(config)) {
         await saveHomeTransConfig(config);
     }
     // Append any default editors that this (older) config predates, matched by
@@ -311,19 +414,14 @@ export async function loadHomeTransConfig() {
         config.editors.push(...missingEditors);
         await saveHomeTransConfig(config);
     }
-    // Backfill editor flags introduced after the user's config was first written.
-    // The append-above only adds whole new editors by name; an editor entry that
-    // already exists (e.g. "DevEco Code" created before `stripAgentColors` shipped)
-    // keeps its old shape, so the flag would be missing and agents would install
-    // with their `color:` intact. Copy `stripAgentColors` from the same-named
-    // default when the stored entry doesn't define it; user-set values (incl. an
-    // explicit false) are preserved because we only fill when the key is absent.
-    const defaultsByName = new Map(defaultEditors().map((e) => [e.name, e]));
+    // Drop the obsolete `stripAgentColors` flag from configs written by older
+    // versions. Agent colors are now normalized to hex at install time based on
+    // the editor's MCP format (see needsHexAgentColor in init.ts), so the flag is
+    // no longer read — strip it so config.json stays clean.
     let editorsDirty = false;
     for (const ed of config.editors) {
-        const def = defaultsByName.get(ed.name);
-        if (def?.stripAgentColors && ed.stripAgentColors === undefined) {
-            ed.stripAgentColors = def.stripAgentColors;
+        if ('stripAgentColors' in ed) {
+            delete ed.stripAgentColors;
             editorsDirty = true;
         }
     }

package/dist/cli/config.js

@@ -23,10 +23,17 @@ export async function configCommand() {
     console.log(`    DEVECO_HOME     : ${config.env.DEVECO_HOME || '(not set)'} (derived)`);
     console.log(`    OHOS_SDK_PATH   : ${config.env.OHOS_SDK_PATH || '(not set)'} (derived)`);
     console.log(`    HMS_SDK_PATH    : ${config.env.HMS_SDK_PATH || '(not set)'} (derived)`);
-    console.log(`    autotest api_key: ${mask(config.autotest?.unified_model?.api_key ?? '')} (config.json → autotest)`);
-    console.log(`    GLM_API_KEY     : ${mask(config.env.GLM_API_KEY)}`);
     console.log(`    HOMETRANS_TOOL_PATH       : ${config.env.HOMETRANS_TOOL_PATH || '(not set)'}`);
     console.log('');
+    // Unified multimodal model — shared by UI alignment + self-test. Stored in
+    // autotest.unified_model and exported as HOMETRANS_MODEL_* env vars.
+    const um = config.autotest?.unified_model;
+    console.log('  Model (UI alignment + self-test, env: HOMETRANS_MODEL_*):');
+    console.log(`    api_key  : ${mask(um?.api_key ?? '')}`);
+    console.log(`    name     : ${um?.name || '(not set)'}`);
+    console.log(`    base_url : ${um?.base_url || '(not set)'}`);
+    console.log(`    provider : ${um?.provider || '(not set)'}`);
+    console.log('');
     // Full config content
     console.log('  Full Content:');
     console.log('');