@dsh-plus/agent-preset-rea 0.1.1 → 0.1.2

package/src/routes.ts

@@ -1,8 +1,9 @@
 /**
- * 受管安装/更新的 HTTP 通道：状态查询 + 三类动作（安装/更新 REA、更新 skill、取消）。
+ * 受管安装/更新的 HTTP 通道：状态查询 + 四类动作（安装/更新 REA、更新 REA skill、
+ * 更新 reverse-skill、取消作业）。
  *
  * 只挂在 dsh web 同源（webserver 默认 127.0.0.1，与 notify-email 的测试端点同等暴露面）：
- * 这些端点会 spawn npm 并写插件数据目录，不做鉴权以外的额外暴露面扩张。
+ * 这些端点会 spawn npm/curl 并写插件数据目录，不做鉴权以外的额外暴露面扩张。
  * 配置读写仍走官方 settings（卡片直连 remote.settings），这里只补官方传输没有的动作。
  *
  * 请求体只接受一个可选字段 `proxyPort`（0..65535）；其余一律来自插件配置。
@@ -15,10 +16,11 @@ import type { Context } from '@deepseek-ai/cordis'
 import type {} from '@deepseek-ai/dsh-host-webserver'
 
 import type { AgentPresetReaConfig } from './config.ts'
-import type { JobActionDto, StatusDto } from './dto.ts'
+import type { JobActionDto, JobKind, StatusDto } from './dto.ts'
 import type { JobBoard } from './jobs.ts'
 import type { ReaManager } from './manager.ts'
 import { type McpLaunch, reaMcpLaunch } from './mcp.ts'
+import { reversePaths, reverseSkillDirs } from './reverse.ts'
 
 /** 路由前缀。 */
 export const ROUTE_BASE = '/dsh-plus/agent-preset-rea'
@@ -33,6 +35,18 @@ export interface ReaRoutesOptions {
   config: () => AgentPresetReaConfig
 }
 
