@buaa_smat/hometrans 0.1.2 → 0.1.4

package/agents/build-fixer.md

@@ -29,35 +29,40 @@ Execute a build-fix loop: resolve environment → validate project → build →
 
 The build requires the **DevEco Studio installation path**, from which Node.js, hvigor, and ohpm are derived.
 
-### 0a. Read the plugin config
+### 0a. Read the HomeTrans config
 
-Read the config file at `android-harmonyos-converter/.claude-plugin/converter-config.json` (locate the plugin root by searching for the `android-harmonyos-converter/.claude-plugin/plugin.json` file). It may contain:
+Read the config file written by `ht init` at `~/.hometrans/config.json` (`$HOME/.hometrans/config.json`; on Windows `%USERPROFILE%\.hometrans\config.json`). Its shape is:
 
 ```jsonc
 {
-  "node_path": "...",
-  "deveco_studio_path": "...",   // e.g. "D:\\DevEco Studio"
-  "harmonyos_sdk_path": "...",
-  "python_path": "...",
-  "java_home": "..."
+  "editors": [ /* ... */ ],
+  "params": {
+    "OHOS_SDK_PATH": "...",   // OpenHarmony SDK ETS path, e.g. "D:/DevEco Studio/sdk/default/openharmony/ets"
+    "HMS_SDK_PATH": "...",    // HMS SDK ETS path, e.g. "D:/DevEco Studio/sdk/default/hms/ets"
+    "TEST_API_KEY": "..."
+  }
 }
 ```
 
-Extract `deveco_studio_path` from this file.
+Read `params.OHOS_SDK_PATH` from this file.
 
-### 0b. Derive tool paths from DevEco Studio
+### 0b. Derive the DevEco Studio root and tool paths
 
-If `deveco_studio_path` is present and valid, derive:
-- **Node executable**: `<deveco_studio_path>/tools/node/node.exe`
-- **Hvigor script**: `<deveco_studio_path>/tools/hvigor/bin/hvigorw.js`
-- **ohpm**: `<deveco_studio_path>/tools/ohpm/bin/ohpm`
-- **SDK directory**: `<deveco_studio_path>/sdk`
+The DevEco Studio installation root is the part of `OHOS_SDK_PATH` before the SDK suffix. Strip the trailing `/sdk/default/openharmony/ets` (or `\sdk\default\openharmony\ets`) from `OHOS_SDK_PATH` to get `<deveco>`.
 
-Verify these files exist. If they do, use them and skip auto-detection.
+> Example: `OHOS_SDK_PATH = D:/DevEco Studio/sdk/default/openharmony/ets` → `<deveco> = D:/DevEco Studio`.
+
+From `<deveco>`, derive:
+- **Node executable**: `<deveco>/tools/node/node.exe`
+- **Hvigor script**: `<deveco>/tools/hvigor/bin/hvigorw.js`
+- **ohpm**: `<deveco>/tools/ohpm/bin/ohpm`
+- **SDK directory**: `<deveco>/sdk`
+
+Verify these files exist. If they do, use them and skip auto-detection. (Fall back to `params.HMS_SDK_PATH` — stripping `/sdk/default/hms/ets` — if `OHOS_SDK_PATH` is absent but `HMS_SDK_PATH` is present.)
 
 ### 0c. Auto-detect if config is missing or invalid
 
-If the config file is empty, missing, or the paths don't point to real files, auto-detect:
+If `~/.hometrans/config.json` is missing, has empty `params.OHOS_SDK_PATH`/`HMS_SDK_PATH`, or the derived paths don't point to real files, auto-detect:
 
 1. **Find DevEco Studio installation**:
    - Search common locations: `D:\DevEco Studio`, `C:\DevEco Studio`, `C:\Program Files\DevEco Studio`
@@ -68,7 +73,7 @@ If the config file is empty, missing, or the paths don't point to real files, au
    - `where node` (Windows) or `which node` (Unix)
    - Verify it runs: `node --version`
 
-If auto-detection fails for any critical path, **stop and report clearly** what is missing so the user can run `/setup` to configure it.
+If auto-detection fails for any critical path, **stop and report clearly** what is missing so the user can run `ht init` to configure it.
 
 ### 0d. Store resolved paths
 

