@harmonyos-arkts/d2h 0.1.1 → 0.1.2

package/README.md

@@ -79,9 +79,9 @@ sh ./install-opencode.sh
 
 该脚本把 `skills/` 和 `agents/` 安装到当前用户的 OpenCode 全局配置目录，不读取或改写 `opencode.json`。更新已有安装时使用 `--force`；本地开发需要让全局安装实时跟随仓库时使用 `--link --force`。可通过 `--config-dir` 和 `--source-dir` 适配自定义目录，先用 `--dry-run` 检查操作。完整参数见 `sh ./install-opencode.sh --help`。
 
-npm 安装器支持同样的参数，完整说明见 `npx --yes @harmonyos-arkts/d2h --help`。本地开发可使用 `node bin/install-opencode.mjs --source-dir /path/to/repository --link --force`。Windows 下 Agent 文件符号链接需要开发者模式或管理员权限；默认复制模式不需要。不要将 `npx` 缓存作为长期链接来源，缓存清理后链接可能失效。
+npm 安装器支持同样的参数，完整说明见 `npx --yes @harmonyos-arkts/d2h --help`。本地开发可使用 `npm run build && node dist/bin/install-opencode.js --source-dir /path/to/repository --link --force`。Windows 下 Agent 文件符号链接需要开发者模式或管理员权限；默认复制模式不需要。不要将 `npx` 缓存作为长期链接来源，缓存清理后链接可能失效。
 
-维护者发布：在 `skill` 分支运行 `npm run check && npm test`，然后 `npm publish`。npm 包包含 Agent、完整 Skill 资源树及 schema，不包含研发文档和测试；发布时不会自动修改用户配置，只有显式执行 `npx` 安装器才会安装。
+维护者发布：安装开发依赖后运行 `npm run build`，将 TypeScript 源码编译到 `dist/`；`npm run check && npm test` 检查类型并测试编译后的 CLI，然后 `npm publish`。npm 包使用 `dist/bin/install-opencode.js` 作为入口，包含编译后的运行代码、Agent、完整 Skill 资源树及 schema，不包含 TypeScript 源码、研发文档和测试；发布时不会自动修改用户配置，只有显式执行 `npx` 安装器才会安装。
 
 完全退出并重新启动 OpenCode 后，选择 `android-to-hmos-00-orchestrator` 执行完整迁移。
 

