@buaa_smat/hometrans 0.1.13 → 0.1.15

package/dist/cli/uninstall.js

@@ -16,11 +16,16 @@ import { promisify } from 'node:util';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { modify, applyEdits } from 'jsonc-parser';
-import { expandHome, loadHomeTransConfig, } from './config-store.js';
-import { dirExists, isPromptAbort, prettyHome } from './init.js';
+import { expandHome, getConfigDir, loadHomeTransConfig, } from './config-store.js';
+import { dirExists, isPromptAbort, prettyHome, MACHINE_ENV_KEYS } from './init.js';
+import { removeEnvVars } from './env-vars.js';
 const execFileAsync = promisify(execFile);
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+/** Names + readable count of env vars that have a non-empty value in config. */
+function plannedEnvVarNames(env) {
+    return MACHINE_ENV_KEYS.filter((k) => (env[k] ?? '').trim().length > 0);
+}
 /* ------------------------------------------------------------------ */
 /*  Bundled content discovery                                          */
 /* ------------------------------------------------------------------ */
@@ -85,7 +90,7 @@ async function tryRemoveJsoncKey(filePath, keyPath) {
     const edits = modify(raw, keyPath, undefined, { formattingOptions });
     if (edits.length === 0)
         return null;
-    return applyEdits(raw, edits);
+    return { oldContent: raw, newContent: applyEdits(raw, edits) };
 }
 async function tryRemoveTomlSection(filePath, sectionHeader) {
     let raw;
@@ -116,7 +121,7 @@ async function tryRemoveTomlSection(filePath, sectionHeader) {
     let content = result.join('\n').replace(/\n{3,}/g, '\n\n').trimEnd();
     if (content.length > 0)
         content += '\n';
-    return content;
+    return { oldContent: raw, newContent: content };
 }
 /* ------------------------------------------------------------------ */
 /*  Plan building                                                      */
@@ -165,13 +170,14 @@ async function buildPlanForEditor(editor, skillNames, agentEntries, plan) {
             if (!mcp.path || !mcp.keyPath)
                 break;
             const configPath = expandHome(mcp.path);
-            const newContent = await tryRemoveJsoncKey(configPath, mcp.keyPath);
-            if (newContent !== null) {
+            const change = await tryRemoveJsoncKey(configPath, mcp.keyPath);
+            if (change !== null) {
                 plan.modifications.push({
                     display: `${editor.name}: ${prettyHome(configPath)}`,
                     absPath: configPath,
                     reason: 'Remove hometrans MCP entry',
-                    newContent,
+                    oldContent: change.oldContent,
+                    newContent: change.newContent,
                 });
             }
             break;
@@ -180,13 +186,14 @@ async function buildPlanForEditor(editor, skillNames, agentEntries, plan) {
             plan.codexRemove = true;
             if (mcp.path && mcp.section) {
                 const configPath = expandHome(mcp.path);
-                const newContent = await tryRemoveTomlSection(configPath, mcp.section);
-                if (newContent !== null) {
+                const change = await tryRemoveTomlSection(configPath, mcp.section);
+                if (change !== null) {
                     plan.modifications.push({
                         display: `${editor.name}: ${prettyHome(configPath)}`,
                         absPath: configPath,
                         reason: 'Remove hometrans MCP section',
-                        newContent,
+                        oldContent: change.oldContent,
+                        newContent: change.newContent,
                     });
                 }
             }
@@ -196,13 +203,14 @@ async function buildPlanForEditor(editor, skillNames, agentEntries, plan) {
             if (!mcp.path || !mcp.section)
                 break;
             const configPath = expandHome(mcp.path);
-            const newContent = await tryRemoveTomlSection(configPath, mcp.section);
-            if (newContent !== null) {
+            const change = await tryRemoveTomlSection(configPath, mcp.section);
+            if (change !== null) {
                 plan.modifications.push({
                     display: `${editor.name}: ${prettyHome(configPath)}`,
                     absPath: configPath,
                     reason: 'Remove hometrans MCP section',
-                    newContent,
+                    oldContent: change.oldContent,
+                    newContent: change.newContent,
                 });
             }
             break;
@@ -211,12 +219,92 @@ async function buildPlanForEditor(editor, skillNames, agentEntries, plan) {
             break;
     }
 }
+/** Line-based diff via an LCS table. Files here are small config files. */
+function diffLines(oldLines, newLines) {
+    const n = oldLines.length;
+    const m = newLines.length;
+    const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
+    for (let i = n - 1; i >= 0; i--) {
+        for (let j = m - 1; j >= 0; j--) {
+            dp[i][j] =
+                oldLines[i] === newLines[j]
+                    ? dp[i + 1][j + 1] + 1
+                    : Math.max(dp[i + 1][j], dp[i][j + 1]);
+        }
+    }
+    const out = [];
+    let i = 0;
+    let j = 0;
+    while (i < n && j < m) {
+        if (oldLines[i] === newLines[j]) {
+            out.push({ type: ' ', text: oldLines[i] });
+            i++;
+            j++;
+        }
+        else if (dp[i + 1][j] >= dp[i][j + 1]) {
+            out.push({ type: '-', text: oldLines[i] });
+            i++;
+        }
+        else {
+            out.push({ type: '+', text: newLines[j] });
+            j++;
+        }
+    }
+    while (i < n)
+        out.push({ type: '-', text: oldLines[i++] });
+    while (j < m)
+        out.push({ type: '+', text: newLines[j++] });
+    return out;
+}
+/**
+ * Render a unified, git-style diff with `context` unchanged lines around each
+ * change; long unchanged runs collapse to a `⋮` marker. Returns coloured,
+ * pre-indented lines ready to print.
+ */
+function renderDiff(oldContent, newContent, context = 3) {
+    const diff = diffLines(oldContent.split('\n'), newContent.split('\n'));
+    const keep = new Array(diff.length).fill(false);
+    for (let k = 0; k < diff.length; k++) {
+        if (diff[k].type === ' ')
+            continue;
+        const from = Math.max(0, k - context);
+        const to = Math.min(diff.length - 1, k + context);
+        for (let c = from; c <= to; c++)
+            keep[c] = true;
+    }
+    const lines = [];
+    let gapOpen = false;
+    for (let k = 0; k < diff.length; k++) {
+        if (!keep[k]) {
+            if (!gapOpen) {
+                lines.push(chalk.gray('        ⋮'));
+                gapOpen = true;
+            }
+            continue;
+        }
+        gapOpen = false;
+        const { type, text } = diff[k];
+        if (type === '-')
+            lines.push(chalk.red(`      - ${text}`));
+        else if (type === '+')
+            lines.push(chalk.green(`      + ${text}`));
+        else
+            lines.push(chalk.gray(`        ${text}`));
+    }
+    return lines;
+}
 /* ------------------------------------------------------------------ */
 /*  Render                                                             */
 /* ------------------------------------------------------------------ */
+function isPlanEmpty(plan) {
+    return (plan.deletions.length === 0 &&
+        plan.modifications.length === 0 &&
+        plan.envVars.length === 0 &&
+        plan.configDir === null);
+}
 function renderPlan(plan) {
     console.log(chalk.bold('\nHomeTrans uninstall plan\n'));
-    if (plan.deletions.length === 0 && plan.modifications.length === 0) {
+    if (isPlanEmpty(plan)) {
         console.log(chalk.gray('  Nothing to uninstall — no hometrans files found in configured editors.\n'));
         return;
     }
@@ -231,9 +319,27 @@ function renderPlan(plan) {
         console.log(chalk.yellow.bold(`  Will be modified (${plan.modifications.length} files):`));
         for (const m of plan.modifications) {
             console.log(`    ${chalk.yellow('~')} ${m.display}  ${chalk.gray(`(${m.reason})`)}`);
+            for (const line of renderDiff(m.oldContent, m.newContent)) {
+                console.log(line);
+            }
+            console.log('');
+        }
+    }
+    if (plan.envVars.length > 0) {
+        console.log(chalk.red.bold(`  Environment variables to remove (${plan.envVars.length}):`));
+        console.log(chalk.gray(process.platform === 'win32'
+            ? '    (Windows: deleted from the per-user environment)'
+            : '    (macOS/Linux: the hometrans export block is removed from your shell profile)'));
+        for (const name of plan.envVars) {
+            console.log(`    ${chalk.red('-')} ${name}`);
         }
         console.log('');
     }
+    if (plan.configDir) {
+        console.log(chalk.red.bold('  Config directory to delete:'));
+        console.log(`    ${chalk.red('-')} ${prettyHome(plan.configDir)}/`);
+        console.log('');
+    }
 }
 /* ------------------------------------------------------------------ */
 /*  Execute                                                            */
@@ -241,6 +347,7 @@ function renderPlan(plan) {
 async function executePlan(plan) {
     let deleted = 0;
     let modified = 0;
+    let envNote = null;
     for (const mod of plan.modifications) {
         await fs.writeFile(mod.absPath, mod.newContent, 'utf-8');
         modified++;
@@ -264,7 +371,20 @@ async function executePlan(plan) {
             // best-effort
         }
     }
-    return { deleted, modified };
+    // Remove machine environment variables (names captured from config.json env)
+    // before deleting the config directory that holds config.json.
+    if (plan.envVars.length > 0) {
+        envNote = await removeEnvVars(plan.envVars);
+    }
+    if (plan.configDir) {
+        try {
+            await fs.rm(plan.configDir, { recursive: true, force: true });
+        }
+        catch {
+            // best-effort
+        }
+    }
+    return { deleted, modified, envNote };
 }
 /* ------------------------------------------------------------------ */
 /*  Entry point                                                        */
@@ -278,17 +398,26 @@ export async function uninstallCommand() {
         console.log(chalk.gray('  Reinstall hometrans or manually remove skill/agent directories from your editors.\n'));
         return;
     }
-    const { editors } = await loadHomeTransConfig();
+    const { editors, env } = await loadHomeTransConfig();
     const plan = {
         deletions: [],
         modifications: [],
         codexRemove: false,
+        envVars: [],
+        configDir: null,
     };
     for (const editor of editors) {
         await buildPlanForEditor(editor, skillNames, agentEntries, plan);
     }
+    // Env vars to remove come from config.json `env`; the ~/.hometrans dir
+    // (which holds config.json) is deleted last.
+    plan.envVars = plannedEnvVarNames(env);
+    const configDir = getConfigDir();
+    if (await dirExists(configDir)) {
+        plan.configDir = configDir;
+    }
     renderPlan(plan);
-    if (plan.deletions.length === 0 && plan.modifications.length === 0) {
+    if (isPlanEmpty(plan)) {
         return;
     }
     let proceed;
@@ -317,5 +446,11 @@ export async function uninstallCommand() {
     const summary = await executePlan(plan);
     console.log('');
     console.log(chalk.green(`  Uninstalled: ${summary.deleted} entries deleted, ${summary.modified} files modified.`));
+    if (summary.envNote) {
+        console.log(chalk.green(`  Environment variables: ${summary.envNote}`));
+    }
+    if (plan.configDir) {
+        console.log(chalk.green(`  Removed config directory: ${prettyHome(plan.configDir)}/`));
+    }
     console.log('');
 }

package/dist/context/index.js

@@ -10,38 +10,8 @@ import {
 } from "arkanalyzer";
 
 // src/cli/config-store.ts
-import fs from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-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: home,
-    DEVECO_PATH: path.dirname(home),
-    OHOS_SDK_PATH: path.join(home, "default", "openharmony", "ets"),
-    HMS_SDK_PATH: path.join(home, "default", "hms", "ets")
-  };
-}
-function sdkHomeFromLegacyPaths(env) {
-  const tryStrip = (p, suffix) => {
-    if (!p) return "";
-    const norm = p.replace(/[\\/]+$/, "").split(/[\\/]/);
-    if (norm.length <= suffix.length) return "";
-    const tail = norm.slice(-suffix.length).map((s) => s.toLowerCase());
-    if (tail.join("/") !== suffix.join("/")) return "";
-    return norm.slice(0, -suffix.length).join(path.sep);
-  };
-  return tryStrip(env.OHOS_SDK_PATH, ["default", "openharmony", "ets"]) || tryStrip(env.HMS_SDK_PATH, ["default", "hms", "ets"]);
-}
-function getConfigDir() {
-  return path.join(os.homedir(), ".hometrans");
-}
-function getConfigPath() {
-  return path.join(getConfigDir(), "config.json");
-}
 function expandHome(p) {
   if (!p) return p;
   if (p === "~") return os.homedir();
@@ -50,162 +20,6 @@ function expandHome(p) {
   }
   return p;
 }
-function defaultEditors() {
-  return [
-    {
-      name: "Claude Code",
-      markerDir: "~/.claude",
-      skillsDir: "~/.claude/skills",
-      agentsDir: "~/.claude/agents",
-      mcp: {
-        format: "jsonc-object",
-        path: "~/.claude.json",
-        keyPath: ["mcpServers", "hometrans"]
-      }
-    },
-    {
-      name: "Cursor",
-      markerDir: "~/.cursor",
-      skillsDir: "~/.cursor/skills",
-      agentsDir: "~/.cursor/agents",
-      mcp: {
-        format: "jsonc-object",
-        path: "~/.cursor/mcp.json",
-        keyPath: ["mcpServers", "hometrans"]
-      }
-    },
-    {
-      name: "OpenCode",
-      markerDir: "~/.config/opencode",
-      skillsDir: "~/.config/opencode/skills",
-      agentsDir: "~/.config/opencode/agents",
-      mcp: {
-        format: "jsonc-command-array",
-        path: "~/.config/opencode/opencode.json",
-        keyPath: ["mcp", "hometrans"]
-      }
-    },
-    {
-      name: "Codex",
-      markerDir: "~/.codex",
-      // Codex 复用 Agent Skills 公共目录，agent 定义独立。
-      skillsDir: "~/.agents/skills",
-      agentsDir: "~/.codex/agents",
-      mcp: {
-        format: "codex-cli",
-        path: "~/.codex/config.toml",
-        section: "mcp_servers.hometrans"
-      }
-    },
-    {
-      // CodeBuddy（腾讯）：与 Claude Code 同构的 .codebuddy/ 目录，
-      // 全局安装映射到 ~/.codebuddy/{skills,agents}，MCP 走 mcpServers JSON。
-      name: "CodeBuddy",
-      markerDir: "~/.codebuddy",
-      skillsDir: "~/.codebuddy/skills",
-      agentsDir: "~/.codebuddy/agents",
-      mcp: {
-        format: "jsonc-object",
-        path: "~/.codebuddy/mcp.json",
-        keyPath: ["mcpServers", "hometrans"]
-      }
-    }
-  ];
-}
-async function fileExists(p) {
-  try {
-    await fs.access(p);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function defaultEnv() {
-  return {
-    DEVECO_SDK_HOME: "",
-    DEVECO_PATH: "",
-    OHOS_SDK_PATH: "",
-    HMS_SDK_PATH: "",
-    TEST_API_KEY: "",
-    GLM_API_KEY: "",
-    TOOL_PATH: ""
-  };
-}
-async function loadHomeTransConfig() {
-  const configPath = getConfigPath();
-  if (!await fileExists(configPath)) {
-    const config2 = {
-      editors: defaultEditors(),
-      env: defaultEnv()
-    };
-    await fs.mkdir(getConfigDir(), { recursive: true });
-    await fs.writeFile(configPath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
-    return config2;
-  }
-  const raw = await fs.readFile(configPath, "utf-8");
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    throw new Error(
-      `Failed to parse ${configPath}: ${err.message}. Fix the JSON or delete the file to restore defaults.`
-    );
-  }
-  if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.editors)) {
-    throw new Error(
-      `Invalid config.json shape at ${configPath}: top-level must be { "editors": [...] }.`
-    );
-  }
-  const config = parsed;
-  const anyParsed = parsed;
-  const legacyParams = anyParsed.params ?? anyParsed.sdkPaths;
-  const legacyToolPath = typeof anyParsed.tool_path === "string" ? anyParsed.tool_path : void 0;
-  config.env = {
-    ...defaultEnv(),
-    ...legacyParams ?? {},
-    ...config.env ?? {}
-  };
-  if (legacyToolPath && !config.env.TOOL_PATH) {
-    config.env.TOOL_PATH = legacyToolPath;
-  }
-  delete anyParsed.sdkPaths;
-  delete anyParsed.params;
-  delete anyParsed.tool_path;
-  let envDirty = false;
-  if (!config.env.DEVECO_SDK_HOME) {
-    const migrated = sdkHomeFromLegacyPaths(config.env);
-    if (migrated) {
-      config.env.DEVECO_SDK_HOME = migrated;
-      envDirty = true;
-    }
-  }
-  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"]) {
-      if (!config.env[key]) {
-        config.env[key] = derived[key];
-        envDirty = true;
-      }
-    }
-  }
-  if (envDirty) {
-    await saveHomeTransConfig(config);
-  }
-  const existingNames = new Set(config.editors.map((e) => e.name));
-  const missingEditors = defaultEditors().filter(
-    (e) => !existingNames.has(e.name)
-  );
-  if (missingEditors.length > 0) {
-    config.editors.push(...missingEditors);
-    await saveHomeTransConfig(config);
-  }
-  return config;
-}
-async function saveHomeTransConfig(config) {
-  const configPath = getConfigPath();
-  await fs.mkdir(getConfigDir(), { recursive: true });
-  await fs.writeFile(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
-}
 
 // src/context/analysis/ArkTsGitInfoAnalysis.ts
 import {
@@ -218,12 +32,12 @@ import {
   parseJsonText
 } from "arkanalyzer";
 import path3 from "path";
-import fs3 from "fs";
+import fs2 from "fs";
 
 // src/context/utils/util.ts
 import LoggerMod, { LOG_MODULE_TYPE } from "arkanalyzer/lib/utils/logger.js";
 import path2 from "path";
-import fs2 from "fs";
+import fs from "fs";
 var Logger = LoggerMod.default ?? LoggerMod;
 var logger = Logger.getLogger(LOG_MODULE_TYPE.DEFAULT, "util");
 function safePush(target, source, maxBatchSize = 1e4) {
@@ -233,21 +47,21 @@ function safePush(target, source, maxBatchSize = 1e4) {
   }
 }
 function getAllFiles(dirPath, exts, filenameArr = [], visited = /* @__PURE__ */ new Set()) {
-  if (!fs2.existsSync(dirPath)) {
+  if (!fs.existsSync(dirPath)) {
     logger.error(`'${dirPath}' is not exist, please check!`);
     return filenameArr;
   }
-  const realSrc = fs2.realpathSync(dirPath);
+  const realSrc = fs.realpathSync(dirPath);
   if (visited.has(realSrc)) {
     return filenameArr;
   }
   visited.add(realSrc);
-  fs2.readdirSync(realSrc).forEach((fileName) => {
+  fs.readdirSync(realSrc).forEach((fileName) => {
     if (shouldSkipFile(fileName)) {
       return;
     }
     const realFile = path2.resolve(realSrc, fileName);
-    if (fs2.statSync(realFile).isDirectory()) {
+    if (fs.statSync(realFile).isDirectory()) {
       getAllFiles(realFile, exts, filenameArr, visited);
     } else {
       if (exts.length === 0) {
@@ -442,7 +256,7 @@ var ArkTsGitInfoAnalysis = class {
     const jsonItems = [];
     const results = getAllFiles(resourcePath, [fileName]);
     for (const result of results) {
-      const configText = fs3.readFileSync(result, "utf8");
+      const configText = fs2.readFileSync(result, "utf8");
       const json = parseJsonText(configText);
       jsonItems.push({ path: result, content: json });
     }
@@ -779,12 +593,11 @@ function loadSdks(ohosSdkPath, hmsSdkPath) {
 async function extractCommitContext(input) {
   const { projectPath, commitId } = input;
   const mode = input.mode ?? "default";
-  const config = await loadHomeTransConfig();
   const ohosSdkPath = expandHome(
-    input.ohosSdkPath ?? config.env.OHOS_SDK_PATH ?? process.env.OHOS_SDK_PATH ?? ""
+    input.ohosSdkPath ?? process.env.OHOS_SDK_PATH ?? ""
   );
   const hmsSdkPath = expandHome(
-    input.hmsSdkPath ?? config.env.HMS_SDK_PATH ?? process.env.HMS_SDK_PATH ?? ""
+    input.hmsSdkPath ?? process.env.HMS_SDK_PATH ?? ""
   );
   if (!projectPath) {
     throw new Error("extractCommitContext: projectPath is required");
@@ -794,7 +607,7 @@ async function extractCommitContext(input) {
   }
   if (!ohosSdkPath && !hmsSdkPath) {
     throw new Error(
-      "extractCommitContext: ohosSdkPath/hmsSdkPath not provided. Set params.OHOS_SDK_PATH / params.HMS_SDK_PATH in ~/.hometrans/config.json (view with `ht config`), pass them as tool input, or set OHOS_SDK_PATH / HMS_SDK_PATH env vars (e.g. D:\\DevEco Studio\\sdk\\default\\openharmony\\ets)."
+      "extractCommitContext: OHOS_SDK_PATH / HMS_SDK_PATH not found in the OS environment. Run `ht init` to set them as machine environment variables (and open a new terminal), or pass ohosSdkPath / hmsSdkPath as tool input (e.g. D:\\DevEco Studio\\sdk\\default\\openharmony\\ets)."
     );
   }
   console.error(