@continuous-excellence/ze-great-dashboard-aws 0.31.53 → 0.31.55

package/dist/cli.js

@@ -205,11 +205,11 @@ var panelSchema = z2.looseObject({
         path: ["test_results"],
         message: "test-count requires test_results artifact configuration"
       });
-  } else if (panel.test_results) {
+  } else if (panel.test_results && panel.type !== "pipeline-status") {
     ctx.addIssue({
       code: "custom",
       path: ["test_results"],
-      message: "test_results is only supported by test-count panels"
+      message: "test_results is only supported by test-count and pipeline-status panels"
     });
   }
   if (panel.type !== "http-value") return;
@@ -454,6 +454,12 @@ var boardConfigSchema = z2.object({
           }
         });
       }
+      if (panel.type === "pipeline-status" && panel.test_results && source?.type !== "github-actions")
+        ctx.addIssue({
+          code: "custom",
+          path: ["boards", boardName, "panels", panelIndex, "test_results"],
+          message: "test_results requires a github-actions source"
+        });
       if (panel.type !== "pipeline-status" || source?.type !== "azure-devops") return;
       if (typeof panel.pipeline !== "number" || !Number.isInteger(panel.pipeline) || panel.pipeline <= 0) {
         ctx.addIssue({
@@ -566,11 +572,29 @@ var pipelineActivitySchema = z4.object({
   name: z4.string().min(1),
   parent: z4.string().min(1).optional()
 });
+var testCountSchema = z4.discriminatedUnion("status", [
+  z4.object({
+    type: z4.literal("test-count"),
+    status: z4.literal("reported"),
+    total: z4.number().int().nonnegative(),
+    passed: z4.number().int().nonnegative().optional(),
+    failed: z4.number().int().nonnegative().optional(),
+    skipped: z4.number().int().nonnegative().optional()
+  }),
+  z4.object({ type: z4.literal("test-count"), status: z4.literal("pending") }),
+  z4.object({ type: z4.literal("test-count"), status: z4.literal("not-reported") })
+]);
+var testEvidenceSchema = z4.discriminatedUnion("state", [
+  z4.object({ state: z4.literal("ok"), observedAt: z4.iso.datetime(), signal: testCountSchema }),
+  z4.object({ state: z4.literal("error"), observedAt: z4.iso.datetime(), error: envelopeErrorSchema })
+]);
 var pipelineStatusSchema = z4.object({
   type: z4.literal("pipeline-status"),
   status: z4.enum(["passed", "failed", "warning", "running", "cancelled", "unknown"]),
   /** The source's unmodified status/result vocabulary, for an honest display. */
   rawStatus: z4.string(),
+  /** Test evidence bound to this exact run; failures do not erase build status. */
+  testResults: testEvidenceSchema.optional(),
   name: z4.string().min(1),
   /** The branch represented by this status, when the upstream supplies or filters by one. */
   branch: z4.string().min(1).optional(),
@@ -587,18 +611,6 @@ var pipelineStatusSchema = z4.object({
   /** When this workflow run was last updated by its source, distinct from our observation time. */
   sourceUpdatedAt: z4.iso.datetime().optional()
 });
-var testCountSchema = z4.discriminatedUnion("status", [
-  z4.object({
-    type: z4.literal("test-count"),
-    status: z4.literal("reported"),
-    total: z4.number().int().nonnegative(),
-    passed: z4.number().int().nonnegative().optional(),
-    failed: z4.number().int().nonnegative().optional(),
-    skipped: z4.number().int().nonnegative().optional()
-  }),
-  z4.object({ type: z4.literal("test-count"), status: z4.literal("pending") }),
-  z4.object({ type: z4.literal("test-count"), status: z4.literal("not-reported") })
-]);
 var pullRequestHealthItemSchema = z4.object({
   label: z4.string().min(1),
   status: pipelineStatusSchema.shape.status,
@@ -1545,6 +1557,7 @@ function concat(chunks, length) {
 
 // packages/server/src/adapters/github-actions.ts
 var pipelinePanelSchema = z7.object({
+  test_results: testResultsArtifactSchema.optional(),
   id: z7.string().min(1),
   type: z7.literal("pipeline-status"),
   source: z7.string().min(1),
@@ -1620,37 +1633,60 @@ function testCountCapabilities(panel, source) {
 async function fetchGithubActionsTestCount(args2) {
   const { panel, source } = testCountCapabilities(args2.panel, args2.source);
   const githubClient = githubClientFor(args2);
-  const noValidators = new Headers();
-  let failureLink = sourceLinkForWorkflow(source, panel.pipeline);
-  let failureObservedAt;
   try {
     const selected = await selectGithubWorkflowRun({
       ...args2,
       source,
       workflow: panel.pipeline,
-      requestHeaders: noValidators,
+      requestHeaders: new Headers(),
       githubClient
     });
     if (!selected.response.ok) return testCountFailure(panel.id, source, selected.response);
-    const { run: run2 } = selected;
-    if (!run2?.id)
+    if (!selected.run?.id)
       return testCountEnvelope(
         noRunEnvelope(panel.id, source, panel.pipeline, selected.response.headers.get("date"))
       );
-    const link = run2.html_url;
-    const runObservedAt = selected.observedAt;
-    failureLink = link;
-    failureObservedAt = runObservedAt;
+    const evidence = await readGithubRunTestEvidence(
+      { ...args2, source, githubClient },
+      {
+        run: selected.run,
+        observedAt: selected.observedAt
+      },
+      panel.test_results
+    );
+    return testCountEnvelope({ ...evidence, panelId: panel.id, link: selected.run.html_url });
+  } catch (error) {
+    return testCountEnvelope(
+      errorEnvelope(
+        panel.id,
+        error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
+        error,
+        sourceLinkForWorkflow(source, panel.pipeline)
+      )
+    );
+  }
+}
+async function readGithubRunTestEvidence(args2, selected, artifactConfig) {
+  const { run: run2, observedAt: runObservedAt } = selected;
+  const { source, githubClient } = args2;
+  const noValidators = new Headers();
+  let failureObservedAt = runObservedAt;
+  const evidenceError = (kind, at = failureObservedAt) => ({
+    state: "error",
+    observedAt: at,
+    error: { kind, message: publicErrorMessage(kind) }
+  });
+  const failedResponse = (response) => evidenceError(errorKind(response.status), observedAt2(response.headers.get("date")));
+  try {
+    if (!run2.id) return evidenceError("upstream-error");
     if (run2.status !== "completed")
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: runObservedAt,
-        link,
         signal: { type: "test-count", status: "pending" }
-      });
+      };
     const artifactsResponse = await githubFetch(
-      githubArtifactsCall(source, run2.id, panel.test_results),
+      githubArtifactsCall(source, run2.id, artifactConfig),
       {
         ...args2,
         source,
@@ -1658,57 +1694,37 @@ async function fetchGithubActionsTestCount(args2) {
         githubClient
       }
     );
-    if (!artifactsResponse.ok) return testCountFailure(panel.id, source, artifactsResponse, link);
+    if (!artifactsResponse.ok) return failedResponse(artifactsResponse);
     const artifactObservedAt = observedAt2(artifactsResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt);
     const artifacts = artifactsSchema.parse(await artifactsResponse.json()).artifacts;
-    const matches = artifacts.filter((artifact2) => artifact2.name === panel.test_results.artifact);
+    const matches = artifacts.filter((artifact2) => artifact2.name === artifactConfig.artifact);
     if (matches.length === 0)
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: oldestObservation(runObservedAt, artifactObservedAt),
-        link,
         signal: { type: "test-count", status: "not-reported" }
-      });
-    if (matches.length !== 1 || matches[0]?.expired)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+      };
     const [artifact] = matches;
-    if (!artifact)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+    if (matches.length !== 1 || !artifact || artifact.expired)
+      return evidenceError("upstream-error");
     const archiveResponse = await githubFetch(githubArtifactDownloadCall(source, artifact.id), {
       ...args2,
       source,
       requestHeaders: noValidators,
       githubClient
     });
-    if (!archiveResponse.ok) return testCountFailure(panel.id, source, archiveResponse, link);
+    if (!archiveResponse.ok) return failedResponse(archiveResponse);
     const archiveObservedAt = observedAt2(archiveResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt);
     const summary = testResultsSummarySchema.parse(
-      JSON.parse(await readTestResultsArtifact(archiveResponse, panel.test_results.entry))
+      JSON.parse(await readTestResultsArtifact(archiveResponse, artifactConfig.entry))
     );
     if (summary.runId !== run2.id || summary.runAttempt !== run2.run_attempt || summary.headSha !== run2.head_sha)
       throw new Error("Test-results manifest does not belong to the selected workflow run.");
-    return testCountEnvelope({
-      panelId: panel.id,
+    return {
       state: "ok",
       observedAt: oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt),
-      link,
       signal: {
         type: "test-count",
         status: "reported",
@@ -1717,16 +1733,10 @@ async function fetchGithubActionsTestCount(args2) {
         ...summary.failed === void 0 ? {} : { failed: summary.failed },
         ...summary.skipped === void 0 ? {} : { skipped: summary.skipped }
       }
-    });
+    };
   } catch (error) {
-    return testCountEnvelope(
-      errorEnvelope(
-        panel.id,
-        error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
-        error,
-        failureLink,
-        failureObservedAt
-      )
+    return evidenceError(
+      error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error"
     );
   }
 }
@@ -1767,6 +1777,7 @@ async function fetchGithubActionsPipeline(args2) {
       ...args2,
       source: parsedSource,
       workflow: parsedPanel.pipeline,
+      requestHeaders: parsedPanel.test_results ? new Headers() : args2.requestHeaders,
       githubClient
     });
   } catch (error) {
@@ -1831,14 +1842,21 @@ async function fetchGithubActionsPipeline(args2) {
       });
       if (activity) signal.activity = activity;
     }
+    if (parsedPanel.test_results) {
+      signal.testResults = await readGithubRunTestEvidence(
+        { ...args2, source: parsedSource, githubClient },
+        { run: run2, observedAt: selected.observedAt },
+        parsedPanel.test_results
+      );
+    }
     const envelope = {
       panelId: args2.panel.id,
       state: "ok",
-      observedAt: observedAt2(upstream.headers.get("date")),
+      observedAt: signal.testResults ? oldestObservation(selected.observedAt, signal.testResults.observedAt) : selected.observedAt,
       link: run2.html_url,
       signal
     };
-    return { envelope, response: upstream };
+    return { envelope, response: parsedPanel.test_results ? new Response(null) : upstream };
   } catch (error) {
     return {
       response: new Response(

package/dist/index.js

@@ -887,11 +887,11 @@ var panelSchema = z2.looseObject({
         path: ["test_results"],
         message: "test-count requires test_results artifact configuration"
       });
-  } else if (panel.test_results) {
+  } else if (panel.test_results && panel.type !== "pipeline-status") {
     ctx.addIssue({
       code: "custom",
       path: ["test_results"],
-      message: "test_results is only supported by test-count panels"
+      message: "test_results is only supported by test-count and pipeline-status panels"
     });
   }
   if (panel.type !== "http-value") return;
@@ -1136,6 +1136,12 @@ var boardConfigSchema = z2.object({
           }
         });
       }
+      if (panel.type === "pipeline-status" && panel.test_results && source?.type !== "github-actions")
+        ctx.addIssue({
+          code: "custom",
+          path: ["boards", boardName, "panels", panelIndex, "test_results"],
+          message: "test_results requires a github-actions source"
+        });
       if (panel.type !== "pipeline-status" || source?.type !== "azure-devops") return;
       if (typeof panel.pipeline !== "number" || !Number.isInteger(panel.pipeline) || panel.pipeline <= 0) {
         ctx.addIssue({
@@ -1248,11 +1254,29 @@ var pipelineActivitySchema = z4.object({
   name: z4.string().min(1),
   parent: z4.string().min(1).optional()
 });
+var testCountSchema = z4.discriminatedUnion("status", [
+  z4.object({
+    type: z4.literal("test-count"),
+    status: z4.literal("reported"),
+    total: z4.number().int().nonnegative(),
+    passed: z4.number().int().nonnegative().optional(),
+    failed: z4.number().int().nonnegative().optional(),
+    skipped: z4.number().int().nonnegative().optional()
+  }),
+  z4.object({ type: z4.literal("test-count"), status: z4.literal("pending") }),
+  z4.object({ type: z4.literal("test-count"), status: z4.literal("not-reported") })
+]);
+var testEvidenceSchema = z4.discriminatedUnion("state", [
+  z4.object({ state: z4.literal("ok"), observedAt: z4.iso.datetime(), signal: testCountSchema }),
+  z4.object({ state: z4.literal("error"), observedAt: z4.iso.datetime(), error: envelopeErrorSchema })
+]);
 var pipelineStatusSchema = z4.object({
   type: z4.literal("pipeline-status"),
   status: z4.enum(["passed", "failed", "warning", "running", "cancelled", "unknown"]),
   /** The source's unmodified status/result vocabulary, for an honest display. */
   rawStatus: z4.string(),
+  /** Test evidence bound to this exact run; failures do not erase build status. */
+  testResults: testEvidenceSchema.optional(),
   name: z4.string().min(1),
   /** The branch represented by this status, when the upstream supplies or filters by one. */
   branch: z4.string().min(1).optional(),
@@ -1269,18 +1293,6 @@ var pipelineStatusSchema = z4.object({
   /** When this workflow run was last updated by its source, distinct from our observation time. */
   sourceUpdatedAt: z4.iso.datetime().optional()
 });
-var testCountSchema = z4.discriminatedUnion("status", [
-  z4.object({
-    type: z4.literal("test-count"),
-    status: z4.literal("reported"),
-    total: z4.number().int().nonnegative(),
-    passed: z4.number().int().nonnegative().optional(),
-    failed: z4.number().int().nonnegative().optional(),
-    skipped: z4.number().int().nonnegative().optional()
-  }),
-  z4.object({ type: z4.literal("test-count"), status: z4.literal("pending") }),
-  z4.object({ type: z4.literal("test-count"), status: z4.literal("not-reported") })
-]);
 var pullRequestHealthItemSchema = z4.object({
   label: z4.string().min(1),
   status: pipelineStatusSchema.shape.status,
@@ -2227,6 +2239,7 @@ function concat(chunks, length) {
 
 // packages/server/src/adapters/github-actions.ts
 var pipelinePanelSchema = z7.object({
+  test_results: testResultsArtifactSchema.optional(),
   id: z7.string().min(1),
   type: z7.literal("pipeline-status"),
   source: z7.string().min(1),
@@ -2302,37 +2315,60 @@ function testCountCapabilities(panel, source) {
 async function fetchGithubActionsTestCount(args) {
   const { panel, source } = testCountCapabilities(args.panel, args.source);
   const githubClient = githubClientFor(args);
-  const noValidators = new Headers();
-  let failureLink = sourceLinkForWorkflow(source, panel.pipeline);
-  let failureObservedAt;
   try {
     const selected = await selectGithubWorkflowRun({
       ...args,
       source,
       workflow: panel.pipeline,
-      requestHeaders: noValidators,
+      requestHeaders: new Headers(),
       githubClient
     });
     if (!selected.response.ok) return testCountFailure(panel.id, source, selected.response);
-    const { run } = selected;
-    if (!run?.id)
+    if (!selected.run?.id)
       return testCountEnvelope(
         noRunEnvelope(panel.id, source, panel.pipeline, selected.response.headers.get("date"))
       );
-    const link = run.html_url;
-    const runObservedAt = selected.observedAt;
-    failureLink = link;
-    failureObservedAt = runObservedAt;
+    const evidence = await readGithubRunTestEvidence(
+      { ...args, source, githubClient },
+      {
+        run: selected.run,
+        observedAt: selected.observedAt
+      },
+      panel.test_results
+    );
+    return testCountEnvelope({ ...evidence, panelId: panel.id, link: selected.run.html_url });
+  } catch (error) {
+    return testCountEnvelope(
+      errorEnvelope(
+        panel.id,
+        error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
+        error,
+        sourceLinkForWorkflow(source, panel.pipeline)
+      )
+    );
+  }
+}
+async function readGithubRunTestEvidence(args, selected, artifactConfig) {
+  const { run, observedAt: runObservedAt } = selected;
+  const { source, githubClient } = args;
+  const noValidators = new Headers();
+  let failureObservedAt = runObservedAt;
+  const evidenceError = (kind, at = failureObservedAt) => ({
+    state: "error",
+    observedAt: at,
+    error: { kind, message: publicErrorMessage(kind) }
+  });
+  const failedResponse = (response) => evidenceError(errorKind(response.status), observedAt2(response.headers.get("date")));
+  try {
+    if (!run.id) return evidenceError("upstream-error");
     if (run.status !== "completed")
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: runObservedAt,
-        link,
         signal: { type: "test-count", status: "pending" }
-      });
+      };
     const artifactsResponse = await githubFetch(
-      githubArtifactsCall(source, run.id, panel.test_results),
+      githubArtifactsCall(source, run.id, artifactConfig),
       {
         ...args,
         source,
@@ -2340,57 +2376,37 @@ async function fetchGithubActionsTestCount(args) {
         githubClient
       }
     );
-    if (!artifactsResponse.ok) return testCountFailure(panel.id, source, artifactsResponse, link);
+    if (!artifactsResponse.ok) return failedResponse(artifactsResponse);
     const artifactObservedAt = observedAt2(artifactsResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt);
     const artifacts = artifactsSchema.parse(await artifactsResponse.json()).artifacts;
-    const matches = artifacts.filter((artifact2) => artifact2.name === panel.test_results.artifact);
+    const matches = artifacts.filter((artifact2) => artifact2.name === artifactConfig.artifact);
     if (matches.length === 0)
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: oldestObservation(runObservedAt, artifactObservedAt),
-        link,
         signal: { type: "test-count", status: "not-reported" }
-      });
-    if (matches.length !== 1 || matches[0]?.expired)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+      };
     const [artifact] = matches;
-    if (!artifact)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+    if (matches.length !== 1 || !artifact || artifact.expired)
+      return evidenceError("upstream-error");
     const archiveResponse = await githubFetch(githubArtifactDownloadCall(source, artifact.id), {
       ...args,
       source,
       requestHeaders: noValidators,
       githubClient
     });
-    if (!archiveResponse.ok) return testCountFailure(panel.id, source, archiveResponse, link);
+    if (!archiveResponse.ok) return failedResponse(archiveResponse);
     const archiveObservedAt = observedAt2(archiveResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt);
     const summary = testResultsSummarySchema.parse(
-      JSON.parse(await readTestResultsArtifact(archiveResponse, panel.test_results.entry))
+      JSON.parse(await readTestResultsArtifact(archiveResponse, artifactConfig.entry))
     );
     if (summary.runId !== run.id || summary.runAttempt !== run.run_attempt || summary.headSha !== run.head_sha)
       throw new Error("Test-results manifest does not belong to the selected workflow run.");
-    return testCountEnvelope({
-      panelId: panel.id,
+    return {
       state: "ok",
       observedAt: oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt),
-      link,
       signal: {
         type: "test-count",
         status: "reported",
@@ -2399,16 +2415,10 @@ async function fetchGithubActionsTestCount(args) {
         ...summary.failed === void 0 ? {} : { failed: summary.failed },
         ...summary.skipped === void 0 ? {} : { skipped: summary.skipped }
       }
-    });
+    };
   } catch (error) {
-    return testCountEnvelope(
-      errorEnvelope(
-        panel.id,
-        error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
-        error,
-        failureLink,
-        failureObservedAt
-      )
+    return evidenceError(
+      error instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error"
     );
   }
 }
@@ -2449,6 +2459,7 @@ async function fetchGithubActionsPipeline(args) {
       ...args,
       source: parsedSource,
       workflow: parsedPanel.pipeline,
+      requestHeaders: parsedPanel.test_results ? new Headers() : args.requestHeaders,
       githubClient
     });
   } catch (error) {
@@ -2513,14 +2524,21 @@ async function fetchGithubActionsPipeline(args) {
       });
       if (activity) signal.activity = activity;
     }
+    if (parsedPanel.test_results) {
+      signal.testResults = await readGithubRunTestEvidence(
+        { ...args, source: parsedSource, githubClient },
+        { run, observedAt: selected.observedAt },
+        parsedPanel.test_results
+      );
+    }
     const envelope = {
       panelId: args.panel.id,
       state: "ok",
-      observedAt: observedAt2(upstream.headers.get("date")),
+      observedAt: signal.testResults ? oldestObservation(selected.observedAt, signal.testResults.observedAt) : selected.observedAt,
       link: run.html_url,
       signal
     };
-    return { envelope, response: upstream };
+    return { envelope, response: parsedPanel.test_results ? new Response(null) : upstream };
   } catch (error) {
     return {
       response: new Response(

package/dist/lambda.mjs

@@ -71277,11 +71277,11 @@ var panelSchema = external_exports.looseObject({
         path: ["test_results"],
         message: "test-count requires test_results artifact configuration"
       });
-  } else if (panel.test_results) {
+  } else if (panel.test_results && panel.type !== "pipeline-status") {
     ctx.addIssue({
       code: "custom",
       path: ["test_results"],
-      message: "test_results is only supported by test-count panels"
+      message: "test_results is only supported by test-count and pipeline-status panels"
     });
   }
   if (panel.type !== "http-value") return;
@@ -71531,6 +71531,12 @@ var boardConfigSchema = external_exports.object({
           }
         });
       }
+      if (panel.type === "pipeline-status" && panel.test_results && source?.type !== "github-actions")
+        ctx.addIssue({
+          code: "custom",
+          path: ["boards", boardName, "panels", panelIndex, "test_results"],
+          message: "test_results requires a github-actions source"
+        });
       if (panel.type !== "pipeline-status" || source?.type !== "azure-devops") return;
       if (typeof panel.pipeline !== "number" || !Number.isInteger(panel.pipeline) || panel.pipeline <= 0) {
         ctx.addIssue({
@@ -71643,11 +71649,29 @@ var pipelineActivitySchema = external_exports.object({
   name: external_exports.string().min(1),
   parent: external_exports.string().min(1).optional()
 });
+var testCountSchema = external_exports.discriminatedUnion("status", [
+  external_exports.object({
+    type: external_exports.literal("test-count"),
+    status: external_exports.literal("reported"),
+    total: external_exports.number().int().nonnegative(),
+    passed: external_exports.number().int().nonnegative().optional(),
+    failed: external_exports.number().int().nonnegative().optional(),
+    skipped: external_exports.number().int().nonnegative().optional()
+  }),
+  external_exports.object({ type: external_exports.literal("test-count"), status: external_exports.literal("pending") }),
+  external_exports.object({ type: external_exports.literal("test-count"), status: external_exports.literal("not-reported") })
+]);
+var testEvidenceSchema = external_exports.discriminatedUnion("state", [
+  external_exports.object({ state: external_exports.literal("ok"), observedAt: external_exports.iso.datetime(), signal: testCountSchema }),
+  external_exports.object({ state: external_exports.literal("error"), observedAt: external_exports.iso.datetime(), error: envelopeErrorSchema })
+]);
 var pipelineStatusSchema = external_exports.object({
   type: external_exports.literal("pipeline-status"),
   status: external_exports.enum(["passed", "failed", "warning", "running", "cancelled", "unknown"]),
   /** The source's unmodified status/result vocabulary, for an honest display. */
   rawStatus: external_exports.string(),
+  /** Test evidence bound to this exact run; failures do not erase build status. */
+  testResults: testEvidenceSchema.optional(),
   name: external_exports.string().min(1),
   /** The branch represented by this status, when the upstream supplies or filters by one. */
   branch: external_exports.string().min(1).optional(),
@@ -71664,18 +71688,6 @@ var pipelineStatusSchema = external_exports.object({
   /** When this workflow run was last updated by its source, distinct from our observation time. */
   sourceUpdatedAt: external_exports.iso.datetime().optional()
 });
-var testCountSchema = external_exports.discriminatedUnion("status", [
-  external_exports.object({
-    type: external_exports.literal("test-count"),
-    status: external_exports.literal("reported"),
-    total: external_exports.number().int().nonnegative(),
-    passed: external_exports.number().int().nonnegative().optional(),
-    failed: external_exports.number().int().nonnegative().optional(),
-    skipped: external_exports.number().int().nonnegative().optional()
-  }),
-  external_exports.object({ type: external_exports.literal("test-count"), status: external_exports.literal("pending") }),
-  external_exports.object({ type: external_exports.literal("test-count"), status: external_exports.literal("not-reported") })
-]);
 var pullRequestHealthItemSchema = external_exports.object({
   label: external_exports.string().min(1),
   status: pipelineStatusSchema.shape.status,
@@ -72754,6 +72766,7 @@ function concat(chunks, length) {
 
 // packages/server/src/adapters/github-actions.ts
 var pipelinePanelSchema = external_exports.object({
+  test_results: testResultsArtifactSchema.optional(),
   id: external_exports.string().min(1),
   type: external_exports.literal("pipeline-status"),
   source: external_exports.string().min(1),
@@ -72829,37 +72842,60 @@ function testCountCapabilities(panel, source) {
 async function fetchGithubActionsTestCount(args) {
   const { panel, source } = testCountCapabilities(args.panel, args.source);
   const githubClient = githubClientFor(args);
-  const noValidators = new Headers();
-  let failureLink = sourceLinkForWorkflow(source, panel.pipeline);
-  let failureObservedAt;
   try {
     const selected = await selectGithubWorkflowRun({
       ...args,
       source,
       workflow: panel.pipeline,
-      requestHeaders: noValidators,
+      requestHeaders: new Headers(),
       githubClient
     });
     if (!selected.response.ok) return testCountFailure(panel.id, source, selected.response);
-    const { run } = selected;
-    if (!run?.id)
+    if (!selected.run?.id)
       return testCountEnvelope(
         noRunEnvelope(panel.id, source, panel.pipeline, selected.response.headers.get("date"))
       );
-    const link = run.html_url;
-    const runObservedAt = selected.observedAt;
-    failureLink = link;
-    failureObservedAt = runObservedAt;
+    const evidence = await readGithubRunTestEvidence(
+      { ...args, source, githubClient },
+      {
+        run: selected.run,
+        observedAt: selected.observedAt
+      },
+      panel.test_results
+    );
+    return testCountEnvelope({ ...evidence, panelId: panel.id, link: selected.run.html_url });
+  } catch (error63) {
+    return testCountEnvelope(
+      errorEnvelope(
+        panel.id,
+        error63 instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
+        error63,
+        sourceLinkForWorkflow(source, panel.pipeline)
+      )
+    );
+  }
+}
+async function readGithubRunTestEvidence(args, selected, artifactConfig) {
+  const { run, observedAt: runObservedAt } = selected;
+  const { source, githubClient } = args;
+  const noValidators = new Headers();
+  let failureObservedAt = runObservedAt;
+  const evidenceError = (kind, at = failureObservedAt) => ({
+    state: "error",
+    observedAt: at,
+    error: { kind, message: publicErrorMessage(kind) }
+  });
+  const failedResponse = (response) => evidenceError(errorKind(response.status), observedAt2(response.headers.get("date")));
+  try {
+    if (!run.id) return evidenceError("upstream-error");
     if (run.status !== "completed")
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: runObservedAt,
-        link,
         signal: { type: "test-count", status: "pending" }
-      });
+      };
     const artifactsResponse = await githubFetch(
-      githubArtifactsCall(source, run.id, panel.test_results),
+      githubArtifactsCall(source, run.id, artifactConfig),
       {
         ...args,
         source,
@@ -72867,57 +72903,37 @@ async function fetchGithubActionsTestCount(args) {
         githubClient
       }
     );
-    if (!artifactsResponse.ok) return testCountFailure(panel.id, source, artifactsResponse, link);
+    if (!artifactsResponse.ok) return failedResponse(artifactsResponse);
     const artifactObservedAt = observedAt2(artifactsResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt);
     const artifacts = artifactsSchema.parse(await artifactsResponse.json()).artifacts;
-    const matches = artifacts.filter((artifact2) => artifact2.name === panel.test_results.artifact);
+    const matches = artifacts.filter((artifact2) => artifact2.name === artifactConfig.artifact);
     if (matches.length === 0)
-      return testCountEnvelope({
-        panelId: panel.id,
+      return {
         state: "ok",
         observedAt: oldestObservation(runObservedAt, artifactObservedAt),
-        link,
         signal: { type: "test-count", status: "not-reported" }
-      });
-    if (matches.length !== 1 || matches[0]?.expired)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+      };
     const [artifact] = matches;
-    if (!artifact)
-      return testCountEnvelope(
-        errorEnvelope(
-          panel.id,
-          "upstream-error",
-          "The test-results artifact is unavailable.",
-          link
-        )
-      );
+    if (matches.length !== 1 || !artifact || artifact.expired)
+      return evidenceError("upstream-error");
     const archiveResponse = await githubFetch(githubArtifactDownloadCall(source, artifact.id), {
       ...args,
       source,
       requestHeaders: noValidators,
       githubClient
     });
-    if (!archiveResponse.ok) return testCountFailure(panel.id, source, archiveResponse, link);
+    if (!archiveResponse.ok) return failedResponse(archiveResponse);
     const archiveObservedAt = observedAt2(archiveResponse.headers.get("date"));
     failureObservedAt = oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt);
     const summary = testResultsSummarySchema.parse(
-      JSON.parse(await readTestResultsArtifact(archiveResponse, panel.test_results.entry))
+      JSON.parse(await readTestResultsArtifact(archiveResponse, artifactConfig.entry))
     );
     if (summary.runId !== run.id || summary.runAttempt !== run.run_attempt || summary.headSha !== run.head_sha)
       throw new Error("Test-results manifest does not belong to the selected workflow run.");
-    return testCountEnvelope({
-      panelId: panel.id,
+    return {
       state: "ok",
       observedAt: oldestObservation(runObservedAt, artifactObservedAt, archiveObservedAt),
-      link,
       signal: {
         type: "test-count",
         status: "reported",
@@ -72926,16 +72942,10 @@ async function fetchGithubActionsTestCount(args) {
         ...summary.failed === void 0 ? {} : { failed: summary.failed },
         ...summary.skipped === void 0 ? {} : { skipped: summary.skipped }
       }
-    });
+    };
   } catch (error63) {
-    return testCountEnvelope(
-      errorEnvelope(
-        panel.id,
-        error63 instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error",
-        error63,
-        failureLink,
-        failureObservedAt
-      )
+    return evidenceError(
+      error63 instanceof GithubAuthenticationError ? "unauthorized" : "upstream-error"
     );
   }
 }
@@ -73151,6 +73161,7 @@ async function fetchGithubActionsPipeline(args) {
       ...args,
       source: parsedSource,
       workflow: parsedPanel.pipeline,
+      requestHeaders: parsedPanel.test_results ? new Headers() : args.requestHeaders,
       githubClient
     });
   } catch (error63) {
@@ -73215,14 +73226,21 @@ async function fetchGithubActionsPipeline(args) {
       });
       if (activity) signal.activity = activity;
     }
+    if (parsedPanel.test_results) {
+      signal.testResults = await readGithubRunTestEvidence(
+        { ...args, source: parsedSource, githubClient },
+        { run, observedAt: selected.observedAt },
+        parsedPanel.test_results
+      );
+    }
     const envelope = {
       panelId: args.panel.id,
       state: "ok",
-      observedAt: observedAt2(upstream.headers.get("date")),
+      observedAt: signal.testResults ? oldestObservation(selected.observedAt, signal.testResults.observedAt) : selected.observedAt,
       link: run.html_url,
       signal
     };
-    return { envelope, response: upstream };
+    return { envelope, response: parsedPanel.test_results ? new Response(null) : upstream };
   } catch (error63) {
     return {
       response: new Response(
@@ -74241,6 +74259,15 @@ var getPathNoStrict = (request) => {
   const result = getPath(request);
   return result.length > 1 && result.at(-1) === "/" ? result.slice(0, -1) : result;
 };
+var stripPathPrefix = (rawPath, decodedPath, prefixLength) => {
+  if (rawPath.at(-1) === "/" && decodedPath.at(-1) !== "/") rawPath = rawPath.slice(0, -1);
+  let index = 0;
+  for (let i6 = decodedPath.indexOf("/"); i6 !== -1 && i6 < prefixLength; i6 = decodedPath.indexOf("/", i6 + 1)) {
+    index = rawPath.indexOf("/", index + 1);
+    if (index === -1) return "/";
+  }
+  return rawPath.slice(index) || "/";
+};
 var mergePath = (base, sub, ...rest) => {
   if (rest.length) sub = mergePath(sub, ...rest);
   return `${base?.[0] === "/" ? "" : "/"}${base}${sub === "/" ? "" : `${base?.at(-1) === "/" ? "" : "/"}${sub?.[0] === "/" ? sub.slice(1) : sub}`}`;
@@ -74821,7 +74848,7 @@ var Context = class {
   * ```
   */
   header = (name, value, options) => {
-    if (this.finalized) this.#res = createResponseInstance(this.#res.body, this.#res);
+    if (this.finalized && !this.#res.bodyUsed) this.#res = createResponseInstance(this.#res.body, this.#res);
     const headers = this.#res ? this.#res.headers : this.#preparedHeaders ??= new Headers();
     if (value === void 0) headers.delete(name);
     else if (options?.append) headers.append(name, value);
@@ -75050,6 +75077,37 @@ var UnsupportedPathError = class extends Error {
 // node_modules/hono/dist/utils/constants.js
 var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 
+// node_modules/hono/dist/utils/mount.js
+var getPathPrefixLength = (c5, pathPrefix, routePath) => {
+  if (!/[:*]/.test(pathPrefix)) return pathPrefix.length;
+  const path = c5.req.path;
+  const matchResult = c5.req[GET_MATCH_RESULT];
+  const paramNames = /* @__PURE__ */ new Set();
+  let length = 0;
+  for (const part of splitRoutingPath(pathPrefix)) {
+    const pattern = getPattern(part);
+    if (pattern && pattern !== "*") {
+      const name = pattern[1];
+      if (paramNames.has(name)) throw new Error(`mount(): Duplicate path parameter "${name}" in "${routePath}".`);
+      paramNames.add(name);
+    }
+    if (pattern && pattern !== "*" && pattern[2] !== true) {
+      const value = matchResult.length === 2 ? matchResult[1][matchResult[0][c5.req.routeIndex][1][pattern[1]]] : matchResult[0][c5.req.routeIndex][1][pattern[1]];
+      length += value.length + 1;
+    } else if (pattern || part.endsWith("*")) {
+      const end2 = path.indexOf("/", length + 1);
+      length = end2 === -1 ? path.length : end2;
+    } else length += part.length + 1;
+  }
+  return length;
+};
+var createMountedRequest = (c5, pathPrefix, routePath) => {
+  if (/[^/]\*$/.test(routePath)) throw new Error(`mount(): Wildcard must follow "/" in "${routePath}".`);
+  const url2 = new URL(c5.req.raw.url);
+  url2.pathname = stripPathPrefix(url2.pathname, c5.req.path, getPathPrefixLength(c5, pathPrefix, routePath));
+  return new Request(url2, c5.req.raw);
+};
+
 // node_modules/hono/dist/hono-base.js
 var notFoundHandler = (c5) => {
   return c5.text("404 Not Found", 404);
@@ -75271,17 +75329,10 @@ var Hono = class Hono2 {
       }
       return [c5.env, executionContext];
     };
-    replaceRequest ||= (() => {
-      const mergedPath = mergePath(this._basePath, path);
-      const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
-      return (request) => {
-        const url2 = new URL(request.url);
-        url2.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
-        return new Request(url2, request);
-      };
-    })();
+    const mergedPath = mergePath(this._basePath, path);
+    const defaultReplaceRequest = (c5) => createMountedRequest(c5, mergedPath.replace(/\/$/, ""), mergePath(mergedPath, "*"));
     const handler2 = async (c5, next) => {
-      const res = await applicationHandler(replaceRequest(c5.req.raw), ...getOptions(c5));
+      const res = await applicationHandler(replaceRequest ? replaceRequest(c5.req.raw) : defaultReplaceRequest(c5), ...getOptions(c5));
       if (res) return res;
       await next();
     };
@@ -75413,14 +75464,15 @@ function match(method, path) {
 
 // node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
-var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
+var ONLY_WILDCARD_REG_EXP_STR = "[^]*";
+var TAIL_WILDCARD_REG_EXP_STR = "(?:|/[^]*)";
 var PATH_ERROR = /* @__PURE__ */ Symbol();
 var regExpMetaChars = /* @__PURE__ */ new Set(".\\+*[^]$()");
 function compareKey(a5, b5) {
   if (a5.length === 1) return b5.length === 1 ? a5 < b5 ? -1 : 1 : -1;
   if (b5.length === 1) return 1;
-  if (a5 === ".*" || a5 === "(?:|/.*)") return b5 === "(?:|/.*)" ? -1 : 1;
-  else if (b5 === ".*" || b5 === "(?:|/.*)") return -1;
+  if (a5 === "[^]*" || a5 === "(?:|/[^]*)") return b5 === "[^]*" ? -1 : 1;
+  else if (b5 === "[^]*" || b5 === "(?:|/[^]*)") return -1;
   if (a5 === "[^/]+") return 1;
   else if (b5 === "[^/]+") return -1;
   return a5.length === b5.length ? a5 < b5 ? -1 : 1 : b5.length - a5.length;
@@ -75429,14 +75481,14 @@ var Node = class Node2 {
   #index;
   #varIndex;
   #children = createNullObject();
-  insert(tokens, index, paramMap, context, isStatic) {
+  insert(tokens, index, paramMap, context, keys) {
     let node2 = this;
     for (let i6 = 0, len = tokens.length; i6 < len; i6++) {
       const token = tokens[i6];
       const pattern = token.length === 1 ? token === "*" ? i6 === len - 1 ? [
         "",
         "",
-        ".*"
+        ONLY_WILDCARD_REG_EXP_STR
       ] : [
         "",
         "",
@@ -75451,15 +75503,16 @@ var Node = class Node2 {
         const name = pattern[1];
         let regexpStr = pattern[2] || "[^/]+";
         if (name && pattern[2]) {
-          if (regexpStr === ".*") throw PATH_ERROR;
+          if (new RegExp(regexpStr).test("")) throw PATH_ERROR;
           regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
           if (/\((?!\?:)/.test(regexpStr)) throw PATH_ERROR;
           if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) throw PATH_ERROR;
         }
+        keys.push(regexpStr);
         nextNode = node2.#children[regexpStr];
         if (!nextNode) {
-          if (regexpStr !== ".*" && regexpStr !== "(?:|/.*)") {
-            for (const k5 in node2.#children) if ((regexpStr.length > 1 || k5.length > 1) && k5 !== ".*" && k5 !== "(?:|/.*)") throw PATH_ERROR;
+          if (regexpStr !== "[^]*" && regexpStr !== "(?:|/[^]*)") {
+            for (const k5 in node2.#children) if ((regexpStr.length > 1 || k5.length > 1) && k5 !== "[^]*" && k5 !== "(?:|/[^]*)") throw PATH_ERROR;
           }
           nextNode = node2.#children[regexpStr] = new Node2();
         }
@@ -75468,16 +75521,17 @@ var Node = class Node2 {
           paramMap.push([name, nextNode.#varIndex]);
         }
       } else {
+        keys.push(token);
         nextNode = node2.#children[token];
         if (!nextNode) {
-          for (const k5 in node2.#children) if (k5.length > 1 && k5 !== ".*" && k5 !== "(?:|/.*)") throw PATH_ERROR;
+          for (const k5 in node2.#children) if (k5.length > 1 && k5 !== "[^]*" && k5 !== "(?:|/[^]*)") throw PATH_ERROR;
           nextNode = node2.#children[token] = new Node2();
         }
       }
       node2 = nextNode;
     }
     if (node2.#index !== void 0) throw PATH_ERROR;
-    node2.#index = isStatic ? -1 : index;
+    node2.#index = index;
   }
   buildRegExpStr() {
     const strList = Object.keys(this.#children).sort(compareKey).map((k5) => {
@@ -75499,8 +75553,14 @@ var Trie = class {
   #index = 0;
   paths = createNullObject();
   insert(path, isStatic) {
+    const keys = [];
     if (isStatic) {
-      this.#root.insert(path.split(""), 0, [], this.#context, true);
+      this.#root.insert(path.split(""), -1, [], this.#context, keys);
+      this.paths[path] = [
+        -1,
+        [],
+        keys
+      ];
       return;
     }
     const paramAssoc = [];
@@ -75508,7 +75568,7 @@ var Trie = class {
     let markedPath = path;
     for (let i6 = 0; ; ) {
       let replaced = false;
-      markedPath = markedPath.replace(/\{[^}]+\}/g, (m3) => {
+      markedPath = markedPath.replace(/\{(?:\{[\d,]+\}|[^}])+\}/g, (m3) => {
         const mark = `@\\${i6}`;
         groups[i6] = [mark, m3];
         i6++;
@@ -75517,7 +75577,7 @@ var Trie = class {
       });
       if (!replaced) break;
     }
-    const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
+    const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./gs) || [];
     for (let i6 = groups.length - 1; i6 >= 0; i6--) {
       const [mark] = groups[i6];
       for (let j5 = tokens.length - 1; j5 >= 0; j5--) if (tokens[j5].indexOf(mark) !== -1) {
@@ -75525,8 +75585,12 @@ var Trie = class {
         break;
       }
     }
-    this.#root.insert(tokens, this.#index, paramAssoc, this.#context, false);
-    this.paths[path] = [this.#index++, paramAssoc];
+    this.#root.insert(tokens, this.#index, paramAssoc, this.#context, keys);
+    this.paths[path] = [
+      this.#index++,
+      paramAssoc,
+      keys
+    ];
   }
   buildRegExp() {
     let regexp = this.#root.buildRegExpStr();
@@ -75558,21 +75622,21 @@ var Trie = class {
 };
 
 // node_modules/hono/dist/router/reg-exp-router/router.js
-var wildcardRegExpCache = createNullObject();
-function buildWildcardRegExp(path) {
-  return wildcardRegExpCache[path] ??= new RegExp(`^${path.replace(/\/:[^/{}]+(?:\{\[\^\/]\+})?(?=[/{]|$)|\/?\*$|([.\\+*[^\]$()?{}|])/g, (match2, metaChar) => metaChar ? `\\${metaChar}` : match2 === "/*" ? TAIL_WILDCARD_REG_EXP_STR : match2 === "*" ? ".*" : `/:${LABEL_REG_EXP_STR}`)}$`);
+function endsWithWildcard(keys) {
+  const tail = keys[keys.length - 1];
+  return tail === "[^]*" || tail === "(?:|/[^]*)";
 }
-function findMiddleware(middleware, path) {
-  for (const k5 of Object.keys(middleware).sort((a5, b5) => b5.length - a5.length)) if (buildWildcardRegExp(k5).test(path)) return [...middleware[k5]];
+function covers(wildcard, target) {
+  const last = wildcard.length - 1;
+  for (let i6 = 0; i6 < last; i6++) if (wildcard[i6] !== target[i6]) return false;
+  return wildcard[last] === "[^]*" || target.length === last || target[last] === "/";
 }
 var RegExpRouter = class {
   name = "RegExpRouter";
-  #middleware;
-  #routes;
+  #handlers;
   #tries;
   constructor() {
-    this.#middleware = { ["ALL"]: createNullObject() };
-    this.#routes = { ["ALL"]: createNullObject() };
+    this.#handlers = { ["ALL"]: [] };
     this.#tries = { ["ALL"]: new Trie() };
   }
   #insertPath(method, path) {
@@ -75583,65 +75647,53 @@ var RegExpRouter = class {
     }
   }
   add(method, path, handler2) {
-    const middleware = this.#middleware;
-    const routes = this.#routes;
-    if (!middleware) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
-    if (!middleware[method]) {
-      this.#tries[method] = new Trie();
-      for (const handlerMap of [middleware, routes]) {
-        handlerMap[method] = createNullObject();
-        for (const p3 in handlerMap["ALL"]) {
-          handlerMap[method][p3] = [...handlerMap["ALL"][p3]];
-          this.#insertPath(method, p3);
-        }
-      }
+    const handlers = this.#handlers;
+    if (!handlers) throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
+    const tries = this.#tries;
+    if (!handlers[method]) {
+      tries[method] = new Trie();
+      handlers[method] = [...handlers["ALL"]];
+      for (const p3 in tries["ALL"].paths) this.#insertPath(method, p3);
     }
     if (path === "/*") path = "*";
-    const methods = method === "ALL" ? Object.keys(middleware) : [method];
-    if (/\*$/.test(path)) {
-      const re = buildWildcardRegExp(path);
-      for (const m3 of methods) if (!middleware[m3][path]) {
-        this.#insertPath(m3, path);
-        middleware[m3][path] = findMiddleware(middleware[m3], path) || findMiddleware(middleware["ALL"], path) || [];
-      }
-      for (const handlerMap of [middleware, routes]) for (const m3 of methods) for (const p3 in handlerMap[m3]) re.test(p3) && handlerMap[m3][p3].push([handler2, path]);
-      return;
-    }
+    const methods = method === "ALL" ? Object.keys(handlers) : [method];
     const paths = checkOptionalParameter(path) || [path];
     for (const path2 of paths) for (const m3 of methods) {
-      if (!routes[m3][path2]) {
-        this.#insertPath(m3, path2);
-        routes[m3][path2] = findMiddleware(middleware[m3], path2) || findMiddleware(middleware["ALL"], path2) || [];
-      }
-      routes[m3][path2].push([handler2, path2]);
+      if (!tries[m3].paths[path2]) this.#insertPath(m3, path2);
+      handlers[m3].push([handler2, path2]);
     }
   }
   match = match;
   buildAllMatchers() {
     const matchers = createNullObject();
-    for (const method of Object.keys(this.#routes)) matchers[method] = this.#buildMatcher(method);
-    this.#middleware = this.#routes = this.#tries = void 0;
-    wildcardRegExpCache = createNullObject();
+    for (const method of Object.keys(this.#handlers)) matchers[method] = this.#buildMatcher(method);
+    this.#handlers = this.#tries = void 0;
     return matchers;
   }
   #buildMatcher(method) {
-    const middleware = this.#middleware[method];
-    const routes = this.#routes[method];
+    const handlers = this.#handlers[method];
     const trie = this.#tries[method];
     const staticMap = createNullObject();
     const handlerData = [];
     const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-    for (const r5 of [middleware, routes]) for (const path in r5) {
-      const handlers = r5[path];
-      const pathData = trie.paths[path];
-      if (!pathData) {
-        staticMap[path] = [handlers.map(([h5]) => [h5, createNullObject()]), emptyParam];
-        continue;
-      }
-      handlerData[pathData[0]] = handlers.map(([h5, handlerPath]) => [h5, trie.paths[handlerPath][1].reduceRight((map4, [key], i6) => {
-        map4[key] = paramReplacementMap[pathData[1][i6][1]];
+    const own2 = createNullObject();
+    const entries = handlers.map(([h5, p3], i6) => {
+      (own2[p3] ??= []).push(i6);
+      return [h5, trie.paths[p3][1].reduceRight((map4, [key, varIndex]) => {
+        map4[key] = paramReplacementMap[varIndex];
         return map4;
-      }, createNullObject())]);
+      }, createNullObject())];
+    });
+    const wildcards = Object.keys(own2).filter((p3) => endsWithWildcard(trie.paths[p3][2]));
+    for (const path in trie.paths) {
+      const [index, , keys] = trie.paths[path];
+      const indexes = [...own2[path]];
+      for (const p3 of wildcards) if (p3 !== path && covers(trie.paths[p3][2], keys)) indexes.push(...own2[p3]);
+      const data = indexes.sort((a5, b5) => a5 - b5).map((i6) => entries[i6]);
+      if (index === -1) {
+        const last = Math.max(-1, ...data.flatMap(([, map4]) => Object.values(map4)));
+        staticMap[path] = [data, last === -1 ? emptyParam : path.match(regexp).slice(0, last + 1)];
+      } else handlerData[index] = data;
     }
     return [
       regexp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuous-excellence/ze-great-dashboard-aws",
-  "version": "0.31.53",
+  "version": "0.31.55",
   "type": "module",
   "description": "AWS server runtime and CloudFormation deployment tooling for Ze Great Dashboard.",
   "keywords": [