package/dist/bin/install-opencode.js

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+import { fileURLToPath } from 'node:url';
+import path from 'node:path';
+import os from 'node:os';
+import { installOpenCode } from '../src/install-opencode.js';
+const help = `Install this package's skills and agents into OpenCode or DevEco Code.
+
+Usage: d2h [options]
+
+  --source-dir <path>  Source root (defaults to this package)
+  --agent <name>       opencode (default) or deveco
+  --config-dir <path>  Override the selected agent's config root
+                       OPENCODE_CONFIG_DIR / DEVECO_CONFIG_DIR, or
+                       $XDG_CONFIG_HOME/<agent>, or ~/.config/<agent>
+  --link              Create absolute symbolic links (development only)
+  --force             Replace conflicting installed skills and agents
+  --dry-run           Print operations without writing files
+  -h, --help          Show this help
+
+Only skills/*/SKILL.md trees and agents/*.md are installed.
+Existing application configuration and AGENTS.md are not modified.
+With npx, prefer the default copy mode: its cache can be removed.
+`;
+try {
+    const options = {
+        sourceDir: path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..'),
+        agent: 'opencode',
+    };
+    const args = process.argv.slice(2);
+    for (let index = 0; index < args.length; index++) {
+        const arg = args[index];
+        if (arg === '-h' || arg === '--help') {
+            console.log(help);
+            process.exit(0);
+        }
+        if (arg === '--source-dir' || arg === '--config-dir' || arg === '--agent') {
+            const value = args[++index];
+            if (!value || value.startsWith('--'))
+                throw new Error(`${arg} requires a value`);
+            const key = { '--source-dir': 'sourceDir', '--config-dir': 'configDir', '--agent': 'agent' }[arg];
+            options[key] = value;
+        }
+        else if (arg === '--link' || arg === '--force' || arg === '--dry-run') {
+            const key = { '--link': 'link', '--force': 'force', '--dry-run': 'dryRun' }[arg];
+            options[key] = true;
+        }
+        else {
+            throw new Error(`unknown option: ${arg}`);
+        }
+    }
+    if (!options.agent || !['opencode', 'deveco'].includes(options.agent)) {
+        throw new Error(`unsupported agent: ${options.agent}; choose opencode or deveco`);
+    }
+    options.configDir ??= process.env[options.agent === 'deveco' ? 'DEVECO_CONFIG_DIR' : 'OPENCODE_CONFIG_DIR'] || path.join(process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config'), options.agent);
+    installOpenCode(options);
+}
+catch (error) {
+    console.error(`install-opencode: ${error instanceof Error ? error.message : String(error)}`);
+    process.exitCode = 1;
+}

package/dist/src/install-opencode.js

@@ -0,0 +1,135 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+function stat(file) {
+    try {
+        return fs.lstatSync(file);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return null;
+        throw error;
+    }
+}
+function sameTree(source, destination) {
+    const left = stat(source);
+    const right = stat(destination);
+    if (!left || !right)
+        return false;
+    if (left.isSymbolicLink() || right.isSymbolicLink()) {
+        if (!left.isSymbolicLink() || !right.isSymbolicLink())
+            return false;
+        return fs.readlinkSync(source) === fs.readlinkSync(destination);
+    }
+    if (left.isDirectory() && right.isDirectory()) {
+        const names = fs.readdirSync(source).sort();
+        const otherNames = fs.readdirSync(destination).sort();
+        return names.length === otherNames.length && names.every((name, index) => name === otherNames[index] && sameTree(path.join(source, name), path.join(destination, name)));
+    }
+    return left.isFile() && right.isFile() && fs.readFileSync(source).equals(fs.readFileSync(destination));
+}
+function contains(parent, child) {
+    const relative = path.relative(parent, child);
+    return relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));
+}
+// Resolve existing ancestors too, including a config directory beneath a junction.
+function resolvedLocation(directory) {
+    if (fs.existsSync(directory))
+        return fs.realpathSync(directory);
+    const parent = path.dirname(directory);
+    return parent === directory ? directory : path.join(resolvedLocation(parent), path.basename(directory));
+}
+export function installOpenCode({ sourceDir, configDir, agent = 'opencode', link = false, force = false, dryRun = false, log = console.log }) {
+    if (!['opencode', 'deveco'].includes(agent))
+        throw new Error(`unsupported agent: ${agent}`);
+    const application = agent === 'deveco' ? 'DevEco Code' : 'OpenCode';
+    if (!configDir || ['.', '..'].includes(configDir))
+        throw new Error(`refusing unsafe OpenCode config directory: ${configDir}`);
+    const sourceRoot = fs.realpathSync(path.resolve(sourceDir));
+    const configRoot = resolvedLocation(path.resolve(configDir));
+    if (configRoot === path.parse(configRoot).root || configRoot === fs.realpathSync(os.homedir()) ||
+        contains(sourceRoot, configRoot) || contains(configRoot, sourceRoot)) {
+        throw new Error(`refusing unsafe OpenCode config directory: ${configDir}`);
+    }
+    const entries = [];
+    for (const kind of ['skills', 'agents']) {
+        const source = path.join(sourceRoot, kind);
+        if (!fs.statSync(source).isDirectory())
+            throw new Error(`${kind} directory not found: ${source}`);
+        const destinationRoot = path.join(configRoot, kind);
+        if (stat(destinationRoot)?.isSymbolicLink())
+            throw new Error(`refusing linked installation directory: ${destinationRoot}`);
+        let count = 0;
+        for (const name of fs.readdirSync(source).sort()) {
+            const entrySource = path.join(source, name);
+            if (kind === 'skills' ? !fs.existsSync(path.join(entrySource, 'SKILL.md')) :
+                !name.endsWith('.md') || !fs.statSync(entrySource).isFile())
+                continue;
+            count++;
+            const destination = path.join(destinationRoot, name);
+            let unchanged = false;
+            if (link && stat(destination)?.isSymbolicLink()) {
+                unchanged = path.resolve(path.dirname(destination), fs.readlinkSync(destination)) === entrySource;
+            }
+            else if (!link) {
+                unchanged = sameTree(entrySource, destination);
+            }
+            if (!unchanged && stat(destination) && !force) {
+                throw new Error(`${kind} '${name}' already exists at ${destination}; rerun with --force to replace it`);
+            }
+            entries.push({ kind, name, source: entrySource, destination, unchanged });
+        }
+        if (!count)
+            throw new Error(`no ${kind} found under ${source}`);
+    }
+    for (const entry of entries) {
+        if (entry.unchanged) {
+            log(`unchanged ${entry.kind}: ${entry.name}`);
+            continue;
+        }
+        if (dryRun) {
+            log(`would install ${entry.kind}: ${entry.source} -> ${entry.destination} (${link ? 'link' : 'copy'})`);
+            continue;
+        }
+        const parent = path.dirname(entry.destination);
+        fs.mkdirSync(parent, { recursive: true });
+        if (!contains(configRoot, fs.realpathSync(parent)))
+            throw new Error(`installation escaped config directory: ${parent}`);
+        const staging = fs.mkdtempSync(path.join(parent, '.migration-install-'));
+        const staged = path.join(staging, 'new');
+        const backup = path.join(staging, 'backup');
+        try {
+            if (link)
+                fs.symlinkSync(entry.source, staged, process.platform === 'win32' && entry.kind === 'skills' ? 'junction' : undefined);
+            else
+                fs.cpSync(entry.source, staged, { recursive: true });
+            if (stat(entry.destination))
+                fs.renameSync(entry.destination, backup);
+            try {
+                fs.renameSync(staged, entry.destination);
+            }
+            catch (error) {
+                if (stat(backup))
+                    fs.renameSync(backup, entry.destination);
+                throw error;
+            }
+        }
+        finally {
+            // If restoring a replaced entry also failed, retain its backup for recovery.
+            if (stat(backup) && !stat(entry.destination)) {
+                log(`installation backup retained: ${backup}`);
+            }
+            else {
+                fs.rmSync(staging, { recursive: true, force: true });
+            }
+        }
+        log(`installed ${entry.kind}: ${entry.destination}`);
+    }
+    const skills = entries.filter(entry => entry.kind === 'skills').length;
+    const agents = entries.filter(entry => entry.kind === 'agents').length;
+    log(`${application} installation ${dryRun ? 'preview' : 'complete'}: ${skills} skill(s), ${agents} agent(s).`);
+    log(`Config directory: ${configRoot}`);
+    if (!dryRun)
+        log(`Quit and restart ${application} to load the installed definitions.`);
+    return { skills, agents, configRoot };
+}

