opc-agent 4.1.0 → 4.1.2

package/src/skills/marketplace.ts

@@ -1,113 +1,113 @@
-/**
- * Skill Marketplace Manager
- * Handles skill installation, uninstallation, and runtime discovery.
- */
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import * as os from 'os';
-import type { MarketplaceSkill, InstalledSkill, SkillInstallResult, SkillCategory } from './types';
-import { BUILTIN_SKILLS } from './builtin/index';
-
-export class SkillMarketplace {
-  private installedSkills: Map<string, InstalledSkill> = new Map();
-  private configPath: string;
-
-  constructor() {
-    const dir = join(os.homedir(), '.opc');
-    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    this.configPath = join(dir, 'skills-installed.json');
-    this.loadInstalled();
-  }
-
-  private loadInstalled(): void {
-    if (existsSync(this.configPath)) {
-      try {
-        const data = JSON.parse(readFileSync(this.configPath, 'utf-8'));
-        if (Array.isArray(data)) {
-          data.forEach((s: InstalledSkill) => this.installedSkills.set(s.skillId, s));
-        }
-      } catch { /* ignore corrupted file */ }
-    }
-  }
-
-  private saveInstalled(): void {
-    const data = Array.from(this.installedSkills.values());
-    writeFileSync(this.configPath, JSON.stringify(data, null, 2));
-  }
-
-  /** Get all available skills with installation status */
-  listAll(category?: string, search?: string): (MarketplaceSkill & { installed: boolean })[] {
-    let skills = BUILTIN_SKILLS;
-    if (category) {
-      skills = skills.filter(s => s.category === category);
-    }
-    if (search) {
-      const q = search.toLowerCase();
-      skills = skills.filter(s =>
-        s.name.toLowerCase().includes(q) ||
-        s.nameZh.includes(q) ||
-        s.description.toLowerCase().includes(q) ||
-        s.descriptionZh.includes(q)
-      );
-    }
-    return skills.map(s => ({
-      ...s,
-      installed: this.installedSkills.has(s.id),
-    }));
-  }
-
-  /** Get a single skill by ID */
-  getSkill(id: string): (MarketplaceSkill & { installed: boolean }) | null {
-    const skill = BUILTIN_SKILLS.find(s => s.id === id);
-    if (!skill) return null;
-    return { ...skill, installed: this.installedSkills.has(id) };
-  }
-
-  /** Install a skill */
-  install(id: string, config?: Record<string, any>): SkillInstallResult {
-    const skill = BUILTIN_SKILLS.find(s => s.id === id);
-    if (!skill) return { success: false, skillId: id, message: 'Skill not found' };
-    if (this.installedSkills.has(id)) return { success: true, skillId: id, message: 'Already installed' };
-
-    this.installedSkills.set(id, {
-      skillId: id,
-      installedAt: new Date().toISOString(),
-      config,
-    });
-    this.saveInstalled();
-    return { success: true, skillId: id, message: 'Installed successfully' };
-  }
-
-  /** Uninstall a skill */
-  uninstall(id: string): SkillInstallResult {
-    if (!this.installedSkills.has(id)) {
-      return { success: false, skillId: id, message: 'Skill not installed' };
-    }
-    this.installedSkills.delete(id);
-    this.saveInstalled();
-    return { success: true, skillId: id, message: 'Uninstalled successfully' };
-  }
-
-  /** Get installed skills with full details */
-  getInstalled(): (MarketplaceSkill & { installed: boolean; installedAt: string })[] {
-    return Array.from(this.installedSkills.values())
-      .map(inst => {
-        const skill = BUILTIN_SKILLS.find(s => s.id === inst.skillId);
-        if (!skill) return null;
-        return { ...skill, installed: true, installedAt: inst.installedAt };
-      })
-      .filter(Boolean) as any;
-  }
-
-  /** Get system prompts for all installed skills (for agent runtime) */
-  getInstalledSystemPrompts(): string[] {
-    return this.getInstalled()
-      .filter(s => s.systemPrompt)
-      .map(s => `[${s.icon} ${s.nameZh}] ${s.systemPrompt}`);
-  }
-
-  /** Get all tool names from installed skills */
-  getInstalledToolNames(): string[] {
-    return this.getInstalled().flatMap(s => s.tools);
-  }
-}
+/**
+ * Skill Marketplace Manager
+ * Handles skill installation, uninstallation, and runtime discovery.
+ */
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
+import { join } from 'path';
+import * as os from 'os';
+import type { MarketplaceSkill, InstalledSkill, SkillInstallResult, SkillCategory } from './types';
+import { BUILTIN_SKILLS } from './builtin/index';
+
+export class SkillMarketplace {
+  private installedSkills: Map<string, InstalledSkill> = new Map();
+  private configPath: string;
+
+  constructor() {
+    const dir = join(os.homedir(), '.opc');
+    if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+    this.configPath = join(dir, 'skills-installed.json');
+    this.loadInstalled();
+  }
+
+  private loadInstalled(): void {
+    if (existsSync(this.configPath)) {
+      try {
+        const data = JSON.parse(readFileSync(this.configPath, 'utf-8'));
+        if (Array.isArray(data)) {
+          data.forEach((s: InstalledSkill) => this.installedSkills.set(s.skillId, s));
+        }
+      } catch { /* ignore corrupted file */ }
+    }
+  }
+
+  private saveInstalled(): void {
+    const data = Array.from(this.installedSkills.values());
+    writeFileSync(this.configPath, JSON.stringify(data, null, 2));
+  }
+
+  /** Get all available skills with installation status */
+  listAll(category?: string, search?: string): (MarketplaceSkill & { installed: boolean })[] {
+    let skills = BUILTIN_SKILLS;
+    if (category) {
+      skills = skills.filter(s => s.category === category);
+    }
+    if (search) {
+      const q = search.toLowerCase();
+      skills = skills.filter(s =>
+        s.name.toLowerCase().includes(q) ||
+        s.nameZh.includes(q) ||
+        s.description.toLowerCase().includes(q) ||
+        s.descriptionZh.includes(q)
+      );
+    }
+    return skills.map(s => ({
+      ...s,
+      installed: this.installedSkills.has(s.id),
+    }));
+  }
+
+  /** Get a single skill by ID */
+  getSkill(id: string): (MarketplaceSkill & { installed: boolean }) | null {
+    const skill = BUILTIN_SKILLS.find(s => s.id === id);
+    if (!skill) return null;
+    return { ...skill, installed: this.installedSkills.has(id) };
+  }
+
+  /** Install a skill */
+  install(id: string, config?: Record<string, any>): SkillInstallResult {
+    const skill = BUILTIN_SKILLS.find(s => s.id === id);
+    if (!skill) return { success: false, skillId: id, message: 'Skill not found' };
+    if (this.installedSkills.has(id)) return { success: true, skillId: id, message: 'Already installed' };
+
+    this.installedSkills.set(id, {
+      skillId: id,
+      installedAt: new Date().toISOString(),
+      config,
+    });
+    this.saveInstalled();
+    return { success: true, skillId: id, message: 'Installed successfully' };
+  }
+
+  /** Uninstall a skill */
+  uninstall(id: string): SkillInstallResult {
+    if (!this.installedSkills.has(id)) {
+      return { success: false, skillId: id, message: 'Skill not installed' };
+    }
+    this.installedSkills.delete(id);
+    this.saveInstalled();
+    return { success: true, skillId: id, message: 'Uninstalled successfully' };
+  }
+
+  /** Get installed skills with full details */
+  getInstalled(): (MarketplaceSkill & { installed: boolean; installedAt: string })[] {
+    return Array.from(this.installedSkills.values())
+      .map(inst => {
+        const skill = BUILTIN_SKILLS.find(s => s.id === inst.skillId);
+        if (!skill) return null;
+        return { ...skill, installed: true, installedAt: inst.installedAt };
+      })
+      .filter(Boolean) as any;
+  }
+
+  /** Get system prompts for all installed skills (for agent runtime) */
+  getInstalledSystemPrompts(): string[] {
+    return this.getInstalled()
+      .filter(s => s.systemPrompt)
+      .map(s => `[${s.icon} ${s.nameZh}] ${s.systemPrompt}`);
+  }
+
+  /** Get all tool names from installed skills */
+  getInstalledToolNames(): string[] {
+    return this.getInstalled().flatMap(s => s.tools);
+  }
+}

