@kevisual/cnb 0.0.54 → 0.0.56

package/agent/npc.ts

@@ -1,7 +1,7 @@
 import { app } from './index.ts';
 import { parse } from '@kevisual/router/src/commander.ts';
 
-import { useIssueEnv, useCommentEnv, useRepoInfoEnv, IssueLabelItem } from '../src/index.ts'
+import { useIssueEnv, useCommentEnv, useRepoInfoEnv, IssueLabelItem, IssueComment } from '../src/index.ts'
 import { pick } from 'es-toolkit';
 import z from 'zod';
 import { useKey } from '@kevisual/context';
@@ -16,9 +16,9 @@ const writeToProcess = (message: string) => {
 const getIssuesLabels = async () => {
   const issueEnv = useIssueEnv();
   const repoInfoEnv = useRepoInfoEnv();
-  const issueId = issueEnv.issueId;
+  const issueIid = issueEnv.issueIid;
   const repoSlug = repoInfoEnv.repoSlug;
-  if (!issueId || !repoSlug) {
+  if (!issueIid || !repoSlug) {
     return [];
   }
   const res = await app.run({
@@ -26,7 +26,7 @@ const getIssuesLabels = async () => {
     key: 'getIssue',
     payload: {
       repo: repoSlug,
-      issueNumber: issueId
+      issueNumber: issueIid
     }
   });
   if (res.code === 200) {
@@ -38,13 +38,33 @@ const getIssuesLabels = async () => {
   return []
 
 }
+const getIssueComment = async (opts: { repo: string, issueNumber: number }) => {
+  const res = await app.run({
+    path: 'cnb',
+    key: 'list-issue-comments',
+    payload: {
+      repo: opts.repo,
+      issueNumber: opts.issueNumber,
+    }
+  })
+  let comments: { commentId: string, body: string, author: string }[] = [];
+  if (res.code === 200) {
+    const data = res.data as IssueComment[];
+    comments = data.map(item => ({
+      commentId: item.id,
+      body: item.body,
+      author: item.author?.nickname || item.author?.username || 'unknown',
+    }));
+  }
+  return comments;
+}
 
-const main = async ({ exit, question }: { exit: (code: number) => void, question?: string }) => {
+const main = async ({ exit, question, admins }: { exit: (code: number) => void, question?: string, admins: string[] }) => {
   const repoInfoEnv = useRepoInfoEnv();
   const commentEnv = useCommentEnv();
   const issueEnv = useIssueEnv();
   const pickCommentEnv = pick(commentEnv, ['commentId', 'commentIdLabel']);
-  const pickIssueEnv = pick(issueEnv, ['issueId', 'issueIdLabel', 'issueIid', 'issueIidLabel', 'issueTitle', 'issueTitleLabel', 'issueDescription', 'issueDescriptionLabel']);
+  const pickIssueEnv = pick(issueEnv, ['issueIid', 'issueIidLabel', 'issueTitle', 'issueTitleLabel', 'issueDescription', 'issueDescriptionLabel']);
   const pickRepoInfoEnv = pick(repoInfoEnv, ['repoId', 'repoIdLabel', 'repoName', 'repoNameLabel', 'repoSlug', 'repoSlugLabel']);
   // const issueLabels = issueEnv.issueLabels || [];
   const isComment = !!commentEnv.commentId;
@@ -61,15 +81,40 @@ const main = async ({ exit, question }: { exit: (code: number) => void, question
     writeToProcess('当前 Issue 不包含 Run 标签，跳过执行');
     return exit(0);
   }
+  const issueComments = await getIssueComment({ repo: repoInfoEnv.repoSlug || '', issueNumber: Number(issueEnv.issueIid) });
+  if (issueComments.length > 0) {
+    const lastComment = issueComments[issueComments.length - 1];
+    if (admins.length > 0 && !admins.includes(lastComment.author)) {
+      writeToProcess(`当前 Issue 最新的评论由 ${lastComment.author} 创建，不是管理员 ${admins.join(', ')}，跳过执行`);
+      const helperKey = ['帮', '做', '执行', '处理', '解决', '回复', '评论'];
+      const hasHelper = helperKey.some(key => question?.includes(key));
+      if (!hasHelper) {
+        await app.run({
+          path: 'cnb', key: 'create-issue-comment', payload: {
+            repo: repoInfoEnv.repoSlug || '',
+            issueNumber: Number(issueEnv.issueIid),
+            body: `当前 Issue 最新的评论由 ${lastComment.author} 创建，不是管理员，不允许执行喵~`
+          }
+        })
+      }
+      return exit(0);
+    }
+  }
+  const botName = 'kevisual/cnb(router) '
   const messages = [
     {
       role: 'system',
-      content: `你是一个智能的代码助手, 根据用户提供的上下文信息，提供有用的建议和帮助, 如果用户的要求和执行工具不一致，请说出你不能这么做。并把最后的结果提交一个评论到对应的issue中,提交的内容必须不能包含 @ 提及。用户提供的上下文信息如下：`
+      content: `你是一个智能的代码助手叫${botName}, 根据用户提供的上下文信息，提供有用的建议和帮助, 如果用户的要求和执行工具不一致，请说出你不能这么做。并把最后的结果提交一个评论到对应的issue中,提交的内容必须不能包含 @ 提及。如果你有些决定不能决定，需要咨询，需要任何交互的，也把对应的需求评论到对应的issue。用户提供的上下文信息如下：`
     },
     {
       role: 'system',
       content: `相关变量：${JSON.stringify({ ...pickCommentEnv, ...pickIssueEnv, ...pickRepoInfoEnv })}`
-    }, {
+    },
+    {
+      role: "assistant",
+      content: '历史评论：' + JSON.stringify(issueComments)
+    },
+    {
       role: 'user',
       content: question || commentEnv.commentBody || pickIssueEnv.issueDescription || '无'
     }
@@ -116,9 +161,9 @@ app.route({
   const buildUserNickName = useKey('CNB_BUILD_USER_NICKNAME')
   let admins = owner.split(',').map(item => item.trim());
   if (owner && admins.includes(buildUserNickName)) {
-    await main({ exit });
+    await main({ exit, admins });
   } else {
-    await main({ exit, question: `你是${owner}的专属助手，请生成一条评论，说明你不具备其他用户能访问的能力。同时你需要提示说明，fork当前仓库后，即可成为你的专属助手` });
+    await main({ exit, admins, question: `你是${owner}的专属助手，请生成一条评论，说明你不具备其他用户能访问的能力。同时你需要提示说明，fork当前仓库后，即可成为你的专属助手` });
   }
 }).addTo(app)
 

package/agent/routes/index.ts

@@ -12,6 +12,7 @@ import './cnb-manager/index.ts';
 import './build/index.ts';
 import './chat/chat.ts';
 import './missions/index.ts';
+import './labels/index.ts';
 
 /**
  * 验证上下文中的 App ID 是否与指定的 App ID 匹配

package/agent/routes/issues/comments.ts

@@ -26,8 +26,8 @@ app.route({
   const cnb = await cnbManager.getContext(ctx);
   let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
   const issueNumber = ctx.query?.issueNumber;
-  const page = ctx.query?.page ? Number(ctx.query.page) : undefined;
-  const page_size = ctx.query?.page_size ? Number(ctx.query.page_size) : undefined;
+  const page = ctx.query?.page ?? 1;
+  const page_size = ctx.query?.page_size ?? 100;
 
   if (!repo) {
     ctx.throw(400, '缺少参数 repo');

package/agent/routes/labels/index.ts

@@ -0,0 +1 @@
+import './issue-label.ts'

package/agent/routes/labels/issue-label.ts

@@ -0,0 +1,195 @@
+import { createSkill, tool } from '@kevisual/router';
+import { app, cnbManager } from '../../app.ts';
+import { useKey } from '@kevisual/context';
+
+// 查询 Issue 标签列表
+app.route({
+  path: 'cnb',
+  key: 'list-issue-labels',
+  description: '查询 Issue 的标签列表',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'list-issue-labels',
+      title: '查询 Issue 标签列表',
+      summary: '查询 Issue 的标签列表',
+      args: {
+        repo: tool.schema.string().optional().describe('仓库路径, 如 my-user/my-repo'),
+        issueNumber: tool.schema.number().describe('Issue 编号'),
+        page: tool.schema.number().optional().describe('分页页码，默认 1'),
+        pageSize: tool.schema.number().optional().describe('分页每页大小，默认 30'),
+      },
+    })
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
+  const issueNumber = ctx.query?.issueNumber;
+  const page = ctx.query?.page;
+  const pageSize = ctx.query?.pageSize;
+
+  if (!repo) {
+    ctx.throw(400, '缺少参数 repo');
+  }
+  if (!issueNumber) {
+    ctx.throw(400, '缺少参数 issueNumber');
+  }
+
+  const res = await cnb.labels.issueLabel.list(repo, issueNumber, {
+    page,
+    page_size: pageSize,
+  });
+  ctx.forward(res);
+}).addTo(app);
+
+// 设置 Issue 标签（完全替换）
+app.route({
+  path: 'cnb',
+  key: 'set-issue-labels',
+  description: '设置 Issue 标签（完全替换现有标签）',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'set-issue-labels',
+      title: '设置 Issue 标签',
+      summary: '设置 Issue 标签（完全替换现有标签）',
+      args: {
+        repo: tool.schema.string().optional().describe('仓库路径, 如 my-user/my-repo'),
+        issueNumber: tool.schema.number().describe('Issue 编号'),
+        labels: tool.schema.array(tool.schema.string()).describe('标签名称数组'),
+      },
+    })
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
+  const issueNumber = ctx.query?.issueNumber;
+  const labels = ctx.query?.labels;
+
+  if (!repo) {
+    ctx.throw(400, '缺少参数 repo');
+  }
+  if (!issueNumber) {
+    ctx.throw(400, '缺少参数 issueNumber');
+  }
+  if (!labels || !Array.isArray(labels)) {
+    ctx.throw(400, '缺少参数 labels');
+  }
+
+  const res = await cnb.labels.issueLabel.set(repo, issueNumber, { labels });
+  ctx.forward(res);
+}).addTo(app);
+
+// 新增 Issue 标签（追加）
+app.route({
+  path: 'cnb',
+  key: 'add-issue-labels',
+  description: '新增 Issue 标签（追加到现有标签）',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'add-issue-labels',
+      title: '新增 Issue 标签',
+      summary: '新增 Issue 标签（追加到现有标签）',
+      args: {
+        repo: tool.schema.string().optional().describe('仓库路径, 如 my-user/my-repo'),
+        issueNumber: tool.schema.number().describe('Issue 编号'),
+        labels: tool.schema.array(tool.schema.string()).describe('标签名称数组'),
+      },
+    })
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
+  const issueNumber = ctx.query?.issueNumber;
+  const labels = ctx.query?.labels;
+
+  if (!repo) {
+    ctx.throw(400, '缺少参数 repo');
+  }
+  if (!issueNumber) {
+    ctx.throw(400, '缺少参数 issueNumber');
+  }
+  if (!labels || !Array.isArray(labels)) {
+    ctx.throw(400, '缺少参数 labels');
+  }
+
+  const res = await cnb.labels.issueLabel.add(repo, issueNumber, { labels });
+  ctx.forward(res);
+}).addTo(app);
+
+// 清空 Issue 标签
+app.route({
+  path: 'cnb',
+  key: 'clear-issue-labels',
+  description: '清空 Issue 标签（移除所有标签）',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'clear-issue-labels',
+      title: '清空 Issue 标签',
+      summary: '清空 Issue 标签（移除所有标签）',
+      args: {
+        repo: tool.schema.string().optional().describe('仓库路径, 如 my-user/my-repo'),
+        issueNumber: tool.schema.number().describe('Issue 编号'),
+      },
+    })
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
+  const issueNumber = ctx.query?.issueNumber;
+
+  if (!repo) {
+    ctx.throw(400, '缺少参数 repo');
+  }
+  if (!issueNumber) {
+    ctx.throw(400, '缺少参数 issueNumber');
+  }
+
+  const res = await cnb.labels.issueLabel.clear(repo, issueNumber);
+  ctx.forward(res);
+}).addTo(app);
+
+// 删除 Issue 指定标签
+app.route({
+  path: 'cnb',
+  key: 'remove-issue-label',
+  description: '删除 Issue 指定标签',
+  middleware: ['auth'],
+  metadata: {
+    tags: ['opencode'],
+    ...createSkill({
+      skill: 'remove-issue-label',
+      title: '删除 Issue 标签',
+      summary: '删除 Issue 指定标签',
+      args: {
+        repo: tool.schema.string().optional().describe('仓库路径, 如 my-user/my-repo'),
+        issueNumber: tool.schema.number().describe('Issue 编号'),
+        name: tool.schema.string().describe('标签名称'),
+      },
+    })
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  let repo = ctx.query?.repo || useKey('CNB_REPO_SLUG_LOWERCASE');
+  const issueNumber = ctx.query?.issueNumber;
+  const name = ctx.query?.name;
+
+  if (!repo) {
+    ctx.throw(400, '缺少参数 repo');
+  }
+  if (!issueNumber) {
+    ctx.throw(400, '缺少参数 issueNumber');
+  }
+  if (!name) {
+    ctx.throw(400, '缺少参数 name');
+  }
+
+  const res = await cnb.labels.issueLabel.remove(repo, issueNumber, name);
+  ctx.forward(res);
+}).addTo(app);

package/agent/routes/repo/list.ts

@@ -16,7 +16,8 @@ app.route({
       summary: '列出cnb代码仓库, 可选flags参数，如 KnowledgeBase',
       args: {
         search: tool.schema.string().optional().describe('搜索关键词'),
-        pageSize: tool.schema.number().optional().describe('每页数量，默认999'),
+        page: tool.schema.number().optional().describe('分页页码，默认 1'),
+        pageSize: tool.schema.number().optional().describe('每页数量，默认99'),
         flags: tool.schema.string().optional().describe('仓库标记，如果是知识库则填写 KnowledgeBase'),
       },
     })
@@ -24,13 +25,17 @@ app.route({
 }).define(async (ctx) => {
   const cnb = await cnbManager.getContext(ctx);
   const search = ctx.query?.search;
-  const pageSize = ctx.query?.pageSize || 9999;
+  const page = ctx.query?.page || 1;
+  let pageSize = ctx.query?.pageSize || 99;
   const flags = ctx.query?.flags;
   const params: any = {};
   if (flags) {
     params.flags = flags;
   }
-  const res = await cnb.repo.getRepoList({ search, page_size: pageSize, role: 'developer', ...params });
+  if (pageSize > 99) {
+    pageSize = 99;
+  }
+  const res = await cnb.repo.getRepoList({ search, page, page_size: pageSize + 1, role: 'developer', ...params });
   if (res.code === 200) {
     const repos = res.data.map((item) => ({
       name: item.name,
@@ -38,7 +43,9 @@ app.route({
       description: item.description,
       web_url: item.web_url,
     }));
-    ctx.body = { content: JSON.stringify(repos), list: res.data };
+    const list = repos.slice(0, pageSize);
+    const hasMore = repos.length > pageSize;
+    ctx.body = { content: JSON.stringify(repos), list, hasMore, page, pageSize };
   } else {
     ctx.throw(500, '获取仓库列表失败');
   }

package/agent/routes/workspace/index.ts

@@ -4,6 +4,7 @@ import z from 'zod';
 import './skills.ts';
 import './keep.ts';
 import './build.ts';
+import './rerun.ts';
 
 // 启动工作空间
 app.route({

package/agent/routes/workspace/rerun.ts

@@ -0,0 +1,55 @@
+import z from 'zod';
+import { app, cnbManager } from '../../app.ts';
+
+app.route({
+  path: 'cnb',
+  key: 'rerun',
+  description: '重新启动工作区，定时任务',
+  middleware: ['auth'],
+  metadata: {
+    args: {
+      repo: z.string().optional().describe('仓库名称,例如：owner/repo'),
+      config: z.string().optional().describe('工作区配置'),
+      event: z.string().optional().describe('触发事件来源，api_trigger_event'),
+    }
+  }
+}).define(async (ctx) => {
+  const cnb = await cnbManager.getContext(ctx);
+  const repo = ctx.args.repo;
+  const config = ctx.args.config;
+  const event = ctx.args.event || 'api_trigger_event';
+  const res = await cnb.workspace.list({ status: "running" })
+  if (res.code !== 200) {
+    ctx.throw(500, res.message || 'Failed to list workspaces');
+  }
+  const list = res.data?.list || []
+  const _list = list.filter(item => {
+    // 如果指定了 repo 参数，则只重启该仓库相关的工作区；如果未指定 repo 参数，则重启所有包含 '/dev' 的工作区
+    if (repo) {
+      if (item.slug === repo) {
+        return true;
+      }
+    } else {
+      if (item.slug.includes('/dev')) {
+        return true;
+      }
+    }
+    return false;
+  })
+  for (const item of _list) {
+    const branch = item.branch || 'main';
+    const repo = item.slug;
+    const sn = item.sn;
+    // 先停止工作区
+    await cnb.workspace.stopWorkspace({ sn });
+    if (config) {
+      await cnb.build.startBuild(repo, { branch, config, event });
+    } else {
+      await cnb.workspace.startWorkspace(repo, { branch });
+    }
+
+  }
+  ctx.body = {
+    content: '工作区重新启动中',
+  }
+}).addTo(app)