agent-resource-management 2.1.8 → 2.1.9

package/dist/main.js

@@ -16,6 +16,9 @@ class ApiClient {
   clearToken() {
     this.token = null;
   }
+  getToken() {
+    return this.token;
+  }
   async request(path, options = {}) {
     const headers = {
       "Content-Type": "application/json",
@@ -170,7 +173,7 @@ class ApiClient {
   async listKnowledge(keyword, page = 1, pageSize = 20) {
     let path = `/knowledges?page=${page}&pageSize=${pageSize}`;
     if (keyword) {
-      path += `&keyword=${encodeURIComponent(keyword)}`;
+      path += `&search=${encodeURIComponent(keyword)}`;
     }
     const res = await this.request(path);
     if (!res.ok) {
@@ -288,10 +291,10 @@ class ApiClient {
       throw new Error(res.msg);
     }
   }
-  async bindKnowledgeToAgent(agentId, knowledgeId, version, retrievalConfig) {
+  async bindKnowledgeToAgent(agentId, knowledgeId, version, retrievalConfig, kind) {
     const res = await this.request(`/agents/${agentId}/knowledges`, {
       method: "POST",
-      body: JSON.stringify({ knowledgeId, version, retrievalConfig })
+      body: JSON.stringify({ knowledgeId, version, retrievalConfig, kind })
     });
     if (!res.ok) {
       throw new Error(res.msg);
@@ -323,7 +326,7 @@ class ApiClient {
 }
 
 // src/lib/storage.ts
-import { writeFileSync, readFileSync, existsSync, mkdirSync } from "fs";
+import { writeFileSync, readFileSync, existsSync, mkdirSync, chmodSync } from "fs";
 import { join } from "path";
 var CONFIG_DIR = join(process.env.HOME || "/root", ".arm");
 var CONFIG_FILE = join(CONFIG_DIR, "config.json");
@@ -334,7 +337,8 @@ function ensureConfigDir() {
 }
 function saveConfig(config) {
   ensureConfigDir();
-  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), { mode: 384 });
+  chmodSync(CONFIG_FILE, 384);
 }
 function loadConfig() {
   try {
@@ -527,18 +531,32 @@ async function register(name, email, password) {
     process.exit(1);
   }
 }
-async function login(serverUrl, apiKey) {
+async function login() {
+  console.log("请在浏览器打开：" + (loadConfig()?.serverUrl || "http://localhost:3000") + "/settings/tokens");
+  console.log("生成一个 PAT（建议命名包含机器名），复制粘贴到此处：");
+  const { readline } = await import("readline");
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const token = await new Promise((resolve) => rl.question("PAT> ", (a) => {
+    rl.close();
+    resolve(a);
+  }));
+  const trimmed = token.trim();
+  if (!trimmed.startsWith("arm_pat_")) {
+    error("格式错误：应以 arm_pat_ 开头");
+    process.exit(1);
+  }
+  const config = loadConfig() || { serverUrl: "http://localhost:3000" };
+  config.serverUrl = config.serverUrl || "http://localhost:3000";
+  config.token = trimmed;
+  saveConfig(config);
+  const client = new ApiClient(config.serverUrl, trimmed);
   try {
-    const client = new ApiClient(serverUrl);
-    const loginRes = await client.login(apiKey);
-    saveConfig({
-      serverUrl,
-      token: loginRes.token,
-      user: loginRes.user
-    });
-    success(`登录成功! 欢迎, ${loginRes.user.name}`);
-  } catch (err) {
-    error(`登录失败: ${err instanceof Error ? err.message : "未知错误"}`);
+    const me = await client.me();
+    config.user = { id: me.id, name: me.name, email: me.email };
+    saveConfig(config);
+    success(`登录成功! 欢迎, ${me.name}`);
+  } catch (e) {
+    error(`Token 无效：${e instanceof Error ? e.message : e}`);
     process.exit(1);
   }
 }
@@ -1352,7 +1370,7 @@ async function unbindSkill(id, skillId, version) {
     process.exit(1);
   }
 }
-async function bindKnowledge(id, knowledgeId, version = "1.0.0", retrievalConfig) {
+async function bindKnowledge(id, knowledgeId, version = "1.0.0", retrievalConfig, kind) {
   const configStore = loadConfig();
   if (!configStore?.token) {
     if (shouldOutputJson()) {
@@ -1365,12 +1383,12 @@ async function bindKnowledge(id, knowledgeId, version = "1.0.0", retrievalConfig
   const client = new ApiClient(configStore.serverUrl, configStore.token);
   try {
     const parsedConfig = retrievalConfig ? JSON.parse(retrievalConfig) : undefined;
-    await client.bindKnowledgeToAgent(id, knowledgeId, version, parsedConfig);
+    await client.bindKnowledgeToAgent(id, knowledgeId, version, parsedConfig, kind);
     if (shouldOutputJson()) {
-      outputJson({ success: true, data: { agentId: id, knowledgeId, version, retrievalConfig: parsedConfig } });
+      outputJson({ success: true, data: { agentId: id, knowledgeId, version, kind: kind ?? "experience", retrievalConfig: parsedConfig } });
       return;
     }
-    success(`Knowledge "${knowledgeId}@${version}" 已绑定到 Agent "${id}"`);
+    success(`Knowledge "${knowledgeId}@${version}"（${kind ?? "experience"}）已绑定到 Agent "${id}"`);
   } catch (err) {
     if (shouldOutputJson()) {
       outputJson({ success: false, error: { code: "BIND_FAILED", message: err instanceof Error ? err.message : "未知错误" } });
@@ -2227,6 +2245,67 @@ function setServer(url) {
   info(`已设置服务端: ${url}`);
 }
 
+// src/cmd/token.ts
+async function ensureClient() {
+  const config = loadConfig();
+  if (!config?.token) {
+    error("未登录，请先运行 arm login");
+    process.exit(1);
+  }
+  return { client: new ApiClient(config.serverUrl, config.token), serverUrl: config.serverUrl };
+}
+async function listTokens() {
+  const { client, serverUrl } = await ensureClient();
+  const headers = { Authorization: `Bearer ${client.getToken() ?? ""}` };
+  const res = await fetch(`${serverUrl}/api/v1/tokens`, { headers });
+  const j = await res.json();
+  if (!j.ok) {
+    error(j.msg);
+    process.exit(1);
+  }
+  console.table(j.data.tokens.map((t) => ({
+    id: t.id,
+    name: t.name,
+    created: t.createdAt,
+    lastUsed: t.lastUsedAt ?? "(never)",
+    expires: t.expiresAt ?? "(never)"
+  })));
+  success("完成");
+}
+async function createToken(name, expiresAt) {
+  const { client, serverUrl } = await ensureClient();
+  const headers = {
+    "Content-Type": "application/json",
+    Authorization: `Bearer ${client.getToken() ?? ""}`
+  };
+  const res = await fetch(`${serverUrl}/api/v1/tokens`, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({ name, expiresAt })
+  });
+  const j = await res.json();
+  if (!j.ok) {
+    error(j.msg);
+    process.exit(1);
+  }
+  success("Token 已创建（仅此一次展示，请妥善保存）：");
+  console.log(j.data.token);
+}
+async function revokeToken(id) {
+  const { client, serverUrl } = await ensureClient();
+  const headers = { Authorization: `Bearer ${client.getToken() ?? ""}` };
+  const res = await fetch(`${serverUrl}/api/v1/tokens/${id}`, {
+    method: "DELETE",
+    headers
+  });
+  const j = await res.json();
+  if (!j.ok) {
+    error(j.msg);
+    process.exit(1);
+  }
+  success(`已撤销 ${id}`);
+}
+
 // src/main.ts
 import { readFileSync as readFileSync4 } from "fs";
 import { join as join6 } from "path";
@@ -2257,11 +2336,7 @@ async function main() {
       }
       break;
     case "login":
-      if (!args[1] || !args[2]) {
-        console.error("用法: arm login <server-url> <api-key>");
-        process.exit(1);
-      }
-      await login(args[1], args[2]);
+      await login();
       break;
     case "logout":
       await logout();
@@ -2326,7 +2401,7 @@ async function main() {
         default:
           console.log(`
 可用命令:
-  arm login <server-url> <api-key>   登录
+  arm login                            登录（粘贴 PAT）
   arm logout                          登出
   arm skill ls                        列出所有 Skill
   arm skill search <keyword>          搜索 Skill
@@ -2400,6 +2475,26 @@ async function main() {
     case "me":
       await getCurrentUser();
       break;
+    case "token":
+      if (subCommand === "list") {
+        await listTokens();
+      } else if (subCommand === "create") {
+        if (!args[2]) {
+          console.error("用法: arm token create <name> [expiresAt]");
+          process.exit(1);
+        }
+        await createToken(args[2], args[3]);
+      } else if (subCommand === "revoke") {
+        if (!args[2]) {
+          console.error("用法: arm token revoke <id>");
+          process.exit(1);
+        }
+        await revokeToken(args[2]);
+      } else {
+        console.error("用法: arm token list|create <name> [expiresAt]|revoke <id>");
+        process.exit(1);
+      }
+      break;
     case "output":
       if (subCommand === "json" || subCommand === "text") {
         setOutputMode(subCommand);
@@ -2535,6 +2630,7 @@ async function main() {
             let knowledgeId;
             let skillConfig;
             let knowledgeConfig;
+            let knowledgeKind;
             for (let i = 3;i < args.length; i++) {
               const arg = args[i];
               if (arg.startsWith("--skill=")) {
@@ -2545,14 +2641,17 @@ async function main() {
                 skillConfig = arg.split("=").slice(1).join("=");
               } else if (arg.startsWith("--knowledge-config=")) {
                 knowledgeConfig = arg.split("=").slice(1).join("=");
+              } else if (arg.startsWith("--kind=")) {
+                knowledgeKind = arg.split("=").slice(1).join("=");
               }
             }
             if (skillId) {
               await bindSkill(id, skillId, undefined, skillConfig);
             } else if (knowledgeId) {
-              await bindKnowledge(id, knowledgeId, undefined, knowledgeConfig);
+              const kind = knowledgeKind === "essential" || knowledgeKind === "experience" ? knowledgeKind : undefined;
+              await bindKnowledge(id, knowledgeId, undefined, knowledgeConfig, kind);
             } else {
-              console.error("用法: arm agent bind <id> --skill=<skillId> 或 --knowledge=<knowledgeId>");
+              console.error("用法: arm agent bind <id> --skill=<skillId> 或 --knowledge=<knowledgeId> [--kind=essential|experience]");
               process.exit(1);
             }
           }
@@ -2646,7 +2745,7 @@ Agent Resource Management (arm)
 
 用法:
   arm register [--name=<name>] [--email=<email>] [--password=<password>]  注册 (交互式或参数)
-  arm login <server-url> <api-key>   登录
+  arm login                            登录（粘贴 PAT）
   arm logout                          登出
   arm output [json|text]              设置/查看输出模式 (默认json)
   arm skill ls                        列出所有 Skill

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-resource-management",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "type": "module",
   "bin": {
     "arm": "./dist/main.js"

package/src/cmd/agent.ts

@@ -217,7 +217,7 @@ export async function unbindSkill(id: string, skillId: string, version?: string)
   }
 }
 
-export async function bindKnowledge(id: string, knowledgeId: string, version: string = '1.0.0', retrievalConfig?: string): Promise<void> {
+export async function bindKnowledge(id: string, knowledgeId: string, version: string = '1.0.0', retrievalConfig?: string, kind?: 'essential' | 'experience'): Promise<void> {
   const configStore = loadConfig();
   if (!configStore?.token) {
     if (shouldOutputJson()) {
@@ -231,13 +231,13 @@ export async function bindKnowledge(id: string, knowledgeId: string, version: st
   const client = new ApiClient(configStore.serverUrl, configStore.token);
   try {
     const parsedConfig = retrievalConfig ? JSON.parse(retrievalConfig) : undefined;
-    await client.bindKnowledgeToAgent(id, knowledgeId, version, parsedConfig);
+    await client.bindKnowledgeToAgent(id, knowledgeId, version, parsedConfig, kind);
 
     if (shouldOutputJson()) {
-      outputJson({ success: true, data: { agentId: id, knowledgeId, version, retrievalConfig: parsedConfig } });
+      outputJson({ success: true, data: { agentId: id, knowledgeId, version, kind: kind ?? 'experience', retrievalConfig: parsedConfig } });
       return;
     }
-    success(`Knowledge "${knowledgeId}@${version}" 已绑定到 Agent "${id}"`);
+    success(`Knowledge "${knowledgeId}@${version}"（${kind ?? 'experience'}）已绑定到 Agent "${id}"`);
   } catch (err) {
     if (shouldOutputJson()) {
       outputJson({ success: false, error: { code: 'BIND_FAILED', message: err instanceof Error ? err.message : '未知错误' } });

package/src/cmd/auth.ts

@@ -52,20 +52,32 @@ export async function register(name?: string, email?: string, password?: string)
   }
 }
 
-export async function login(serverUrl: string, apiKey: string): Promise<void> {
-  try {
-    const client = new ApiClient(serverUrl);
-    const loginRes = await client.login(apiKey);
+export async function login(): Promise<void> {
+  console.log('请在浏览器打开：' + (loadConfig()?.serverUrl || 'http://localhost:3000') + '/settings/tokens');
+  console.log('生成一个 PAT（建议命名包含机器名），复制粘贴到此处：');
+  const { readline } = await import('readline');
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const token = await new Promise<string>((resolve) => rl.question('PAT> ', (a) => { rl.close(); resolve(a); }));
+  const trimmed = token.trim();
+  if (!trimmed.startsWith('arm_pat_')) {
+    error('格式错误：应以 arm_pat_ 开头');
+    process.exit(1);
+  }
 
-    saveConfig({
-      serverUrl,
-      token: loginRes.token,
-      user: loginRes.user,
-    });
+  const config = loadConfig() || { serverUrl: 'http://localhost:3000' };
+  config.serverUrl = config.serverUrl || 'http://localhost:3000';
+  config.token = trimmed;
+  saveConfig(config);
 
-    success(`登录成功! 欢迎, ${loginRes.user.name}`);
-  } catch (err) {
-    error(`登录失败: ${err instanceof Error ? err.message : '未知错误'}`);
+  // 顺便用这个 token 拉一次用户信息
+  const client = new ApiClient(config.serverUrl, trimmed);
+  try {
+    const me = await client.me();
+    config.user = { id: me.id, name: me.name, email: me.email };
+    saveConfig(config);
+    success(`登录成功! 欢迎, ${me.name}`);
+  } catch (e) {
+    error(`Token 无效：${e instanceof Error ? e.message : e}`);
     process.exit(1);
   }
 }
@@ -97,4 +109,4 @@ export async function getCurrentUser(): Promise<void> {
     error(`获取用户信息失败: ${err instanceof Error ? err.message : '未知错误'}`);
     process.exit(1);
   }
-}
+}

package/src/cmd/token.ts

@@ -0,0 +1,57 @@
+import { ApiClient } from '../lib/client';
+import { loadConfig } from '../lib/storage';
+import { success, error } from '../lib/formatter';
+
+async function ensureClient(): Promise<{ client: ApiClient; serverUrl: string }> {
+  const config = loadConfig();
+  if (!config?.token) {
+    error('未登录，请先运行 arm login');
+    process.exit(1);
+  }
+  return { client: new ApiClient(config.serverUrl, config.token), serverUrl: config.serverUrl };
+}
+
+export async function listTokens(): Promise<void> {
+  const { client, serverUrl } = await ensureClient();
+  const headers = { Authorization: `Bearer ${client.getToken() ?? ''}` };
+  const res = await fetch(`${serverUrl}/api/v1/tokens`, { headers });
+  const j = await res.json();
+  if (!j.ok) { error(j.msg); process.exit(1); }
+  console.table(j.data.tokens.map((t: any) => ({
+    id: t.id,
+    name: t.name,
+    created: t.createdAt,
+    lastUsed: t.lastUsedAt ?? '(never)',
+    expires: t.expiresAt ?? '(never)',
+  })));
+  success('完成');
+}
+
+export async function createToken(name: string, expiresAt?: string): Promise<void> {
+  const { client, serverUrl } = await ensureClient();
+  const headers = {
+    'Content-Type': 'application/json',
+    Authorization: `Bearer ${client.getToken() ?? ''}`,
+  };
+  const res = await fetch(`${serverUrl}/api/v1/tokens`, {
+    method: 'POST',
+    headers,
+    body: JSON.stringify({ name, expiresAt }),
+  });
+  const j = await res.json();
+  if (!j.ok) { error(j.msg); process.exit(1); }
+  success('Token 已创建（仅此一次展示，请妥善保存）：');
+  console.log(j.data.token);
+}
+
+export async function revokeToken(id: string): Promise<void> {
+  const { client, serverUrl } = await ensureClient();
+  const headers = { Authorization: `Bearer ${client.getToken() ?? ''}` };
+  const res = await fetch(`${serverUrl}/api/v1/tokens/${id}`, {
+    method: 'DELETE',
+    headers,
+  });
+  const j = await res.json();
+  if (!j.ok) { error(j.msg); process.exit(1); }
+  success(`已撤销 ${id}`);
+}

package/src/lib/client.ts

@@ -17,6 +17,10 @@ export class ApiClient {
     this.token = null;
   }
 
+  getToken(): string | null {
+    return this.token;
+  }
+
   private async request<T>(
     path: string,
     options: RequestInit = {}
@@ -200,7 +204,7 @@ export class ApiClient {
   async listKnowledge(keyword?: string, page = 1, pageSize = 20): Promise<{ knowledges: any[]; total: number }> {
     let path = `/knowledges?page=${page}&pageSize=${pageSize}`;
     if (keyword) {
-      path += `&keyword=${encodeURIComponent(keyword)}`;
+      path += `&search=${encodeURIComponent(keyword)}`;
     }
     const res = await this.request<{ knowledges: any[]; total: number }>(path);
     if (!res.ok) {
@@ -349,10 +353,10 @@ export class ApiClient {
     }
   }
 
-  async bindKnowledgeToAgent(agentId: string, knowledgeId: string, version: string, retrievalConfig?: { topK?: number; similarityThreshold?: number }): Promise<void> {
+  async bindKnowledgeToAgent(agentId: string, knowledgeId: string, version: string, retrievalConfig?: { topK?: number; similarityThreshold?: number }, kind?: 'essential' | 'experience'): Promise<void> {
     const res = await this.request<null>(`/agents/${agentId}/knowledges`, {
       method: 'POST',
-      body: JSON.stringify({ knowledgeId, version, retrievalConfig }),
+      body: JSON.stringify({ knowledgeId, version, retrievalConfig, kind }),
     });
     if (!res.ok) {
       throw new Error(res.msg);

package/src/lib/storage.ts

@@ -1,4 +1,4 @@
-import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
+import { writeFileSync, readFileSync, existsSync, mkdirSync, chmodSync } from 'fs';
 import { join } from 'path';
 
 const CONFIG_DIR = join(process.env.HOME || '/root', '.arm');
@@ -23,7 +23,8 @@ function ensureConfigDir() {
 
 export function saveConfig(config: Config): void {
   ensureConfigDir();
-  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+  writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), { mode: 0o600 });
+  chmodSync(CONFIG_FILE, 0o600);
 }
 
 export function loadConfig(): Config | null {

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, createAgentFromFolder, syncAgent } from './cmd/agent';
 import { listKnowledge, searchKnowledge, infoKnowledge, downloadKnowledge, uploadKnowledge, myKnowledge, deleteKnowledge } from './cmd/knowledge';
 import { showServer, setServer } from './cmd/server';
+import { listTokens, createToken, revokeToken } from './cmd/token';
 import { getOutputMode, setOutputMode } from './lib/output';
 
 import { readFileSync } from 'fs';
@@ -38,11 +39,7 @@ async function main() {
       break;
 
     case 'login':
-      if (!args[1] || !args[2]) {
-        console.error('用法: arm login <server-url> <api-key>');
-        process.exit(1);
-      }
-      await login(args[1], args[2]);
+      await login();
       break;
 
     case 'logout':
@@ -110,7 +107,7 @@ async function main() {
         default:
           console.log(`
 可用命令:
-  arm login <server-url> <api-key>   登录
+  arm login                            登录（粘贴 PAT）
   arm logout                          登出
   arm skill ls                        列出所有 Skill
   arm skill search <keyword>          搜索 Skill
@@ -187,6 +184,27 @@ async function main() {
       await getCurrentUser();
       break;
 
+    case 'token':
+      if (subCommand === 'list') {
+        await listTokens();
+      } else if (subCommand === 'create') {
+        if (!args[2]) {
+          console.error('用法: arm token create <name> [expiresAt]');
+          process.exit(1);
+        }
+        await createToken(args[2], args[3]);
+      } else if (subCommand === 'revoke') {
+        if (!args[2]) {
+          console.error('用法: arm token revoke <id>');
+          process.exit(1);
+        }
+        await revokeToken(args[2]);
+      } else {
+        console.error('用法: arm token list|create <name> [expiresAt]|revoke <id>');
+        process.exit(1);
+      }
+      break;
+
     case 'output':
       if (subCommand === 'json' || subCommand === 'text') {
         setOutputMode(subCommand);
@@ -328,6 +346,7 @@ async function main() {
             let knowledgeId: string | undefined;
             let skillConfig: string | undefined;
             let knowledgeConfig: string | undefined;
+            let knowledgeKind: string | undefined;
 
             for (let i = 3; i < args.length; i++) {
               const arg = args[i];
@@ -339,15 +358,18 @@ async function main() {
                 skillConfig = arg.split('=').slice(1).join('=');
               } else if (arg.startsWith('--knowledge-config=')) {
                 knowledgeConfig = arg.split('=').slice(1).join('=');
+              } else if (arg.startsWith('--kind=')) {
+                knowledgeKind = arg.split('=').slice(1).join('=');
               }
             }
 
             if (skillId) {
               await bindSkill(id, skillId, undefined, skillConfig);
             } else if (knowledgeId) {
-              await bindKnowledge(id, knowledgeId, undefined, knowledgeConfig);
+              const kind = (knowledgeKind === 'essential' || knowledgeKind === 'experience') ? knowledgeKind : undefined;
+              await bindKnowledge(id, knowledgeId, undefined, knowledgeConfig, kind);
             } else {
-              console.error('用法: arm agent bind <id> --skill=<skillId> 或 --knowledge=<knowledgeId>');
+              console.error('用法: arm agent bind <id> --skill=<skillId> 或 --knowledge=<knowledgeId> [--kind=essential|experience]');
               process.exit(1);
             }
           }
@@ -444,7 +466,7 @@ Agent Resource Management (arm)
 
 用法:
   arm register [--name=<name>] [--email=<email>] [--password=<password>]  注册 (交互式或参数)
-  arm login <server-url> <api-key>   登录
+  arm login                            登录（粘贴 PAT）
   arm logout                          登出
   arm output [json|text]              设置/查看输出模式 (默认json)
   arm skill ls                        列出所有 Skill