opencode-agents 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-agents",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "CLI for managing AI coding agents",
   "type": "module",
   "bin": {

package/src/commands/add.ts

@@ -8,7 +8,7 @@ import type { AgentPlatform, InstallOptions, AgentFile } from '../types/index.js
 import { basename, join } from 'path';
 import { mkdtempSync } from 'fs';
 import degit from 'degit';
-import { showLogo, S_BAR, S_BRANCH, S_BRANCH_END, S_BULLET, S_STEP_ACTIVE } from '../utils/ui.js';
+import { showLogo } from '../utils/ui.js';
 
 interface AddCommandOptions {
   global: boolean | undefined;
@@ -39,11 +39,11 @@ async function promptSelectAgents(agents: AgentFile[]): Promise<AgentFile[]> {
   const options = agents.map(agent => ({
     value: agent,
     label: agent.agent.name || basename(agent.path, '.md'),
-    hint: agent.agent.description?.slice(0, 50) + '...',
+    hint: agent.agent.description?.slice(0, 50),
   }));
 
   const selected = await p.multiselect({
-    message: 'Select agents to install (space to select, enter to confirm):',
+    message: 'Select agents to install:',
     options,
     required: true,
   });
@@ -90,33 +90,28 @@ export async function addCommand(source: string, options: AddCommandOptions): Pr
     isGlobal = await promptInstallLocation();
   }
 
-  // 使用统一的树状结构
-  console.log(`${S_STEP_ACTIVE} ${pc.cyan('Source:')} ${pc.dim(`https://github.com/${source}.git`)}`);
-  console.log(S_BAR);
+  p.log.step(`Source: ${pc.cyan(`https://github.com/${source}.git`)}`);
   
   const s = p.spinner();
-  s.start('Cloning repository...');
+  s.start('Cloning repository');
   
   let tempDir: string;
   try {
     tempDir = await fetchSource(source);
-    s.stop(`${pc.green('✓')} Repository cloned`);
+    s.stop('Repository cloned');
   } catch (err) {
-    s.stop(`${pc.red('✗')} Failed to clone repository`);
+    s.stop('Failed to clone repository');
     p.log.error(`Failed to fetch source: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
   }
 
-  console.log(S_BAR);
-  
-  // 步骤 2: 发现 agents
-  s.start('Discovering agents...');
+  s.start('Discovering agents');
   let agents: AgentFile[];
   try {
     agents = await discoverFromDirectory(tempDir);
-    s.stop(`${pc.green('✓')} Found ${agents.length} agent(s)`);
+    s.stop(`Found ${pc.green(String(agents.length))} agent(s)`);
   } catch (err) {
-    s.stop(`${pc.red('✗')} Failed to discover agents`);
+    s.stop('Failed to discover agents');
     p.log.error(`Failed to discover agents: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
   }
@@ -126,9 +121,6 @@ export async function addCommand(source: string, options: AddCommandOptions): Pr
     process.exit(1);
   }
 
-  console.log(S_BAR);
-  
-  // 步骤 3: 选择 agents
   let selectedAgents: AgentFile[];
   if (options.yes) {
     selectedAgents = agents;
@@ -141,18 +133,13 @@ export async function addCommand(source: string, options: AddCommandOptions): Pr
     process.exit(0);
   }
 
-  // 显示选中的 agents - 作为树的分支
-  console.log(`${S_BAR} ${S_BRANCH} ${pc.dim('Selected:')}`);
-  selectedAgents.forEach((agent, index) => {
-    const isLast = index === selectedAgents.length - 1;
-    const prefix = isLast ? S_BRANCH_END : S_BRANCH;
-    const name = agent.agent.name || basename(agent.path, '.md');
-    console.log(`${S_BAR} ${isLast ? ' ' : S_BAR} ${prefix} ${S_BULLET} ${pc.bold(name)}`);
-  });
+  // 显示选中的 agents
+  const selectedList = selectedAgents.map(agent => 
+    `  ${pc.bold(agent.agent.name || basename(agent.path, '.md'))}`
+  ).join('\n');
+  p.note(selectedList, 'Selected agents');
 
-  // 步骤 4: 安装
-  console.log(S_BAR);
-  s.start('Installing agents...');
+  s.start(`Installing ${selectedAgents.length} agent(s)`);
 
   try {
     let platforms: AgentPlatform[];
@@ -176,14 +163,11 @@ export async function addCommand(source: string, options: AddCommandOptions): Pr
 
     await installAgent(installOptions);
 
-    s.stop(`${pc.green('✓')} Successfully installed ${selectedAgents.length} agent(s)`);
+    s.stop(pc.green(`Successfully installed ${selectedAgents.length} agent(s)`));
     
-    console.log();
-    console.log(pc.dim('  Next steps:'));
-    console.log(pc.dim(`    npx opencode-agents list     View installed agents`));
-    console.log();
+    p.outro('Installation complete! Run `npx opencode-agents list` to see installed agents.');
   } catch (err) {
-    s.stop(`${pc.red('✗')} Installation failed`);
+    s.stop('Installation failed');
     p.log.error(`Failed to install agent: ${err instanceof Error ? err.message : String(err)}`);
     process.exit(1);
   } finally {

package/src/commands/list.ts

@@ -2,7 +2,6 @@ import * as p from '@clack/prompts';
 import pc from 'picocolors';
 import { listInstalledAgents } from '../core/installer.js';
 import type { AgentPlatform } from '../types/index.js';
-import { S_BAR, S_BRANCH, S_BRANCH_END, S_BULLET } from '../utils/ui.js';
 
 interface ListCommandOptions {
   global: boolean;
@@ -18,8 +17,6 @@ export async function listCommand(options: ListCommandOptions): Promise<void> {
     platforms = ['opencode'];
   }
 
-  console.log();
-  
   let hasAnyAgents = false;
   
   for (const platform of platforms) {
@@ -32,57 +29,52 @@ export async function listCommand(options: ListCommandOptions): Promise<void> {
     
     hasAnyAgents = true;
     
-    console.log(pc.bold(pc.cyan(`◆ ${platform} agents`)));
+    console.log();
+    console.log(pc.bold(pc.cyan(`${platform} agents`)));
     console.log();
     
     // 项目级别
     if (projectAgents.length > 0) {
-      console.log(`  ${globalAgents.length > 0 ? S_BRANCH : S_BRANCH_END} ${pc.dim('Project')} ${pc.dim('(./.opencode/agents/)')}`);
+      console.log(pc.dim('Project (./.opencode/agents/)'));
       
-      projectAgents.forEach((agent, index) => {
-        const isLast = index === projectAgents.length - 1;
-        const prefix = isLast ? S_BRANCH_END : S_BRANCH;
-        
+      for (const agent of projectAgents) {
         const name = agent.agent.name || agent.path.split(/[/\\]/).pop()?.replace('.md', '') || 'unknown';
         const mode = agent.agent.mode || 'subagent';
         
-        console.log(`  ${globalAgents.length > 0 ? S_BAR : '  '} ${prefix} ${S_BULLET} ${pc.bold(name)} ${pc.dim(`[${mode}]`)}`);
+        console.log(`  ${pc.bold(name)} ${pc.dim(`[${mode}]`)}`);
         
         if (agent.agent.description) {
-          console.log(`  ${globalAgents.length > 0 ? S_BAR : '  '} ${isLast ? '  ' : `${S_BAR} `}   ${pc.dim(agent.agent.description)}`);
+          console.log(`    ${pc.dim(agent.agent.description)}`);
         }
-      });
+      }
       
       console.log();
     }
     
     // 全局级别
     if (globalAgents.length > 0) {
-      console.log(`  ${S_BRANCH_END} ${pc.dim('Global')} ${pc.dim('(~/.config/opencode/agents/)')}`);
+      console.log(pc.dim('Global (~/.config/opencode/agents/)'));
       
-      globalAgents.forEach((agent, index) => {
-        const isLast = index === globalAgents.length - 1;
-        const prefix = isLast ? S_BRANCH_END : S_BRANCH;
-        
+      for (const agent of globalAgents) {
         const name = agent.agent.name || agent.path.split(/[/\\]/).pop()?.replace('.md', '') || 'unknown';
         const mode = agent.agent.mode || 'subagent';
         
-        console.log(`    ${prefix} ${S_BULLET} ${pc.bold(name)} ${pc.dim(`[${mode}]`)}`);
+        console.log(`  ${pc.bold(name)} ${pc.dim(`[${mode}]`)}`);
         
         if (agent.agent.description) {
-          console.log(`    ${isLast ? '  ' : `${S_BAR} `}   ${pc.dim(agent.agent.description)}`);
+          console.log(`    ${pc.dim(agent.agent.description)}`);
         }
-      });
+      }
       
       console.log();
     }
   }
   
   if (!hasAnyAgents) {
-    p.log.info(pc.dim('No agents installed'));
+    p.log.info('No agents installed');
     console.log();
-    console.log(pc.dim('  To install an agent:'));
-    console.log(pc.dim(`    npx opencode-agents add <repo>`));
+    console.log(pc.dim('To install an agent:'));
+    console.log(pc.dim(`  npx opencode-agents add <repo>`));
     console.log();
   }
 }

package/src/core/discover.ts

@@ -1,6 +1,6 @@
 import { join, basename } from 'path';
 import { existsSync, readdirSync, readFileSync } from 'fs';
-import { parseAgentFile } from './parser.js';
+import { parseAgentFile, isAgentContent } from './parser.js';
 import { findFiles, isDirectory } from '../utils/filesystem.js';
 import type { AgentFile, Agent } from '../types/index.js';
 
@@ -14,7 +14,6 @@ const SEARCH_DIRECTORIES = [
 
 const PRIORITY_FILES = [
   'AGENTS.md',
-  'SKILL.md',
   'AGENT.md',
 ];
 
@@ -34,8 +33,10 @@ export async function discoverFromDirectory(dir: string): Promise<AgentFile[]> {
 
       try {
         const content = readFileSync(file, 'utf-8');
-        const agentFile = parseAgentFile(content, file);
-        agents.push(agentFile);
+        const result = parseAgentFile(content, file);
+        // 如果解析结果为 null，说明不是 Agent 文件（是 Skill 文件）
+        if (result === null) continue;
+        agents.push(result);
       } catch (err) {
         continue;
       }
@@ -47,10 +48,12 @@ export async function discoverFromDirectory(dir: string): Promise<AgentFile[]> {
     if (existsSync(priorityFile)) {
       try {
         const content = readFileSync(priorityFile, 'utf-8');
-        const agentFile = parseAgentFile(content, priorityFile);
-        const exists = agents.some(a => a.path === agentFile.path);
+        const result = parseAgentFile(content, priorityFile);
+        // 如果解析结果为 null，说明不是 Agent 文件（是 Skill 文件）
+        if (result === null) continue;
+        const exists = agents.some(a => a.path === result.path);
         if (!exists) {
-          agents.unshift(agentFile);
+          agents.unshift(result);
         }
       } catch (err) {
         continue;
@@ -96,8 +99,10 @@ export function discoverLocal(dir: string): AgentFile[] {
 
     try {
       const content = readFileSync(file, 'utf-8');
-      const agentFile = parseAgentFile(content, file);
-      agents.push(agentFile);
+      const result = parseAgentFile(content, file);
+      // 如果解析结果为 null，说明不是 Agent 文件（是 Skill 文件）
+      if (result === null) continue;
+      agents.push(result);
     } catch (err) {
       continue;
     }

package/src/core/installer.ts

@@ -110,12 +110,14 @@ export function listInstalledAgents(platform: AgentPlatform, global: boolean): A
   
   for (const path of paths) {
     if (!existsSync(path)) continue;
-    
+
     const mdFiles = findFiles(path, /\.md$/);
     for (const file of mdFiles) {
       try {
         const content = readFileSync(file, 'utf-8');
         const agentFile = parseAgentFile(content, file);
+        // 如果解析结果为 null，说明不是 Agent 文件（是 Skill 文件）
+        if (agentFile === null) continue;
         agents.push(agentFile);
       } catch (err) {
         continue;

package/src/core/parser.ts

@@ -1,9 +1,40 @@
 import matter from 'gray-matter';
 import type { Agent, AgentFile } from '../types/index.js';
 
-export function parseAgentFile(content: string, path: string): AgentFile {
+// Agent 特有字段，用于区分 Agent 和 Skill
+const AGENT_SPECIFIC_FIELDS = [
+  'mode',
+  'model',
+  'temperature',
+  'maxSteps',
+  'color',
+  'trigger',
+  'tools',
+  'permission',
+  'mcp',
+];
+
+/**
+ * 判断一个 markdown 文件内容是 Agent 还是 Skill
+ * 如果 frontmatter 中包含任何 Agent 特有字段，则认为是 Agent
+ */
+export function isAgentContent(content: string): boolean {
+  try {
+    const { data } = matter(content);
+    return AGENT_SPECIFIC_FIELDS.some(field => field in data);
+  } catch {
+    return false;
+  }
+}
+
+export function parseAgentFile(content: string, path: string): AgentFile | null {
   const { data, content: body } = matter(content);
   
+  // 如果不是 Agent 文件（是 Skill 文件），返回 null
+  if (!isAgentContent(content)) {
+    return null;
+  }
+  
   if (!data.description) {
     throw new Error(`Agent at ${path} is missing required "description" field in frontmatter`);
   }
@@ -31,7 +62,7 @@ export function parseAgentFile(content: string, path: string): AgentFile {
   };
 }
 
-export function parseAgentFromString(content: string, filename: string): AgentFile {
+export function parseAgentFromString(content: string, filename: string): AgentFile | null {
   const baseName = filename.replace(/\.md$/, '');
   return parseAgentFile(content, baseName);
 }