shakers-cli-beta 0.8.0-beta.0 → 0.8.0-beta.1

package/bin/config.js

@@ -15,24 +15,26 @@ const {
 const VALID_LANGS = new Set(['es', 'en']);
 const ENDPOINT_KEYS = new Set(['certsBase', 'hubBase', 'ingestEndpoint', 'profileUrl']);
 const PROFILE_VALUES = new Set(['external', 'talent']);
-const SETTABLE = new Set([...ENDPOINT_KEYS, 'profile']);
+const SETTABLE = new Set([...ENDPOINT_KEYS, 'profile', 'lang']);
 
 const COPY = {
   es: {
-    help: 'config — lee/escribe la configuracion NO sensible del CLI (bases de hub/certs, perfil). Uso: shakers config <list|get [clave]|set clave valor>\n  Claves: certsBase, hubBase, ingestEndpoint, profileUrl, profile.\n  Los secretos (tokens/credenciales) NUNCA se guardan aqui: se obtienen con `shakers login` o por entorno.',
+    help: 'config — lee/escribe la configuracion NO sensible del CLI (bases de hub/certs, perfil, idioma). Uso: shakers config <list|get [clave]|set clave valor>\n  Claves: certsBase, hubBase, ingestEndpoint, profileUrl, profile, lang.\n  Los secretos (tokens/credenciales) NUNCA se guardan aqui: se obtienen con `shakers login` o por entorno.',
     unknownKey: (k) => `clave desconocida: ${k}. Claves validas: ${[...SETTABLE].join(', ')}.`,
     needValue: 'set necesita <clave> <valor>.',
     badEndpoint: (k, r) => `valor invalido para ${k} (${r}). Debe ser una URL http de loopback o https.`,
     badProfile: 'profile debe ser "external" o "talent".',
+    badLang: 'lang debe ser "es" o "en".',
     saved: (k, v) => `guardado ${k} = ${v}`,
     resolvedHeading: 'Resueltos (env > config.json > default local):',
   },
   en: {
-    help: 'config — read/write the CLI NON-sensitive configuration (hub/certs bases, profile). Usage: shakers config <list|get [key]|set key value>\n  Keys: certsBase, hubBase, ingestEndpoint, profileUrl, profile.\n  Secrets (tokens/credentials) are NEVER stored here: get them via `shakers login` or the environment.',
+    help: 'config — read/write the CLI NON-sensitive configuration (hub/certs bases, profile, language). Usage: shakers config <list|get [key]|set key value>\n  Keys: certsBase, hubBase, ingestEndpoint, profileUrl, profile, lang.\n  Secrets (tokens/credentials) are NEVER stored here: get them via `shakers login` or the environment.',
     unknownKey: (k) => `unknown key: ${k}. Valid keys: ${[...SETTABLE].join(', ')}.`,
     needValue: 'set needs <key> <value>.',
     badEndpoint: (k, r) => `invalid value for ${k} (${r}). Must be a loopback http URL or https.`,
     badProfile: 'profile must be "external" or "talent".',
+    badLang: 'lang must be "es" or "en".',
     saved: (k, v) => `saved ${k} = ${v}`,
     resolvedHeading: 'Resolved (env > config.json > local default):',
   },
@@ -98,6 +100,8 @@ async function run(argv = process.argv.slice(2), { env = process.env, out = null
     if (!SETTABLE.has(key)) { line(c.unknownKey(key)); process.exitCode = 1; return; }
     if (key === 'profile') {
       if (!PROFILE_VALUES.has(value)) { line(c.badProfile); process.exitCode = 1; return; }
+    } else if (key === 'lang') {
+      if (!VALID_LANGS.has(value)) { line(c.badLang); process.exitCode = 1; return; }
     } else if (key !== 'profileUrl') {
       const v = validateEndpoint(value);
       if (!v.ok) { line(c.badEndpoint(key, v.reason)); process.exitCode = 1; return; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakers-cli-beta",
-  "version": "0.8.0-beta.0",
+  "version": "0.8.0-beta.1",
   "description": "Shakers AI usage & skills evaluator: a local-first CLI (`shakers` binary) plus a local MCP server. Commands: ai-usage (scan + classify your AI-tool setup, T0-T7), certify (certify Skills from your code), share (branded LinkedIn card).",
   "type": "commonjs",
   "bin": {

package/src/config.js

@@ -36,6 +36,18 @@ function isTalentProfile(env = process.env) {
   return getProfile(env) === 'talent';
 }
 
+// Explicit UI-language preference: SHAKERS_CLI_LANG env > config.json `lang`.
+// Returns 'es' | 'en', or null when neither is set (OS detection then fills it, see i18n.js).
+const VALID_UI_LANGS = new Set(['es', 'en']);
+
+function getUiLang(env = process.env) {
+  const fromEnv = String(readEnv(env, 'LANG') || '').trim().toLowerCase();
+  if (VALID_UI_LANGS.has(fromEnv)) return fromEnv;
+  const fromFile = String(loadConfigFile(env).lang || '').trim().toLowerCase();
+  if (VALID_UI_LANGS.has(fromFile)) return fromFile;
+  return null;
+}
+
 // config.json holds the superadmin session token (ADR-027) and consent/ endpoint data, so it must never be briefly world/group-readable.
 function saveConfigFile(config, env = process.env) {
   const dir = configDir(env);
@@ -771,6 +783,9 @@ module.exports = {
   VALID_PROFILES,
   getProfile,
   isTalentProfile,
+  // UI language preference (env SHAKERS_CLI_LANG > config.json `lang`).
+  VALID_UI_LANGS,
+  getUiLang,
   // Baked backend target flavor (staging | dev | local).
   ENV_PROFILES,
   getEnvProfileName,

package/src/i18n.js

@@ -3238,13 +3238,19 @@ function resolveLang(langCode) {
   return langCode && /^es/i.test(langCode) ? 'es' : 'en';
 }
 
-// Single entry point for report callers (bin/report.js): detects the OS language (see locale.js) and already returns the resolved catalog code ('es' or 'en').
-function detectReportLang(env = process.env) {
-  return resolveLang(detectLangCode(env));
+// Explicit user preference (SHAKERS_CLI_LANG env > config.json `lang`) wins over OS detection; null when unset.
+function preferredUiLang(env = process.env) {
+  return require('./config').getUiLang(env);
 }
 
-function detectFlowLang(env = process.env) {
-  return toLowerLang(detectLangCode(env));
+// Single entry point for report callers (bin/report.js): explicit preference > OS language (see locale.js), resolved to the catalog code ('es' or 'en').
+// `sys` overrides the macOS/Intl readers (tests inject nulls to exercise the env path deterministically).
+function detectReportLang(env = process.env, sys) {
+  return resolveLang(preferredUiLang(env) || detectLangCode(env, sys));
+}
+
+function detectFlowLang(env = process.env, sys) {
+  return toLowerLang(preferredUiLang(env) || detectLangCode(env, sys));
 }
 
 function getCatalog(lang) {

package/src/locale.js

@@ -22,6 +22,22 @@ function langFromEnv(env) {
   return null;
 }
 
+// macOS DISPLAY language (top of "Preferred languages"), e.g. ("en-US", "es-ES").
+// This is the UI-language intent, unlike AppleLocale/LANG which carry the region.
+function langFromAppleLanguages() {
+  if (process.platform !== 'darwin') return null;
+  try {
+    const out = execFileSync('defaults', ['read', '-g', 'AppleLanguages'], {
+      timeout: 2000,
+      stdio: ['ignore', 'pipe', 'ignore'],
+    }).toString('utf8');
+    const first = out.replace(/[()]/g, '').split(',')[0].replace(/["\s]/g, '');
+    return langFromLocaleString(first);
+  } catch {
+    return null; // key not set, command missing, or any other failure: ignored
+  }
+}
+
 function langFromAppleLocale() {
   if (process.platform !== 'darwin') return null;
   try {
@@ -44,8 +60,13 @@ function langFromIntl() {
 }
 
 // Returns the detected language code ('es', 'en', 'fr', ...) or null if no signal could be resolved.
-function detectLangCode(env = process.env) {
-  return langFromEnv(env) || langFromAppleLocale() || langFromIntl() || null;
+// macOS display language (AppleLanguages) wins over env LANG/LC_ALL (region/format), then AppleLocale, then Intl.
+// `sys` overrides the macOS/Intl readers for deterministic tests (they ignore `env` and read the real host).
+function detectLangCode(env = process.env, sys = {}) {
+  const appleLanguages = sys.appleLanguages || langFromAppleLanguages;
+  const appleLocale = sys.appleLocale || langFromAppleLocale;
+  const intl = sys.intl || langFromIntl;
+  return appleLanguages() || langFromEnv(env) || appleLocale() || intl() || null;
 }
 
 module.exports = { detectLangCode, langFromLocaleString };