@buaa_smat/hometrans 0.1.13 → 0.1.14

package/dist/cli/config-store.js

@@ -12,11 +12,11 @@ import os from 'node:os';
 export function deriveSdkPaths(devecoSdkHome) {
     const home = devecoSdkHome.trim().replace(/[\\/]+$/, '');
     if (!home) {
-        return { DEVECO_SDK_HOME: '', DEVECO_PATH: '', OHOS_SDK_PATH: '', HMS_SDK_PATH: '' };
+        return { DEVECO_SDK_HOME: '', DEVECO_HOME: '', OHOS_SDK_PATH: '', HMS_SDK_PATH: '' };
     }
     return {
         DEVECO_SDK_HOME: home,
-        DEVECO_PATH: path.dirname(home),
+        DEVECO_HOME: path.dirname(home),
         OHOS_SDK_PATH: path.join(home, 'default', 'openharmony', 'ets'),
         HMS_SDK_PATH: path.join(home, 'default', 'hms', 'ets'),
     };
@@ -139,12 +139,39 @@ async function fileExists(p) {
 export function defaultEnv() {
     return {
         DEVECO_SDK_HOME: '',
-        DEVECO_PATH: '',
+        DEVECO_HOME: '',
         OHOS_SDK_PATH: '',
         HMS_SDK_PATH: '',
         TEST_API_KEY: '',
         GLM_API_KEY: '',
-        TOOL_PATH: '',
+        HOMETRANS_TOOL_PATH: '',
+    };
+}
+/** AutoTest 自测默认配置（单层模式）。`ht init` 的「测试配置」环节会填充 api_key。 */
+export function defaultAutotest() {
+    return {
+        unified_model: {
+            name: '',
+            base_url: '',
+            api_key: '',
+            provider: '',
+            temperature: 0.1,
+            top_p: 0.9,
+            frequency_penalty: 0.5,
+        },
+        device: {
+            device_sn: null,
+            ip: '127.0.0.1',
+            port: 8710,
+            device_log_level: 'debug',
+        },
+        agent: {
+            max_steps: 50,
+            verbose: true,
+            lang: 'zh',
+            enable_preprocess: false,
+            debug_mode: null,
+        },
     };
 }
 export async function loadHomeTransConfig() {
@@ -153,6 +180,7 @@ export async function loadHomeTransConfig() {
         const config = {
             editors: defaultEditors(),
             env: defaultEnv(),
+            autotest: defaultAutotest(),
         };
         await fs.mkdir(getConfigDir(), { recursive: true });
         await fs.writeFile(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
@@ -173,7 +201,7 @@ export async function loadHomeTransConfig() {
     const anyParsed = parsed;
     // Migrate legacy fields into `env`:
     //   - `sdkPaths` / `params` held OHOS_SDK_PATH / HMS_SDK_PATH / TEST_API_KEY.
-    //   - `tool_path` held the tools dir, now env.TOOL_PATH.
+    //   - `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;
     config.env = {
@@ -181,8 +209,8 @@ export async function loadHomeTransConfig() {
         ...(legacyParams ?? {}),
         ...(config.env ?? {}),
     };
-    if (legacyToolPath && !config.env.TOOL_PATH) {
-        config.env.TOOL_PATH = legacyToolPath;
+    if (legacyToolPath && !config.env.HOMETRANS_TOOL_PATH) {
+        config.env.HOMETRANS_TOOL_PATH = legacyToolPath;
     }
     delete anyParsed.sdkPaths;
     delete anyParsed.params;
@@ -190,6 +218,34 @@ export async function loadHomeTransConfig() {
     // SDK 路径统一迁移：老配置只有 OHOS_SDK_PATH/HMS_SDK_PATH 时反推
     // DEVECO_SDK_HOME，再用它补齐缺失的派生路径（不覆盖已有非空值）。
     let envDirty = false;
+    const envRecord = config.env;
+    // 旧字段重命名：env.DEVECO_PATH（DevEco 安装根目录）-> env.DEVECO_HOME。
+    // 保留旧值（DEVECO_HOME 为空时），并删除遗留键。
+    if ('DEVECO_PATH' in envRecord) {
+        const legacy = envRecord.DEVECO_PATH;
+        if (!config.env.DEVECO_HOME && typeof legacy === 'string') {
+            config.env.DEVECO_HOME = legacy;
+        }
+        delete envRecord.DEVECO_PATH;
+        envDirty = true;
+    }
+    // 移除已废弃的派生字段：JAVA_HOME / NODE_HOME 不再写入 env（构建时由
+    // build agent 自行从 DEVECO_HOME 推导），清理老配置里残留的同名键。
+    for (const legacyKey of ['JAVA_HOME', 'NODE_HOME']) {
+        if (legacyKey in envRecord) {
+            delete envRecord[legacyKey];
+            envDirty = true;
+        }
+    }
+    // 旧字段重命名：env.TOOL_PATH（HomeTrans 工具目录）-> env.HOMETRANS_TOOL_PATH。
+    if ('TOOL_PATH' in envRecord) {
+        const legacy = envRecord.TOOL_PATH;
+        if (!config.env.HOMETRANS_TOOL_PATH && typeof legacy === 'string') {
+            config.env.HOMETRANS_TOOL_PATH = legacy;
+        }
+        delete envRecord.TOOL_PATH;
+        envDirty = true;
+    }
     if (!config.env.DEVECO_SDK_HOME) {
         const migrated = sdkHomeFromLegacyPaths(config.env);
         if (migrated) {
@@ -199,7 +255,7 @@ export async function loadHomeTransConfig() {
     }
     if (config.env.DEVECO_SDK_HOME) {
         const derived = deriveSdkPaths(config.env.DEVECO_SDK_HOME);
-        for (const key of ['DEVECO_PATH', 'OHOS_SDK_PATH', 'HMS_SDK_PATH']) {
+        for (const key of ['DEVECO_HOME', 'OHOS_SDK_PATH', 'HMS_SDK_PATH']) {
             if (!config.env[key]) {
                 config.env[key] = derived[key];
                 envDirty = true;
@@ -209,6 +265,26 @@ export async function loadHomeTransConfig() {
     if (envDirty) {
         await saveHomeTransConfig(config);
     }
+    // Seed the `autotest` block for configs created before it existed (it
+    // replaced test-tools/autotest/config.yaml). Only added when absent, so
+    // manual edits to an existing block are preserved.
+    if (!config.autotest || typeof config.autotest !== 'object') {
+        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) {
+        const um = config.autotest.unified_model;
+        if (um && (!um.api_key || um.api_key === 'YOUR_API_KEY_HERE')) {
+            um.api_key = legacyTestKey;
+        }
+        config.env.TEST_API_KEY = '';
+        await saveHomeTransConfig(config);
+    }
     // Append any default editors that this (older) config predates, matched by
     // name. Existing entries are never modified, so manual edits are preserved;
     // we only add editors the user's file is missing (e.g. CodeBuddy shipped

package/dist/cli/config.js

@@ -20,12 +20,12 @@ export async function configCommand() {
     const mask = (key) => key ? key.slice(0, 4) + '***' + key.slice(-4) : '(not set)';
     console.log('  Parameters:');
     console.log(`    DEVECO_SDK_HOME : ${config.env.DEVECO_SDK_HOME || '(not set)'}`);
-    console.log(`    DEVECO_PATH     : ${config.env.DEVECO_PATH || '(not set)'} (derived)`);
+    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(`    TEST_API_KEY    : ${mask(config.env.TEST_API_KEY)}`);
+    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(`    TOOL_PATH       : ${config.env.TOOL_PATH || '(not set)'}`);
+    console.log(`    HOMETRANS_TOOL_PATH       : ${config.env.HOMETRANS_TOOL_PATH || '(not set)'}`);
     console.log('');
     // Full config content
     console.log('  Full Content:');

package/dist/cli/env-vars.js

@@ -0,0 +1,129 @@
+/**
+ * Persist HomeTrans config values as real OS environment variables, so tools,
+ * shells and skills can read them straight from the environment (not only from
+ * ~/.hometrans/config.json).
+ *
+ * Cross-platform:
+ *   - Windows: `setx NAME "VALUE"` — writes to the per-user environment (HKCU);
+ *     visible in newly opened terminals.
+ *   - macOS / Linux: a marked, idempotent block of `export NAME="VALUE"` lines
+ *     appended to the user's shell rc file (~/.zshrc / ~/.bashrc / ~/.profile).
+ */
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+const BLOCK_BEGIN = '# >>> hometrans env >>>';
+const BLOCK_END = '# <<< hometrans env <<<';
+/** Pick the shell rc file to write exports into, based on $SHELL. */
+export function unixProfilePath(homeDir, shell) {
+    if (shell.includes('zsh'))
+        return path.join(homeDir, '.zshrc');
+    if (shell.includes('bash'))
+        return path.join(homeDir, '.bashrc');
+    return path.join(homeDir, '.profile');
+}
+function escapeRegExp(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/** Build the managed export block for POSIX shells. */
+export function buildUnixBlock(vars) {
+    const lines = vars.map(([name, value]) => `export ${name}="${value.replace(/(["\\$`])/g, '\\$1')}"`);
+    return [BLOCK_BEGIN, ...lines, BLOCK_END].join('\n');
+}
+/** Insert or replace the marked block in `content`, returning the new content. */
+export function upsertBlock(content, block) {
+    const re = new RegExp(`${escapeRegExp(BLOCK_BEGIN)}[\\s\\S]*?${escapeRegExp(BLOCK_END)}`);
+    if (re.test(content))
+        return content.replace(re, block);
+    const trimmed = content.replace(/\s*$/, '');
+    return (trimmed ? `${trimmed}\n\n` : '') + `${block}\n`;
+}
+/**
+ * Strip the managed hometrans block (including surrounding blank lines) from
+ * `content`. Returns the new content and whether anything was removed.
+ */
+export function stripBlock(content) {
+    const re = new RegExp(`\\n*${escapeRegExp(BLOCK_BEGIN)}[\\s\\S]*?${escapeRegExp(BLOCK_END)}\\n*`);
+    if (!re.test(content))
+        return { content, changed: false };
+    const next = content.replace(re, '\n').replace(/\n{3,}/g, '\n\n');
+    return { content: next, changed: true };
+}
+async function persistUnix(vars) {
+    const profile = unixProfilePath(os.homedir(), process.env.SHELL ?? '');
+    let content = '';
+    try {
+        content = await fs.readFile(profile, 'utf-8');
+    }
+    catch {
+        content = '';
+    }
+    await fs.writeFile(profile, upsertBlock(content, buildUnixBlock(vars)), 'utf-8');
+    return profile;
+}
+function persistWindows(vars) {
+    for (const [name, value] of vars) {
+        // No shell: each value is passed as a single argv, so spaces are safe.
+        execFileSync('setx', [name, value], { stdio: ['ignore', 'ignore', 'ignore'] });
+    }
+}
+/**
+ * Persist `vars` to the machine's per-user environment. Returns a short note
+ * describing where they were written and how to activate them.
+ */
+export async function persistEnvVars(vars) {
+    if (vars.length === 0)
+        return 'no values to set';
+    if (process.platform === 'win32') {
+        persistWindows(vars);
+        return 'written to the Windows user environment (setx) — open a new terminal to use them';
+    }
+    const profile = await persistUnix(vars);
+    return `written to ${profile} — run \`source ${profile}\` or open a new terminal to use them`;
+}
+function removeWindows(names) {
+    let removed = 0;
+    for (const name of names) {
+        try {
+            // Delete the value from the per-user environment (HKCU\Environment),
+            // mirroring how `setx` writes it. Missing values throw — ignore those.
+            execFileSync('reg', ['delete', 'HKCU\\Environment', '/v', name, '/f'], {
+                stdio: ['ignore', 'ignore', 'ignore'],
+            });
+            removed++;
+        }
+        catch {
+            // value wasn't present — nothing to remove
+        }
+    }
+    return removed;
+}
+/**
+ * Remove previously persisted HomeTrans env vars from the machine.
+ *   - Windows: `reg delete HKCU\Environment /v NAME /f` for each name.
+ *   - macOS / Linux: strip the marked export block from the shell rc file
+ *     (the `names` are ignored — the whole managed block is removed).
+ * Returns a short note describing what happened.
+ */
+export async function removeEnvVars(names) {
+    if (process.platform === 'win32') {
+        const removed = removeWindows(names);
+        return removed > 0
+            ? `removed ${removed} variable(s) from the Windows user environment — open a new terminal to refresh`
+            : 'no HomeTrans variables found in the Windows user environment';
+    }
+    const profile = unixProfilePath(os.homedir(), process.env.SHELL ?? '');
+    let content;
+    try {
+        content = await fs.readFile(profile, 'utf-8');
+    }
+    catch {
+        return 'no shell profile found — nothing to remove';
+    }
+    const { content: next, changed } = stripBlock(content);
+    if (!changed)
+        return `no HomeTrans export block found in ${profile}`;
+    await fs.writeFile(profile, next, 'utf-8');
+    return `removed the HomeTrans export block from ${profile} — open a new terminal to refresh`;
+}