package/src/skills/types.ts

@@ -1,42 +1,42 @@
-/**
- * Skill Marketplace - Type Definitions
- * Defines the structure for installable skills in the OPC Agent marketplace.
- */
-
-export interface MarketplaceSkill {
-  id: string;
-  name: string;
-  nameZh: string;
-  description: string;
-  descriptionZh: string;
-  category: SkillCategory;
-  icon: string;
-  version: string;
-  author: string;
-  tools: string[];
-  config?: Record<string, any>;
-  systemPrompt?: string;
-}
-
-export type SkillCategory = 'productivity' | 'knowledge' | 'creative' | 'developer' | 'lifestyle' | 'business';
-
-export interface InstalledSkill {
-  skillId: string;
-  installedAt: string;
-  config?: Record<string, any>;
-}
-
-export interface SkillInstallResult {
-  success: boolean;
-  skillId: string;
-  message?: string;
-}
-
-export const CATEGORY_LABELS: Record<SkillCategory, { en: string; zh: string }> = {
-  productivity: { en: 'Productivity', zh: '效率工具' },
-  knowledge: { en: 'Knowledge', zh: '知识工具' },
-  creative: { en: 'Creative', zh: '创作工具' },
-  developer: { en: 'Developer', zh: '开发工具' },
-  lifestyle: { en: 'Lifestyle', zh: '生活工具' },
-  business: { en: 'Business', zh: '业务工具' },
-};
+/**
+ * Skill Marketplace - Type Definitions
+ * Defines the structure for installable skills in the OPC Agent marketplace.
+ */
+
+export interface MarketplaceSkill {
+  id: string;
+  name: string;
+  nameZh: string;
+  description: string;
+  descriptionZh: string;
+  category: SkillCategory;
+  icon: string;
+  version: string;
+  author: string;
+  tools: string[];
+  config?: Record<string, any>;
+  systemPrompt?: string;
+}
+
+export type SkillCategory = 'productivity' | 'knowledge' | 'creative' | 'developer' | 'lifestyle' | 'business';
+
+export interface InstalledSkill {
+  skillId: string;
+  installedAt: string;
+  config?: Record<string, any>;
+}
+
+export interface SkillInstallResult {
+  success: boolean;
+  skillId: string;
+  message?: string;
+}
+
+export const CATEGORY_LABELS: Record<SkillCategory, { en: string; zh: string }> = {
+  productivity: { en: 'Productivity', zh: '效率工具' },
+  knowledge: { en: 'Knowledge', zh: '知识工具' },
+  creative: { en: 'Creative', zh: '创作工具' },
+  developer: { en: 'Developer', zh: '开发工具' },
+  lifestyle: { en: 'Lifestyle', zh: '生活工具' },
+  business: { en: 'Business', zh: '业务工具' },
+};

