feat: Enhance Marketplace and Skill Management UI with improved error handling and user feedback
- Updated MarketplaceDrawer to include security notes and manual installation hints. - Refactored SkillDetailDrawer to display default icons for skills. - Simplified SkillListItem to use default icons for better readability. - Integrated gateway status checks and warnings in SkillsPage for improved user awareness. - Enhanced error handling for skill installation and fetching, providing clearer feedback to users. - Added new translations for error messages and gateway warnings to improve localization support.
This commit is contained in:
167
scripts/bundle-preinstalled-skills.mjs
Normal file
167
scripts/bundle-preinstalled-skills.mjs
Normal file
@@ -0,0 +1,167 @@
|
||||
#!/usr/bin/env zx
|
||||
|
||||
import 'zx/globals';
|
||||
import { readFileSync, existsSync, mkdirSync, rmSync, cpSync, writeFileSync } from 'node:fs';
|
||||
import { join, dirname, basename } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = join(__dirname, '..');
|
||||
const MANIFEST_PATH = join(ROOT, 'resources', 'skills', 'preinstalled-manifest.json');
|
||||
const OUTPUT_ROOT = join(ROOT, 'build', 'preinstalled-skills');
|
||||
const TMP_ROOT = join(ROOT, 'build', '.tmp-preinstalled-skills');
|
||||
|
||||
function loadManifest() {
|
||||
if (!existsSync(MANIFEST_PATH)) {
|
||||
throw new Error(`Missing manifest: ${MANIFEST_PATH}`);
|
||||
}
|
||||
const raw = readFileSync(MANIFEST_PATH, 'utf8');
|
||||
const parsed = JSON.parse(raw);
|
||||
if (!parsed || !Array.isArray(parsed.skills)) {
|
||||
throw new Error('Invalid preinstalled-skills manifest format');
|
||||
}
|
||||
for (const item of parsed.skills) {
|
||||
if (!item.slug || !item.repo || !item.repoPath) {
|
||||
throw new Error(`Invalid manifest entry: ${JSON.stringify(item)}`);
|
||||
}
|
||||
}
|
||||
return parsed.skills;
|
||||
}
|
||||
|
||||
function groupByRepoRef(entries) {
|
||||
const grouped = new Map();
|
||||
for (const entry of entries) {
|
||||
const ref = entry.ref || 'main';
|
||||
const key = `${entry.repo}#${ref}`;
|
||||
if (!grouped.has(key)) {
|
||||
grouped.set(key, { repo: entry.repo, ref, entries: [] });
|
||||
}
|
||||
grouped.get(key).entries.push(entry);
|
||||
}
|
||||
return [...grouped.values()];
|
||||
}
|
||||
|
||||
function createRepoDirName(repo, ref) {
|
||||
return `${repo.replace(/[\\/]/g, '__')}__${ref.replace(/[^a-zA-Z0-9._-]/g, '_')}`;
|
||||
}
|
||||
|
||||
function toGitPath(inputPath) {
|
||||
if (process.platform !== 'win32') return inputPath;
|
||||
return inputPath.replace(/\\/g, '/');
|
||||
}
|
||||
|
||||
function normalizeRepoPath(repoPath) {
|
||||
return repoPath.replace(/\\/g, '/').replace(/^\/+/, '').replace(/\/+$/, '');
|
||||
}
|
||||
|
||||
function shouldCopySkillFile(srcPath) {
|
||||
const base = basename(srcPath);
|
||||
if (base === '.git') return false;
|
||||
if (base === '.subset.tar') return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
async function extractArchive(archiveFileName, cwd) {
|
||||
const prevCwd = $.cwd;
|
||||
$.cwd = cwd;
|
||||
try {
|
||||
try {
|
||||
await $`tar -xf ${archiveFileName}`;
|
||||
return;
|
||||
} catch (tarError) {
|
||||
if (process.platform === 'win32') {
|
||||
await $`bsdtar -xf ${archiveFileName}`;
|
||||
return;
|
||||
}
|
||||
throw tarError;
|
||||
}
|
||||
} finally {
|
||||
$.cwd = prevCwd;
|
||||
}
|
||||
}
|
||||
|
||||
async function fetchSparseRepo(repo, ref, paths, checkoutDir) {
|
||||
const remote = `https://github.com/${repo}.git`;
|
||||
mkdirSync(checkoutDir, { recursive: true });
|
||||
const gitCheckoutDir = toGitPath(checkoutDir);
|
||||
const archiveFileName = '.subset.tar';
|
||||
const archivePath = join(checkoutDir, archiveFileName);
|
||||
const archivePaths = [...new Set(paths.map(normalizeRepoPath))];
|
||||
|
||||
await $`git init ${gitCheckoutDir}`;
|
||||
await $`git -C ${gitCheckoutDir} remote add origin ${remote}`;
|
||||
await $`git -C ${gitCheckoutDir} fetch --depth 1 origin ${ref}`;
|
||||
await $`git -C ${gitCheckoutDir} archive --format=tar --output ${archiveFileName} FETCH_HEAD ${archivePaths}`;
|
||||
await extractArchive(archiveFileName, checkoutDir);
|
||||
rmSync(archivePath, { force: true });
|
||||
|
||||
const commit = (await $`git -C ${gitCheckoutDir} rev-parse FETCH_HEAD`).stdout.trim();
|
||||
return commit;
|
||||
}
|
||||
|
||||
echo`Bundling preinstalled skills for zn-ai...`;
|
||||
|
||||
mkdirSync(OUTPUT_ROOT, { recursive: true });
|
||||
|
||||
if (process.env.SKIP_PREINSTALLED_SKILLS === '1') {
|
||||
echo`⏭ SKIP_PREINSTALLED_SKILLS=1 set, skipping skills fetch.`;
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
const manifestSkills = loadManifest();
|
||||
|
||||
rmSync(OUTPUT_ROOT, { recursive: true, force: true });
|
||||
mkdirSync(OUTPUT_ROOT, { recursive: true });
|
||||
rmSync(TMP_ROOT, { recursive: true, force: true });
|
||||
mkdirSync(TMP_ROOT, { recursive: true });
|
||||
|
||||
const lock = {
|
||||
generatedAt: new Date().toISOString(),
|
||||
skills: [],
|
||||
};
|
||||
|
||||
const groups = groupByRepoRef(manifestSkills);
|
||||
for (const group of groups) {
|
||||
const repoDir = join(TMP_ROOT, createRepoDirName(group.repo, group.ref));
|
||||
const sparsePaths = [...new Set(group.entries.map((entry) => entry.repoPath))];
|
||||
|
||||
echo`Fetching ${group.repo} @ ${group.ref}`;
|
||||
const commit = await fetchSparseRepo(group.repo, group.ref, sparsePaths, repoDir);
|
||||
echo` commit ${commit}`;
|
||||
|
||||
for (const entry of group.entries) {
|
||||
const sourceDir = join(repoDir, entry.repoPath);
|
||||
const targetDir = join(OUTPUT_ROOT, entry.slug);
|
||||
|
||||
if (!existsSync(sourceDir)) {
|
||||
throw new Error(`Missing source path in repo checkout: ${entry.repoPath}`);
|
||||
}
|
||||
|
||||
rmSync(targetDir, { recursive: true, force: true });
|
||||
cpSync(sourceDir, targetDir, { recursive: true, dereference: true, filter: shouldCopySkillFile });
|
||||
|
||||
const skillManifest = join(targetDir, 'SKILL.md');
|
||||
if (!existsSync(skillManifest)) {
|
||||
throw new Error(`Skill ${entry.slug} is missing SKILL.md after copy`);
|
||||
}
|
||||
|
||||
const requestedVersion = (entry.version || '').trim();
|
||||
const resolvedVersion = !requestedVersion || requestedVersion === 'main'
|
||||
? commit
|
||||
: requestedVersion;
|
||||
lock.skills.push({
|
||||
slug: entry.slug,
|
||||
version: resolvedVersion,
|
||||
repo: entry.repo,
|
||||
repoPath: entry.repoPath,
|
||||
ref: group.ref,
|
||||
commit,
|
||||
});
|
||||
|
||||
echo` OK ${entry.slug}`;
|
||||
}
|
||||
}
|
||||
|
||||
writeFileSync(join(OUTPUT_ROOT, '.preinstalled-lock.json'), `${JSON.stringify(lock, null, 2)}\n`, 'utf8');
|
||||
rmSync(TMP_ROOT, { recursive: true, force: true });
|
||||
echo`Preinstalled skills ready: ${OUTPUT_ROOT}`;
|
||||
30
scripts/prepare-preinstalled-skills-dev.mjs
Normal file
30
scripts/prepare-preinstalled-skills-dev.mjs
Normal file
@@ -0,0 +1,30 @@
|
||||
#!/usr/bin/env zx
|
||||
|
||||
import 'zx/globals';
|
||||
import { existsSync } from 'node:fs';
|
||||
import { dirname, join } from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const __dirname = dirname(fileURLToPath(import.meta.url));
|
||||
const ROOT = join(__dirname, '..');
|
||||
const lockPath = join(ROOT, 'build', 'preinstalled-skills', '.preinstalled-lock.json');
|
||||
const bundleScript = join(ROOT, 'scripts', 'bundle-preinstalled-skills.mjs');
|
||||
|
||||
if (process.env.ZN_AI_SKIP_PREINSTALLED_SKILLS_PREPARE === '1') {
|
||||
echo`Skipping preinstalled skills prepare (ZN_AI_SKIP_PREINSTALLED_SKILLS_PREPARE=1).`;
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
if (existsSync(lockPath)) {
|
||||
echo`Preinstalled skills bundle already exists, skipping prepare.`;
|
||||
process.exit(0);
|
||||
}
|
||||
|
||||
echo`Preinstalled skills bundle missing, preparing for dev startup...`;
|
||||
|
||||
try {
|
||||
await $`zx ${bundleScript}`;
|
||||
} catch (error) {
|
||||
echo`Warning: failed to prepare preinstalled skills for dev startup: ${error?.message || error}`;
|
||||
process.exit(0);
|
||||
}
|
||||
Reference in New Issue
Block a user