@haposoft/cafekit 0.11.3 → 0.11.5

package/bin/install.js

@@ -122,7 +122,7 @@ async function main() {
 
   try {
     ctx = buildContext(process.argv, `${Date.now()}`);
-    ctx.ui.intro(`${ctx.ui.pc.bgCyan(ctx.ui.pc.black(' CafeKit '))}Installer v${packageJson.version} · Multi-platform SDD`);
+    ctx.ui.intro(`${ctx.ui.pc.bgCyan(ctx.ui.pc.black(' CafeKit '))}${ctx.ui.pc.gray(' Installer')} v${packageJson.version}\n  ${ctx.ui.pc.dim('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')}\n  ${ctx.ui.pc.blue('📦 ' + (ctx.t ? ctx.t('introDesc') : 'AI-native development workflow'))}`);
     if (got.reclaimed) ctx.ui.info(ctx.t('reclaimed'));
 
     await selectLanguage(ctx);

package/bin/lib/i18n.js

@@ -37,6 +37,9 @@ const MESSAGES = {
     modeDryRun:   'Mode: dry-run  •  no changes will be written',
     modeInstall:  'Mode: install / update  •  your customisations are preserved',
 
+    // Intro
+    introDesc:    'AI-native development workflow for Claude Code',
+
     // Platform install spinner
     installingPlatform:    'Installing {name}',
     platformInstalled:     '{name} — {files} file(s), {skills} skill(s)',
@@ -94,8 +97,15 @@ const MESSAGES = {
     outroDone:       'Done!  docs: https://github.com/haposoft/cafekit',
 
     // Version check
-    versionUpToDate:  'Already up to date ({v}). Use --force-overwrite to reinstall.',
-    versionDowngrade: 'Downgrading {from} → {to}. Features may be removed. Continue?'
+    versionUpToDate:      'Already up to date ({v}). Use --force-overwrite to reinstall.',
+    versionDowngrade:     'Downgrading {from} → {to}. Features may be removed. Continue?',
+    versionSamePrompt:    'CafeKit {v} is already installed. What would you like to do?',
+    versionForceReinstall: 'Reinstalling CafeKit {v} (--force-overwrite)...',
+    versionUpgradePrompt: 'CafeKit {from} → {to}: Update available!',
+    updateOption:         'Update to {v}',
+    reinstallOption:      'Reinstall (overwrite managed files)',
+    reinstallCurrentOption: 'Reinstall {v}',
+    skipOption:           'Skip (exit)'
   },
 
   // ─── 日本語 ─────────────────────────────────────────────────────────────────
@@ -118,6 +128,9 @@ const MESSAGES = {
     modeDryRun:   'モード: ドライラン  •  ファイルへの変更はありません',
     modeInstall:  'モード: インストール / 更新  •  カスタマイズは保持されます',
 
+    // Intro
+    introDesc:    'Claude Code 向け AI ネイティブ開発ワークフロー',
+
     installingPlatform:    '{name} をインストール中',
     platformInstalled:     '{name} — {files} ファイル、{skills} スキル',
     platformDryInstalled:  '{name} — {files} ファイル、{skills} スキル  [ドライラン]',
@@ -169,8 +182,15 @@ const MESSAGES = {
     dryRunOnly:      'ドライラン完了 — ファイルへの変更はありませんでした。\n  変更を適用するには --dry-run なしで再実行してください。',
     outroDone:       '完了！  ドキュメント: https://github.com/haposoft/cafekit',
 
-    versionUpToDate:  '最新バージョンです（{v}）。再インストールするには --force-overwrite を使用してください。',
-    versionDowngrade: '{from} → {to} へのダウングレードです。機能が削除される可能性があります。続けますか？'
+    versionUpToDate:      '最新バージョンです（{v}）。再インストールするには --force-overwrite を使用してください。',
+    versionDowngrade:     '{from} → {to} へのダウングレードです。機能が削除される可能性があります。続けますか？',
+    versionSamePrompt:    'CafeKit {v} は既にインストールされています。何をしますか？',
+    versionForceReinstall: 'CafeKit {v} を再インストール中 (--force-overwrite)...',
+    versionUpgradePrompt: 'CafeKit {from} → {to}: アップデートが利用可能です！',
+    updateOption:         '{v} にアップデート',
+    reinstallOption:      '再インストール（管理対象ファイルを上書き）',
+    reinstallCurrentOption: '{v} を再インストール',
+    skipOption:           'スキップ（終了）'
   },
 
   // ─── Tiếng Việt ─────────────────────────────────────────────────────────────
@@ -193,6 +213,9 @@ const MESSAGES = {
     modeDryRun:   'Chế độ: dry-run  •  sẽ không thay đổi bất kỳ tệp nào',
     modeInstall:  'Chế độ: cài / cập nhật  •  nội dung bạn tuỳ chỉnh được giữ nguyên',
 
+    // Intro
+    introDesc:    'Quy trình phát triển AI-native cho Claude Code',
+
     installingPlatform:    'Đang cài {name}',
     platformInstalled:     '{name} — {files} tệp, {skills} skill',
     platformDryInstalled:  '{name} — {files} tệp, {skills} skill  [dry-run]',
@@ -244,8 +267,15 @@ const MESSAGES = {
     dryRunOnly:      'Dry-run hoàn tất — không có tệp nào thay đổi.\n  Chạy lại không có --dry-run để áp dụng.',
     outroDone:       'Xong!  Tài liệu: https://github.com/haposoft/cafekit',
 
-    versionUpToDate:  'Đã là phiên bản mới nhất ({v}). Dùng --force-overwrite để cài lại.',
-    versionDowngrade: 'Đang hạ cấp {from} → {to}. Một số tính năng có thể bị xoá. Tiếp tục?'
+    versionUpToDate:      'Đã là phiên bản mới nhất ({v}). Dùng --force-overwrite để cài lại.',
+    versionDowngrade:     'Đang hạ cấp {from} → {to}. Một số tính năng có thể bị xoá. Tiếp tục?',
+    versionSamePrompt:    'CafeKit {v} đã được cài đặt. Bạn muốn làm gì?',
+    versionForceReinstall: 'Đang cài lại CafeKit {v} (--force-overwrite)...',
+    versionUpgradePrompt: 'CafeKit {from} → {to}: Có bản cập nhật mới!',
+    updateOption:         'Cập nhật lên {v}',
+    reinstallOption:      'Cài lại (ghi đè file được quản lý)',
+    reinstallCurrentOption: 'Cài lại {v}',
+    skipOption:           'Bỏ qua (thoát)'
   }
 };
 

package/bin/lib/version-check.js

@@ -43,46 +43,123 @@ function getInstalledVersion(platformKey) {
 /**
  * Check versions for all selected platforms and decide whether to proceed.
  * Sets ctx.cancelled on same-version (without --force) or unconfirmed downgrade.
+ * Shows interactive prompt when version differs, asking user what to do.
  */
 async function checkVersions(ctx) {
   if (ctx.dryRun) return ctx;
 
   const incoming = packageJson.version;
+  const platformsWithInstall = [];
 
   for (const key of ctx.platforms) {
     const installed = getInstalledVersion(key);
-    if (!installed) continue; // fresh install — no check needed
+    if (installed) {
+      platformsWithInstall.push({ key, installed });
+    }
+  }
+
+  // All fresh installs - skip version check, proceed normally
+  if (platformsWithInstall.length === 0) {
+    return ctx;
+  }
+
+  // Get unique versions across all platforms
+  const uniqueVersions = [...new Set(platformsWithInstall.map(p => p.installed))];
+  const installedVersion = uniqueVersions.length === 1 ? uniqueVersions[0] : `${uniqueVersions.join(', ')}`;
 
-    const cmp = cmpVersion(installed, incoming);
+  // Determine overall comparison (assuming same version across platforms)
+  const firstPlatform = platformsWithInstall[0];
+  const cmp = cmpVersion(firstPlatform.installed, incoming);
 
-    // ── Same version ─────────────────────────────────────────────────────────
-    if (cmp === 0) {
-      if (ctx.options.forceOverwrite) continue; // --force-overwrite overrides
-      ctx.ui.info(ctx.t ? ctx.t('versionUpToDate', { v: installed }) : `Already up to date (${installed}). Use --force-overwrite to reinstall.`);
+  // ── Same version ───────────────────────────────────────────────────────────
+  if (cmp === 0) {
+    if (ctx.options.forceOverwrite) {
+      ctx.ui.info(ctx.t ? ctx.t('versionForceReinstall', { v: installedVersion }) : `Reinstalling CafeKit ${installedVersion} (--force-overwrite)...`);
+      return ctx;
+    }
+
+    if (!ctx.interactive) {
+      ctx.ui.info(ctx.t ? ctx.t('versionUpToDate', { v: installedVersion }) : `CafeKit ${installedVersion} is already up to date. Use --force-overwrite to reinstall.`);
       ctx.cancelled = true;
       return ctx;
     }
 
-    // ── Downgrade ─────────────────────────────────────────────────────────────
-    if (cmp > 0) {
-      const msg = ctx.t
-        ? ctx.t('versionDowngrade', { from: installed, to: incoming })
-        : `Downgrading ${installed} → ${incoming}. This may remove features. Continue?`;
-
-      if (!ctx.interactive) {
-        ctx.ui.warn ? ctx.ui.warn(`Downgrade detected (${installed} → ${incoming}). Aborted in non-interactive mode. Use --force-overwrite to proceed.`) : console.warn(msg);
-        ctx.cancelled = true;
-        return ctx;
-      }
-
-      const yes = await ctx.ui.confirm({ message: msg, initialValue: false }, false);
-      if (!yes || ctx.ui.isCancel(yes)) {
-        ctx.cancelled = true;
-        return ctx;
-      }
+    // Show current vs new and ask what to do
+    const options = [
+      { value: 'reinstall', label: ctx.t ? ctx.t('reinstallOption') : 'Reinstall (overwrite managed files)' },
+      { value: 'skip', label: ctx.t ? ctx.t('skipOption') : 'Skip (exit)' }
+    ];
+
+    const answer = await ctx.ui.select({
+      message: ctx.t
+        ? ctx.t('versionSamePrompt', { v: installedVersion })
+        : `CafeKit ${installedVersion} is already installed. What do you want to do?`,
+      options
+    });
+
+    if (ctx.ui.isCancel(answer) || answer === 'skip') {
+      ctx.cancelled = true;
+      return ctx;
+    }
+
+    if (answer === 'reinstall') {
+      ctx.options.forceOverwrite = true;
+    }
+
+    return ctx;
+  }
+
+  // ── Upgrade available ───────────────────────────────────────────────────────
+  if (cmp < 0) {
+    if (!ctx.interactive) {
+      // Non-interactive: proceed with upgrade automatically
+      return ctx;
     }
 
-    // cmp < 0 → upgrade, proceed normally
+    // Show current vs new and ask what to do
+    const options = [
+      { value: 'update', label: ctx.t ? ctx.t('updateOption', { v: incoming }) : `Update to ${incoming}` },
+      { value: 'reinstall', label: ctx.t ? ctx.t('reinstallCurrentOption', { v: firstPlatform.installed }) : `Reinstall ${firstPlatform.installed}` },
+      { value: 'skip', label: ctx.t ? ctx.t('skipOption') : 'Skip (exit)' }
+    ];
+
+    const answer = await ctx.ui.select({
+      message: ctx.t
+        ? ctx.t('versionUpgradePrompt', { from: firstPlatform.installed, to: incoming })
+        : `CafeKit ${firstPlatform.installed} → ${incoming}: Update available!`,
+      options
+    });
+
+    if (ctx.ui.isCancel(answer) || answer === 'skip') {
+      ctx.cancelled = true;
+      return ctx;
+    }
+
+    if (answer === 'reinstall') {
+      ctx.options.forceOverwrite = true;
+    }
+
+    // 'update' proceeds normally (no special flag needed)
+    return ctx;
+  }
+
+  // ── Downgrade ──────────────────────────────────────────────────────────────
+  if (cmp > 0) {
+    const msg = ctx.t
+      ? ctx.t('versionDowngrade', { from: firstPlatform.installed, to: incoming })
+      : `Downgrading ${firstPlatform.installed} → ${incoming}. This may remove features.`;
+
+    if (!ctx.interactive) {
+      ctx.ui.warn ? ctx.ui.warn(msg + ' Downgrade aborted in non-interactive mode. Use --force-overwrite to proceed.') : console.warn(msg);
+      ctx.cancelled = true;
+      return ctx;
+    }
+
+    const yes = await ctx.ui.confirm({ message: msg + ' Continue?', initialValue: false });
+    if (!yes || ctx.ui.isCancel(yes)) {
+      ctx.cancelled = true;
+      return ctx;
+    }
   }
 
   return ctx;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haposoft/cafekit",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "Claude Code-first spec-driven workflow for AI coding assistants. Bundles CafeKit hapo: skills, runtime hooks, agents, and installer scaffolding.",
   "author": "Haposoft <nghialt@haposoft.com>",
   "license": "MIT",