package/package.json

@@ -1,45 +1,51 @@
-{
-  "name": "@harmonyos-arkts/d2h",
-  "version": "0.1.1",
-  "description": "Install Android-to-HarmonyOS migration agents and skills into OpenCode or DevEco Code",
-  "type": "module",
-  "bin": {
-    "d2h": "bin/install-opencode.mjs"
-  },
-  "files": [
-    "bin/",
-    "src/",
-    "skills/",
-    "agents/",
-    "schemas/",
-    "opencode/",
-    ".claude-plugin/",
-    "install-opencode.sh",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "check": "node --check bin/install-opencode.mjs && node --check src/install-opencode.mjs && node scripts/check-skill-refs.mjs",
-    "test": "node --test test/*.test.mjs",
-    "prepublishOnly": "npm run check && npm test"
-  },
-  "engines": {
-    "node": ">=20 <25"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Harmony-Ai-Tool/android-to-hmos-migration.git"
-  },
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "android",
-    "harmonyos",
-    "arkts",
-    "migration",
-    "opencode"
-  ]
-}
+{
+  "name": "@harmonyos-arkts/d2h",
+  "version": "0.1.2",
+  "description": "Install Android-to-HarmonyOS migration agents and skills into OpenCode or DevEco Code",
+  "type": "module",
+  "bin": {
+    "d2h": "dist/bin/install-opencode.js"
+  },
+  "files": [
+    "dist/bin/",
+    "dist/src/",
+    "skills/",
+    "agents/",
+    "schemas/",
+    "opencode/",
+    ".claude-plugin/",
+    "install-opencode.sh",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "check": "tsc --noEmit && npm run build && node dist/scripts/check-skill-refs.js",
+    "test": "npm run build && node --test dist/test/*.test.js",
+    "prepack": "npm run build",
+    "prepublishOnly": "npm run check && npm test"
+  },
+  "engines": {
+    "node": ">=20 <25"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Harmony-Ai-Tool/android-to-hmos-migration.git"
+  },
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "keywords": [
+    "android",
+    "harmonyos",
+    "arkts",
+    "migration",
+    "opencode"
+  ],
+  "devDependencies": {
+    "@types/node": "^22.20.5",
+    "typescript": "^5.9.3"
+  }
+}

