@empirical-gauzza/cli 1.0.18 → 1.0.20

package/lib/kitCommands.js

@@ -14,9 +14,30 @@ const { httpJson, printApiError } = require('./http');
 const { parseOption, parseFlag } = require('./env');
 const { requireAccessToken, resolveApiBaseUrl, buildApiAuthHeaders } = require('./auth');
 const { withCliAnalyticsContext } = require('./memoryCommands');
-const { readDeviceConfig, writeDeviceConfig, ensureDeviceId, readPendingReview } = require('./deviceConfig');
+const { readDeviceConfig, writeDeviceConfig, ensureDeviceId, readPendingReview, readIntegrationMode } = require('./deviceConfig');
 const { performSync, printSyncSummary } = require('./skillSync');
 const { registerScheduledSync, deregisterScheduledSync } = require('./scheduledSync');
+const { detectInstallTargets } = require('./installers/detect');
+const { applySkillModeVariant } = require('./installers/nativePlugin');
+
+// C-001: `kit use`/`kit sync` are the second distribution path the PRD names for mode-aware
+// Skill content. skillSync.js's generalized Kit writer deliberately never writes empirical-memory
+// (see filterOutEmpiricalMemory in skillSync.js -- the server's resolved builtin for that name is
+// a placeholder, not the real plugin content), so a Kit sync alone would never re-apply a mode
+// change. Refresh it here instead, right after every sync, so `kit sync`/`kit use` -- not just
+// re-running the full installer -- keeps empirical-memory's Skill content matching whatever
+// integration mode the user last chose in `empirical install`.
+function refreshEmpiricalMemorySkillForCurrentMode({ dryRun, quiet }) {
+  if (dryRun) return;
+  const integrationMode = readIntegrationMode();
+  for (const target of detectInstallTargets()) {
+    try {
+      applySkillModeVariant(target.id, integrationMode);
+    } catch (error) {
+      if (!quiet) warn(`Warning: could not refresh empirical-memory skill content for ${target.label}: ${error.message}`);
+    }
+  }
+}
 
 // US-016: nag banner surfaced at the START of every interactive (non-`--quiet`) `kit`
 // subcommand — informational only, never blocks the subcommand's own work. `kit sync` is the
@@ -143,7 +164,7 @@ async function runKitRemoveSource(args) {
   log(JSON.stringify(result));
 }
 
