@kevisual/router 0.0.73 → 0.0.75

package/agent/routes/route-create.ts

@@ -1,6 +1,7 @@
 import { app, createSkill, tool } from '../app.ts';
 import * as docs from '../gen/index.ts'
 import * as pkgs from '../../package.json' assert { type: 'json' };
+import z from 'zod';
 app.route({
   path: 'router-skill',
   key: 'create-route',
@@ -32,14 +33,47 @@ app.route({
   }
 }).addTo(app);
 
-// 调用router应用 path router-skill key version
+// 获取最新router版本号
 app.route({
   path: 'router-skill',
   key: 'version',
-  description: '获取路由技能版本',
+  description: '获取最新router版本号',
   middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'router-skill-version',
+      title: '获取最新router版本号',
+      summary: '获取最新router版本号',
+      args: {}
+    })
+  },
 }).define(async (ctx) => {
   ctx.body = {
     content: pkgs.version || 'unknown'
   }
-}).addTo(app);
+}).addTo(app);
+
+// 执行技能test-route-skill,name为abearxiong
+app.route({
+  path: 'route-skill',
+  key: 'test',
+  description: '测试路由技能',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'test-route-skill',
+      title: '测试路由技能',
+      summary: '测试路由技能是否正常工作',
+      args: z.object({
+        name: z.string().describe('名字'),
+      })
+    })
+  },
+}).define(async (ctx) => {
+  const name = ctx.query.name || 'unknown';
+  ctx.body = {
+    content: '测试成功,你好 ' + name
+  }
+}).addTo(app)

package/dist/app.js

