@haposoft/cafekit 0.11.5 → 0.11.7

package/bin/install.js

@@ -15,6 +15,7 @@
  *  - --dry-run                     — preview only, no filesystem changes.
  */
 
+const { spawnSync } = require('child_process');
 const { buildContext, PLATFORMS, packageJson } = require('./lib/context');
 const lock = require('./lib/lock');
 const backup = require('./lib/backup');
@@ -129,10 +130,27 @@ async function main() {
     await resolvePlatforms(ctx);
     if (ctx.cancelled) { lock.release(); process.exit(0); }
 
-    // Version check: same → exit, downgrade → confirm
+    // Version check: same → exit, downgrade → confirm, upgrade → version picker
     await checkVersions(ctx);
     if (ctx.cancelled) { lock.release(); process.exit(0); }
 
+    // User picked a different version from the picker — re-exec that version
+    if (ctx.reexec) {
+      lock.release();
+      ctx.ui.info(ctx.t('versionReexec', { v: ctx.reexec }));
+      // Forward original flags; add --force-overwrite so the re-exec'd installer
+      // skips the version picker and proceeds directly with installation.
+      const origFlags = process.argv.slice(2).filter(
+        (f) => f !== '--force-overwrite' && f !== '-f' && f !== '-u' && f !== '--upgrade'
+      );
+      const result = spawnSync(
+        'npx',
+        ['-y', `@haposoft/cafekit@${ctx.reexec}`, '--force-overwrite', ...origFlags],
+        { stdio: 'inherit', shell: process.platform === 'win32' }
+      );
+      process.exit(result.status ?? 1);
+    }
+
     // ── Pre-run snapshot for rollback ─────────────────────
     // Capture platform folders AND the root files the pipeline mutates
     // (CLAUDE.md, .gitignore) so a mid-run failure rolls back cleanly.

package/bin/lib/i18n.js

@@ -51,6 +51,11 @@ const MESSAGES = {
     addressingSet:         '{name} will address you as "{addr}"',
     addressingInvalid:     'Letters only please — addressing skipped.',
 
+    // Addressing update
+    addressingUpdatePrompt: 'You are currently addressed as "{name}". Change it?',
+    keepAddressingOption:  'Keep "{name}"',
+    changeAddressingOption:'Change to something else',
+
     // Skills / deps setup
     skillDepsConfirm:      'Install skill dependencies? (Python venv, pip, npm, Chromium — takes a few minutes)',
     skillsSkipped:         'Skill dependencies skipped.\n  Run later: npx @haposoft/cafekit --with-skills-deps',
@@ -105,7 +110,19 @@ const MESSAGES = {
     updateOption:         'Update to {v}',
     reinstallOption:      'Reinstall (overwrite managed files)',
     reinstallCurrentOption: 'Reinstall {v}',
-    skipOption:           'Skip (exit)'
+    skipOption:           'Skip (exit)',
+
+    // Platform/language auto-skip when already installed
+    installingFor:        'Installing for: {names}',
+    langKept:             'Language: {lang} (saved — skipping prompt)',
+    platformKept:         'Platform: {names} (saved — skipping prompt)',
+
+    // Version picker
+    versionPickPrompt:    'Select CafeKit version to install:',
+    versionPickCurrent:   '(installed)',
+    versionPickLatest:    '(latest)',
+    versionReexec:        'Switching to CafeKit {v}…',
+    versionFetchFailed:   'Could not fetch version list. Using default menu.'
   },
 
   // ─── 日本語 ─────────────────────────────────────────────────────────────────
@@ -140,6 +157,11 @@ const MESSAGES = {
     addressingSet:         '{name} はあなたを「{addr}」とお呼びします',
     addressingInvalid:     '文字のみ入力できます — 呼称の設定をスキップしました。',
 
+    // Addressing update
+    addressingUpdatePrompt: '現在「{name}」と呼ばれています。変更しますか？',
+    keepAddressingOption:  '「{name}」のまま',
+    changeAddressingOption:'別の名前に変更',
+
     skillDepsConfirm:      'スキルの依存関係をインストールしますか？（Python venv、pip、npm、Chromium — 数分かかります）',
     skillsSkipped:         'スキルの依存関係をスキップしました。\n  後で実行: npx @haposoft/cafekit --with-skills-deps',
     venvCreating:          'Python 環境を準備しています',
@@ -190,7 +212,19 @@ const MESSAGES = {
     updateOption:         '{v} にアップデート',
     reinstallOption:      '再インストール（管理対象ファイルを上書き）',
     reinstallCurrentOption: '{v} を再インストール',
-    skipOption:           'スキップ（終了）'
+    skipOption:           'スキップ（終了）',
+
+    // Platform/language auto-skip when already installed
+    installingFor:        'インストール先: {names}',
+    langKept:             '言語: {lang} (保存済み — スキップ)',
+    platformKept:         'プラットフォーム: {names} (保存済み — スキップ)',
+
+    // Version picker
+    versionPickPrompt:    'インストールする CafeKit バージョンを選択:',
+    versionPickCurrent:   '(インストール済み)',
+    versionPickLatest:    '(最新)',
+    versionReexec:        'CafeKit {v} に切り替えます…',
+    versionFetchFailed:   'バージョン一覧を取得できませんでした。デフォルトメニューを表示します。'
   },
 
   // ─── Tiếng Việt ─────────────────────────────────────────────────────────────
@@ -225,6 +259,11 @@ const MESSAGES = {
     addressingSet:         '{name} sẽ gọi bạn là "{addr}"',
     addressingInvalid:     'Chỉ nhập chữ cái — bỏ qua thiết lập xưng hô.',
 
+    // Addressing update
+    addressingUpdatePrompt: 'Bạn đang được gọi là "{name}". Bạn có muốn đổi không?',
+    keepAddressingOption:  'Giữ "{name}"',
+    changeAddressingOption:'Đổi tên khác',
+
     skillDepsConfirm:      'Cài dependencies cho skill ngay? (Python venv, pip, npm, Chromium — mất vài phút)',
     skillsSkipped:         'Đã bỏ qua dependencies skill.\n  Cài sau bằng lệnh: npx @haposoft/cafekit --with-skills-deps',
     venvCreating:          'Đang thiết lập môi trường Python',
@@ -275,7 +314,19 @@ const MESSAGES = {
     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)'
+    skipOption:           'Bỏ qua (thoát)',
+
+    // Platform/language auto-skip when already installed
+    installingFor:        'Cài cho: {names}',
+    langKept:             'Ngôn ngữ: {lang} (đã lưu — bỏ qua chọn lại)',
+    platformKept:         'Nền tảng: {names} (đã lưu — bỏ qua chọn lại)',
+
+    // Version picker
+    versionPickPrompt:    'Chọn phiên bản CafeKit để cài:',
+    versionPickCurrent:   '(đang cài)',
+    versionPickLatest:    '(mới nhất)',
+    versionReexec:        'Đang chuyển sang cài CafeKit {v}…',
+    versionFetchFailed:   'Không lấy được danh sách phiên bản. Dùng menu mặc định.'
   }
 };
 

package/bin/lib/registry.js

@@ -0,0 +1,61 @@
+/**
+ * npm registry queries for the installer version picker.
+ *
+ * Intentionally standalone — no imports from other installer lib files
+ * to avoid circular dependencies. Timeout is short (3 s) so a slow/offline
+ * network never blocks the install flow; callers must handle a null result.
+ */
+
+'use strict';
+
+const https = require('https');
+
+const REGISTRY_URL = 'https://registry.npmjs.org/@haposoft/cafekit';
+const FETCH_TIMEOUT_MS = 3000;
+const MAX_VERSIONS = 5;
+
+/** Sort version strings descending (newest first), semver-ish. */
+function sortDesc(versions) {
+  return [...versions].sort((a, b) => {
+    const toNum = (v) => String(v).split('.').map((n) => parseInt(n, 10) || 0);
+    const [aN, bN] = [toNum(a), toNum(b)];
+    for (let i = 0; i < 3; i++) {
+      const d = (bN[i] || 0) - (aN[i] || 0);
+      if (d !== 0) return d;
+    }
+    return 0;
+  });
+}
+
+/**
+ * Fetch up to MAX_VERSIONS recent published versions from the npm registry.
+ * Returns an object `{ versions: string[], latest: string }` or null on any error.
+ */
+function fetchRecentVersions() {
+  return new Promise((resolve) => {
+    const req = https.get(
+      REGISTRY_URL,
+      { timeout: FETCH_TIMEOUT_MS, headers: { Accept: 'application/json' } },
+      (res) => {
+        let body = '';
+        res.on('data', (chunk) => { body += chunk; });
+        res.on('end', () => {
+          try {
+            const data = JSON.parse(body);
+            const allVersions = Object.keys(data.versions || {});
+            if (allVersions.length === 0) { resolve(null); return; }
+            const sorted = sortDesc(allVersions);
+            const latest = (data['dist-tags'] && data['dist-tags'].latest) || sorted[0];
+            resolve({ versions: sorted.slice(0, MAX_VERSIONS), latest });
+          } catch {
+            resolve(null);
+          }
+        });
+      }
+    );
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => { req.destroy(); resolve(null); });
+  });
+}
+
+module.exports = { fetchRecentVersions };

package/bin/lib/version-check.js

@@ -13,6 +13,7 @@
 const fs = require('fs');
 const path = require('path');
 const { PLATFORMS, packageJson } = require('./context');
+const { fetchRecentVersions } = require('./registry');
 
 /** Simple semver-ish comparison. Returns -1 | 0 | 1. */
 function cmpVersion(a, b) {
@@ -43,6 +44,7 @@ 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.
+ * Sets ctx.isUpdate = true when upgrading from an older version.
  * Shows interactive prompt when version differs, asking user what to do.
  */
 async function checkVersions(ctx) {
@@ -60,6 +62,7 @@ async function checkVersions(ctx) {
 
   // All fresh installs - skip version check, proceed normally
   if (platformsWithInstall.length === 0) {
+    ctx.isUpdate = false;
     return ctx;
   }
 
@@ -73,6 +76,8 @@ async function checkVersions(ctx) {
 
   // ── Same version ───────────────────────────────────────────────────────────
   if (cmp === 0) {
+    ctx.isUpdate = false;
+
     if (ctx.options.forceOverwrite) {
       ctx.ui.info(ctx.t ? ctx.t('versionForceReinstall', { v: installedVersion }) : `Reinstalling CafeKit ${installedVersion} (--force-overwrite)...`);
       return ctx;
@@ -111,13 +116,51 @@ async function checkVersions(ctx) {
 
   // ── Upgrade available ───────────────────────────────────────────────────────
   if (cmp < 0) {
-    if (!ctx.interactive) {
-      // Non-interactive: proceed with upgrade automatically
+    ctx.isUpdate = true;
+
+    // --force-overwrite or non-interactive: proceed without asking
+    if (!ctx.interactive || ctx.options.forceOverwrite) {
       return ctx;
     }
 
-    // Show current vs new and ask what to do
-    const options = [
+    // Try to fetch recent versions for the picker; fall back to 3-option menu on failure
+    const registry = await fetchRecentVersions();
+
+    if (registry) {
+      // Build picker options: each version labelled with (installed) / (latest) hints
+      const pickerOptions = registry.versions.map((v) => {
+        let hint = '';
+        if (v === firstPlatform.installed) hint = ctx.t ? ctx.t('versionPickCurrent') : '(installed)';
+        else if (v === registry.latest) hint = ctx.t ? ctx.t('versionPickLatest') : '(latest)';
+        const label = hint ? `${v}  ${hint}` : v;
+        return { value: v, label };
+      });
+      pickerOptions.push({ value: 'skip', label: ctx.t ? ctx.t('skipOption') : 'Skip (exit)' });
+
+      const picked = await ctx.ui.select({
+        message: ctx.t ? ctx.t('versionPickPrompt') : 'Select CafeKit version to install:',
+        options: pickerOptions
+      });
+
+      if (ctx.ui.isCancel(picked) || picked === 'skip') {
+        ctx.cancelled = true;
+        return ctx;
+      }
+
+      if (picked !== incoming) {
+        // User chose a version different from the one currently running — signal re-exec
+        ctx.reexec = picked;
+        return ctx;
+      }
+
+      // User confirmed the incoming (latest) version — proceed normally
+      return ctx;
+    }
+
+    // Offline or fetch failed: fall back to the classic 3-option menu
+    ctx.ui.warn(ctx.t ? ctx.t('versionFetchFailed') : 'Could not fetch version list. Using default menu.');
+
+    const fallbackOptions = [
       { 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)' }
@@ -127,7 +170,7 @@ async function checkVersions(ctx) {
       message: ctx.t
         ? ctx.t('versionUpgradePrompt', { from: firstPlatform.installed, to: incoming })
         : `CafeKit ${firstPlatform.installed} → ${incoming}: Update available!`,
-      options
+      options: fallbackOptions
     });
 
     if (ctx.ui.isCancel(answer) || answer === 'skip') {
@@ -137,14 +180,16 @@ async function checkVersions(ctx) {
 
     if (answer === 'reinstall') {
       ctx.options.forceOverwrite = true;
+      ctx.isUpdate = false; // Reinstall treats as fresh install
     }
 
-    // 'update' proceeds normally (no special flag needed)
     return ctx;
   }
 
   // ── Downgrade ──────────────────────────────────────────────────────────────
   if (cmp > 0) {
+    ctx.isUpdate = false;
+
     const msg = ctx.t
       ? ctx.t('versionDowngrade', { from: firstPlatform.installed, to: incoming })
       : `Downgrading ${firstPlatform.installed} → ${incoming}. This may remove features.`;

package/bin/phases/post-install.js

@@ -130,6 +130,34 @@ ${name} always addresses the user as "${userAddress}" throughout the conversatio
 async function setupAddressing(ctx) {
   if (!ctx.platforms.includes('claude')) return;
 
+  // Check if there's already an addressing section in CLAUDE.md
+  const claudeMdFile = path.join(process.cwd(), 'CLAUDE.md');
+  let existingName = null;
+  if (fs.existsSync(claudeMdFile)) {
+    const content = fs.readFileSync(claudeMdFile, 'utf8');
+    const match = content.match(/##[^\n]*Context Overflow Indicator[^\n]*[\s\S]*?always addresses the user as "([^"]+)"/);
+    if (match) {
+      existingName = match[1];
+    }
+  }
+
+  // For updates: ask if user wants to keep the existing name
+  if (existingName && ctx.isUpdate) {
+    const options = [
+      { value: 'keep', label: ctx.t('keepAddressingOption', { addr: existingName }) || `Giữ "${existingName}"` },
+      { value: 'change', label: ctx.t('changeAddressingOption') || 'Đổi tên mới' }
+    ];
+
+    const choice = await ctx.ui.select({
+      message: ctx.t('addressingUpdatePrompt') || `Bạn đang dùng "${existingName}" để xưng hô. Muốn đổi không?`,
+      options
+    });
+
+    if (ctx.ui.isCancel(choice)) return;
+    if (choice === 'keep') return;
+    // If 'change', continue to ask for new name
+  }
+
   const answer = await ctx.ui.text(
     { message: ctx.t('addressingQuestion'), placeholder: ctx.t('addressingPlaceholder') },
     ''

package/bin/phases/select-platform.js

@@ -6,6 +6,8 @@
  * or prompted. Sets ctx.platforms, or ctx.cancelled if the user backs out.
  */
 
+const fs = require('fs');
+const path = require('path');
 const {
   PLATFORMS,
   detectPlatforms,
@@ -16,10 +18,34 @@ const { SUPPORTED, LANGUAGE_LABELS, OTHER_LABEL } = require('../lib/i18n');
 
 const OTHER = '__other__';
 
+/**
+ * Read saved locale label from .claude/runtime.json (written by post-install).
+ * Returns the freeform label string (e.g. "Tiếng Việt") or null.
+ */
+function getInstalledLocale() {
+  const runtimeJson = path.join(process.cwd(), '.claude', 'runtime.json');
+  if (!fs.existsSync(runtimeJson)) return null;
+  try {
+    const data = JSON.parse(fs.readFileSync(runtimeJson, 'utf8'));
+    return (data && data.locale && typeof data.locale.responseLanguage === 'string')
+      ? data.locale.responseLanguage
+      : null;
+  } catch { return null; }
+}
+
 /** First step: pick the installer/UI language (interactive only). */
 async function selectLanguage(ctx) {
   if (!ctx.interactive || ctx.options.lang) return ctx;
 
+  // If already installed, restore saved locale and skip the prompt
+  const savedLocale = getInstalledLocale();
+  if (savedLocale) {
+    const code = Object.keys(LANGUAGE_LABELS).find((k) => LANGUAGE_LABELS[k] === savedLocale) || 'en';
+    ctx.setLang(code, savedLocale); // updates ctx.t to the saved language
+    ctx.ui.info(ctx.t('langKept', { lang: savedLocale }));
+    return ctx;
+  }
+
   const options = [
     ...SUPPORTED.map((code) => ({ value: code, label: LANGUAGE_LABELS[code] })),
     { value: OTHER, label: OTHER_LABEL.en + ' / その他 / Ngôn ngữ khác' }
@@ -75,8 +101,27 @@ async function confirmAllDetected(ctx, detected) {
 
 /**
  * Resolve ctx.platforms via detection + prompts. Sets ctx.cancelled on backout.
+ * If cafekit.json exists (prior install), reads platform from it to skip prompt.
+ * Note: ctx.isUpdate is set later by checkVersions and cannot be used here.
  */
 async function resolvePlatforms(ctx) {
+  // Skip platform prompt when a prior install is detected via cafekit.json
+  const savedPlatform = getInstalledPlatform();
+  if (savedPlatform) {
+    ctx.platforms = [savedPlatform];
+    const platformNames = PLATFORMS[savedPlatform].name;
+    ctx.ui.info(ctx.t('platformKept', { names: platformNames }));
+
+    if (ctx.options.forceOverwrite) {
+      ctx.ui.info(ctx.t('modeForce'));
+    } else if (ctx.dryRun) {
+      ctx.ui.info(ctx.t('modeDryRun'));
+    } else {
+      ctx.ui.info(ctx.t('modeInstall'));
+    }
+    return ctx;
+  }
+
   let platforms = detectPlatforms();
 
   if (platforms.length === 0) {
@@ -120,4 +165,28 @@ async function resolvePlatforms(ctx) {
   return ctx;
 }
 
+/**
+ * Get the installed platform from cafekit.json files.
+ * Returns the platform key (e.g. 'claude', 'opencode') or null.
+ */
+function getInstalledPlatform() {
+  const claudeJson = path.join(process.cwd(), '.claude', 'cafekit.json');
+  if (fs.existsSync(claudeJson)) {
+    try {
+      const data = JSON.parse(fs.readFileSync(claudeJson, 'utf8'));
+      if (data.platform) return data.platform;
+    } catch { /* ignore */ }
+  }
+
+  const opencodeJson = path.join(process.cwd(), '.opencode', 'cafekit.json');
+  if (fs.existsSync(opencodeJson)) {
+    try {
+      const data = JSON.parse(fs.readFileSync(opencodeJson, 'utf8'));
+      if (data.platform) return data.platform;
+    } catch { /* ignore */ }
+  }
+
+  return null;
+}
+
 module.exports = { selectLanguage, promptPlatformSelection, resolvePlatforms };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haposoft/cafekit",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "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",