-async function runKitList(args) {
+async function runKitList(args) {
   const accessToken = requireAccessToken();
   const baseUrl = resolveApiBaseUrl();
   const url = new URL('/api/v1/kits', baseUrl).toString();
@@ -157,112 +178,166 @@ async function runKitList(args) {
   }
 
   const result = (response && response.data) ? response.data : response;
-  log(JSON.stringify(result));
-}
-
-async function fetchInventoryJson(url, accessToken) {
-  try {
-    return await httpJson(url, 'GET', undefined, buildApiAuthHeaders(accessToken));
-  } catch (error) {
-    printApiError(error);
-    process.exit(1);
-  }
-}
-
-async function listOwnedKits(baseUrl, accessToken) {
-  const response = await fetchInventoryJson(new URL('/api/v1/kits', baseUrl).toString(), accessToken);
-  return response?.data?.kits || response?.kits || [];
-}
-
-async function runSkillList(args) {
-  const accessToken = requireAccessToken();
-  const baseUrl = resolveApiBaseUrl();
-  const kitFilter = parseOption(args, '--kit', '');
-  const kits = await listOwnedKits(baseUrl, accessToken);
-  const selectedKits = kitFilter
-    ? kits.filter((kit) => kit.kitId === kitFilter || kit.name === kitFilter)
-    : kits;
-  const skills = [];
-
-  for (const kit of selectedKits) {
-    const response = await fetchInventoryJson(
-      new URL(`/api/v1/kits/${encodeURIComponent(kit.kitId)}/resolved`, baseUrl).toString(),
-      accessToken
-    );
-    const kitSkills = response?.data?.skills || response?.skills || [];
-    for (const skill of kitSkills) {
-      skills.push({
-        ...skill,
-        kitId: kit.kitId,
-        kitName: kit.name,
-        isDefault: Boolean(kit.isDefault)
-      });
-    }
-  }
-
-  log(JSON.stringify({ skills }));
-}
-
-async function runDeviceList() {
-  const accessToken = requireAccessToken();
-  const baseUrl = resolveApiBaseUrl();
-  const kits = await listOwnedKits(baseUrl, accessToken);
-  const devicesById = new Map();
-
-  for (const kit of kits.filter((candidate) => !candidate.isDefault)) {
-    const response = await fetchInventoryJson(
-      new URL(`/api/v1/kits/${encodeURIComponent(kit.kitId)}/devices`, baseUrl).toString(),
-      accessToken
-    );
-    const devices = response?.data?.devices || response?.devices || [];
-    for (const device of devices) {
-      const existing = devicesById.get(device.deviceId) || {
-        ...device,
-        kits: []
-      };
-      existing.kits.push({
-        kitId: kit.kitId,
-        kitName: kit.name,
-        active: Boolean(device.active)
-      });
-      devicesById.set(device.deviceId, existing);
-    }
-  }
-
-  log(JSON.stringify({ devices: [...devicesById.values()] }));
-}
-
-async function runDeviceShow(args) {
-  const deviceId = args[0] && !args[0].startsWith('--') ? args[0] : '';
-  if (!deviceId) {
-    warn('Usage: empirical device show <deviceId>');
-    process.exit(1);
-  }
-
-  const accessToken = requireAccessToken();
-  const baseUrl = resolveApiBaseUrl();
-  const response = await fetchInventoryJson(
-    new URL(`/api/v1/devices/${encodeURIComponent(deviceId)}/resolved`, baseUrl).toString(),
-    accessToken
-  );
-  const data = response?.data || response || {};
-  log(JSON.stringify({ deviceId, ...data }));
-}
-
-async function runDeviceCommand(subArgs) {
-  const sub = subArgs[0];
-  const rest = subArgs.slice(1);
-  return withCliAnalyticsContext(
-    { command: `device.${sub || 'unknown'}`, subcommand: sub || 'unknown' },
-    async () => {
-      if (sub === 'list') return runDeviceList(rest);
-      if (sub === 'show') return runDeviceShow(rest);
-      warn('Unknown device subcommand: ' + (sub || '(none)'));
-      warn('Usage: empirical device <list|show> [options]');
-      process.exit(1);
-    }
-  );
-}
+  log(JSON.stringify(result));
+}
+
+async function fetchInventoryJson(url, accessToken) {
+  try {
+    return await httpJson(url, 'GET', undefined, buildApiAuthHeaders(accessToken));
+  } catch (error) {
+    printApiError(error);
+    process.exit(1);
+  }
+}
+
+async function listOwnedKits(baseUrl, accessToken) {
+  const response = await fetchInventoryJson(new URL('/api/v1/kits', baseUrl).toString(), accessToken);
+  return response?.data?.kits || response?.kits || [];
+}
+
+// C-006: fetch every resolved skill across the caller's kits (or just `kitFilter`'s kit), each
+// annotated with which kit it came from. Shared by `skill list` (the human-facing listing) and
+// `resolveAuthoredSkillId` (name -> authoredSkillId lookup for `skill history`/`skill rollback`)
+// so both read the exact same data — a name that resolves for one resolves the same way for
+// the other.
+async function fetchAllResolvedSkills(baseUrl, accessToken, kitFilter) {
+  const kits = await listOwnedKits(baseUrl, accessToken);
+  const selectedKits = kitFilter
+    ? kits.filter((kit) => kit.kitId === kitFilter || kit.name === kitFilter)
+    : kits;
+  const skills = [];
+
+  for (const kit of selectedKits) {
+    const response = await fetchInventoryJson(
+      new URL(`/api/v1/kits/${encodeURIComponent(kit.kitId)}/resolved`, baseUrl).toString(),
+      accessToken
+    );
+    const kitSkills = response?.data?.skills || response?.skills || [];
+    for (const skill of kitSkills) {
+      skills.push({
+        ...skill,
+        kitId: kit.kitId,
+        kitName: kit.name,
+        isDefault: Boolean(kit.isDefault)
+      });
+    }
+  }
+
+  return skills;
+}
+
+async function runSkillList(args) {
+  const accessToken = requireAccessToken();
+  const baseUrl = resolveApiBaseUrl();
+  const kitFilter = parseOption(args, '--kit', '');
+  const skills = await fetchAllResolvedSkills(baseUrl, accessToken, kitFilter);
+
+  // C-006: name, resolvedVersion (its version) and authoredSkillId are the fields that matter
+  // for finding/using a skill again later — authoredSkillId in particular is the ONLY way to
+  // reach `skill history`/`skill rollback`, and until now it was never shown here (only ever
+  // printed once, in the JSON blob `skill push` prints at push time). Every other field from
+  // the resolved payload is still included; this just guarantees those three are always present
+  // per row, even for skill types (git_custom/builtin) where authoredSkillId is absent.
+  const rows = skills.map((skill) => ({
+    name: skill.name,
+    resolvedVersion: skill.resolvedVersion,
+    authoredSkillId: skill.authoredSkillId || null,
+    ...skill
+  }));
+
+  log(JSON.stringify({ skills: rows }));
+}
+
+// C-006: `skill history`/`skill rollback` historically required the raw authoredSkillId, which
+// the user only ever sees once (the JSON `skill push` prints at push time). This lets either
+// command accept the skill's NAME instead, resolved against the same data `skill list` shows.
+// Direct authoredSkillId matches win outright (no ambiguity possible — it's a unique id); name
+// matches must be unique among authored skills (only authored skills have an authoredSkillId,
+// hence history/rollback) or this throws a clear, actionable error.
+async function resolveAuthoredSkillId(identifier, baseUrl, accessToken, kitFilter) {
+  const skills = await fetchAllResolvedSkills(baseUrl, accessToken, kitFilter);
+
+  const directMatch = skills.find((skill) => skill.authoredSkillId === identifier);
+  if (directMatch) return directMatch.authoredSkillId;
+
+  const nameMatches = skills.filter((skill) => skill.authoredSkillId && skill.name === identifier);
+
+  if (nameMatches.length === 1) return nameMatches[0].authoredSkillId;
+
+  if (nameMatches.length > 1) {
+    const locations = nameMatches
+      .map((skill) => `${skill.kitName || skill.kitId} (${skill.authoredSkillId})`)
+      .join(', ');
+    throw new Error(
+      `"${identifier}" matches ${nameMatches.length} authored skills: ${locations}. Pass the authoredSkillId instead, or narrow with --kit.`
+    );
+  }
+
+  throw new Error(
+    `No authored skill named or with id "${identifier}" was found${kitFilter ? ` in kit "${kitFilter}"` : ''}. Run 'empirical skill list' to see authoredSkillId per skill.`
+  );
+}
+
+async function runDeviceList() {
+  const accessToken = requireAccessToken();
+  const baseUrl = resolveApiBaseUrl();
+  const kits = await listOwnedKits(baseUrl, accessToken);
+  const devicesById = new Map();
+
+  for (const kit of kits.filter((candidate) => !candidate.isDefault)) {
+    const response = await fetchInventoryJson(
+      new URL(`/api/v1/kits/${encodeURIComponent(kit.kitId)}/devices`, baseUrl).toString(),
+      accessToken
+    );
+    const devices = response?.data?.devices || response?.devices || [];
+    for (const device of devices) {
+      const existing = devicesById.get(device.deviceId) || {
+        ...device,
+        kits: []
+      };
+      existing.kits.push({
+        kitId: kit.kitId,
+        kitName: kit.name,
+        active: Boolean(device.active)
+      });
+      devicesById.set(device.deviceId, existing);
+    }
+  }
+
+  log(JSON.stringify({ devices: [...devicesById.values()] }));
+}
+
+async function runDeviceShow(args) {
+  const deviceId = args[0] && !args[0].startsWith('--') ? args[0] : '';
+  if (!deviceId) {
+    warn('Usage: empirical device show <deviceId>');
+    process.exit(1);
+  }
+
+  const accessToken = requireAccessToken();
+  const baseUrl = resolveApiBaseUrl();
+  const response = await fetchInventoryJson(
+    new URL(`/api/v1/devices/${encodeURIComponent(deviceId)}/resolved`, baseUrl).toString(),
+    accessToken
+  );
+  const data = response?.data || response || {};
+  log(JSON.stringify({ deviceId, ...data }));
+}
+
+async function runDeviceCommand(subArgs) {
+  const sub = subArgs[0];
+  const rest = subArgs.slice(1);
+  return withCliAnalyticsContext(
+    { command: `device.${sub || 'unknown'}`, subcommand: sub || 'unknown' },
+    async () => {
+      if (sub === 'list') return runDeviceList(rest);
+      if (sub === 'show') return runDeviceShow(rest);
+      warn('Unknown device subcommand: ' + (sub || '(none)'));
+      warn('Usage: empirical device <list|show> [options]');
+      process.exit(1);
+    }
+  );
+}
 
 async function runKitAutosync(args) {
   const kitId = args[0] && !args[0].startsWith('--') ? args[0] : '';
@@ -398,6 +473,7 @@ async function runKitUse(args) {
     process.exit(1);
   }
   printSyncSummary(syncResult, quiet);
+  refreshEmpiricalMemorySkillForCurrentMode({ dryRun, quiet });
 
   // US-012: fetch this Kit's own autoSyncEnabled flag and reconcile the local scheduled task to
   // match it. A failure here is fetched best-effort — it must never turn a successful `kit use`
@@ -434,6 +510,7 @@ async function runKitSync(args) {
   }
 
   printSyncSummary(result, quiet);
+  refreshEmpiricalMemorySkillForCurrentMode({ dryRun, quiet });
 }
 
 async function runKitCommand(subArgs) {
@@ -527,14 +604,24 @@ async function runSkillPush(args) {
 }
 
 async function runSkillHistory(args) {
-  const authoredSkillId = args[0] && !args[0].startsWith('--') ? args[0] : '';
-  if (!authoredSkillId) {
-    warn('Usage: empirical skill history <authoredSkillId>');
+  const identifier = args[0] && !args[0].startsWith('--') ? args[0] : '';
+  if (!identifier) {
+    warn('Usage: empirical skill history <authoredSkillId|name> [--kit <kitId>]');
     process.exit(1);
   }
 
+  const kitFilter = parseOption(args, '--kit', '');
   const accessToken = requireAccessToken();
   const baseUrl = resolveApiBaseUrl();
+
+  let authoredSkillId;
+  try {
+    authoredSkillId = await resolveAuthoredSkillId(identifier, baseUrl, accessToken, kitFilter);
+  } catch (error) {
+    warn(error.message);
+    process.exit(1);
+  }
+
   const url = new URL(
     `/api/v1/skills/${encodeURIComponent(authoredSkillId)}/history`,
     baseUrl
@@ -553,17 +640,27 @@ async function runSkillHistory(args) {
 }
 
 async function runSkillRollback(args) {
-  const authoredSkillId = args[0] && !args[0].startsWith('--') ? args[0] : '';
+  const identifier = args[0] && !args[0].startsWith('--') ? args[0] : '';
   const toVersionRaw = parseOption(args, '--to-version', '');
   const toVersion = Number(toVersionRaw);
 
-  if (!authoredSkillId || !toVersionRaw || !Number.isInteger(toVersion) || toVersion < 1) {
-    warn('Usage: empirical skill rollback <authoredSkillId> --to-version <n>');
+  if (!identifier || !toVersionRaw || !Number.isInteger(toVersion) || toVersion < 1) {
+    warn('Usage: empirical skill rollback <authoredSkillId|name> --to-version <n> [--kit <kitId>]');
     process.exit(1);
   }
 
+  const kitFilter = parseOption(args, '--kit', '');
   const accessToken = requireAccessToken();
   const baseUrl = resolveApiBaseUrl();
+
+  let authoredSkillId;
+  try {
+    authoredSkillId = await resolveAuthoredSkillId(identifier, baseUrl, accessToken, kitFilter);
+  } catch (error) {
+    warn(error.message);
+    process.exit(1);
+  }
+
   const url = new URL(
     `/api/v1/skills/${encodeURIComponent(authoredSkillId)}/rollback`,
     baseUrl
@@ -588,13 +685,13 @@ async function runSkillCommand(subArgs) {
   return withCliAnalyticsContext(
     { command: `skill.${sub || 'unknown'}`, subcommand: sub || 'unknown' },
     async () => {
-      if (sub === 'push') return runSkillPush(rest);
-      if (sub === 'list') return runSkillList(rest);
+      if (sub === 'push') return runSkillPush(rest);
+      if (sub === 'list') return runSkillList(rest);
       if (sub === 'history') return runSkillHistory(rest);
       if (sub === 'rollback') return runSkillRollback(rest);
 
       warn('Unknown skill subcommand: ' + (sub || '(none)'));
-      warn('Usage: empirical skill <list|push|history|rollback> [options]');
+      warn('Usage: empirical skill <list|push|history|rollback> [options]');
       process.exit(1);
     }
   );
@@ -609,11 +706,11 @@ module.exports = {
   runKitDevices,
   runKitDeactivate,
   runKitUse,
-  runKitSync,
-  runSkillList,
-  runDeviceList,
-  runDeviceShow,
-  runDeviceCommand,
+  runKitSync,
+  runSkillList,
+  runDeviceList,
+  runDeviceShow,
+  runDeviceCommand,
   runKitCommand,
   runSkillPush,
   runSkillHistory,