@yottameta/yotta-skills-plugin 0.29.0 → 0.29.2

package/skills/yotta-skills/lib/hub-migrate.js

@@ -0,0 +1,183 @@
+'use strict';
+/**
+ * Hub 迁移（0.29.2 U4）—— `hub config set --hub <new> --move` 的两段式实现。
+ *
+ * 1) stageHubCopy({ from, to })：复制旧 Hub → 逐技能 treeHash 校验；失败
+ *    fail-closed（清理暂存副本、旧 Hub 不动、配置不切换）。
+ * 2) relinkAndRetireOldHub({ from, to, targets })：`hub link` 以新 Hub 为源、
+ *    --force 重链各宿主 → 全部成功才把旧 Hub 移入回收站（7 天）；有失败则
+ *    保留旧 Hub 供重试（此时新旧内容一致，链接混合指向两个 Hub 均可用）。
+ *
+ * 配置切换（config.json 写入）由调用方在两段之间执行；写入失败时调用
+ * discardStagedCopy() 清理暂存副本。
+ */
+const fs = require('fs');
+const path = require('path');
+const hubLib = require('./hub');
+
+function nowStamp() {
+  return new Date().toISOString().replace(/[:.]/g, '-');
+}
+
+function safeRealpath(target) {
+  try {
+    return fs.realpathSync.native(target);
+  } catch (_) {
+    try {
+      return fs.realpathSync(target);
+    } catch (_) {
+      return path.resolve(target);
+    }
+  }
+}
+
+function samePath(left, right) {
+  const a = safeRealpath(left);
+  const b = safeRealpath(right);
+  if (process.platform === 'win32') return a.toLowerCase() === b.toLowerCase();
+  return a === b;
+}
+
+function isInside(root, target) {
+  const relative = path.relative(path.resolve(root), path.resolve(target));
+  return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
+}
+
+function listEntries(dir) {
+  try {
+    return fs.readdirSync(dir);
+  } catch (_) {
+    return [];
+  }
+}
+
+/** 清理暂存副本（仅在 stage 阶段失败或配置写入失败时调用）。 */
+function discardStagedCopy(options) {
+  const opts = options || {};
+  const to = path.resolve(opts.to);
+  try {
+    if (opts.existed) {
+      for (const name of listEntries(to)) fs.rmSync(path.join(to, name), { recursive: true, force: true });
+    } else {
+      fs.rmSync(to, { recursive: true, force: true });
+    }
+  } catch (_) { /* 保留现场供排查 */ }
+}
+
+/** 复制 + 校验（不切配置）。返回 { ok, error?, from, to, existed, verifiedSkills }。 */
+function stageHubCopy(options) {
+  const opts = options || {};
+  const from = path.resolve(opts.from);
+  const to = path.resolve(opts.to);
+  if (samePath(from, to)) return { ok: false, error: '新旧 Hub 路径相同：' + from };
+  if (isInside(from, to) || isInside(to, from)) return { ok: false, error: '新旧 Hub 不能互相嵌套：' + from + ' / ' + to };
+  let stat = null;
+  try {
+    stat = fs.statSync(from);
+  } catch (_) { /* handled below */ }
+  if (!stat || !stat.isDirectory()) return { ok: false, error: '旧 Hub 不存在或不是目录：' + from };
+  const existed = fs.existsSync(to);
+  if (existed && listEntries(to).length > 0) {
+    return { ok: false, error: '新 Hub 目录非空（fail-closed，不合并）：' + to };
+  }
+
+  try {
+    fs.mkdirSync(to, { recursive: true });
+    fs.cpSync(from, to, { recursive: true });
+  } catch (error) {
+    discardStagedCopy({ to, existed });
+    return { ok: false, error: '复制失败：' + error.message };
+  }
+
+  const mismatches = [];
+  for (const name of listEntries(from)) {
+    if (!fs.existsSync(path.join(to, name))) mismatches.push('entry:' + name);
+  }
+  const skills = hubLib.scanHubSkills(from);
+  for (const skill of skills) {
+    let sourceStat = null;
+    try {
+      sourceStat = fs.lstatSync(skill.dir);
+    } catch (_) {
+      continue;
+    }
+    // in-place / 外部链接条目：随链接原样复制，不做内容校验。
+    if (sourceStat.isSymbolicLink() || !isInside(from, skill.dir)) continue;
+    const copied = path.join(to, path.relative(from, skill.dir));
+    let copiedStat = null;
+    try {
+      copiedStat = fs.lstatSync(copied);
+    } catch (_) { /* mismatch below */ }
+    if (!copiedStat || !copiedStat.isDirectory()) {
+      mismatches.push(skill.slug);
+      continue;
+    }
+    try {
+      if (hubLib.hashTree(skill.dir) !== hubLib.hashTree(copied)) mismatches.push(skill.slug);
+    } catch (_) {
+      mismatches.push(skill.slug);
+    }
+  }
+  if (mismatches.length > 0) {
+    discardStagedCopy({ to, existed });
+    return {
+      ok: false,
+      error: '迁移校验失败（未切换配置；已清理暂存副本）：' + mismatches.slice(0, 8).join(', ') +
+        (mismatches.length > 8 ? ' 等 ' + mismatches.length + ' 项' : ''),
+    };
+  }
+  return { ok: true, from, to, existed, verifiedSkills: skills.length };
+}
+
+/** 重链（新 Hub 为源）+ 旧 Hub 入回收站（仅当重链无失败）。 */
+function relinkAndRetireOldHub(options) {
+  const opts = options || {};
+  const from = path.resolve(opts.from);
+  const to = path.resolve(opts.to);
+  const targets = Array.isArray(opts.targets) ? opts.targets : [];
+  const relink = [];
+  let incomplete = 0;
+  for (const target of targets) {
+    if (!target || !target.dir) continue;
+    if (samePath(target.dir, from) || samePath(target.dir, to)) continue;
+    const result = hubLib.linkSkills({
+      hubDir: to,
+      targetDir: target.dir,
+      agentId: target.agentId,
+      label: target.label,
+      force: true,
+      manifest: opts.manifest,
+      homeDir: opts.homeDir,
+      env: opts.env,
+    });
+    const notLinked = result.results.filter((item) => item.status !== 'linked' && item.status !== 'missing');
+    incomplete += notLinked.length;
+    relink.push({
+      dir: target.dir,
+      label: target.label,
+      linked: result.results.filter((item) => item.status === 'linked').length,
+      incomplete: notLinked.map((item) => item.slug + ': ' + item.note),
+    });
+  }
+
+  let trashedTo = null;
+  let trashError = null;
+  if (incomplete === 0) {
+    try {
+      const trashRoot = hubLib.resolveTrashRoot(from, { env: opts.env });
+      const dest = path.join(trashRoot, 'hub-migrate-' + nowStamp(), path.basename(from));
+      fs.mkdirSync(path.dirname(dest), { recursive: true });
+      hubLib.moveEntryAcrossDevices(from, dest);
+      trashedTo = dest;
+    } catch (error) {
+      trashError = error.message;
+    }
+  }
+  return { ok: incomplete === 0, from, to, relink, incomplete, trashedTo, trashError };
+}
+
+module.exports = {
+  discardStagedCopy,
+  stageHubCopy,
+  relinkAndRetireOldHub,
+};