package/bin/install-opencode.mjs

@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
-import os from 'node:os';
-import { installOpenCode } from '../src/install-opencode.mjs';
-
-const help = `Install this package's skills and agents into OpenCode or DevEco Code.
-
-Usage: d2h [options]
-
-  --source-dir <path>  Source root (defaults to this package)
-  --agent <name>       opencode (default) or deveco
-  --config-dir <path>  Override the selected agent's config root
-                       OPENCODE_CONFIG_DIR / DEVECO_CONFIG_DIR, or
-                       $XDG_CONFIG_HOME/<agent>, or ~/.config/<agent>
-  --link              Create absolute symbolic links (development only)
-  --force             Replace conflicting installed skills and agents
-  --dry-run           Print operations without writing files
-  -h, --help          Show this help
-
-Only skills/*/SKILL.md trees and agents/*.md are installed.
-Existing application configuration and AGENTS.md are not modified.
-With npx, prefer the default copy mode: its cache can be removed.
-`;
-
-try {
-  const options = {
-    sourceDir: path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'),
-    agent: 'opencode',
-  };
-  const args = process.argv.slice(2);
-  for (let index = 0; index < args.length; index++) {
-    const arg = args[index];
-    if (arg === '-h' || arg === '--help') {
-      console.log(help);
-      process.exit(0);
-    }
-    if (arg === '--source-dir' || arg === '--config-dir' || arg === '--agent') {
-      const value = args[++index];
-      if (!value || value.startsWith('--')) throw new Error(`${arg} requires a value`);
-      options[{ '--source-dir': 'sourceDir', '--config-dir': 'configDir', '--agent': 'agent' }[arg]] = value;
-    } else if (arg === '--link' || arg === '--force' || arg === '--dry-run') {
-      options[{ '--link': 'link', '--force': 'force', '--dry-run': 'dryRun' }[arg]] = true;
-    } else {
-      throw new Error(`unknown option: ${arg}`);
-    }
-  }
-  if (!['opencode', 'deveco'].includes(options.agent)) {
-    throw new Error(`unsupported agent: ${options.agent}; choose opencode or deveco`);
-  }
-  options.configDir ??= process.env[options.agent === 'deveco' ? 'DEVECO_CONFIG_DIR' : 'OPENCODE_CONFIG_DIR'] || path.join(
-    process.env.XDG_CONFIG_HOME || path.join(os.homedir(), '.config'), options.agent);
-  installOpenCode(options);
-} catch (error) {
-  console.error(`install-opencode: ${error.message}`);
-  process.exitCode = 1;
-}

package/src/install-opencode.mjs