@@ -16745,6 +16745,9 @@ function date4(params) {
 
 // node_modules/.pnpm/zod@4.3.6/node_modules/zod/v4/classic/external.js
 config(en_default());
+// node_modules/.pnpm/zod@4.3.6/node_modules/zod/index.js
+var zod_default = exports_external;
+
 // node_modules/.pnpm/nanoid@5.1.6/node_modules/nanoid/index.js
 import { webcrypto as crypto } from "node:crypto";
 var POOL_SIZE_MULTIPLIER = 128;
@@ -16799,6 +16802,12 @@ var tool = {
   schema: exports_external
 };
 var createSkill = (skill) => {
+  if (skill.tags) {
+    const hasOpencode = skill.tags.includes("opencode");
+    if (!hasOpencode) {
+      skill.tags.push("opencode");
+    }
+  }
   return {
     args: {},
     ...skill
@@ -16919,6 +16928,10 @@ var toJSONSchema2 = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     const args = pickValues.metadata.args;
+    if (args && typeof args === "object" && args.toJSONSchema && typeof args.toJSONSchema === "function") {
+      pickValues.metadata.args = args.toJSONSchema();
+      return pickValues;
+    }
     const keys = Object.keys(args);
     const newArgs = {};
     for (let key of keys) {
@@ -16937,6 +16950,10 @@ var fromJSONSchema2 = (route) => {
   const args = route?.metadata?.args;
   if (!args)
     return route;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    route.metadata.args = exports_external.fromJSONSchema(args);
+    return route;
+  }
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
@@ -17283,7 +17300,7 @@ class QueryRouter {
           });
           ctx.body = {
             list: list.map((item) => {
-              const route = pick(item, ["id", "path", "key", "description", "middleware"]);
+              const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
               return toJSONSchema2(route);
             }),
             isUser
@@ -19175,8 +19192,12 @@ var addCallFn = (app2) => {
       tags: ["opencode"],
       ...createSkill({
         skill: "call-app",
-        title: "调用app应用",
-        summary: "调用router的应用, 参数path, key, payload",
+        title: "调用app应用,非技能模块",
+        summary: `调用router的应用(非技能模块)，适用于需要直接调用应用而不是技能的场景
+条件1: 参数path(string), key(string), payload(object)
+条件2: 当前的应用调用的模式不是技能
+
+`,
         args: {
           path: tool.schema.string().describe("应用路径，例如 cnb"),
           key: tool.schema.string().optional().describe("应用key，例如 list-repos"),
@@ -19196,6 +19217,7 @@ var addCallFn = (app2) => {
   }).addTo(app2);
 };
 var createRouterAgentPluginFn = (opts) => {
+  new Promise((resolve) => setTimeout(resolve, 100));
   let router = opts?.router;
   if (!router) {
     const app2 = useContextKey("app");
@@ -19213,6 +19235,9 @@ var createRouterAgentPluginFn = (opts) => {
   const _routes = filter(router.routes, opts?.query || "");
   const routes = _routes.filter((r) => {
     const metadata = r.metadata;
+    if (metadata && metadata.skill && metadata.summary) {
+      return true;
+    }
     if (metadata && metadata.tags && metadata.tags.includes("opencode")) {
       return !!metadata.skill;
     }
@@ -19226,15 +19251,16 @@ var createRouterAgentPluginFn = (opts) => {
       tool: {
         ...routes.reduce((acc, route) => {
           const metadata = route.metadata;
+          let args = extractArgs(metadata?.args);
           acc[metadata.skill] = {
             name: metadata.title || metadata.skill,
             description: metadata.summary || "",
-            args: metadata.args || {},
-            async execute(args) {
+            args,
+            async execute(args2) {
               const res = await router.run({
                 path: route.path,
                 key: route.key,
-                payload: args
+                payload: args2
               }, { appId: router.appId });
               if (res.code === 200) {
                 if (res.data?.content) {
@@ -19261,6 +19287,12 @@ var createRouterAgentPluginFn = (opts) => {
   };
   return AgentPlugin;
 };
+var extractArgs = (args) => {
+  if (args && typeof args === "object" && typeof args.shape === "object") {
+    return args.shape;
+  }
+  return args || {};
+};
 
 // agent/gen/index.ts
 var readme = `# router
@@ -19453,7 +19485,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.73";
+var version2 = "0.0.75";
 
 // agent/routes/route-create.ts
 app.route({
@@ -19493,13 +19525,44 @@ app.route({
 app.route({
   path: "router-skill",
   key: "version",
-  description: "获取路由技能版本",
-  middleware: ["auth"]
+  description: "获取最新router版本号",
+  middleware: ["auth"],
+  metadata: {
+    tags: ["opencode"],
+    ...createSkill({
+      skill: "router-skill-version",
+      title: "获取最新router版本号",
+      summary: "获取最新router版本号",
+      args: {}
+    })
+  }
 }).define(async (ctx) => {
   ctx.body = {
     content: version2 || "unknown"
   };
 }).addTo(app);
+app.route({
+  path: "route-skill",
+  key: "test",
+  description: "测试路由技能",
+  middleware: ["auth"],
+  metadata: {
+    tags: ["opencode"],
+    ...createSkill({
+      skill: "test-route-skill",
+      title: "测试路由技能",
+      summary: "测试路由技能是否正常工作",
+      args: zod_default.object({
+        name: zod_default.string().describe("名字")
+      })
+    })
+  }
+}).define(async (ctx) => {
+  const name = ctx.query.name || "unknown";
+  ctx.body = {
+    content: "测试成功,你好 " + name
+  };
+}).addTo(app);
 
 // agent/routes/index.ts
 if (!app.hasRoute("auth", "")) {

package/dist/opencode.d.ts

@@ -719,5 +719,12 @@ declare const createRouterAgentPluginFn: (opts?: {
     hooks?: (plugin: PluginInput) => Promise<Hooks>;
 }) => Plugin;
 declare const usePluginInput: () => PluginInput;
+/**
+ * 如果args是z.object类型，拆分第一个Object的属性，比如z.object({ name: z.string(), age: z.number() })，拆分成{name: z.string(), age: z.number()}
+ * 如果args是普通对象，直接返回
+ * @param args
+ * @returns
+ */
+declare const extractArgs: (args: any) => any;
 
-export { addCallFn, createRouterAgentPluginFn, usePluginInput };
+export { addCallFn, createRouterAgentPluginFn, extractArgs, usePluginInput };

package/dist/opencode.js

@@ -14339,6 +14339,12 @@ var tool = {
   schema: exports_external
 };
 var createSkill = (skill) => {
+  if (skill.tags) {
+    const hasOpencode = skill.tags.includes("opencode");
+    if (!hasOpencode) {
+      skill.tags.push("opencode");
+    }
+  }
   return {
     args: {},
     ...skill
@@ -14699,8 +14705,12 @@ var addCallFn = (app) => {
       tags: ["opencode"],
       ...createSkill({
         skill: "call-app",
-        title: "调用app应用",
-        summary: "调用router的应用, 参数path, key, payload",
+        title: "调用app应用,非技能模块",
+        summary: `调用router的应用(非技能模块)，适用于需要直接调用应用而不是技能的场景
+条件1: 参数path(string), key(string), payload(object)
+条件2: 当前的应用调用的模式不是技能
+
+`,
         args: {
           path: tool.schema.string().describe("应用路径，例如 cnb"),
           key: tool.schema.string().optional().describe("应用key，例如 list-repos"),
@@ -14720,6 +14730,7 @@ var addCallFn = (app) => {
   }).addTo(app);
 };
 var createRouterAgentPluginFn = (opts) => {
+  new Promise((resolve) => setTimeout(resolve, 100));
   let router = opts?.router;
   if (!router) {
     const app = useContextKey("app");
@@ -14737,6 +14748,9 @@ var createRouterAgentPluginFn = (opts) => {
   const _routes = filter(router.routes, opts?.query || "");
   const routes = _routes.filter((r) => {
     const metadata = r.metadata;
+    if (metadata && metadata.skill && metadata.summary) {
+      return true;
+    }
     if (metadata && metadata.tags && metadata.tags.includes("opencode")) {
       return !!metadata.skill;
     }
@@ -14750,15 +14764,16 @@ var createRouterAgentPluginFn = (opts) => {
       tool: {
         ...routes.reduce((acc, route) => {
           const metadata = route.metadata;
+          let args = extractArgs(metadata?.args);
           acc[metadata.skill] = {
             name: metadata.title || metadata.skill,
             description: metadata.summary || "",
-            args: metadata.args || {},
-            async execute(args) {
+            args,
+            async execute(args2) {
               const res = await router.run({
                 path: route.path,
                 key: route.key,
-                payload: args
+                payload: args2
               }, { appId: router.appId });
               if (res.code === 200) {
                 if (res.data?.content) {
@@ -14788,8 +14803,15 @@ var createRouterAgentPluginFn = (opts) => {
 var usePluginInput = () => {
   return useContextKey("plugin-input");
 };
+var extractArgs = (args) => {
+  if (args && typeof args === "object" && typeof args.shape === "object") {
+    return args.shape;
+  }
+  return args || {};
+};
 export {
   usePluginInput,
+  extractArgs,
   createRouterAgentPluginFn,
   addCallFn
 };

package/dist/router-browser.d.ts

@@ -149,6 +149,7 @@ type Skill<T = SimpleObject$1> = {
     skill: string;
     title: string;
     summary?: string;
+    tags?: string[];
     args?: {
         [key: string]: any;
     };

package/dist/router-browser.js

@@ -13966,6 +13966,12 @@ var tool = {
   schema: exports_external
 };
 var createSkill = (skill) => {
+  if (skill.tags) {
+    const hasOpencode = skill.tags.includes("opencode");
+    if (!hasOpencode) {
+      skill.tags.push("opencode");
+    }
+  }
   return {
     args: {},
     ...skill
@@ -14086,6 +14092,10 @@ var toJSONSchema2 = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     const args = pickValues.metadata.args;
+    if (args && typeof args === "object" && args.toJSONSchema && typeof args.toJSONSchema === "function") {
+      pickValues.metadata.args = args.toJSONSchema();
+      return pickValues;
+    }
     const keys = Object.keys(args);
     const newArgs = {};
     for (let key of keys) {
@@ -14104,6 +14114,10 @@ var fromJSONSchema2 = (route) => {
   const args = route?.metadata?.args;
   if (!args)
     return route;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    route.metadata.args = exports_external.fromJSONSchema(args);
+    return route;
+  }
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
@@ -14450,7 +14464,7 @@ class QueryRouter {
           });
           ctx.body = {
             list: list.map((item) => {
-              const route = pick(item, ["id", "path", "key", "description", "middleware"]);
+              const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
               return toJSONSchema2(route);
             }),
             isUser

package/dist/router.d.ts

@@ -155,6 +155,7 @@ type Skill<T = SimpleObject$1> = {
     skill: string;
     title: string;
     summary?: string;
+    tags?: string[];
     args?: {
         [key: string]: any;
     };

package/dist/router.js

@@ -16799,6 +16799,12 @@ var tool = {
   schema: exports_external
 };
 var createSkill = (skill) => {
+  if (skill.tags) {
+    const hasOpencode = skill.tags.includes("opencode");
+    if (!hasOpencode) {
+      skill.tags.push("opencode");
+    }
+  }
   return {
     args: {},
     ...skill
@@ -16919,6 +16925,10 @@ var toJSONSchema2 = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     const args = pickValues.metadata.args;
+    if (args && typeof args === "object" && args.toJSONSchema && typeof args.toJSONSchema === "function") {
+      pickValues.metadata.args = args.toJSONSchema();
+      return pickValues;
+    }
     const keys = Object.keys(args);
     const newArgs = {};
     for (let key of keys) {
@@ -16937,6 +16947,10 @@ var fromJSONSchema2 = (route) => {
   const args = route?.metadata?.args;
   if (!args)
     return route;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    route.metadata.args = exports_external.fromJSONSchema(args);
+    return route;
+  }
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
@@ -17283,7 +17297,7 @@ class QueryRouter {
           });
           ctx.body = {
             list: list.map((item) => {
-              const route = pick(item, ["id", "path", "key", "description", "middleware"]);
+              const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
               return toJSONSchema2(route);
             }),
             isUser

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -28,7 +28,7 @@
     "@kevisual/dts": "^0.0.4",
     "@kevisual/js-filter": "^0.0.5",
     "@kevisual/local-proxy": "^0.0.8",
-    "@kevisual/query": "^0.0.43",
+    "@kevisual/query": "^0.0.46",
     "@kevisual/use-config": "^1.0.30",
     "@opencode-ai/plugin": "^1.2.6",
     "@types/bun": "^1.3.9",

package/src/opencode.ts

@@ -1,5 +1,5 @@
 import { useContextKey } from '@kevisual/context'
-import { createSkill, type QueryRouterServer, tool, type QueryRouter, type Skill } from './route.ts'
+import { createSkill, type QueryRouterServer, tool, type Skill } from './route.ts'
 import { type App } from './app.ts'
 import { PluginInput, type Plugin, Hooks } from "@opencode-ai/plugin"
 
@@ -15,8 +15,12 @@ export const addCallFn = (app: App) => {
       tags: ['opencode'],
       ...createSkill({
         skill: 'call-app',
-        title: '调用app应用',
-        summary: '调用router的应用, 参数path, key, payload',
+        title: '调用app应用,非技能模块',
+        summary: `调用router的应用(非技能模块)，适用于需要直接调用应用而不是技能的场景
+条件1: 参数path(string), key(string), payload(object)
+条件2: 当前的应用调用的模式不是技能
+
+`,
         args: {
           path: tool.schema.string().describe('应用路径，例如 cnb'),
           key: tool.schema.string().optional().describe('应用key，例如 list-repos'),
@@ -42,7 +46,9 @@ export const createRouterAgentPluginFn = (opts?: {
   query?: string,
   hooks?: (plugin: PluginInput) => Promise<Hooks>
 }) => {
+  new Promise(resolve => setTimeout(resolve, 100)) // 等待路由加载
   let router = opts?.router
+
   if (!router) {
     const app = useContextKey<App>('app')
     router = app
@@ -59,13 +65,15 @@ export const createRouterAgentPluginFn = (opts?: {
   const _routes = filter(router.routes, opts?.query || '')
   const routes = _routes.filter(r => {
     const metadata = r.metadata as Skill
+    if (metadata && metadata.skill && metadata.summary) {
+      return true
+    }
     if (metadata && metadata.tags && metadata.tags.includes('opencode')) {
       return !!metadata.skill
     }
     return false
   });
-
-  // opencode run "查看系统信息"
+  // opencode run "使用技能查看系统信息"
   const AgentPlugin: Plugin = async (pluginInput) => {
     useContextKey<PluginInput>('plugin-input', () => pluginInput, true)
     const hooks = opts?.hooks ? await opts.hooks(pluginInput) : {}
@@ -74,10 +82,11 @@ export const createRouterAgentPluginFn = (opts?: {
       'tool': {
         ...routes.reduce((acc, route) => {
           const metadata = route.metadata as Skill
+          let args = extractArgs(metadata?.args)
           acc[metadata.skill!] = {
             name: metadata.title || metadata.skill,
             description: metadata.summary || '',
-            args: metadata.args || {},
+            args: args,
             async execute(args: Record<string, any>) {
               const res = await router.run({
                 path: route.path,
@@ -117,4 +126,17 @@ export const createRouterAgentPluginFn = (opts?: {
 
 export const usePluginInput = (): PluginInput => {
   return useContextKey<PluginInput>('plugin-input')
+}
+
+/**
+ * 如果args是z.object类型，拆分第一个Object的属性，比如z.object({ name: z.string(), age: z.number() })，拆分成{name: z.string(), age: z.number()}
+ * 如果args是普通对象，直接返回
+ * @param args 
+ * @returns
+ */
+export const extractArgs = (args: any) => {
+  if (args && typeof args === 'object' && typeof args.shape === 'object') {
+    return args.shape
+  }
+  return args || {}
 }

package/src/route.ts

@@ -97,6 +97,7 @@ export type Skill<T = SimpleObject> = {
   skill: string;
   title: string;
   summary?: string;
+  tags?: string[];
   args?: {
     [key: string]: any
   };
@@ -106,6 +107,12 @@ export const tool = {
 }
 /** */
 export const createSkill = <T = SimpleObject>(skill: Skill<T>): Skill<T> => {
+  if (skill.tags) {
+    const hasOpencode = skill.tags.includes('opencode');
+    if (!hasOpencode) {
+      skill.tags.push('opencode');
+    }
+  }
   return {
     args: {},
     ...skill
@@ -247,6 +254,10 @@ export const toJSONSchema = (route: RouteInfo) => {
   const pickValues = pick(route, pickValue as any);
   if (pickValues?.metadata?.args) {
     const args = pickValues.metadata.args;
+    if (args && typeof args === 'object' && args.toJSONSchema && typeof args.toJSONSchema === 'function') {
+      pickValues.metadata.args = args.toJSONSchema();
+      return pickValues;
+    }
     const keys = Object.keys(args);
     const newArgs: { [key: string]: any } = {};
     for (let key of keys) {
@@ -265,6 +276,11 @@ export const toJSONSchema = (route: RouteInfo) => {
 export const fromJSONSchema = (route: RouteInfo): RouteInfo => {
   const args = route?.metadata?.args;
   if (!args) return route;
+  if (args["$schema"] || (args.type === 'object' && args.properties && typeof args.properties === 'object')) {
+    // 可能是整个schema
+    route.metadata.args = z.fromJSONSchema(args);
+    return route;
+  }
   const keys = Object.keys(args);
   const newArgs: { [key: string]: any } = {};
   for (let key of keys) {
@@ -680,7 +696,7 @@ export class QueryRouter {
           });
           ctx.body = {
             list: list.map((item) => {
-              const route = pick(item, ['id', 'path', 'key', 'description', 'middleware'] as const);
+              const route = pick(item, ['id', 'path', 'key', 'description', 'middleware', 'metadata'] as const);
               return toJSONSchema(route);
             }),
             isUser