@soleri/forge 9.0.1 → 9.2.0

package/src/templates/skills.ts

@@ -1,4 +1,4 @@
-import { readFileSync, readdirSync } from 'node:fs';
+import { readFileSync, readdirSync, existsSync, statSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import type { AgentConfig } from '../types.js';
@@ -15,12 +15,14 @@ const AGENT_SPECIFIC_SKILLS = new Set([
   'brainstorming',
   'code-patrol',
   'context-resume',
+  'deep-review',
   'deliver-and-ship',
   'executing-plans',
   'fix-and-learn',
   'health-check',
   'knowledge-harvest',
   'onboard-me',
+  'parallel-execute',
   'retrospective',
   'second-opinion',
   'systematic-debugging',
@@ -28,6 +30,7 @@ const AGENT_SPECIFIC_SKILLS = new Set([
   'vault-capture',
   'vault-curate',
   'vault-navigator',
+  'vault-smells',
   'verification-before-completion',
   'writing-plans',
 ]);
@@ -43,10 +46,10 @@ const AGENT_SPECIFIC_SKILLS = new Set([
  */
 export function generateSkills(config: AgentConfig): Array<[string, string]> {
   const files: Array<[string, string]> = [];
-  let skillFiles: string[];
+  let entries: string[];
 
   try {
-    skillFiles = readdirSync(SKILLS_DIR).filter((f) => f.endsWith('.md'));
+    entries = readdirSync(SKILLS_DIR);
   } catch {
     return files;
   }
@@ -55,14 +58,32 @@ export function generateSkills(config: AgentConfig): Array<[string, string]> {
   // undefined = include all (backward compat), [] = include none.
   const allowedSkills = config.skills ? new Set(config.skills) : null; // null = include all (backward compat)
 
-  for (const file of skillFiles) {
-    const skillName = file.replace('.md', '');
+  for (const entry of entries) {
+    const entryPath = join(SKILLS_DIR, entry);
+
+    // Support both layouts:
+    // - Directory: skills/{name}/SKILL.md (current)
+    // - Flat file: skills/{name}.md (legacy)
+    let skillName: string;
+    let contentPath: string;
+
+    if (statSync(entryPath).isDirectory()) {
+      const skillMd = join(entryPath, 'SKILL.md');
+      if (!existsSync(skillMd)) continue;
+      skillName = entry;
+      contentPath = skillMd;
+    } else if (entry.endsWith('.md')) {
+      skillName = entry.replace('.md', '');
+      contentPath = entryPath;
+    } else {
+      continue;
+    }
 
     if (allowedSkills && !allowedSkills.has(skillName)) {
       continue;
     }
 
-    let content = readFileSync(join(SKILLS_DIR, file), 'utf-8');
+    let content = readFileSync(contentPath, 'utf-8');
 
     if (AGENT_SPECIFIC_SKILLS.has(skillName)) {
       content = content.replace(/YOUR_AGENT_core/g, `${config.id}_core`);

package/src/types.ts

@@ -1,8 +1,13 @@
 import { z } from 'zod';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
 
 /** Communication tone for the agent persona */
 const TONES = ['precise', 'mentor', 'pragmatic'] as const;
 
+/** Default parent directory for new agents: ~/.soleri/ */
+const SOLERI_HOME_DEFAULT = process.env.SOLERI_HOME ?? join(homedir(), '.soleri');
+
 /** Where to scaffold host/client integration setup. */
 export const SETUP_TARGETS = ['claude', 'codex', 'opencode', 'both', 'all'] as const;
 export type SetupTarget = (typeof SETUP_TARGETS)[number];
@@ -39,8 +44,8 @@ export const AgentConfigSchema = z.object({
   tone: z.enum(TONES).optional().default('pragmatic'),
   /** Greeting message when agent introduces itself (auto-generated if omitted) */
   greeting: z.string().min(10).max(300).optional(),
-  /** Output directory (parent — agent dir will be created inside, defaults to cwd) */
-  outputDir: z.string().min(1).optional().default(process.cwd()),
+  /** Output directory (parent — agent dir will be created inside, defaults to ~/.soleri/) */
+  outputDir: z.string().min(1).optional().default(SOLERI_HOME_DEFAULT),
   /** Hook packs to install after scaffolding (optional) */
   hookPacks: z.array(z.string()).optional(),
   /** Skills to include (if omitted, all skills are included for backward compat) */