agent-resource-management 1.4.1 → 2.1.0

package/src/cmd/skill.ts

@@ -1,6 +1,7 @@
 import { ApiClient } from '../lib/client';
 import { loadConfig } from '../lib/storage';
 import { formatSkill, formatSkillDetail, success, error, info } from '../lib/formatter';
+import { shouldOutputJson, outputJson } from '../lib/output';
 import { validateZip, validateSkillDir } from '../lib/validate';
 import { writeFileSync, createWriteStream, existsSync, mkdirSync, statSync } from 'fs';
 import { join, basename, dirname } from 'path';
@@ -12,6 +13,10 @@ import { mkdtempSync, rmSync } from 'fs';
 export async function listSkills(): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
@@ -19,6 +24,10 @@ export async function listSkills(): Promise<void> {
   const client = new ApiClient(config.serverUrl, config.token);
   try {
     const result = await client.listSkills();
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: result });
+      return;
+    }
     if (result.skills.length === 0) {
       info('暂无 Skill');
       return;
@@ -29,6 +38,10 @@ export async function listSkills(): Promise<void> {
       console.log('');
     }
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'LIST_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`获取列表失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -37,6 +50,10 @@ export async function listSkills(): Promise<void> {
 export async function searchSkills(keyword: string): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
@@ -44,6 +61,10 @@ export async function searchSkills(keyword: string): Promise<void> {
   const client = new ApiClient(config.serverUrl, config.token);
   try {
     const result = await client.listSkills(keyword);
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: result });
+      return;
+    }
     if (result.skills.length === 0) {
       info(`没有找到包含 "${keyword}" 的 Skill`);
       return;
@@ -54,6 +75,10 @@ export async function searchSkills(keyword: string): Promise<void> {
       console.log('');
     }
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'SEARCH_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`搜索失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -62,6 +87,10 @@ export async function searchSkills(keyword: string): Promise<void> {
 export async function infoSkill(name: string): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
@@ -69,8 +98,16 @@ export async function infoSkill(name: string): Promise<void> {
   const client = new ApiClient(config.serverUrl, config.token);
   try {
     const skill = await client.getSkill(name);
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: skill });
+      return;
+    }
     console.log(formatSkillDetail(skill));
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'INFO_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`获取详情失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -79,18 +116,32 @@ export async function infoSkill(name: string): Promise<void> {
 export async function downloadSkill(name: string, outputDir?: string): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
 
   const client = new ApiClient(config.serverUrl, config.token);
   try {
-    info(`正在下载 ${name}...`);
+    if (shouldOutputJson()) {
+      info(`正在下载 ${name}...`);
+    }
     const buffer = await client.downloadSkill(name);
     const outputPath = join(outputDir || '.', `${name}.zip`);
     writeFileSync(outputPath, Buffer.from(buffer));
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: { path: outputPath } });
+      return;
+    }
     success(`已下载到 ${outputPath}`);
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'DOWNLOAD_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`下载失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -99,11 +150,19 @@ export async function downloadSkill(name: string, outputDir?: string): Promise<v
 export async function uploadSkill(filePath: string): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
 
   if (!existsSync(filePath)) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'FILE_NOT_FOUND', message: `上传失败: 目录不存在: ${filePath}` } });
+      process.exit(1);
+    }
     error(`上传失败: 目录不存在: ${filePath}`);
     process.exit(1);
   }
@@ -111,6 +170,10 @@ export async function uploadSkill(filePath: string): Promise<void> {
   const isZip = filePath.toLowerCase().endsWith('.zip');
   const validation = isZip ? validateZip(filePath) : validateSkillDir(filePath);
   if (!validation.valid) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'VALIDATION_FAILED', message: validation.errors.join(', ') } });
+      process.exit(1);
+    }
     error(`上传失败: ${validation.errors.join(', ')}`);
     process.exit(1);
   }
@@ -127,11 +190,21 @@ export async function uploadSkill(filePath: string): Promise<void> {
     }
 
     const client = new ApiClient(config.serverUrl, config.token);
-    info(`正在上传 ${filePath}...`);
+    if (shouldOutputJson()) {
+      info(`正在上传 ${filePath}...`);
+    }
     const skill = await client.uploadSkill(zipPath);
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: skill });
+      return;
+    }
     success(`上传成功! Skill: ${skill.name}`);
   } catch (err) {
     console.error('DEBUG upload error:', err);
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'UPLOAD_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`上传失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   } finally {
@@ -142,6 +215,10 @@ export async function uploadSkill(filePath: string): Promise<void> {
 export async function mySkills(): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
@@ -149,6 +226,10 @@ export async function mySkills(): Promise<void> {
   const client = new ApiClient(config.serverUrl, config.token);
   try {
     const skills = await client.getMySkills();
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: skills });
+      return;
+    }
     if (skills.length === 0) {
       info('您还没有发布任何 Skill');
       return;
@@ -159,6 +240,10 @@ export async function mySkills(): Promise<void> {
       console.log('');
     }
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'LIST_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`获取列表失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -167,6 +252,10 @@ export async function mySkills(): Promise<void> {
 export async function deleteSkill(name: string): Promise<void> {
   const config = loadConfig();
   if (!config?.token) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'NOT_LOGGED_IN', message: '未登录，请先运行 arm login' } });