@@ -1,110 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-
-function stat(file) {
-  try { return fs.lstatSync(file); } catch (error) {
-    if (error.code === 'ENOENT') return null;
-    throw error;
-  }
-}
-
-function sameTree(source, destination) {
-  const left = stat(source);
-  const right = stat(destination);
-  if (!left || !right) return false;
-  if (left.isSymbolicLink() || right.isSymbolicLink()) {
-    if (!left.isSymbolicLink() || !right.isSymbolicLink()) return false;
-    return fs.readlinkSync(source) === fs.readlinkSync(destination);
-  }
-  if (left.isDirectory() && right.isDirectory()) {
-    const names = fs.readdirSync(source).sort();
-    const otherNames = fs.readdirSync(destination).sort();
-    return names.length === otherNames.length && names.every((name, index) =>
-      name === otherNames[index] && sameTree(path.join(source, name), path.join(destination, name)));
-  }
-  return left.isFile() && right.isFile() && fs.readFileSync(source).equals(fs.readFileSync(destination));
-}
-
-function contains(parent, child) {
-  const relative = path.relative(parent, child);
-  return relative === '' || (!relative.startsWith(`..${path.sep}`) && relative !== '..' && !path.isAbsolute(relative));
-}
-
-// Resolve existing ancestors too, including a config directory beneath a junction.
-function resolvedLocation(directory) {
-  if (fs.existsSync(directory)) return fs.realpathSync(directory);
-  const parent = path.dirname(directory);
-  return parent === directory ? directory : path.join(resolvedLocation(parent), path.basename(directory));
-}
-
-export function installOpenCode({ sourceDir, configDir, agent = 'opencode', link = false, force = false, dryRun = false, log = console.log }) {
-  if (!['opencode', 'deveco'].includes(agent)) throw new Error(`unsupported agent: ${agent}`);
-  const application = agent === 'deveco' ? 'DevEco Code' : 'OpenCode';
-  if (!configDir || ['.', '..'].includes(configDir)) throw new Error(`refusing unsafe OpenCode config directory: ${configDir}`);
-  const sourceRoot = fs.realpathSync(path.resolve(sourceDir));
-  const configRoot = resolvedLocation(path.resolve(configDir));
-  if (configRoot === path.parse(configRoot).root || configRoot === fs.realpathSync(os.homedir()) ||
-      contains(sourceRoot, configRoot) || contains(configRoot, sourceRoot)) {
-    throw new Error(`refusing unsafe OpenCode config directory: ${configDir}`);
-  }
-  const entries = [];
-  for (const kind of ['skills', 'agents']) {
-    const source = path.join(sourceRoot, kind);
-    if (!fs.statSync(source).isDirectory()) throw new Error(`${kind} directory not found: ${source}`);
-    const destinationRoot = path.join(configRoot, kind);
-    if (stat(destinationRoot)?.isSymbolicLink()) throw new Error(`refusing linked installation directory: ${destinationRoot}`);
-    let count = 0;
-    for (const name of fs.readdirSync(source).sort()) {
-      const entrySource = path.join(source, name);
-      if (kind === 'skills' ? !fs.existsSync(path.join(entrySource, 'SKILL.md')) :
-          !name.endsWith('.md') || !fs.statSync(entrySource).isFile()) continue;
-      count++;
-      const destination = path.join(destinationRoot, name);
-      let unchanged = false;
-      if (link && stat(destination)?.isSymbolicLink()) {
-        unchanged = path.resolve(path.dirname(destination), fs.readlinkSync(destination)) === entrySource;
-      } else if (!link) {
-        unchanged = sameTree(entrySource, destination);
-      }
-      if (!unchanged && stat(destination) && !force) {
-        throw new Error(`${kind} '${name}' already exists at ${destination}; rerun with --force to replace it`);
-      }
-      entries.push({ kind, name, source: entrySource, destination, unchanged });
-    }
-    if (!count) throw new Error(`no ${kind} found under ${source}`);
-  }
-  for (const entry of entries) {
-    if (entry.unchanged) { log(`unchanged ${entry.kind}: ${entry.name}`); continue; }
-    if (dryRun) { log(`would install ${entry.kind}: ${entry.source} -> ${entry.destination} (${link ? 'link' : 'copy'})`); continue; }
-    const parent = path.dirname(entry.destination);
-    fs.mkdirSync(parent, { recursive: true });
-    if (!contains(configRoot, fs.realpathSync(parent))) throw new Error(`installation escaped config directory: ${parent}`);
-    const staging = fs.mkdtempSync(path.join(parent, '.migration-install-'));
-    const staged = path.join(staging, 'new');
-    const backup = path.join(staging, 'backup');
-    try {
-      if (link) fs.symlinkSync(entry.source, staged, process.platform === 'win32' && entry.kind === 'skills' ? 'junction' : undefined);
-      else fs.cpSync(entry.source, staged, { recursive: true });
-      if (stat(entry.destination)) fs.renameSync(entry.destination, backup);
-      try { fs.renameSync(staged, entry.destination); } catch (error) {
-        if (stat(backup)) fs.renameSync(backup, entry.destination);
-        throw error;
-      }
-    } finally {
-      // If restoring a replaced entry also failed, retain its backup for recovery.
-      if (stat(backup) && !stat(entry.destination)) {
-        log(`installation backup retained: ${backup}`);
-      } else {
-        fs.rmSync(staging, { recursive: true, force: true });
-      }
-    }
-    log(`installed ${entry.kind}: ${entry.destination}`);
-  }
-  const skills = entries.filter(entry => entry.kind === 'skills').length;
-  const agents = entries.filter(entry => entry.kind === 'agents').length;
-  log(`${application} installation ${dryRun ? 'preview' : 'complete'}: ${skills} skill(s), ${agents} agent(s).`);
-  log(`Config directory: ${configRoot}`);
-  if (!dryRun) log(`Quit and restart ${application} to load the installed definitions.`);
-  return { skills, agents, configRoot };
-}