package/skills/yotta-skills/lib/hub-scan.js

@@ -13,6 +13,10 @@ const { spawnSync } = require('child_process');
 const depsLib = require('./deps');
 const gateLib = require('./verify-gate');
 const trustedVerifierLib = require('./trusted-verifier');
+const scanPolicyLib = require('./scan-policy');
+const hubLib = require('./hub');
+
+const POLICY_PATH = path.join(__dirname, '..', 'scan-policy.json');
 
 function currentCommand() {
   const args = process.argv.slice(2).map((a) => (/\s/.test(a) ? '"' + a + '"' : a));
@@ -52,6 +56,21 @@ function runScan(engine, skillDir, opts) {
   return gateLib.runVerifier(engine, skillDir, { python, spawnSync });
 }
 
+/**
+ * 复用安装管线的 scanPolicy 复核（0.29.2）：版本 + treeHash 绑定，fail-closed。
+ * 未命中例外表 / 绑定不匹配时返回原始 scan（不豁免任何发现）。
+ */
+function reviewScanWithPolicy(scan, context) {
+  const ctx = context || {};
+  const policy = scanPolicyLib.loadPolicy(ctx.policyPath || POLICY_PATH);
+  return scanPolicyLib.applyScanPolicy(scan, {
+    slug: ctx.slug,
+    version: ctx.version,
+    pkgDir: ctx.pkgDir,
+    policy,
+  });
+}
+
 /** Hub adopt scan engine: Hub itself first, then every discovered host dir. */
 function scanEngineForHub(hubDir, discovery, opts) {
   const direct = findVerifyEngine(hubDir, opts);
@@ -69,7 +88,7 @@ function scanEngineForHub(hubDir, discovery, opts) {
  * Scan one candidate directory for Hub adoption.
  * Returns { ok, verdict, counts, block } or { ok:false, error }.
  */
-function hubScanSkill(hubDir, discovery, opts, skillDir) {
+function hubScanSkill(hubDir, discovery, opts, skillDir, context) {
   const options = opts || {};
   if (options.skipScan) {
     return { ok: true, verdict: 'explicit-unverified', counts: null, block: false };
@@ -83,8 +102,22 @@ function hubScanSkill(hubDir, discovery, opts, skillDir) {
   }
   const scan = runScan(engine, skillDir, options);
   if (!scan.ok) return scan;
-  const verdict = gateLib.evaluateVerdict(scan.verdict);
-  return { ok: true, verdict: scan.verdict, counts: scan.counts, block: verdict.block };
+  const ctx = context || {};
+  const meta = hubLib.readSkillMeta(skillDir);
+  const reviewed = reviewScanWithPolicy(scan, {
+    slug: ctx.slug || (meta && (meta.slug || meta.name)) || null,
+    version: ctx.version || (meta && meta.version) || null,
+    pkgDir: skillDir,
+    policyPath: options.policyPath,
+  });
+  const verdict = gateLib.evaluateVerdict(reviewed.verdict);
+  return {
+    ok: true,
+    verdict: reviewed.verdict,
+    counts: reviewed.counts,
+    block: verdict.block,
+    policy: reviewed.policy || null,
+  };
 }
 
 module.exports = {
@@ -92,6 +125,7 @@ module.exports = {
   findVerifyEngine,
   findPython,
   runScan,
+  reviewScanWithPolicy,
   scanEngineForHub,
   hubScanSkill,
 };

package/skills/yotta-skills/lib/hub-view-server.js

@@ -35,6 +35,7 @@ const usageLib = require('./usage-journal');
 const cliHelpLib = require('./cli-help');
 const hostsRegistryLib = require('./hosts-registry');
 const hostPurgeLib = require('./host-purge');
+const skillsConfigLib = require('./skills-config');
 
 const DEFAULT_HOST = '127.0.0.1';
 const DEFAULT_PORT = 8789;
@@ -44,7 +45,7 @@ const DEFAULT_LIMIT = 100;
 const MAX_LIMIT = 500;
 const TOKEN_HEADER = 'x-yotta-view-token';
 const TOKEN_PLACEHOLDER = '__YOTTA_VIEW_TOKEN__';
-const CONFIRM = { unlink: 'unlink', rollback: 'rollback', remove: 'remove', purge: 'purge' };
+const CONFIRM = { unlink: 'unlink', rollback: 'rollback', remove: 'remove', purge: 'purge', hubConfig: 'hub-config' };
 const SLUG_RE = /^[a-z0-9][a-z0-9-]*$/;
 
 function nowIso() {
@@ -164,9 +165,19 @@ function overviewPayload(ctx) {
     discovery: discovery(ctx),
   });
   const audit = readJsonlTail(hubAuditPath(ctx.hubDir), 8);
+  const hubNow = skillsConfigLib.resolveHub({ homeDir: ctx.homeDir, env: ctx.env });
   return {
     version: ctx.version,
     hubDir: ctx.hubDir,
+    // 0.29.2 U4：Hub 位置来源 / 配置覆盖 / 重启提示（面板「Hub 位置」区）。
+    hub: {
+      dir: ctx.hubDir,
+      source: ctx.hubSource || 'default',
+      configured: hubNow.configured,
+      configFile: hubNow.configFile,
+      effectiveNow: hubNow.dir,
+      restartRequired: !ctx.hubFlag && !sameDir(hubNow.dir, ctx.hubDir),
+    },
     standard: hubLib.STANDARD_ID,
     generatedAt: nowIso(),
     status: {
@@ -204,12 +215,17 @@ function hostsPayload(ctx) {
       brokenLinks: hostLinks.filter((link) => link.status !== 'ok').length,
     };
   });
+  const registry = hostsRegistryLib.readHostsRegistry({ homeDir: ctx.homeDir, env: ctx.env });
   return {
     generatedAt: found.generatedAt,
     hubDir: ctx.hubDir,
     standard: hubLib.STANDARD_ID,
     hosts,
     installed: found.installed,
+    // 0.29.1 U2：面板只渲染未配对标记（与 CLI hubHostLines 共用单一真源）。
+    unpaired: discoveryLib.unpairedMarkers(found),
+    excluded: registry.excluded || [],
+    overrides: registry.overrides || [],
     links,
     hubSkills,
     summary: {
@@ -219,6 +235,9 @@ function hostsPayload(ctx) {
       discovered: hosts.filter((host) => host.exists && !host.verified && !host.bridgeOnly).length,
       bridge: hosts.filter((host) => host.exists && host.bridgeOnly).length,
       installedMarks: found.installed.length,
+      unpairedMarks: discoveryLib.unpairedMarkers(found).length,
+      excluded: (registry.excluded || []).length,
+      overrides: (registry.overrides || []).length,
       links: links.length,
       brokenLinks: links.filter((link) => link.status !== 'ok').length,
       // 0.29.0 F3：宿主生命周期状态细分（面板分组 / 筛选）。
@@ -603,6 +622,110 @@ function writeHostPurge(ctx, body) {
   };
 }
 
+// ── 宿主标记 / 目录覆盖 / 不接管（0.29.1 U2；与 CLI 同源 hosts.json） ─────────
+function writeHostMark(ctx, body) {
+  const dir = String(body.dir || '').trim();
+  if (!dir) return { code: 400, payload: { error: '缺少目录。' } };
+  const state = String(body.state || '').trim().toLowerCase();
+  const result = hostsRegistryLib.markHost({ homeDir: ctx.homeDir, env: ctx.env }, { dir, state });
+  if (!result.ok) return { code: 400, payload: { error: result.error } };
+  auditViewHostEvent(ctx, { event: 'hosts.mark', dir: result.entry.dir, state, via: 'view' });
+  return { code: 200, payload: { action: 'hosts.mark', entry: result.entry } };
+}
+
+function writeHostSet(ctx, body) {
+  const agentId = String(body.agentId || '').trim().toLowerCase();
+  if (!agentId) return { code: 400, payload: { error: '缺少 agentId。' } };
+  const registryOpts = { homeDir: ctx.homeDir, env: ctx.env };
+  if (body.clear) {
+    const result = hostsRegistryLib.clearHostOverride(registryOpts, { agentId });
+    if (!result.ok) return { code: 400, payload: { error: result.error } };
+    auditViewHostEvent(ctx, { event: 'hosts.set', agentId, cleared: true, dir: result.removed.dir, via: 'view' });
+    return { code: 200, payload: { action: 'hosts.set', cleared: true, removed: result.removed } };
+  }
+  const dir = String(body.dir || '').trim();
+  const result = hostsRegistryLib.setHostOverride(registryOpts, { agentId, dir, label: body.label });
+  if (!result.ok) return { code: 400, payload: { error: result.error } };
+  auditViewHostEvent(ctx, {
+    event: 'hosts.set',
+    agentId,
+    dir: result.entry.dir,
+    label: result.entry.label,
+    via: 'view',
+  });
+  return { code: 200, payload: { action: 'hosts.set', entry: result.entry } };
+}
+
+function writeHostExclude(ctx, body) {
+  const target = String(body.target || '').trim();
+  if (!target) return { code: 400, payload: { error: '缺少 target（agentId 或目录）。' } };
+  const result = hostsRegistryLib.excludeHost({ homeDir: ctx.homeDir, env: ctx.env }, { target });
+  if (!result.ok) return { code: 400, payload: { error: result.error } };
+  auditViewHostEvent(ctx, {
+    event: 'hosts.exclude',
+    kind: result.entry.kind,
+    value: result.entry.value,
+    label: result.entry.label,
+    via: 'view',
+  });
+  return { code: 200, payload: { action: 'hosts.exclude', entry: result.entry, already: Boolean(result.already) } };
+}
+
+function writeHostInclude(ctx, body) {
+  const target = String(body.target || '').trim();
+  if (!target) return { code: 400, payload: { error: '缺少 target（agentId 或目录）。' } };
+  const result = hostsRegistryLib.includeHost({ homeDir: ctx.homeDir, env: ctx.env }, { target });
+  if (!result.ok) return { code: 400, payload: { error: result.error } };
+  auditViewHostEvent(ctx, {
+    event: 'hosts.include',
+    kind: result.removed.kind,
+    value: result.removed.value,
+    label: result.removed.label,
+    via: 'view',
+  });
+  return { code: 200, payload: { action: 'hosts.include', removed: result.removed } };
+}
+
+/** 0.29.2 U4：面板「Hub 位置」设置 / 清除（写 config.json；重启 view 生效）。 */
+function writeHubConfig(ctx, body) {
+  if (String(body.confirm || '') !== CONFIRM.hubConfig) {
+    return { code: 400, payload: { error: '确认串不匹配（需要 "' + CONFIRM.hubConfig + '"）。' } };
+  }
+  const configOpts = { homeDir: ctx.homeDir, env: ctx.env };
+  const current = skillsConfigLib.resolveHub(configOpts);
+  if (body.clear) {
+    const result = skillsConfigLib.clearHub(configOpts);
+    if (!result.ok) return { code: 400, payload: { error: result.error } };
+    if (fs.existsSync(current.dir)) {
+      try {
+        hubLib.appendAudit(current.dir, { event: 'config.clear', removed: result.removed, via: 'view' });
+      } catch (_) { /* best-effort */ }
+    }
+    return { code: 200, payload: { action: 'config.clear', removed: result.removed, restartRequired: true } };
+  }
+  const hub = String(body.hub || '').trim();
+  const guard = skillsConfigLib.validateHubPath(hub, configOpts);
+  if (!guard.ok) return { code: 400, payload: { error: guard.error } };
+  const result = skillsConfigLib.setHub(configOpts, { hub });
+  if (!result.ok) return { code: 400, payload: { error: result.error } };
+  const auditDir = fs.existsSync(result.hub) ? result.hub : current.dir;
+  if (fs.existsSync(auditDir)) {
+    try {
+      hubLib.appendAudit(auditDir, { event: 'config.set', hub: result.hub, previousHub: current.dir, via: 'view' });
+    } catch (_) { /* best-effort */ }
+  }
+  return {
+    code: 200,
+    payload: {
+      action: 'config.set',
+      hub: result.hub,
+      previous: current.dir,
+      configFile: result.configFile,
+      restartRequired: true,
+    },
+  };
+}
+
 function json(res, code, value) {
   if (res.writableEnded) return;
   res.writeHead(code, {
@@ -764,6 +887,11 @@ function handlePost(ctx, pathname, req, res) {
       if (pathname === '/api/hosts/add') return writeHostAdd(ctx, body);
       if (pathname === '/api/hosts/remove') return writeHostRemove(ctx, body);
       if (pathname === '/api/hosts/purge') return writeHostPurge(ctx, body);
+      if (pathname === '/api/hosts/mark') return writeHostMark(ctx, body);
+      if (pathname === '/api/hosts/set') return writeHostSet(ctx, body);
+      if (pathname === '/api/hosts/exclude') return writeHostExclude(ctx, body);
+      if (pathname === '/api/hosts/include') return writeHostInclude(ctx, body);
+      if (pathname === '/api/hub/config') return writeHubConfig(ctx, body);
       return { code: 404, payload: { error: 'not found' } };
     };
     ctx.queue(run)
@@ -781,6 +909,8 @@ function createHubViewServer(options) {
   let chain = Promise.resolve();
   const ctx = {
     hubDir: path.resolve(opts.hubDir || hubLib.resolveHubDir({})),
+    hubSource: opts.hubSource || 'default',
+    hubFlag: Boolean(opts.hubFlag),
     homeDir: opts.homeDir || os.homedir(),
     env: opts.env || process.env,
     manifest: opts.manifest || [],

package/skills/yotta-skills/lib/hub.js

@@ -14,6 +14,7 @@ const os = require('os');
 const path = require('path');
 const scanLib = require('./skills-scan');
 const skillsCliLock = require('./skills-cli-lock');
+const skillsConfigLib = require('./skills-config');
 
 const STANDARD_ID = 'yotta-skills-hub/v1';
 const STATE_VERSION = 1;
@@ -45,11 +46,13 @@ function nowIso() {
   return new Date().toISOString();
 }
 
+/** 解析生效 Hub（含来源）：--hub > YOTTA_SKILLS_HUB > config.json > 默认。 */
+function resolveHub(opts) {
+  return skillsConfigLib.resolveHub(opts);
+}
+
 function resolveHubDir(opts) {
-  const options = opts || {};
-  const explicit = options.hub || process.env.YOTTA_SKILLS_HUB;
-  if (explicit) return path.resolve(explicit);
-  return path.join(options.homeDir || os.homedir(), '.yottaskills', 'hub');
+  return resolveHub(opts).dir;
 }
 
 function hubPaths(hubDir) {
@@ -1498,6 +1501,7 @@ module.exports = {
   AUDIT_FILE,
   TRASH_RETENTION_DAYS,
   HUB_FAMILY_EXTRAS,
+  resolveHub,
   resolveHubDir,
   hubPaths,
   readHubState,

package/skills/yotta-skills/lib/install-pipeline.js

@@ -8,6 +8,7 @@ const lifecycleLib = require('./install-lifecycle');
 const healthLib = require('./install-health');
 const snapshotLib = require('./install-snapshot');
 const hookAdapterLib = require('./hook-adapter');
+const scanLib = require('./skills-scan');
 
 function nowTag() {
   return new Date().toISOString().replace(/[:.]/g, '-');
@@ -60,6 +61,15 @@ function restoreBackup(target, backup, hadTarget) {
   return false;
 }
 
+/** 0.29.1 U1「只升不降」跳过原因文案（equal / local-ahead / unknown）。 */
+function versionSkipNote(relation, installed, target) {
+  if (relation === 'equal') return '已是最新';
+  if (relation === 'local-ahead') {
+    return '本地领先 v' + installed + ' > 目标 v' + target + '，保留不降级（--force 可强制）';
+  }
+  return '无法比较版本（本地 v' + installed + ' / 目标 v' + target + '），保留（--force 可强制）';
+}
+
 function createInstaller(deps) {
   const homeDir = deps.homeDir || os.homedir();
   const runPhase = deps.runPhase || lifecycleLib.runPhase;
@@ -83,8 +93,18 @@ function createInstaller(deps) {
   return function installOne(skill, dest, opts) {
     const target = path.join(dest, skill.slug);
     const existingVersion = deps.readInstalledVersion(target);
-    if (!opts.force && existingVersion === skill.version) {
-      return { skill, status: 'skip', version: existingVersion, note: '已是最新', exitCode: 0 };
+    // 0.29.1 U1「只升不降」：pin 模式目标即最终版本，入口即可判定；
+    // range / latest 模式（目标非最终版本）在 npm pack 解析出精确版本后复判（见下方）。
+    const relation = scanLib.versionRelation(existingVersion, skill.version);
+    if (!opts.force && opts.pin !== false &&
+        (relation === 'equal' || relation === 'local-ahead' || relation === 'unknown')) {
+      return {
+        skill,
+        status: 'skip',
+        version: existingVersion,
+        note: versionSkipNote(relation, existingVersion, skill.version),
+        exitCode: 0,
+      };
     }
     if (opts.dryRun) {
       // 0.29.0 D1：只读预览 —— 不发网络请求、不写任何文件（含台账）。
@@ -124,6 +144,23 @@ function createInstaller(deps) {
         return { skill, status: 'fail', version: null, note: packed.error, exitCode: 1 };
       }
 
+      // 0.29.1 U1：解析出精确版本后、任何解压 / 快照 / 写入之前复判（latest / range 路径）。
+      const resolvedVersion = packed.resolved || (skill.version === 'latest' ? null : skill.version);
+      if (!opts.force && existingVersion) {
+        const resolvedRelation = resolvedVersion
+          ? scanLib.versionRelation(existingVersion, resolvedVersion)
+          : 'unknown';
+        if (resolvedRelation === 'equal' || resolvedRelation === 'local-ahead' || resolvedRelation === 'unknown') {
+          return {
+            skill,
+            status: 'skip',
+            version: existingVersion,
+            note: versionSkipNote(resolvedRelation, existingVersion, resolvedVersion || skill.version),
+            exitCode: 0,
+          };
+        }
+      }
+
       const extractDir = path.join(tmp, 'extract');
       fs.mkdirSync(extractDir, { recursive: true });
       extracted = deps.extractTarball(packed.tarball, extractDir);

package/skills/yotta-skills/lib/self-install.js

@@ -194,12 +194,16 @@ function whereInfo(opts) {
   const options = opts || {};
   const running = safeRealpath(process.argv[1] || '');
   const registry = readSelfRegistry(options);
+  const hubResolved = hubLib.resolveHub(options);
   return {
     action: 'where',
     running,
     version: readPackageVersion(packageRoot()),
     defaultDir: defaultSelfDir(options),
-    hubDir: hubLib.resolveHubDir(options),
+    hubDir: hubResolved.dir,
+    hubSource: hubResolved.source,
+    hubConfigured: hubResolved.configured,
+    hubConfigFile: hubResolved.configFile,
     registry: selfRegistryPath(options),
     installs: registry.installs.map((item) => ({
       dir: item.dir,