@actiondock/core 2.6.0 → 2.8.0

package/dist/server/routes/doctor.js

@@ -1,10 +1,11 @@
+import { DOCTOR_ERROR, PACKAGE_NOT_ALLOWED } from "../../errors.js";
 import { runDoctorChecks } from "../../doctor/doctor.js";
 import { assertPackageAllowed, getSubPath, jsonResponse } from "./common.js";
 /**
- * 处理环境与依赖诊断接口（GET /api/v2/doctor、/doctor 与兼容别名 /api/v1/doctor）。
+ * 处理环境与依赖诊断接口（GET /api/v2/doctor 与 /doctor）。
  */
 export async function handleDoctorRoute(ctx) {
-    const { req, url, pathname, corsHeaders, projectRoot, customHome, host, target, options } = ctx;
+    const { req, url, pathname, corsHeaders, projectRoot, customHome, service, options } = ctx;
     const subpath = getSubPath(pathname);
     if (subpath !== "/doctor" || req.method !== "GET") {
         return null;
@@ -16,7 +17,7 @@ export async function handleDoctorRoute(ctx) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: "Global doctor check is forbidden when package allowlist is active. Please specify an allowed package.",
                     },
                 }, 403, corsHeaders);
@@ -27,18 +28,9 @@ export async function handleDoctorRoute(ctx) {
         }
         let packageRoot;
         if (targetPkg) {
-            if (host) {
-                packageRoot = host.getApp(targetPkg)?.packageRoot;
-            }
-            if (!packageRoot && target?.unwrap) {
-                const inner = target.unwrap();
-                if (inner && "getApp" in inner && typeof inner.getApp === "function") {
-                    packageRoot = inner.getApp(targetPkg)?.packageRoot;
-                }
-                else if (inner && "packageId" in inner && inner.packageId === targetPkg) {
-                    packageRoot = inner.packageRoot;
-                }
-            }
+            const pkgs = await service.discovery.listPackages();
+            const matched = pkgs.find((p) => p.id === targetPkg || p.packageRoot === targetPkg);
+            packageRoot = matched?.packageRoot;
         }
         const report = await runDoctorChecks({
             cwd: packageRoot || projectRoot || process.cwd(),
@@ -49,15 +41,15 @@ export async function handleDoctorRoute(ctx) {
         return jsonResponse({ ok: true, report }, 200, corsHeaders);
     }
     catch (err) {
-        if (err.code === "PACKAGE_NOT_ALLOWED" || err.status === 403) {
+        if (err.code === PACKAGE_NOT_ALLOWED || err.status === 403) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "PACKAGE_NOT_ALLOWED",
+                    code: PACKAGE_NOT_ALLOWED,
                     message: err.message || "Package is not in the allowed package list",
                 },
             }, 403, corsHeaders);
         }
-        return jsonResponse({ ok: false, error: { code: "DOCTOR_ERROR", message: err.message } }, 500, corsHeaders);
+        return jsonResponse({ ok: false, error: { code: DOCTOR_ERROR, message: err.message } }, 500, corsHeaders);
     }
 }

package/dist/server/routes/health.d.ts

@@ -1,5 +1,5 @@
 import { type RouteContext } from "./common.js";
 /**
- * 处理健康检查与就绪状态接口（支持 /api/v2/health、/health 与兼容别名 /api/v1/health）。
+ * 处理健康检查与就绪状态接口（支持 /api/v2/health 与 /health）。
  */
 export declare function handleHealthRoute(ctx: RouteContext): Promise<Response | null>;

package/dist/server/routes/health.js

