sra-skills 0.14.0 → 0.14.2

package/index.mjs

@@ -7,6 +7,7 @@ import {
   getVersion, parseSkillFrontmatter, DEFAULT_CRED_PATH,
   loadCredentials, getCredValue, repoNameFromUrl, mergeCredentials,
   runToolSetup, runPostInstall, promptSkillDeps, findSkillsWithDeps,
+  ensureIdentity,
 } from './lib.mjs';
 import { existsSync, mkdirSync, lstatSync, unlinkSync } from 'fs';
 import { join, basename, resolve } from 'path';
@@ -80,6 +81,8 @@ const cmdArgs = rawArgs.slice(1);
 if (cmd === 'add') {
   const isLocal = cmdArgs.includes('--local');
   const skipPrompt = cmdArgs.includes('-y') || cmdArgs.includes('--yes');
+  const identityIdx = cmdArgs.indexOf('--default-identity');
+  const defaultIdentity = identityIdx >= 0 ? cmdArgs[identityIdx + 1] : null;
   const tools = parseToolFlag(cmdArgs) || detectTools();
   const nameIdx = cmdArgs.indexOf('--name');
   let url, name, repoPath;
@@ -140,6 +143,7 @@ if (cmd === 'add') {
   console.log(`Installing ${skills.length} skills, tools: [${tools.join(', ')}]`);
   linkSkills(skills, tools);
   const credPath = mergeCredentials(repoPath);
+  await ensureIdentity(skipPrompt, defaultIdentity);
   runToolSetup(repoPath, tools);
   runPostInstall(repoPath);
 
@@ -189,6 +193,8 @@ if (cmd === 'add') {
   const m = readManifest();
   const tools = parseToolFlag(cmdArgs) || m.tools || detectTools();
   const skipPrompt = cmdArgs.includes('-y') || cmdArgs.includes('--yes');
+  const identityIdx = cmdArgs.indexOf('--default-identity');
+  const defaultIdentity = identityIdx >= 0 ? cmdArgs[identityIdx + 1] : null;
   const target = cmdArgs.find(a => !a.startsWith('-'));
   const targets = target ? [target] : Object.keys(m.repos);
   const depsEntries = [];
@@ -264,6 +270,7 @@ if (cmd === 'add') {
     const skills = allSkills.filter(s => !disabled.has(s.name));
     linkSkills(skills, tools);
     mergeCredentials(repo.path);
+    await ensureIdentity(skipPrompt, defaultIdentity);
     runToolSetup(repo.path, tools);
     runPostInstall(repo.path);
     depsEntries.push({ repoPath: repo.path, skills });

package/lib.mjs

@@ -317,6 +317,94 @@ export function parseSkillFrontmatter(skillPath) {
 
 export const DEFAULT_CRED_PATH = join(HOME, '.config', 'sra', 'credentials.json');
 
+export const COMPANY_EMAIL_DOMAINS = new Set(['shopee.com', 'garena.com', 'seagroup.com', 'sea.com']);
+const PLACEHOLDER_LOCAL_PARTS = new Set([
+  'your.name', 'yourname', 'your_name', 'your-name',
+  'your.email', 'youremail', 'your_email',
+  'test', 'example', 'placeholder', 'changeme',
+]);
+
+export function isCompanyEmail(email) {
+  if (!email || !email.includes('@')) return false;
+  const [local, domain] = [email.substring(0, email.lastIndexOf('@')), email.substring(email.lastIndexOf('@') + 1)];
+  if (PLACEHOLDER_LOCAL_PARTS.has(local.toLowerCase())) return false;
+  return COMPANY_EMAIL_DOMAINS.has(domain.toLowerCase());
+}
+
+export async function ensureIdentity(skipPrompt, defaultIdentityArg) {
+  const credPath = DEFAULT_CRED_PATH;
+  let existing = {};
+  if (existsSync(credPath)) {
+    try {
+      existing = JSON.parse(readFileSync(credPath, 'utf8'));
+    } catch {
+      console.error(`Warning: ${credPath} contains invalid JSON, credentials will be reset`);
+    }
+  }
+
+  const current = existing?.default?.identity || '';
+  if (isCompanyEmail(current)) return current;
+
+  // --default-identity provided
+  if (defaultIdentityArg) {
+    if (!isCompanyEmail(defaultIdentityArg)) {
+      const domains = [...COMPANY_EMAIL_DOMAINS].sort().join(', ');
+      console.error(`Error: --default-identity "${defaultIdentityArg}" is not a company email (allowed domains: ${domains})`);
+      process.exit(1);
+    }
+    existing = existing || {};
+    (existing.default = existing.default || {}).identity = defaultIdentityArg;
+    mkdirSync(join(HOME, '.config', 'sra'), { recursive: true });
+    writeFileSync(credPath, JSON.stringify(existing, null, 2) + '\n');
+    console.log(`  Company email set: ${defaultIdentityArg}`);
+    return defaultIdentityArg;
+  }
+
+  // --yes mode without --default-identity
+  if (skipPrompt) {
+    const domains = [...COMPANY_EMAIL_DOMAINS].sort().join(', ');
+    console.error(`Error: --yes requires --default-identity <email@company.com> when no valid identity is set.`);
+    process.exit(1);
+  }
+
+  // Non-TTY
+  if (!process.stdin.isTTY) {
+    const domains = [...COMPANY_EMAIL_DOMAINS].sort().join(', ');
+    console.error(`Error: default.identity not configured and stdin is not a terminal.`);
+    console.error(`Use --default-identity=you@company.com (${domains})`);
+    process.exit(1);
+  }
+
+  // Interactive prompt
+  let gitEmail = '';
+  try {
+    gitEmail = execSync('git config --global user.email', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+  } catch {}
+  const prefill = isCompanyEmail(gitEmail) ? gitEmail : '';
+  const domains = [...COMPANY_EMAIL_DOMAINS].sort().join(', ');
+
+  // Need to import input from @inquirer/prompts
+  const { input } = await import('@inquirer/prompts');
+  console.log(`Company email required for telemetry (accepted domains: ${domains})`);
+
+  while (true) {
+    const raw = await input({
+      message: 'Company email',
+      default: prefill || undefined,
+    });
+    const email = raw.trim();
+    if (isCompanyEmail(email)) {
+      existing = existing || {};
+      (existing.default = existing.default || {}).identity = email;
+      mkdirSync(join(HOME, '.config', 'sra'), { recursive: true });
+      writeFileSync(credPath, JSON.stringify(existing, null, 2) + '\n');
+      console.log(`  Company email set: ${email}`);
+      return email;
+    }
+    console.log(`  Invalid: "${email}" — must end with one of: ${domains}`);
+  }
+}
+
 export function loadCredentials(credPath) {
   const p = credPath || DEFAULT_CRED_PATH;
   if (!existsSync(p)) return {};

package/manage.mjs

@@ -152,7 +152,11 @@ export async function main() {
       const enabled = (repo.skills || []).length;
       return `${name} (${enabled}/${all.length})`;
     });
+    // Preserve current repo selection — setItems resets to 0 and fires
+    // 'select item', which would switch currentRepoName to the first repo.
+    const prevIdx = currentRepoName ? names.indexOf(currentRepoName) : 0;
     reposPanel.setItems(items);
+    if (prevIdx >= 0) reposPanel.select(prevIdx);
   }
 
   function renderSkills() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sra-skills",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "SRA agent skills installer — manage AI skill repos",
   "bin": {
     "sra": "index.mjs",