@phuetz/code-buddy 1.1.0 → 1.3.0

package/dist/skills/skill-importer.js

@@ -0,0 +1,261 @@
+/**
+ * Skill importer — bring EXTERNAL skills (a Hermes repo, any skills directory)
+ * into Code Buddy, safely. External skills are untrusted and get injected into the
+ * agent's context, so the firewall gates every one (SKILL.md + its scripts) before
+ * install. Hermes nests 1–3 levels but our registry walks 1 level → flatten; Hermes
+ * tags live under `metadata.hermes.tags` but our discovery scores top-level `tags` +
+ * `nativeEngine.triggers` → remap, else an imported skill is invisible to matching.
+ *
+ * Imported skills are namespaced `imported-*` (distinct provenance; never touched by
+ * the self-improvement engine) and installed flat (1 level) under a tier root.
+ *
+ * @module skills/skill-importer
+ */
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import * as yaml from 'yaml';
+import { scanSkillFirewall } from '../security/skill-scanner.js';
+import { parseSkillFile, validateSkill } from './parser.js';
+import { logger } from '../utils/logger.js';
+const FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n([\s\S]*)$/;
+const SUPPORT_DIRS = ['references', 'templates', 'scripts', 'assets', 'workflows', 'tests'];
+const SKIP_DIRS = new Set(['.git', 'index-cache', '.archive', 'node_modules', '.sources-cache']);
+export const IMPORTED_PREFIX = 'imported-';
+function defaultDestRoot() {
+    return path.join(os.homedir(), '.codebuddy', 'skills', 'managed');
+}
+/** Recursively find skill directories (those containing a SKILL.md). Skips operational dirs. */
+export function findSkillDirs(root) {
+    const out = [];
+    const walk = (dir) => {
+        let entries;
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        if (entries.some((e) => e.isFile() && e.name.toLowerCase() === 'skill.md')) {
+            out.push(dir);
+            // don't descend into a skill's own support dirs
+            return;
+        }
+        for (const e of entries) {
+            if (!e.isDirectory() || e.name.startsWith('.') || SKIP_DIRS.has(e.name))
+                continue;
+            walk(path.join(dir, e.name));
+        }
+    };
+    walk(root);
+    return out;
+}
+function slugify(raw) {
+    const base = String(raw).trim().toLowerCase().replace(/[^a-z0-9-]+/g, '-').replace(/^-+|-+$/g, '');
+    return base.startsWith(IMPORTED_PREFIX) ? base : `${IMPORTED_PREFIX}${base || 'skill'}`;
+}
+function normalizeTags(raw) {
+    const list = Array.isArray(raw) ? raw : [];
+    const seen = new Set();
+    const out = [];
+    for (const t of list) {
+        const s = String(t).trim().toLowerCase();
+        if (s && !seen.has(s)) {
+            seen.add(s);
+            out.push(s);
+        }
+    }
+    return out;
+}
+const STOPWORDS = new Set([
+    'the', 'and', 'for', 'with', 'your', 'via', 'into', 'from', 'that', 'this', 'use', 'using', 'create',
+    'creates', 'creating', 'a', 'an', 'or', 'to', 'of', 'in', 'on', 'as', 'by', 'it', 'is', 'are', 'add',
+    'list', 'get', 'set', 'run', 'when', 'how', 'you', 'can', 'will', 'their', 'them', 'they', 'about',
+]);
+/** Derive discovery triggers (the primary matcher) from the name + tags + description keywords. */
+function deriveTriggers(rawName, tags, description = '') {
+    const nameWords = String(rawName).toLowerCase().split(/[^a-z0-9]+/).filter((w) => w.length >= 3);
+    const descWords = String(description)
+        .toLowerCase()
+        .split(/[^a-z0-9]+/)
+        .filter((w) => w.length >= 4 && !STOPWORDS.has(w));
+    const seen = new Set();
+    const out = [];
+    for (const t of [String(rawName).toLowerCase(), ...tags, ...nameWords, ...descWords]) {
+        if (t && !seen.has(t)) {
+            seen.add(t);
+            out.push(t);
+        }
+        if (out.length >= 12)
+            break;
+    }
+    return out;
+}
+/** Extract discovery tags from any source layout: top-level `tags`, or `metadata.<source>.tags`. */
+function extractTags(rawFm) {
+    if (Array.isArray(rawFm.tags))
+        return rawFm.tags;
+    const meta = rawFm.metadata;
+    if (meta && typeof meta === 'object') {
+        for (const v of Object.values(meta)) {
+            if (v && typeof v === 'object' && Array.isArray(v.tags)) {
+                return v.tags;
+            }
+        }
+    }
+    return [];
+}
+/** Map prerequisites/requires from any source → our SkillRequirements.tools. */
+function extractRequiresTools(rawFm) {
+    const out = new Set();
+    const add = (v) => {
+        if (Array.isArray(v))
+            for (const x of v)
+                if (typeof x === 'string')
+                    out.add(x);
+    };
+    // Hermes: prerequisites.commands
+    const prereq = rawFm.prerequisites;
+    if (prereq)
+        add(prereq.commands);
+    // OpenClaw (and others): metadata.<source>.requires.bins
+    const meta = rawFm.metadata;
+    if (meta && typeof meta === 'object') {
+        for (const v of Object.values(meta)) {
+            const req = v?.requires;
+            if (req)
+                add(req.bins);
+        }
+    }
+    return [...out];
+}
+/** Build a Code-Buddy-shaped SKILL.md from a raw (e.g. Hermes) frontmatter object + body. */
+export function remapSkill(rawFm, body, opts) {
+    const description = String(rawFm.description ?? '').trim() || `Imported skill ${opts.slug}`;
+    const tags = normalizeTags(extractTags(rawFm));
+    const requiresTools = extractRequiresTools(rawFm);
+    const author = Array.isArray(rawFm.author) ? rawFm.author.join(', ') : rawFm.author;
+    const meta = {
+        name: opts.slug,
+        description,
+        ...(rawFm.version ? { version: rawFm.version } : {}),
+        ...(author ? { author } : {}),
+        ...(rawFm.license ? { license: rawFm.license } : {}),
+        ...(rawFm.platforms ? { platforms: rawFm.platforms } : {}),
+        tags,
+        nativeEngine: { triggers: deriveTriggers(String(rawFm.name ?? opts.slug), tags, description) },
+        ...(requiresTools.length ? { requires: { tools: requiresTools } } : {}),
+        imported: true,
+        source: opts.source,
+        ...(opts.pinned ? { pinned: true } : {}),
+    };
+    return `---\n${yaml.stringify(meta)}---\n\n${body.trim()}\n`;
+}
+function copySupportDirs(srcDir, destDir) {
+    for (const sub of SUPPORT_DIRS) {
+        const from = path.join(srcDir, sub);
+        if (fs.existsSync(from) && fs.statSync(from).isDirectory()) {
+            fs.cpSync(from, path.join(destDir, sub), {
+                recursive: true,
+                // never follow symlinks out of the source tree
+                filter: (s) => {
+                    try {
+                        return !fs.lstatSync(s).isSymbolicLink();
+                    }
+                    catch {
+                        return false;
+                    }
+                },
+            });
+        }
+    }
+}
+/** Import skills from a directory. Pure-ish: writes nothing when dryRun. */
+export function importSkills(sourceDir, options = {}) {
+    const destRoot = options.destRoot ?? defaultDestRoot();
+    const source = options.source ?? 'import';
+    const dryRun = options.dryRun ?? false;
+    const pinByDefault = options.pinByDefault ?? true;
+    const report = { imported: [], quarantined: [], review: [], skipped: [], total: 0, dryRun };
+    const skillDirs = findSkillDirs(sourceDir);
+    report.total = skillDirs.length;
+    for (const skillDir of skillDirs) {
+        const rel = path.relative(sourceDir, skillDir);
+        if (options.category && !rel.includes(options.category)) {
+            report.skipped.push({ sourcePath: rel, reason: 'filtered by --category' });
+            continue;
+        }
+        const skillMd = fs.existsSync(path.join(skillDir, 'SKILL.md'))
+            ? path.join(skillDir, 'SKILL.md')
+            : path.join(skillDir, 'skill.md');
+        const content = fs.readFileSync(skillMd, 'utf-8');
+        // Compatibility check.
+        try {
+            const skill = parseSkillFile(content, skillMd, 'managed');
+            const v = validateSkill(skill);
+            if (!v.valid) {
+                report.skipped.push({ sourcePath: rel, reason: `invalid: ${v.errors.join('; ')}` });
+                continue;
+            }
+        }
+        catch (err) {
+            report.skipped.push({ sourcePath: rel, reason: `parse error: ${err instanceof Error ? err.message : String(err)}` });
+            continue;
+        }
+        // Firewall gate (scans SKILL.md + scripts/support files recursively).
+        const fw = scanSkillFirewall(skillDir);
+        if (fw.quarantineRequired) {
+            report.quarantined.push({ sourcePath: rel, reason: fw.summary, verdict: String(fw.verdict) });
+            continue;
+        }
+        if (String(fw.verdict) === 'review' && !options.includeReview) {
+            report.review.push({ sourcePath: rel, reason: fw.summary, verdict: 'review' });
+            continue;
+        }
+        // Remap + flatten + install.
+        const m = content.match(FRONTMATTER_RE);
+        if (!m) {
+            report.skipped.push({ sourcePath: rel, reason: 'missing frontmatter' });
+            continue;
+        }
+        let rawFm;
+        try {
+            rawFm = (yaml.parse(m[1]) ?? {});
+        }
+        catch {
+            report.skipped.push({ sourcePath: rel, reason: 'unparseable frontmatter' });
+            continue;
+        }
+        const slug = slugify(String(rawFm.name ?? path.basename(skillDir)));
+        const destDir = path.join(destRoot, slug);
+        if (fs.existsSync(destDir) && !options.overwrite) {
+            report.skipped.push({ sourcePath: rel, reason: `conflict: ${slug} already imported` });
+            continue;
+        }
+        if (!dryRun) {
+            try {
+                fs.mkdirSync(destDir, { recursive: true });
+                fs.writeFileSync(path.join(destDir, 'SKILL.md'), remapSkill(rawFm, m[2], { slug, source, pinned: pinByDefault }), 'utf-8');
+                copySupportDirs(skillDir, destDir);
+            }
+            catch (err) {
+                report.skipped.push({ sourcePath: rel, reason: `write error: ${err instanceof Error ? err.message : String(err)}` });
+                continue;
+            }
+        }
+        report.imported.push({ name: slug, sourcePath: rel, verdict: String(fw.verdict) });
+    }
+    if (!dryRun && report.imported.length > 0) {
+        void (async () => {
+            try {
+                const { getSkillRegistry } = await import('./registry.js');
+                await getSkillRegistry().reloadAll();
+            }
+            catch (err) {
+                logger.debug(`skill reload after import failed: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        })();
+    }
+    return report;
+}
+//# sourceMappingURL=skill-importer.js.map

package/dist/skills/skill-sources.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Skill sources — a small "referential" of named places skills can be imported
+ * from. A source is a local directory or a git repo. Persisted to
+ * `~/.codebuddy/skill-sources.json`. The importer resolves a source to a local
+ * directory (cloning/pulling a git source into a cache) and then runs the same
+ * firewall-gated import path.
+ *
+ * @module skills/skill-sources
+ */
+export interface SkillSource {
+    name: string;
+    type: 'dir' | 'git';
+    location: string;
+}
+export declare function listSources(): SkillSource[];
+export declare function getSource(name: string): SkillSource | undefined;
+export declare function addSource(name: string, location: string, type?: 'dir' | 'git'): SkillSource;
+export declare function removeSource(name: string): boolean;
+/** Resolve a source to a local directory (clone/pull a git source into the cache). */
+export declare function resolveSourceDir(source: SkillSource): string;

package/dist/skills/skill-sources.js

@@ -0,0 +1,102 @@
+/**
+ * Skill sources — a small "referential" of named places skills can be imported
+ * from. A source is a local directory or a git repo. Persisted to
+ * `~/.codebuddy/skill-sources.json`. The importer resolves a source to a local
+ * directory (cloning/pulling a git source into a cache) and then runs the same
+ * firewall-gated import path.
+ *
+ * @module skills/skill-sources
+ */
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execFileSync } from 'child_process';
+import { logger } from '../utils/logger.js';
+function configPath() {
+    return path.join(os.homedir(), '.codebuddy', 'skill-sources.json');
+}
+function cacheRoot() {
+    return path.join(os.homedir(), '.codebuddy', 'skills', '.sources-cache');
+}
+/** Best-effort: locate the OpenClaw skills dir (it lives inside the npm global package). */
+function findOpenclawSkillsDir() {
+    const candidates = [path.join(os.homedir(), '.openclaw', 'skills')];
+    const nvmRoot = path.join(os.homedir(), '.nvm', 'versions', 'node');
+    try {
+        for (const v of fs.readdirSync(nvmRoot)) {
+            candidates.push(path.join(nvmRoot, v, 'lib', 'node_modules', 'openclaw', 'skills'));
+        }
+    }
+    catch {
+        /* no nvm */
+    }
+    candidates.push('/usr/local/lib/node_modules/openclaw/skills', '/usr/lib/node_modules/openclaw/skills');
+    return candidates.find((c) => fs.existsSync(c));
+}
+function read() {
+    try {
+        const parsed = JSON.parse(fs.readFileSync(configPath(), 'utf-8'));
+        if (Array.isArray(parsed.sources))
+            return { schemaVersion: 1, sources: parsed.sources };
+    }
+    catch {
+        /* no config yet */
+    }
+    // Seed known local skill repos as default `dir` sources when present.
+    const seed = [];
+    const hermes = path.join(os.homedir(), '.hermes', 'skills');
+    if (fs.existsSync(hermes))
+        seed.push({ name: 'hermes', type: 'dir', location: hermes });
+    const openclaw = findOpenclawSkillsDir();
+    if (openclaw)
+        seed.push({ name: 'openclaw', type: 'dir', location: openclaw });
+    return { schemaVersion: 1, sources: seed };
+}
+function write(file) {
+    fs.mkdirSync(path.dirname(configPath()), { recursive: true });
+    fs.writeFileSync(configPath(), JSON.stringify(file, null, 2), 'utf-8');
+}
+export function listSources() {
+    return read().sources;
+}
+export function getSource(name) {
+    return read().sources.find((s) => s.name === name);
+}
+export function addSource(name, location, type = location.endsWith('.git') || location.includes('://') ? 'git' : 'dir') {
+    const file = read();
+    const source = { name, type, location };
+    file.sources = file.sources.filter((s) => s.name !== name);
+    file.sources.push(source);
+    write(file);
+    return source;
+}
+export function removeSource(name) {
+    const file = read();
+    const before = file.sources.length;
+    file.sources = file.sources.filter((s) => s.name !== name);
+    if (file.sources.length === before)
+        return false;
+    write(file);
+    return true;
+}
+/** Resolve a source to a local directory (clone/pull a git source into the cache). */
+export function resolveSourceDir(source) {
+    if (source.type === 'dir')
+        return source.location;
+    // git: shallow clone or pull into the cache.
+    const dir = path.join(cacheRoot(), source.name);
+    fs.mkdirSync(cacheRoot(), { recursive: true });
+    try {
+        if (fs.existsSync(path.join(dir, '.git'))) {
+            execFileSync('git', ['-C', dir, 'pull', '--ff-only', '--depth', '1'], { stdio: 'ignore' });
+        }
+        else {
+            execFileSync('git', ['clone', '--depth', '1', source.location, dir], { stdio: 'ignore' });
+        }
+    }
+    catch (err) {
+        logger.warn(`skill source "${source.name}": git fetch failed — ${err instanceof Error ? err.message : String(err)}`);
+    }
+    return dir;
+}
+//# sourceMappingURL=skill-sources.js.map

package/dist/skills/types.d.ts

@@ -28,6 +28,12 @@ export interface SkillMetadata {
     contextFork?: boolean;
     /** CC11: If true, skill content is returned directly without LLM invocation */
     disableModelInvocation?: boolean;
+    /** Self-improvement: if true, curation won't overwrite/remove/consolidate this skill */
+    pinned?: boolean;
+    /** Provenance: this skill was imported from an external source. */
+    imported?: boolean;
+    /** Provenance: label of the source it was imported from (e.g. "hermes"). */
+    source?: string;
 }
 export interface SkillRequirements {
     /** Required tools */

package/dist/spec/spec-store.js

@@ -58,6 +58,7 @@ export class SpecTransitionError extends Error {
 // Singleton registry (one store per working directory)
 // ============================================================================
 const registry = new Map();
+let lastStoryCreatedAt = 0;
 export function getSpecStore(workDir = process.cwd()) {
     const key = path.resolve(workDir);
     if (!registry.has(key)) {
@@ -73,6 +74,7 @@ export function getSpecStore(workDir = process.cwd()) {
 /** Test helper: drop cached store instances. */
 export function resetSpecStores() {
     registry.clear();
+    lastStoryCreatedAt = 0;
 }
 /** Whether `from → to` is a legal story status transition. */
 export function isLegalTransition(from, to) {
@@ -211,7 +213,7 @@ export class SpecStore {
         const title = (input.title ?? '').trim();
         if (!title)
             throw new Error('Story title is required.');
-        const now = Date.now();
+        const now = nextStoryCreatedAt();
         const allowedPaths = cleanList(input.allowedPaths);
         const verification = cleanList(input.verification);
         const story = {
@@ -479,6 +481,11 @@ function parseFrontmatter(content) {
 function randomId() {
     return `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 7)}`;
 }
+function nextStoryCreatedAt() {
+    const now = Date.now();
+    lastStoryCreatedAt = now > lastStoryCreatedAt ? now : lastStoryCreatedAt + 1;
+    return lastStoryCreatedAt;
+}
 /** Trim, drop blanks, and de-duplicate a string list (used for contract fields). */
 function cleanList(values) {
     if (!Array.isArray(values))

package/dist/talk-mode/providers/audioreader-tts.d.ts

@@ -1,7 +1,7 @@
 /**
  * AudioReader TTS Provider
  *
- * Uses a local AudioReader API (Kokoro-82M engine) for high-quality,
+ * Uses a local AudioReader API for high-quality,
  * free text-to-speech synthesis via an OpenAI-compatible REST API.
  */
 import type { TTSProviderConfig, Voice, SynthesisOptions, SynthesisResult } from '../types.js';

package/dist/talk-mode/providers/audioreader-tts.js

@@ -1,14 +1,14 @@
 /**
  * AudioReader TTS Provider
  *
- * Uses a local AudioReader API (Kokoro-82M engine) for high-quality,
+ * Uses a local AudioReader API for high-quality,
  * free text-to-speech synthesis via an OpenAI-compatible REST API.
  */
 const DEFAULT_BASE_URL = 'http://localhost:8000';
-const DEFAULT_MODEL = 'kokoro';
+const DEFAULT_MODEL = 'audioreader';
 const DEFAULT_VOICE = 'ff_siwis';
-/** Known Kokoro voices with metadata */
-const KOKORO_VOICES = {
+/** Known AudioReader voices with metadata */
+const AUDIOREADER_VOICES = {
     ff_siwis: { name: 'Siwis', language: 'fr-FR', gender: 'female' },
     af_bella: { name: 'Bella', language: 'en-US', gender: 'female' },
     af_heart: { name: 'Heart', language: 'en-US', gender: 'female' },
@@ -20,7 +20,7 @@ const KOKORO_VOICES = {
     bf_emma: { name: 'Emma', language: 'en-GB', gender: 'female' },
     bm_george: { name: 'George', language: 'en-GB', gender: 'male' },
 };
-/** OpenAI voice name to Kokoro voice mapping */
+/** OpenAI voice name to AudioReader voice mapping */
 const OPENAI_VOICE_MAP = {
     alloy: 'af_bella',
     echo: 'am_adam',
@@ -74,7 +74,7 @@ export class AudioReaderTTSProvider {
         catch {
             // Fall back to known voices
         }
-        return Object.keys(KOKORO_VOICES).map(id => this.buildVoice(id));
+        return Object.keys(AUDIOREADER_VOICES).map(id => this.buildVoice(id));
     }
     async synthesize(text, options) {
         if (!this.initialized) {
@@ -131,11 +131,11 @@ export class AudioReaderTTSProvider {
         return voice;
     }
     buildVoice(id) {
-        const meta = KOKORO_VOICES[id];
+        const meta = AUDIOREADER_VOICES[id];
         return {
             id: `audioreader-${id}`,
             name: meta?.name ?? id,
-            description: `AudioReader Kokoro voice - ${meta?.name ?? id}`,
+            description: `AudioReader voice - ${meta?.name ?? id}`,
             language: meta?.language ?? 'en-US',
             gender: meta?.gender ?? 'female',
             provider: 'audioreader',

package/dist/templates/project-scaffolding.js

@@ -12,6 +12,7 @@ import * as path from 'path';
 import { existsSync } from 'fs';
 import { EventEmitter } from 'events';
 import { spawn } from 'child_process';
+import { performance } from 'perf_hooks';
 // ============================================================================
 // Built-in Templates
 // ============================================================================
@@ -641,7 +642,7 @@ export class TemplateEngine extends EventEmitter {
      * Generate project from template
      */
     async generate(options) {
-        const startTime = Date.now();
+        const startTime = performance.now();
         const warnings = [];
         const filesCreated = [];
         // Get template
@@ -737,7 +738,7 @@ export class TemplateEngine extends EventEmitter {
             success: true,
             projectPath,
             filesCreated,
-            duration: Date.now() - startTime,
+            duration: Math.max(1, Math.ceil(performance.now() - startTime)),
             warnings,
             nextSteps,
         };

package/dist/themes/theme-schema.d.ts

@@ -58,11 +58,11 @@ export declare const themeColorsSchema: z.ZodObject<{
     primary: string;
     toolResult: string;
     secondary: string;
+    border: string;
     userMessage: string;
     accent: string;
     textMuted: string;
     textDim: string;
-    border: string;
     borderActive: string;
     borderBusy: string;
     assistantMessage: string;
@@ -81,11 +81,11 @@ export declare const themeColorsSchema: z.ZodObject<{
     primary: string;
     toolResult: string;
     secondary: string;
+    border: string;
     userMessage: string;
     accent: string;
     textMuted: string;
     textDim: string;
-    border: string;
     borderActive: string;
     borderBusy: string;
     assistantMessage: string;
@@ -135,11 +135,11 @@ export declare const themeSchema: z.ZodObject<{
         primary: string;
         toolResult: string;
         secondary: string;
+        border: string;
         userMessage: string;
         accent: string;
         textMuted: string;
         textDim: string;
-        border: string;
         borderActive: string;
         borderBusy: string;
         assistantMessage: string;
@@ -158,11 +158,11 @@ export declare const themeSchema: z.ZodObject<{
         primary: string;
         toolResult: string;
         secondary: string;
+        border: string;
         userMessage: string;
         accent: string;
         textMuted: string;
         textDim: string;
-        border: string;
         borderActive: string;
         borderBusy: string;
         assistantMessage: string;
@@ -206,11 +206,11 @@ export declare const themeSchema: z.ZodObject<{
         primary: string;
         toolResult: string;
         secondary: string;
+        border: string;
         userMessage: string;
         accent: string;
         textMuted: string;
         textDim: string;
-        border: string;
         borderActive: string;
         borderBusy: string;
         assistantMessage: string;
@@ -243,11 +243,11 @@ export declare const themeSchema: z.ZodObject<{
         primary: string;
         toolResult: string;
         secondary: string;
+        border: string;
         userMessage: string;
         accent: string;
         textMuted: string;
         textDim: string;
-        border: string;
         borderActive: string;
         borderBusy: string;
         assistantMessage: string;
@@ -320,13 +320,13 @@ export declare const themePreferencesSchema: z.ZodObject<{
         primary?: string | undefined;
         toolResult?: string | undefined;
         secondary?: string | undefined;
+        border?: string | undefined;
         userMessage?: string | undefined;
         accent?: string | undefined;
         textMuted?: string | undefined;
         textDim?: string | undefined;
         background?: string | undefined;
         backgroundAlt?: string | undefined;
-        border?: string | undefined;
         borderActive?: string | undefined;
         borderBusy?: string | undefined;
         assistantMessage?: string | undefined;
@@ -343,13 +343,13 @@ export declare const themePreferencesSchema: z.ZodObject<{
         primary?: string | undefined;
         toolResult?: string | undefined;
         secondary?: string | undefined;
+        border?: string | undefined;
         userMessage?: string | undefined;
         accent?: string | undefined;
         textMuted?: string | undefined;
         textDim?: string | undefined;
         background?: string | undefined;
         backgroundAlt?: string | undefined;
-        border?: string | undefined;
         borderActive?: string | undefined;
         borderBusy?: string | undefined;
         assistantMessage?: string | undefined;
@@ -375,13 +375,13 @@ export declare const themePreferencesSchema: z.ZodObject<{
         primary?: string | undefined;
         toolResult?: string | undefined;
         secondary?: string | undefined;
+        border?: string | undefined;
         userMessage?: string | undefined;
         accent?: string | undefined;
         textMuted?: string | undefined;
         textDim?: string | undefined;
         background?: string | undefined;
         backgroundAlt?: string | undefined;
-        border?: string | undefined;
         borderActive?: string | undefined;
         borderBusy?: string | undefined;
         assistantMessage?: string | undefined;
@@ -407,13 +407,13 @@ export declare const themePreferencesSchema: z.ZodObject<{
         primary?: string | undefined;
         toolResult?: string | undefined;
         secondary?: string | undefined;
+        border?: string | undefined;
         userMessage?: string | undefined;
         accent?: string | undefined;
         textMuted?: string | undefined;
         textDim?: string | undefined;
         background?: string | undefined;
         backgroundAlt?: string | undefined;
-        border?: string | undefined;
         borderActive?: string | undefined;
         borderBusy?: string | undefined;
         assistantMessage?: string | undefined;