@khanhcan148/mk 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanhcan148/mk",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "CLI to install and manage MyClaudeKit (.claude/) in your projects",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -10,6 +10,7 @@ import { MANIFEST_FILENAME } from '../lib/constants.js';
 import { resolveTokenOrLogin } from '../lib/auth.js';
 import { writeToken, readStoredToken } from '../lib/config.js';
 import { downloadAndExtractKit, cleanupTempDir } from '../lib/download.js';
+import { fetchLatestRelease } from '../lib/releases.js';
 
 /**
  * Run the init command.
@@ -19,7 +20,8 @@ import { downloadAndExtractKit, cleanupTempDir } from '../lib/download.js';
  *   targetDir?: string,
  *   manifestPath?: string,
  *   scope?: 'project'|'global',
- *   dryRun?: boolean
+ *   dryRun?: boolean,
+ *   version?: string  - Kit version to store in manifest (defaults to pkg.version when omitted)
  * }} params
  * @returns {Promise<{ files: Array, totalSize: number }>}
  */
@@ -29,7 +31,8 @@ export async function runInit(params = {}) {
     targetDir = resolveTargetDir({ global: false }),
     manifestPath = resolveManifestPath({ global: false }),
     scope = 'project',
-    dryRun = false
+    dryRun = false,
+    version: explicitVersion
   } = params;
 
   // Guard: abort if already installed
@@ -61,8 +64,10 @@ export async function runInit(params = {}) {
     }
   }
 
-  // Write manifest
-  writeManifest(manifestPath, files, pkg.version, scope);
+  // Write manifest.
+  // Use explicitVersion when provided (e.g. release.version from initAction);
+  // fall back to pkg.version for direct runInit calls without a known release version.
+  writeManifest(manifestPath, files, explicitVersion ?? pkg.version, scope);
 
   const totalSize = fileList.reduce((s, f) => s + f.size, 0);
   return { files: fileList, totalSize, fileCount: fileList.length };
@@ -81,11 +86,15 @@ export async function initAction(options = {}, deps = {}) {
     downloadAndExtractKit: download = downloadAndExtractKit,
     cleanupTempDir: cleanup = cleanupTempDir,
     writeToken: storeToken = writeToken,
-    readStoredToken: readToken = readStoredToken
+    readStoredToken: readToken = readStoredToken,
+    fetchLatestRelease: fetchRelease = fetchLatestRelease,
+    // Injectable for tests — allows overriding resolved paths without touching CWD
+    targetDir: injectedTargetDir,
+    manifestPath: injectedManifestPath
   } = deps;
 
-  const targetDir = resolveTargetDir(options);
-  const manifestPath = resolveManifestPath(options);
+  const targetDir = injectedTargetDir ?? resolveTargetDir(options);
+  const manifestPath = injectedManifestPath ?? resolveManifestPath(options);
   const scope = options.global ? 'global' : 'project';
 
   // Pre-flight: warn if target exists with files
@@ -115,11 +124,23 @@ export async function initAction(options = {}, deps = {}) {
       }
     });
 
+    // Determine installed version from latest release (more accurate than pkg.version).
+    // Falls back silently to pkg.version if no release is available (new repo, API error, etc.)
+    let installedVersion;
+    if (!options.dryRun) {
+      try {
+        const release = await fetchRelease(token);
+        installedVersion = release.available ? release.version : undefined;
+      } catch {
+        // Ignore errors — version fallback handled by runInit
+      }
+    }
+
     process.stdout.write('Downloading kit from GitHub...\n');
     tempDir = await download(token);
     const sourceDir = join(tempDir, '.claude');
 
-    const result = await runInit({ sourceDir, targetDir, manifestPath, scope, dryRun: options.dryRun });
+    const result = await runInit({ sourceDir, targetDir, manifestPath, scope, dryRun: options.dryRun, version: installedVersion });
 
     if (options.dryRun) {
       process.stdout.write(`Would install ${result.files.length} files:\n`);

package/src/commands/update.js

@@ -40,7 +40,8 @@ async function defaultPromptUser(question) {
  *   sourceDir?: string,
  *   targetDir?: string,
  *   manifestPath?: string,
- *   force?: boolean
+ *   force?: boolean,
+ *   version?: string  - Kit version to store in manifest (defaults to pkg.version when omitted)
  * }} params
  * @returns {Promise<{ updated: string[], added: string[], removed: string[], conflicts: string[], unchanged: string[], upToDate: boolean }>}
  */