+      process.exit(1);
+    }
     error('未登录，请先运行 arm login');
     process.exit(1);
   }
@@ -174,8 +263,16 @@ export async function deleteSkill(name: string): Promise<void> {
   const client = new ApiClient(config.serverUrl, config.token);
   try {
     await client.deleteSkill(name);
+    if (shouldOutputJson()) {
+      outputJson({ success: true, data: { name } });
+      return;
+    }
     success(`已删除 ${name}`);
   } catch (err) {
+    if (shouldOutputJson()) {
+      outputJson({ success: false, error: { code: 'DELETE_FAILED', message: err instanceof Error ? err.message : '未知错误' } });
+      process.exit(1);
+    }
     error(`删除失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
@@ -185,6 +282,22 @@ export async function validateSkill(filePath: string): Promise<void> {
   const isDir = existsSync(filePath) && statSync(filePath).isDirectory();
   const result = isDir ? validateSkillDir(filePath) : validateZip(filePath);
 
+  if (shouldOutputJson()) {
+    outputJson({
+      success: result.valid,
+      data: {
+        valid: result.valid,
+        errors: result.errors,
+        warnings: result.warnings,
+        metadata: result.metadata,
+      },
+    });
+    if (!result.valid) {
+      process.exit(1);
+    }
+    return;
+  }
+
   if (result.valid) {
     success('验证通过!');
   } else {

package/src/lib/output.ts

@@ -0,0 +1,35 @@
+import { loadConfig, saveConfig } from './storage';
+
+export type OutputMode = 'json' | 'text';
+
+export interface JsonResult<T = unknown> {
+  success: boolean;
+  data?: T;
+  error?: {
+    code: string;
+    message: string;
+  };
+}
+
+export function outputJson<T>(result: JsonResult<T>): void {
+  console.log(JSON.stringify(result, null, 2));
+}
+
+export function shouldOutputJson(): boolean {
+  if (process.argv.includes('--json') || process.argv.includes('-j')) {
+    return true;
+  }
+  const config = loadConfig();
+  return config.outputMode !== 'text';
+}
+
+export function getOutputMode(): OutputMode {
+  const config = loadConfig();
+  return config.outputMode || 'json';
+}
+
+export function setOutputMode(mode: OutputMode): void {
+  const config = loadConfig() || {};
+  config.outputMode = mode;
+  saveConfig(config);
+}

package/src/lib/storage.ts

@@ -12,6 +12,7 @@ interface Config {
     name: string;
     email: string;
   };
+  outputMode?: 'json' | 'text';
 }
 
 function ensureConfigDir() {

package/src/main.ts

@@ -3,6 +3,7 @@ import { listSkills, searchSkills, infoSkill, downloadSkill, uploadSkill, mySkil
 import { listAgents, searchAgents, infoAgent, downloadAgent, createAgent, updateAgent, deleteAgent, bindSkill, unbindSkill, bindKnowledge, unbindKnowledge } from './cmd/agent';
 import { listKnowledge, searchKnowledge, infoKnowledge, downloadKnowledge, uploadKnowledge, myKnowledge, deleteKnowledge } from './cmd/knowledge';
 import { showServer, setServer } from './cmd/server';
+import { getOutputMode, setOutputMode } from './lib/output';
 
 const args = process.argv.slice(2);
 const command = args[0];
@@ -160,6 +161,16 @@ async function main() {
       await getCurrentUser();
       break;
 
+    case 'output':
+      if (subCommand === 'json' || subCommand === 'text') {
+        setOutputMode(subCommand);
+        console.log(`输出模式已设置为: ${subCommand}`);
+      } else {
+        const mode = getOutputMode();
+        console.log(`当前输出模式: ${mode}`);
+      }
+      break;
+
     case 'agent':
       switch (subCommand) {
         case 'ls':
@@ -359,6 +370,7 @@ Agent Resource Management (arm)
 用法:
   arm login <server-url> <api-key>   登录
   arm logout                          登出
+  arm output [json|text]              设置/查看输出模式 (默认json)
   arm skill ls                        列出所有 Skill
   arm skill search <keyword>          搜索 Skill
   arm skill info <name>               查看 Skill 详情

package/test-regression.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CLI_DIR="/Users/lk/Documents/Dev/aims/xuanwu/xuanwu-agents/agent-sdk/agent-skill-system/cli"
+CLI_DIR="/Users/lk/Documents/Dev/aims/xuanwu/xuanwu-agents/agent-sdk/agent-resource-management/cli"
 DATA_DIR="$CLI_DIR/data/skills"
 SERVER_URL="http://localhost:3000"
 API_KEY="4567c9e607564e91b3898c46d89cb68dc4e40ec4a52b456699b695cf800fd446"