@@ -3,13 +3,12 @@ import { UNAUTHORIZED } from "../../errors.js";
 import { verifyBearerToken } from "../security.js";
 import { jsonResponse } from "./common.js";
 /**
- * 处理健康检查与就绪状态接口（支持 /api/v2/health、/health 与兼容别名 /api/v1/health）。
+ * 处理健康检查与就绪状态接口（支持 /api/v2/health 与 /health）。
  */
 export async function handleHealthRoute(ctx) {
     const { req, pathname, corsHeaders, options, projectRoot } = ctx;
     if (pathname !== "/api/v2/health" &&
-        pathname !== "/health" &&
-        pathname !== "/api/v1/health") {
+        pathname !== "/health") {
         return null;
     }
     if (!verifyBearerToken(req, options.token, options)) {

package/dist/server/routes/info.d.ts

@@ -1,7 +1,7 @@
 import { type RouteContext } from "./common.js";
 /**
  * 处理系统自省与包信息接口：
- * - GET /api/v2/info 与 GET /info -> 委托 target.info()
- * - GET /api/v2/packages 与 GET /packages -> 委托 host.info() 或 target.info()
+ * - GET /api/v2/info 与 GET /info -> 委托 service.info()
+ * - GET /api/v2/packages 与 GET /packages -> 委托 service.discovery.listPackages()
  */
 export declare function handleInfoRoute(ctx: RouteContext): Promise<Response | null>;

package/dist/server/routes/info.js

@@ -1,5 +1,5 @@
 import { filterWithFallbackInfo } from "../../filter/index.js";
-import { PACKAGE_NOT_FOUND } from "../../errors.js";
+import { INFO_ERROR, PACKAGE_NOT_ALLOWED, PACKAGE_NOT_FOUND, PACKAGES_INFO_ERROR } from "../../errors.js";
 import { ACTIONDOCK_VERSION } from "../../version.js";
 import { sanitizeConfigDefinitions } from "../../storage/index.js";
 import { assertPackageAllowed, getSubPath, jsonResponse } from "./common.js";
@@ -18,11 +18,11 @@ function sanitizePackage(pkg, exposeDebugInfo) {
 }
 /**
  * 处理系统自省与包信息接口：
- * - GET /api/v2/info 与 GET /info -> 委托 target.info()
- * - GET /api/v2/packages 与 GET /packages -> 委托 host.info() 或 target.info()
+ * - GET /api/v2/info 与 GET /info -> 委托 service.info()
+ * - GET /api/v2/packages 与 GET /packages -> 委托 service.discovery.listPackages()
  */
 export async function handleInfoRoute(ctx) {
-    const { req, url, pathname, corsHeaders, options, target, host, projectRoot } = ctx;
+    const { req, url, pathname, corsHeaders, options, service, projectRoot } = ctx;
     const subpath = getSubPath(pathname);
     // 1. Packages List: GET /api/v2/packages, /packages
     if ((subpath === "/packages" || pathname === "/api/v2/packages" || pathname === "/packages") && req.method === "GET") {
@@ -31,7 +31,7 @@ export async function handleInfoRoute(ctx) {
             if (targetPkg) {
                 assertPackageAllowed(targetPkg, options);
             }
-            const rawPackages = target ? await target.listPackages() : (host ? await host.info() : []);
+            const rawPackages = await service.discovery.listPackages();
             let packages = rawPackages.map((p) => sanitizePackage(p, options.exposeDebugInfo));
             if (options.packageAllowlist && Array.isArray(options.packageAllowlist) && options.packageAllowlist.length > 0) {
                 packages = packages.filter((p) => p.id && options.packageAllowlist.includes(p.id));
@@ -42,18 +42,18 @@ export async function handleInfoRoute(ctx) {
             }, 200, corsHeaders);
         }
         catch (err) {
-            if (err.code === "PACKAGE_NOT_ALLOWED" || err.status === 403) {
+            if (err.code === PACKAGE_NOT_ALLOWED || err.status === 403) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: err.message || "Package is not in the allowed package list",
                     },
                 }, 403, corsHeaders);
             }
             return jsonResponse({
                 ok: false,
-                error: { code: "PACKAGES_INFO_ERROR", message: err.message },
+                error: { code: PACKAGES_INFO_ERROR, message: err.message },
             }, 500, corsHeaders);
         }
     }
@@ -66,8 +66,7 @@ export async function handleInfoRoute(ctx) {
             if (targetPkg) {
                 assertPackageAllowed(targetPkg, options);
             }
-            const targetInfo = await target.info();
-            const rawPackages = targetInfo.packages || [];
+            const rawPackages = await service.info();
             let packages = rawPackages.map((p) => sanitizePackage(p, options.exposeDebugInfo));
             if (options.packageAllowlist && Array.isArray(options.packageAllowlist) && options.packageAllowlist.length > 0) {
                 packages = packages.filter((p) => p.id && options.packageAllowlist.includes(p.id));
@@ -139,18 +138,18 @@ export async function handleInfoRoute(ctx) {
             }, 200, corsHeaders);
         }
         catch (err) {
-            if (err.code === "PACKAGE_NOT_ALLOWED" || err.status === 403) {
+            if (err.code === PACKAGE_NOT_ALLOWED || err.status === 403) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: err.message || "Package is not in the allowed package list",
                     },
                 }, 403, corsHeaders);
             }
             return jsonResponse({
                 ok: false,
-                error: { code: "INFO_ERROR", message: err.message },
+                error: { code: INFO_ERROR, message: err.message },
             }, 500, corsHeaders);
         }
     }

package/dist/server/routes/playbooks.js

@@ -1,10 +1,11 @@
 import { filterByIntent } from "../../filter/index.js";
