selftune 0.2.22 → 0.2.24

package/cli/selftune/auto-update.ts

@@ -2,19 +2,25 @@
  * Auto-update check for selftune CLI.
  *
  * Runs before command dispatch (skipped for hooks and --help).
+ * Set SELFTUNE_SKIP_AUTO_UPDATE=1 or SELFTUNE_SKIP_UPDATE_CHECK=1 to disable
+ * it for source-tree smoke tests and hermetic automation.
  * Checks npm registry at most once per hour (cached in ~/.selftune/update-check.json).
- * If outdated, auto-updates via `npm install -g selftune@latest` and notifies the user.
+ * If outdated, auto-updates the active global install (npm or Bun) and syncs
+ * bundled skill files into common global skill registries.
  */
 
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 
 import { SELFTUNE_CONFIG_DIR } from "./constants.js";
 
 const UPDATE_CHECK_PATH = join(SELFTUNE_CONFIG_DIR, "update-check.json");
 const CHECK_INTERVAL_MS = 60 * 60 * 1000; // 1 hour
+const PACKAGE_NAME = "selftune";
+const PACKAGE_ROOT = resolve(import.meta.dir, "..", "..");
+const BUNDLED_SKILL_DIR = join(PACKAGE_ROOT, "skill");
 
 interface UpdateCheckCache {
   lastCheck: number;
@@ -22,6 +28,33 @@ interface UpdateCheckCache {
   latestVersion: string;
 }
 
+type InstallSource = "bun-global" | "npm-global";
+
+interface UpdateCommand {
+  source: InstallSource;
+  command: string;
+  args: string[];
+  manualCommand: string;
+}
+
+interface UpdateCommandOptions {
+  homeDir?: string;
+  moduleDir?: string;
+  npmGlobalRoot?: string | null;
+}
+
+function isTruthyEnv(value: string | undefined): boolean {
+  if (!value) return false;
+  return !["0", "false", "no", "off"].includes(value.trim().toLowerCase());
+}
+
+export function isAutoUpdateSkipped(): boolean {
+  return (
+    isTruthyEnv(process.env.SELFTUNE_SKIP_AUTO_UPDATE) ||
+    isTruthyEnv(process.env.SELFTUNE_SKIP_UPDATE_CHECK)
+  );
+}
+
 function readCache(): UpdateCheckCache | null {
   try {
     if (!existsSync(UPDATE_CHECK_PATH)) return null;
@@ -47,6 +80,139 @@ function getCurrentVersion(): string {
   return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 }
 
+function normalizePath(path: string): string {
+  return resolve(path).replaceAll("\\", "/");
+}
+
+function getActivePackageRoot(moduleDir = import.meta.dir): string {
+  return resolve(moduleDir, "..", "..");
+}
+
+function getNpmGlobalRoot(): string | null {
+  const result = spawnSync("npm", ["root", "-g"], {
+    stdio: ["ignore", "pipe", "ignore"],
+    timeout: 5000,
+  });
+  if (result.status !== 0) return null;
+  const root = result.stdout?.toString().trim();
+  return root ? root : null;
+}
+
+function buildManualUpdateCommand(source: InstallSource, version: string): string {
+  const packageSpec = `${PACKAGE_NAME}@${version}`;
+  if (source === "bun-global") {
+    return `bun add -g ${packageSpec}`;
+  }
+  return `npm install -g ${packageSpec}`;
+}
+
+export function resolveSelftuneUpdateCommand(
+  version: string,
+  options?: UpdateCommandOptions,
+): UpdateCommand | null {
+  const homeDir = options?.homeDir ?? homedir();
+  const activePackageRoot = normalizePath(getActivePackageRoot(options?.moduleDir));
+
+  const bunPackageRoot = normalizePath(
+    join(homeDir, ".bun", "install", "global", "node_modules", PACKAGE_NAME),
+  );
+  if (
+    activePackageRoot === bunPackageRoot ||
+    activePackageRoot.includes("/.bun/install/global/node_modules/selftune")
+  ) {
+    return {
+      source: "bun-global",
+      command: "bun",
+      args: ["add", "-g", `${PACKAGE_NAME}@${version}`],
+      manualCommand: buildManualUpdateCommand("bun-global", version),
+    };
+  }
+
+  const npmGlobalRoot = options?.npmGlobalRoot ?? getNpmGlobalRoot();
+  if (npmGlobalRoot) {
+    const npmPackageRoot = normalizePath(join(npmGlobalRoot, PACKAGE_NAME));
+    if (activePackageRoot === npmPackageRoot) {
+      return {
+        source: "npm-global",
+        command: "npm",
+        args: ["install", "-g", `${PACKAGE_NAME}@${version}`],
+        manualCommand: buildManualUpdateCommand("npm-global", version),
+      };
+    }
+  }
+
+  if (activePackageRoot.includes("/lib/node_modules/selftune")) {
+    return {
+      source: "npm-global",
+      command: "npm",
+      args: ["install", "-g", `${PACKAGE_NAME}@${version}`],
+      manualCommand: buildManualUpdateCommand("npm-global", version),
+    };
+  }
+
+  return null;
+}
+
+export function getSelftuneUpdateHint(version = "latest", options?: UpdateCommandOptions): string {
+  return (
+    resolveSelftuneUpdateCommand(version, options)?.manualCommand ??
+    "npx skills add selftune-dev/selftune"
+  );
+}
+
+function readSkillVersion(skillDir: string): string | null {
+  try {
+    const skillPath = join(skillDir, "SKILL.md");
+    if (!existsSync(skillPath)) return null;
+    const skillContent = readFileSync(skillPath, "utf-8");
+    const match = skillContent.match(/^\s*version:\s*(.+)$/m);
+    return match?.[1]?.trim() ?? null;
+  } catch {
+    return null;
+  }
+}
+
+export function getInstalledSkillDirs(homeDir = homedir()): string[] {
+  return [
+    join(homeDir, ".claude", "skills", PACKAGE_NAME),
+    join(homeDir, ".agents", "skills", PACKAGE_NAME),
+  ].filter((dir) => existsSync(dir));
+}
+
+export function syncInstalledSkillFiles(options?: {
+  force?: boolean;
+  homeDir?: string;
+  packageSkillDir?: string;
+}): string[] {
+  const homeDir = options?.homeDir ?? homedir();
+  const packageSkillDir = options?.packageSkillDir ?? BUNDLED_SKILL_DIR;
+  if (!existsSync(packageSkillDir)) return [];
+
+  const sourceVersion = readSkillVersion(packageSkillDir);
+  const syncedDirs: string[] = [];
+
+  for (const targetDir of getInstalledSkillDirs(homeDir)) {
+    const targetVersion = readSkillVersion(targetDir);
+    const shouldSync =
+      options?.force ||
+      sourceVersion === null ||
+      targetVersion === null ||
+      sourceVersion !== targetVersion;
+    if (!shouldSync) continue;
+
+    mkdirSync(targetDir, { recursive: true });
+    for (const entry of readdirSync(packageSkillDir)) {
+      cpSync(join(packageSkillDir, entry), join(targetDir, entry), {
+        recursive: true,
+        force: true,
+      });
+    }
+    syncedDirs.push(targetDir);
+  }
+
+  return syncedDirs;
+}
+
 function compareSemver(a: string, b: string): -1 | 0 | 1 {
   const pa = a.split(".").map(Number);
   const pb = b.split(".").map(Number);
@@ -66,6 +232,8 @@ function compareSemver(a: string, b: string): -1 | 0 | 1 {
  */
 export async function autoUpdate(): Promise<void> {
   try {
+    if (isAutoUpdateSkipped()) return;
+
     const currentVersion = getCurrentVersion();
     const cache = readCache();
 
@@ -74,6 +242,8 @@ export async function autoUpdate(): Promise<void> {
       // Even with a recent check, if we know we're outdated, try updating
       if (cache.latestVersion && compareSemver(currentVersion, cache.latestVersion) < 0) {
         await performUpdate(currentVersion, cache.latestVersion);
+      } else if (cache.latestVersion && compareSemver(currentVersion, cache.latestVersion) >= 0) {
+        syncInstalledSkillFiles();
       }
       return;
     }
@@ -87,7 +257,7 @@ export async function autoUpdate(): Promise<void> {
         signal: controller.signal,
       });
       if (!res.ok) {
-        writeCache({ lastCheck: Date.now(), currentVersion, latestVersion: currentVersion });
+        writeCache({ lastCheck: Date.now(), currentVersion, latestVersion: "" });
         return;
       }
       const data = (await res.json()) as { version: string };
@@ -102,7 +272,10 @@ export async function autoUpdate(): Promise<void> {
     // Auto-update if outdated
     if (compareSemver(currentVersion, latestVersion) < 0) {
       await performUpdate(currentVersion, latestVersion);
+      return;
     }
+
+    syncInstalledSkillFiles();
   } catch {
     // Non-critical — silently skip
   }
@@ -111,7 +284,16 @@ export async function autoUpdate(): Promise<void> {
 async function performUpdate(currentVersion: string, latestVersion: string): Promise<void> {
   console.error(`[selftune] Update available: v${currentVersion} → v${latestVersion}. Updating...`);
 
-  const result = spawnSync("npm", ["install", "-g", `selftune@${latestVersion}`], {
+  const updateCommand = resolveSelftuneUpdateCommand(latestVersion);
+  if (!updateCommand) {
+    console.error(
+      "[selftune] Auto-update skipped. Current install path is not a supported global package install.",
+    );
+    console.error(`[selftune] Refresh manually: ${getSelftuneUpdateHint(latestVersion)}`);
+    return;
+  }
+
+  const result = spawnSync(updateCommand.command, updateCommand.args, {
     stdio: ["ignore", "pipe", "pipe"],
     timeout: 30000,
   });
@@ -130,11 +312,21 @@ async function performUpdate(currentVersion: string, latestVersion: string): Pro
     } catch {
       // Non-critical — updated CLI is usable even if agent sync fails
     }
+
+    // Refresh installed selftune skill registries after a successful package update.
+    try {
+      const syncedSkillDirs = syncInstalledSkillFiles({ force: true });
+      if (getInstalledSkillDirs().length > 0 && syncedSkillDirs.length === 0) {
+        console.error(
+          `[selftune] Skill file sync failed — run: ${getSelftuneUpdateHint(latestVersion)}`,
+        );
+      }
+    } catch {
+      // Non-critical — skill files can be updated manually
+    }
   } else {
     const stderr = result.stderr?.toString().trim();
-    console.error(
-      `[selftune] Auto-update failed. Run manually: npm install -g selftune@${latestVersion}`,
-    );
+    console.error(`[selftune] Auto-update failed. Run manually: ${updateCommand.manualCommand}`);
     if (stderr) {
       console.error(`  ${stderr.split("\n")[0]}`);
     }

package/cli/selftune/canonical-export.ts

@@ -5,6 +5,8 @@ import { readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { parseArgs } from "node:util";
 
+import type { PushPayloadV2 } from "@selftune/telemetry-contract/types";
+
 import { CANONICAL_LOG, CLAUDE_CODE_PROJECTS_DIR } from "./constants.js";
 import {
   buildCanonicalRecordsFromReplay,
@@ -61,6 +63,12 @@ function getClientVersion(): string {
   }
 }
 
+function addOptional(record: Record<string, unknown>, key: string, value: unknown): void {
+  if (value !== undefined && value !== null) {
+    record[key] = value;
+  }
+}
+
 export function loadCanonicalRecordsForExport(
   logPath: string = CANONICAL_LOG,
   projectsDir: string = CLAUDE_CODE_PROJECTS_DIR,
@@ -88,13 +96,47 @@ export function buildPushPayloadV2(
   orchestrateRuns: Record<string, unknown>[] = [],
   gradingResults: Record<string, unknown>[] = [],
   improvementSignals: Record<string, unknown>[] = [],
-): Record<string, unknown> {
-  const sessions = records.filter((record) => record.record_kind === "session");
-  const prompts = records.filter((record) => record.record_kind === "prompt");
-  const skillInvocations = records.filter((record) => record.record_kind === "skill_invocation");
-  const executionFacts = records.filter((record) => record.record_kind === "execution_fact");
-  const normalizationRuns = records.filter((record) => record.record_kind === "normalization_run");
+): PushPayloadV2 {
+  const sessions = records.filter(
+    (record): record is Extract<CanonicalRecord, { record_kind: "session" }> =>
+      record.record_kind === "session",
+  );
+  const prompts = records.filter(
+    (record): record is Extract<CanonicalRecord, { record_kind: "prompt" }> =>
+      record.record_kind === "prompt",
+  );
+  const skillInvocations = records.filter(
+    (record): record is Extract<CanonicalRecord, { record_kind: "skill_invocation" }> =>
+      record.record_kind === "skill_invocation",
+  );
+  const executionFacts = records.filter(
+    (record): record is Extract<CanonicalRecord, { record_kind: "execution_fact" }> =>
+      record.record_kind === "execution_fact",
+  );
+  const normalizationRuns = records.filter(
+    (record): record is Extract<CanonicalRecord, { record_kind: "normalization_run" }> =>
+      record.record_kind === "normalization_run",
+  );
   const normalizerVersion = records[0]?.normalizer_version ?? "1.0.0";
+  const evolutionEvidence = evidenceEntries.map((entry) => {
+    const record: Record<string, unknown> = {
+      evidence_id: entry.evidence_id,
+      skill_name: entry.skill_name,
+      target: entry.target,
+      stage: entry.stage,
+    };
+    addOptional(record, "timestamp", entry.timestamp);
+    addOptional(record, "skill_path", entry.skill_path);
+    addOptional(record, "proposal_id", entry.proposal_id);
+    addOptional(record, "rationale", entry.rationale);
+    addOptional(record, "confidence", entry.confidence);
+    addOptional(record, "details", entry.details);
+    addOptional(record, "original_text", entry.original_text);
+    addOptional(record, "proposed_text", entry.proposed_text);
+    addOptional(record, "eval_set_json", entry.eval_set);
+    addOptional(record, "validation_json", entry.validation);
+    return record;
+  });
 
   return {
     schema_version: "2.0",
@@ -107,25 +149,13 @@ export function buildPushPayloadV2(
       skill_invocations: skillInvocations,
       execution_facts: executionFacts,
       normalization_runs: normalizationRuns,
-      evolution_evidence: evidenceEntries.map((entry) => ({
-        evidence_id: entry.evidence_id,
-        timestamp: entry.timestamp,
-        skill_name: entry.skill_name,
-        skill_path: entry.skill_path,
-        proposal_id: entry.proposal_id,
-        target: entry.target,
-        stage: entry.stage,
-        rationale: entry.rationale,
-        confidence: entry.confidence,
-        details: entry.details,
-        original_text: entry.original_text,
-        proposed_text: entry.proposed_text,
-        eval_set_json: entry.eval_set,
-        validation_json: entry.validation,
-      })),
-      orchestrate_runs: orchestrateRuns,
-      grading_results: gradingResults,
-      improvement_signals: improvementSignals,
+      evolution_evidence:
+        evolutionEvidence as unknown as PushPayloadV2["canonical"]["evolution_evidence"],
+      orchestrate_runs:
+        orchestrateRuns as unknown as PushPayloadV2["canonical"]["orchestrate_runs"],
+      grading_results: gradingResults as unknown as PushPayloadV2["canonical"]["grading_results"],
+      improvement_signals:
+        improvementSignals as unknown as PushPayloadV2["canonical"]["improvement_signals"],
     },
   };
 }