package/agents/code-review-fix.md

@@ -41,7 +41,7 @@ If `commit-id` is provided and is not `none`:
    - `projectPath`: `<harmonyos-project-path>`
    - `commitId`: `<commit-id>`
    - `mode`: `"default"`
-   - `ohosSdkPath` / `hmsSdkPath`: from environment or omit
+   - `ohosSdkPath` / `hmsSdkPath`: omit to let the tool read `params.OHOS_SDK_PATH` / `params.HMS_SDK_PATH` from the `ht init` config (`~/.hometrans/config.json`), falling back to the `OHOS_SDK_PATH` / `HMS_SDK_PATH` env vars
 
 2. **On failure**, fall back to:
    ```bash
@@ -231,16 +231,16 @@ Classify: **CONFIRMED** (fix) | **FALSE_POSITIVE** (skip, record reason) | **UNC
 
 ### Step 3.0: Resolve Build Environment
 
-1. Read `android-harmonyos-converter/.claude-plugin/converter-config.json` (locate plugin root by searching for `android-harmonyos-converter/.claude-plugin/plugin.json`). Extract `deveco_studio_path`.
+1. Read the `ht init` config at `~/.hometrans/config.json` (Windows: `%USERPROFILE%\.hometrans\config.json`). Take `params.OHOS_SDK_PATH` (e.g. `D:/DevEco Studio/sdk/default/openharmony/ets`) and strip the trailing `/sdk/default/openharmony/ets` to get the DevEco Studio root `<deveco>`. Fall back to `params.HMS_SDK_PATH` (strip `/sdk/default/hms/ets`) if needed.
 
 2. Derive tool paths:
    - `NODE_EXE`: `<deveco>/tools/node/node.exe`
    - `HVIGORW_JS`: `<deveco>/tools/hvigor/bin/hvigorw.js`
    - `OHPM`: `<deveco>/tools/ohpm/bin/ohpm`
 
-3. If config missing, auto-detect: search `D:\DevEco Studio`, `C:\DevEco Studio`, `C:\Program Files\DevEco Studio` for `tools/hvigor/bin/hvigorw.js`.
+3. If the config is missing or `params.OHOS_SDK_PATH`/`HMS_SDK_PATH` are empty, auto-detect: search `D:\DevEco Studio`, `C:\DevEco Studio`, `C:\Program Files\DevEco Studio` for `tools/hvigor/bin/hvigorw.js`.
 
-4. If detection fails, stop and report clearly what is missing.
+4. If detection fails, stop and report clearly what is missing so the user can run `ht init` to configure it.
 
 ### Step 3.1: Setup Project
 

package/dist/cli/config-store.js

@@ -14,6 +14,10 @@ export function getConfigDir() {
 export function getConfigPath() {
     return path.join(getConfigDir(), 'config.json');
 }
+/** 工具目录：~/.hometrans/tools，`ht init` 把打包的 tools/ 拷贝到此。 */
+export function getToolsDir() {
+    return path.join(getConfigDir(), 'tools');
+}
 /** 把 ~/foo 展开为 $HOME/foo；非 ~ 开头原样返回。 */
 export function expandHome(p) {
     if (!p)
@@ -100,6 +104,7 @@ export async function loadHomeTransConfig() {
         const config = {
             editors: defaultEditors(),
             params: defaultUserParams(),
+            tool_path: '',
         };
         await fs.mkdir(getConfigDir(), { recursive: true });
         await fs.writeFile(configPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
@@ -125,6 +130,9 @@ export async function loadHomeTransConfig() {
     else {
         config.params = { ...defaultUserParams(), ...config.params };
     }
+    if (typeof config.tool_path !== 'string') {
+        config.tool_path = '';
+    }
     delete config.sdkPaths;
     return config;
 }

package/dist/cli/config.js

@@ -26,6 +26,7 @@ export async function configCommand() {
     console.log(`    OHOS_SDK_PATH : ${config.params.OHOS_SDK_PATH || '(not set)'}`);
     console.log(`    HMS_SDK_PATH  : ${config.params.HMS_SDK_PATH || '(not set)'}`);
     console.log(`    TEST_API_KEY  : ${maskedKey}`);
+    console.log(`    tool_path     : ${config.tool_path || '(not set)'}`);
     console.log('');
     // Full config content
     console.log('  Full Content:');

package/dist/cli/init.js

@@ -13,7 +13,7 @@ import chalk from 'chalk';
 import figlet from 'figlet';
 import inquirer from 'inquirer';
 import { setupMcpForAllEditors } from './mcp-setup.js';
-import { expandHome, loadHomeTransConfig, saveHomeTransConfig, } from './config-store.js';
+import { expandHome, getConfigPath, getToolsDir, loadHomeTransConfig, saveHomeTransConfig, } from './config-store.js';
 function ensureChalkColor() {
     if (process.stdout.isTTY && chalk.level === 0) {
         chalk.level = 1;
@@ -50,6 +50,23 @@ function resolveSkillsRoot() {
 function resolveAgentsRoot() {
     return path.resolve(__dirname, '..', '..', 'agents');
 }
+function resolveToolsRoot() {
+    return path.resolve(__dirname, '..', '..', 'tools');
+}
+/**
+ * Copy the bundled `tools/` folder into ~/.hometrans/tools and record the
+ * destination in config.tool_path. Returns the destination path, or null if
+ * the package ships no tools/ folder.
+ */
+async function installTools(toolsRoot, config) {
+    if (!(await dirExists(toolsRoot)))
+        return null;
+    const toolsDest = getToolsDir();
+    await copyDirRecursive(toolsRoot, toolsDest);
+    config.tool_path = toolsDest;
+    await saveHomeTransConfig(config);
+    return toolsDest;
+}
 function resolveAutotestDir(agentsRoot) {
     return path.join(agentsRoot, 'test-tools', 'autotest');
 }
@@ -198,6 +215,7 @@ export async function initCommand(options = {}) {
     console.log(chalk.gray('\n   Android-to-HarmonyOS skill & agent installer for AI editors\n'));
     const skillsRoot = resolveSkillsRoot();
     const agentsRoot = resolveAgentsRoot();
+    const toolsRoot = resolveToolsRoot();
     const hasSkills = await dirExists(skillsRoot);
     const hasAgents = await dirExists(agentsRoot);
     if (!hasSkills && !hasAgents) {
@@ -296,6 +314,17 @@ export async function initCommand(options = {}) {
     catch (err) {
         console.log(chalk.red(`  ! autotest config.yaml: ${err.message}`));
     }
+    // Copy bundled tools/ into ~/.hometrans/tools and record tool_path.
+    try {
+        const toolsDest = await installTools(toolsRoot, config);
+        if (toolsDest) {
+            console.log(chalk.green(`  + tools copied -> ${prettyHome(toolsDest)}`));
+            console.log(chalk.gray(`    tool_path set in ${prettyHome(getConfigPath())}`));
+        }
+    }
+    catch (err) {
+        console.log(chalk.red(`  ! tools copy: ${err.message}`));
+    }
     console.log('');
     const editorsToSetup = editors.filter((e) => selectedEditors.includes(e.name));
     const result = { configured: [], skipped: [], errors: [] };

package/dist/context/index.js

@@ -96,7 +96,8 @@ async function loadHomeTransConfig() {
   if (!await fileExists(configPath)) {
     const config2 = {
       editors: defaultEditors(),
-      params: defaultUserParams()
+      params: defaultUserParams(),
+      tool_path: ""
     };
     await fs.mkdir(getConfigDir(), { recursive: true });
     await fs.writeFile(configPath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
@@ -123,6 +124,9 @@ async function loadHomeTransConfig() {
   } else {
     config.params = { ...defaultUserParams(), ...config.params };
   }
+  if (typeof config.tool_path !== "string") {
+    config.tool_path = "";
+  }
   delete config.sdkPaths;
   return config;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@buaa_smat/hometrans",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "HomeTrans (Android-to-HarmonyOS) skill + agent installer. Run `ht init` to distribute conversion skills and subagents into AI editors.",
   "license": "MIT",
   "type": "module",
@@ -11,7 +11,8 @@
   "files": [
     "dist",
     "skills",
-    "agents"
+    "agents",
+    "tools"
   ],
   "scripts": {
     "build": "node scripts/build.js",