+import { PACKAGE_NOT_ALLOWED, PLAYBOOK_NOT_FOUND, PLAYBOOKS_LIST_ERROR } from "../../errors.js";
 import { assertPackageAllowed, getSubPath, jsonResponse } from "./common.js";
 /**
  * 处理 Playbook 规程相关的 HTTP 路由（列表与 SOP 详情查询）。
  */
 export async function handlePlaybooksRoutes(ctx) {
-    const { req, url, pathname, corsHeaders, target, host, options } = ctx;
+    const { req, url, pathname, corsHeaders, service, options } = ctx;
     const subpath = getSubPath(pathname);
     // 1. Playbooks List: GET /api/v2/playbooks, GET /playbooks
     if (subpath === "/playbooks" && req.method === "GET") {
@@ -14,7 +15,7 @@ export async function handlePlaybooksRoutes(ctx) {
             if (targetPkg) {
                 assertPackageAllowed(targetPkg, options);
             }
-            let pbs = await target.listPlaybooks({ intent, package: targetPkg });
+            let pbs = await service.discovery.listPlaybooks({ intent, package: targetPkg });
             if (targetPkg) {
                 pbs = pbs.filter((p) => p.packageId === targetPkg);
             }
@@ -27,16 +28,16 @@ export async function handlePlaybooksRoutes(ctx) {
             return jsonResponse(pbs, 200, corsHeaders);
         }
         catch (err) {
-            if (err.code === "PACKAGE_NOT_ALLOWED" || err.status === 403) {
+            if (err.code === PACKAGE_NOT_ALLOWED || err.status === 403) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: err.message || "Package is not in the allowed package list",
                     },
                 }, 403, corsHeaders);
             }
-            return jsonResponse({ ok: false, error: { code: "PLAYBOOKS_LIST_ERROR", message: err.message } }, 500, corsHeaders);
+            return jsonResponse({ ok: false, error: { code: PLAYBOOKS_LIST_ERROR, message: err.message } }, 500, corsHeaders);
         }
     }
     // 2. Multi-package Playbook Show: GET /api/v2/packages/:packageId/playbooks/:playbookId
@@ -51,21 +52,21 @@ export async function handlePlaybooksRoutes(ctx) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "PACKAGE_NOT_ALLOWED",
+                    code: PACKAGE_NOT_ALLOWED,
                     message: err.message || `Package '${packageId}' is not in the allowed package list`,
                 },
             }, 403, corsHeaders);
         }
         const ref = `${packageId}/${playbookId}`;
         try {
-            const pb = await target.describePlaybook(ref);
+            const pb = await service.discovery.describePlaybook(ref);
             return jsonResponse(pb, 200, corsHeaders);
         }
         catch (err) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "PLAYBOOK_NOT_FOUND",
+                    code: PLAYBOOK_NOT_FOUND,
                     message: err.message || `Playbook '${playbookId}' not found in package '${packageId}'`,
                 },
             }, 404, corsHeaders);
@@ -84,31 +85,17 @@ export async function handlePlaybooksRoutes(ctx) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: err.message || `Package '${pkgFromRef}' is not in the allowed package list`,
                     },
                 }, 403, corsHeaders);
             }
         }
         try {
-            const pb = await target.describePlaybook(playbookId);
-            const unwrapped = target.unwrap?.();
-            let pkgId = pb.packageId || (unwrapped && "packageId" in unwrapped ? unwrapped.packageId : undefined);
-            if (!pkgId && host) {
-                for (const app of host.listApps()) {
-                    try {
-                        const map = app.getStaticPlaybookMap?.();
-                        const cleanId = playbookId.replace(/\.md$/, "");
-                        if (map?.has(cleanId) || map?.has(playbookId)) {
-                            pkgId = app.packageId;
-                            break;
-                        }
-                    }
-                    catch { }
-                }
-            }
+            const pb = await service.discovery.describePlaybook(playbookId);
+            let pkgId = pb.packageId;
             if (!pkgId) {
-                const allPbs = await target.listPlaybooks().catch(() => []);
+                const allPbs = await service.discovery.listPlaybooks().catch(() => []);
                 const matched = allPbs.find((p) => p.id === playbookId || p.id.endsWith(`/${playbookId}`));
                 if (matched?.packageId) {
                     pkgId = matched.packageId;
@@ -118,16 +105,16 @@ export async function handlePlaybooksRoutes(ctx) {
             return jsonResponse(pb, 200, corsHeaders);
         }
         catch (err) {
-            if (err.code === "PACKAGE_NOT_ALLOWED" || err.status === 403) {
+            if (err.code === PACKAGE_NOT_ALLOWED || err.status === 403) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_NOT_ALLOWED",
+                        code: PACKAGE_NOT_ALLOWED,
                         message: err.message || "Package is not in the allowed package list",
                     },
                 }, 403, corsHeaders);
             }
-            return jsonResponse({ ok: false, error: { code: "PLAYBOOK_NOT_FOUND", message: err.message } }, 404, corsHeaders);
+            return jsonResponse({ ok: false, error: { code: PLAYBOOK_NOT_FOUND, message: err.message } }, 404, corsHeaders);
         }
     }
     return null;