@@ -49,7 +50,8 @@ export async function runUpdate(params = {}) {
     sourceDir = resolveSourceDir(),
     targetDir = resolveTargetDir({ global: false }),
     manifestPath = resolveManifestPath({ global: false }),
-    force = false
+    force = false,
+    version: explicitVersion
   } = params;
 
   // Read existing manifest
@@ -159,8 +161,10 @@ export async function runUpdate(params = {}) {
     delete newFiles[relPath];
   }
 
-  // Update manifest with new file map
-  updateManifest(manifestPath, newFiles, pkg.version);
+  // Update manifest with new file map.
+  // Use explicitVersion when provided (e.g. release.version from updateAction);
+  // fall back to pkg.version for direct runUpdate calls or main-branch fallback downloads.
+  updateManifest(manifestPath, newFiles, explicitVersion ?? pkg.version);
 
   return {
     updated: diff.updated,
@@ -190,16 +194,18 @@ export async function updateAction(options = {}, deps = {}) {
     readStoredToken: readToken = readStoredToken,
     fetchLatestRelease: fetchRelease = fetchLatestRelease,
     compareVersions: cmpVersions = compareVersions,
-    promptUser = defaultPromptUser
+    promptUser = defaultPromptUser,
+    // Injectable for tests — allows overriding resolved paths without touching CWD
+    manifestPath: injectedManifestPath
   } = deps;
 
-  // Read local package version for comparison
+  // Read local package version (used as fallback when manifest has no version)
   const pkg = JSON.parse(
     readFileSync(fileURLToPath(new URL('../../package.json', import.meta.url)), 'utf8')
   );
 
   const targetDir = resolveTargetDir(options);
-  const manifestPath = resolveManifestPath(options);
+  const manifestPath = injectedManifestPath ?? resolveManifestPath(options);
 
   let tempDir = null;
   try {
@@ -220,7 +226,20 @@ export async function updateAction(options = {}, deps = {}) {
     process.stdout.write('Checking for updates...\n');
     const release = await fetchRelease(token);
 
+    // Read installed version from manifest (more accurate than pkg.version which reflects
+    // the CLI package, not the downloaded kit files). Fall back to pkg.version if no manifest.
+    let installedVersion = pkg.version;
+    if (existsSync(manifestPath)) {
+      try {
+        const existingManifest = readManifest(manifestPath);
+        if (existingManifest?.version) installedVersion = existingManifest.version;
+      } catch {
+        // Manifest unreadable — proceed with pkg.version fallback
+      }
+    }
+
     let downloadUrl; // undefined = use default (main branch)
+    let releaseVersion; // set when downloading from a specific release tarball
 
     if (!release.available) {
       // No release found or API error — warn and fall back to main branch
@@ -228,7 +247,7 @@ export async function updateAction(options = {}, deps = {}) {
         chalk.yellow(`Warning: Could not check latest release (${release.reason}). Falling back to main branch.\n`)
       );
     } else {
-      const { needsUpdate, local, remote } = cmpVersions(pkg.version, release.version);
+      const { needsUpdate, local, remote } = cmpVersions(installedVersion, release.version);
 
       if (!needsUpdate) {
         process.stdout.write(chalk.green(`Already up to date (v${local}).\n`));
@@ -256,6 +275,7 @@ export async function updateAction(options = {}, deps = {}) {
       }
 
       downloadUrl = release.tarballUrl;
+      releaseVersion = release.version;
     }
 
     // --- Download and apply ---
@@ -263,7 +283,10 @@ export async function updateAction(options = {}, deps = {}) {
     tempDir = await download(token, downloadUrl !== undefined ? { url: downloadUrl } : {});
     const sourceDir = join(tempDir, '.claude');
 
-    const result = await runUpdate({ sourceDir, targetDir, manifestPath, force: options.force });
+    // Pass releaseVersion so runUpdate stores it in the manifest.
+    // When falling back to main branch (no release), releaseVersion is undefined and
+    // runUpdate falls back to pkg.version — which is the correct behaviour for that path.
+    const result = await runUpdate({ sourceDir, targetDir, manifestPath, force: options.force, version: releaseVersion });
 
     if (result.upToDate) {
       process.stdout.write(chalk.green('Already up to date.\n'));