+/** 路由处理器形态。 */
+type RouteHandler = (req: IncomingMessage, res: ServerResponse) => Promise<void>
+
+/** 响应发送器。 */
+type Send = (res: ServerResponse, status: number, body: unknown) => void
+
+/** 日志窄面。 */
+interface RouteLogger {
+  info(message: string): void
+  warn(message: string): void
+}
+
 /** 读请求体（超限即拒绝；空体按空对象）。 */
 async function readBody(req: IncomingMessage): Promise<unknown> {
   const chunks: Buffer[] = []
@@ -66,11 +80,18 @@ export function statusPayload(options: ReaRoutesOptions): StatusDto {
   const launch: McpLaunch | null = reaMcpLaunch(config, runtime.install)
   const mode =
     config.mcpCommand.trim() !== '' ? 'custom' : launch === null ? 'missing' : 'installed'
+  const reverse = reversePaths()
+  const activeDirs = reverseSkillDirs(config, runtime.reverse)
   return {
     config: {
       reaVersion: config.reaVersion,
       proxyPort: config.proxyPort,
       mcpEnabled: config.mcpEnabled,
+      skillEnabled: config.skillEnabled,
+      reverseSkillEnabled: config.reverseSkillEnabled,
+      reverseSkillRepo: config.reverseSkillRepo,
+      reverseSkillRef: config.reverseSkillRef,
+      reverseSkillGroups: [...config.reverseSkillGroups],
       installRoot: config.installRoot,
     },
     install: {
@@ -80,102 +101,123 @@ export function statusPayload(options: ReaRoutesOptions): StatusDto {
       entry: runtime.install?.entry ?? null,
     },
     skill: { ...runtime.skill },
+    reverse: {
+      installed: runtime.reverse.installed,
+      repo: runtime.reverse.repo,
+      ref: runtime.reverse.ref,
+      sha: runtime.reverse.sha,
+      version: runtime.reverse.version,
+      root: reverse.root,
+      tree: reverse.tree,
+      files: runtime.reverse.files,
+      groups: [...runtime.reverse.groups],
+      activeGroups: activeDirs.map((dir) =>
+        dir.startsWith(`${reverse.tree}/`) ? dir.slice(reverse.tree.length + 1) : dir,
+      ),
+      updatedAt: runtime.reverse.updatedAt,
+    },
     mcp: {
       mode,
       enabled: config.mcpEnabled && launch !== null,
       command: launch?.command ?? null,
       args: launch?.args ?? [],
     },
-    paths,
+    paths: { ...paths, reverseRoot: reverse.root },
     job: options.board.snapshot(),
   }
 }
 
-/** 注册全部路由。 */
-export function registerReaRoutes(ctx: Context, options: ReaRoutesOptions): void {
-  const logger = ctx.logger('agent-preset-rea')
-  const send = (res: ServerResponse, status: number, body: unknown): void => {
+/** 发送 JSON 响应。 */
+function makeSend(): Send {
+  return (res, status, body) => {
     res.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
     res.end(JSON.stringify(body))
   }
-  const guard = (
-    handler: (req: IncomingMessage, res: ServerResponse) => Promise<void>,
-  ): ((req: IncomingMessage, res: ServerResponse) => Promise<void>) => {
-    return async (req, res) => {
-      try {
-        await handler(req, res)
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error)
-        logger.warn(`${req.method ?? '?'} ${req.url ?? '?'} 失败：${message}`)
-        if (!res.headersSent) send(res, 400, { job: null, error: message } satisfies JobActionDto)
-        else res.end()
-      }
+}
+
+/** 异常兜底：日志 + 400（响应头已发则只收尾）。 */
+function makeGuard(logger: RouteLogger, send: Send): (handler: RouteHandler) => RouteHandler {
+  return (handler) => async (req, res) => {
+    try {
+      await handler(req, res)
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      logger.warn(`${req.method ?? '?'} ${req.url ?? '?'} 失败：${message}`)
+      if (!res.headersSent) send(res, 400, { job: null, error: message } satisfies JobActionDto)
+      else res.end()
+    }
+  }
+}
+
+/** 方法门：不匹配即 405。 */
+function withMethod(method: string, send: Send, handler: RouteHandler): RouteHandler {
+  return async (req, res) => {
+    if (req.method !== method) {
+      send(res, 405, { job: null, error: 'method not allowed' } satisfies JobActionDto)
+      return
     }
+    await handler(req, res)
   }
-  const startJob = async (
-    req: IncomingMessage,
-    res: ServerResponse,
-    kind: 'install' | 'skill',
-  ): Promise<void> => {
+}
+
+/** 起作业的处理器工厂（409 = 已有作业在跑）。 */
+function startJobHandler(
+  kind: JobKind,
+  options: ReaRoutesOptions,
+  logger: RouteLogger,
+  send: Send,
+): RouteHandler {
+  return async (req, res) => {
     const overrides = proxyPortOf(await readBody(req))
     const operations = options.manager.operations(
       overrides === undefined ? undefined : { proxyPort: overrides },
     )
     const job = options.board.start(kind, operations[kind])
     if (job === null) {
-      send(res, 409, { job: options.board.snapshot(), error: '已有作业在运行' })
+      send(res, 409, {
+        job: options.board.snapshot(),
+        error: '已有作业在运行',
+      } satisfies JobActionDto)
       return
     }
     logger.info(`已启动 ${kind} 作业`)
     send(res, 200, { job } satisfies JobActionDto)
   }
+}
 
-  ctx.webServer.register({
-    kind: 'exact',
-    path: `${ROUTE_BASE}/status`,
-    handler: guard(async (req, res) => {
-      if (req.method !== 'GET') {
-        send(res, 405, { job: null, error: 'method not allowed' })
-        return
-      }
+/** 全部路由（path 末段 → 处理器）。 */
+function buildRoutes(
+  options: ReaRoutesOptions,
+  logger: RouteLogger,
+  send: Send,
+): Record<string, RouteHandler> {
+  return {
+    status: withMethod('GET', send, async (_req, res) => {
       send(res, 200, statusPayload(options))
     }),
-  })
-  ctx.webServer.register({
-    kind: 'exact',
-    path: `${ROUTE_BASE}/install`,
-    handler: guard(async (req, res) => {
-      if (req.method !== 'POST') {
-        send(res, 405, { job: null, error: 'method not allowed' })
-        return
-      }
-      await startJob(req, res, 'install')
-    }),
-  })
-  ctx.webServer.register({
-    kind: 'exact',
-    path: `${ROUTE_BASE}/skill`,
-    handler: guard(async (req, res) => {
-      if (req.method !== 'POST') {
-        send(res, 405, { job: null, error: 'method not allowed' })
-        return
-      }
-      await startJob(req, res, 'skill')
-    }),
-  })
-  ctx.webServer.register({
-    kind: 'exact',
-    path: `${ROUTE_BASE}/cancel`,
-    handler: guard(async (req, res) => {
-      if (req.method !== 'POST') {
-        send(res, 405, { job: null, error: 'method not allowed' })
-        return
-      }
+    install: withMethod('POST', send, startJobHandler('install', options, logger, send)),
+    skill: withMethod('POST', send, startJobHandler('skill', options, logger, send)),
+    reverse: withMethod('POST', send, startJobHandler('reverse', options, logger, send)),
+    cancel: withMethod('POST', send, async (_req, res) => {
       const cancelled = options.board.cancel()
       send(res, 200, {
         job: options.board.snapshot(),
         ...(cancelled ? {} : { error: '没有正在运行的作业' }),
       } satisfies JobActionDto)
     }),
-  })
+  }
+}
+
+/** 注册全部路由。 */
+export function registerReaRoutes(ctx: Context, options: ReaRoutesOptions): void {
+  const logger = ctx.logger('agent-preset-rea')
+  const send = makeSend()
+  const guard = makeGuard(logger, send)
+  for (const [name, handler] of Object.entries(buildRoutes(options, logger, send))) {
+    ctx.webServer.register({
+      kind: 'exact',
+      path: `${ROUTE_BASE}/${name}`,
+      handler: guard(handler),
+    })
+  }
 }

package/src/skill.ts

@@ -11,6 +11,8 @@
 import { fileURLToPath } from 'node:url'
 
 import type { AgentPresetReaConfig } from './config.ts'
+import type { RuntimeSnapshot } from './manager.ts'
+import { reverseSkillDirs } from './reverse.ts'
 
 /**
  * 随包 REA 官方 skill 根（包内 `skills/`）。
@@ -21,14 +23,27 @@ import type { AgentPresetReaConfig } from './config.ts'
 export const BUNDLED_SKILL_ROOT = fileURLToPath(new URL('../skills', import.meta.url))
 
 /**
- * skill-filesystem 的追加根清单。
+ * REA skill 根（随包副本，或手动更新副本——后者存在即替代前者）。
+ * @param updatedRoot - 手动更新副本根（来自 manager 现探）。
+ */
+export function reaSkillDirs(updatedRoot: string | null = null): string[] {
+  return updatedRoot === null ? [BUNDLED_SKILL_ROOT] : [updatedRoot]
+}
+
+/**
+ * 本预设 `skill-filesystem` 行的完整追加根清单，按三个开关裁剪：
+ * - `skillEnabled=false` → 不挂 REA 官方 skill（安装副本仍留在磁盘）；
+ * - `reverseSkillEnabled=false` → 不挂 reverse-skill 的技能组；
+ * - `extraSkillDirs` 是部署方追加项，不受开关影响（关掉的是本插件自带的两个源）。
  * @param config - 插件配置。
- * @param updatedRoot - 手动更新副本根（存在即替代随包根；来自 manager 现探）。
+ * @param runtime - 现探运行期事实。
  */
-export function reaSkillDirs(
-  config: AgentPresetReaConfig,
-  updatedRoot: string | null = null,
-): string[] {
-  const base = updatedRoot === null ? [BUNDLED_SKILL_ROOT] : [updatedRoot]
-  return [...base, ...config.extraSkillDirs]
+export function presetSkillDirs(config: AgentPresetReaConfig, runtime: RuntimeSnapshot): string[] {
+  const rea =
+    config.skillEnabled === false
+      ? []
+      : reaSkillDirs(runtime.skill.source === 'updated' ? runtime.skill.root : null)
+  const reverse =
+    config.reverseSkillEnabled === false ? [] : reverseSkillDirs(config, runtime.reverse)
+  return [...rea, ...reverse, ...config.extraSkillDirs]
 }