package/src/studio/server.ts

@@ -785,11 +785,41 @@ class StudioServer {
   }
 
   private listAgents(): { agents: any[] } {
+    // 1. Load Studio-created agents from ~/.opc/agents/*.json
     const dir = this.getAgentsDir();
     const files = readdirSync(dir).filter(f => f.endsWith('.json'));
     const agents = files.map(f => {
       try { return JSON.parse(readFileSync(join(dir, f), 'utf-8')); } catch { return null; }
-    }).filter(Boolean).sort((a: any, b: any) => new Date(b.updated).getTime() - new Date(a.updated).getTime());
+    }).filter(Boolean);
+
+    // 2. Also detect current working directory agent (oad.yaml)
+    const seenIds = new Set(agents.map((a: any) => a.id));
+    const oadPath = join(this.config.agentDir, 'oad.yaml');
+    if (existsSync(oadPath)) {
+      try {
+        const oadRaw = readFileSync(oadPath, 'utf-8');
+        const yamlMod = require('js-yaml');
+        const oad = yamlMod.load(oadRaw) as any;
+        const name = oad?.name || oad?.metadata?.name || 'My Agent';
+        const id = oad?.id || name.toLowerCase().replace(/\s+/g, '-').replace(/[^a-z0-9-]/g, '');
+        if (!seenIds.has(id)) {
+          agents.push({
+            id,
+            name,
+            description: oad?.description || oad?.spec?.description || '',
+            icon: oad?.icon || '🤖',
+            emoji: oad?.icon || '🤖',
+            status: 'running',
+            source: 'oad.yaml',
+            model: oad?.spec?.model || oad?.spec?.provider?.model || 'auto',
+            created: new Date().toISOString(),
+            updated: new Date().toISOString(),
+          });
+        }
+      } catch { /* ignore parse errors */ }
+    }
+
+    agents.sort((a: any, b: any) => new Date(b.updated).getTime() - new Date(a.updated).getTime());
     return { agents };
   }