@evo-dev/core 0.0.1-alpha.13 → 0.0.1-alpha.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evo-dev/core",
-  "version": "0.0.1-alpha.13",
+  "version": "0.0.1-alpha.15",
   "type": "module",
   "repository": {
     "type": "git",

package/src/evolution/knowledge/index.ts

@@ -3,6 +3,11 @@ import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { resolveEvoDevPaths } from "../../config/paths.ts";
+import {
+  canonicalizeProjectKey,
+  listEquivalentProjectKeys,
+  listProjectAliases,
+} from "../../projects/index.ts";
 import { createStableId, normalizeTimestamp } from "../../utils/index.ts";
 import { listEvolutionEvosCases } from "../candidates/index.ts";
 import {
@@ -377,6 +382,7 @@ interface OkfPaths {
 
 interface KnowledgeQueryScope {
   projectKey?: string;
+  projectKeys?: string[];
   roleId?: string;
   workflowId?: string;
   paths: string[];
@@ -2367,6 +2373,13 @@ export async function listOkfKnowledgeConcepts(input: {
 }): Promise<OkfKnowledgeConcept[]> {
   const okfDir = resolveOkfKnowledgePaths(input.homeDir).okfDir;
   if (!(await pathExists(okfDir))) return [];
+  const equivalentProjectKeys =
+    input.projectKey === undefined
+      ? undefined
+      : await listEquivalentProjectKeys({
+          homeDir: input.homeDir,
+          projectKey: input.projectKey,
+        });
   const files = await listMarkdownFiles(okfDir);
   const concepts: OkfKnowledgeConcept[] = [];
   for (const file of files) {
@@ -2376,7 +2389,7 @@ export async function listOkfKnowledgeConcepts(input: {
     if (parsed !== null) concepts.push(parsed);
   }
   return concepts
-    .filter((concept) => matchesConceptFilters(concept, input))
+    .filter((concept) => matchesConceptFilters(concept, input, equivalentProjectKeys))
     .sort((left, right) => left.id.localeCompare(right.id));
 }
 
@@ -2406,7 +2419,7 @@ export async function queryOkfKnowledge(input: {
   now?: string | Date;
 }): Promise<OkfKnowledgeQueryResult> {
   const okfDir = resolveOkfKnowledgePaths(input.homeDir).okfDir;
-  const scope = normalizeKnowledgeQueryScope(input);
+  const scope = await normalizeKnowledgeQueryScope(input);
   const queryText = normalizeKnowledgeQueryText(input.queryText);
   const now = normalizeQueryNow(input.now);
   const warnings: string[] = [];
@@ -2705,17 +2718,39 @@ export async function queryScopedOkfKnowledgeContext(input: {
   now?: string | Date;
 }): Promise<OkfKnowledgeQueryResult> {
   const result = await queryOkfKnowledge(input);
-  const evosCases = await listEvolutionEvosCases({
-    homeDir: input.homeDir,
-    projectKey: input.projectKey,
-    roleId: input.roleId,
-    reviewStates: ["accepted", "auto-accepted"],
-  });
+  const equivalentProjectKeys =
+    result.projectKey === undefined
+      ? [undefined]
+      : await listEquivalentProjectKeys({
+          homeDir: input.homeDir,
+          projectKey: result.projectKey,
+        });
+  const evosResults = await Promise.all(
+    equivalentProjectKeys.map((projectKey) =>
+      listEvolutionEvosCases({
+        homeDir: input.homeDir,
+        ...(projectKey === undefined ? {} : { projectKey }),
+        roleId: input.roleId,
+        reviewStates: ["accepted", "auto-accepted"],
+      }),
+    ),
+  );
+  const evosCases = {
+    cases: [
+      ...new Map(
+        evosResults
+          .flatMap((entry) => entry.cases)
+          .map((evosCase) => [`${evosCase.projectKey}\0${evosCase.id}`, evosCase]),
+      ).values(),
+    ],
+    warnings: [...new Set(evosResults.flatMap((entry) => entry.warnings))],
+  };
   return mergeAcceptedEvosCasesIntoKnowledgeQuery(
     result,
     evosCases.cases,
     evosCases.warnings,
     input.limit,
+    equivalentProjectKeys.flatMap((projectKey) => (projectKey === undefined ? [] : [projectKey])),
   );
 }
 
@@ -2724,6 +2759,7 @@ export function mergeAcceptedEvosCasesIntoKnowledgeQuery(
   cases: EvolutionEvosCase[],
   warnings: string[] = [],
   limit?: number,
+  equivalentProjectKeys: string[] = [],
 ): OkfKnowledgeQueryResult {
   const startRank = result.items.length + 1;
   const evosItems = cases.flatMap<OkfKnowledgeContextItem>((evosCase, index) => {
@@ -2738,8 +2774,10 @@ export function mergeAcceptedEvosCasesIntoKnowledgeQuery(
         : []),
     ];
     const structuredScore =
-      (result.projectKey !== undefined && evosCase.projectKey === result.projectKey ? 100 : 0) +
-      (result.roleId !== undefined && evosCase.roleTags.includes(result.roleId) ? 100 : 0);
+      (result.projectKey !== undefined &&
+      [result.projectKey, ...equivalentProjectKeys].includes(evosCase.projectKey)
+        ? 100
+        : 0) + (result.roleId !== undefined && evosCase.roleTags.includes(result.roleId) ? 100 : 0);
     return [
       {
         id: evosCase.id,
@@ -4107,12 +4145,16 @@ function parseOkfConceptFile(
 function matchesConceptFilters(
   concept: OkfKnowledgeConcept,
   input: { projectKey?: string; roleId?: string; workflowId?: string; paths?: string[] },
+  equivalentProjectKeys?: string[],
 ): boolean {
+  const projectKeys = (equivalentProjectKeys ?? []).map(sanitizeSlug);
   if (
     input.projectKey !== undefined &&
     concept.repoTags.length > 0 &&
-    !concept.repoTags.includes(sanitizeSlug(input.projectKey)) &&
-    !concept.tags.includes(`repo:${sanitizeSlug(input.projectKey)}`)
+    ![sanitizeSlug(input.projectKey), ...projectKeys].some(
+      (projectKey) =>
+        concept.repoTags.includes(projectKey) || concept.tags.includes(`repo:${projectKey}`),
+    )
   ) {
     return false;
   }
@@ -4140,14 +4182,40 @@ function matchesConceptFilters(
   return true;
 }
 
-function normalizeKnowledgeQueryScope(input: {
+async function normalizeKnowledgeQueryScope(input: {
+  homeDir: string;
   projectKey?: string;
   roleId?: string;
   workflowId?: string;
   paths?: string[];
-}): KnowledgeQueryScope {
+}): Promise<KnowledgeQueryScope> {
+  const aliases =
+    input.projectKey === undefined
+      ? {}
+      : await listProjectAliases({
+          homeDir: input.homeDir,
+        });
+  const requestedProjectKey =
+    input.projectKey === undefined ? undefined : sanitizeSlug(input.projectKey);
+  const projectKey =
+    requestedProjectKey === undefined
+      ? undefined
+      : canonicalizeProjectKey(requestedProjectKey, aliases);
+  const projectKeys =
+    projectKey === undefined
+      ? undefined
+      : [
+          ...new Set([
+            projectKey,
+            requestedProjectKey ?? projectKey,
+            ...Object.keys(aliases).filter(
+              (alias) => canonicalizeProjectKey(alias, aliases) === projectKey,
+            ),
+          ]),
+        ].map(sanitizeSlug);
   return {
-    projectKey: input.projectKey === undefined ? undefined : sanitizeSlug(input.projectKey),
+    projectKey,
+    projectKeys,
     roleId: input.roleId === undefined ? undefined : sanitizeSlug(input.roleId),
     workflowId: input.workflowId === undefined ? undefined : sanitizeSlug(input.workflowId),
     paths: (input.paths ?? []).flatMap((path) => {
@@ -4368,8 +4436,10 @@ function matchOkfConceptForContext(
 
   const repoTags = collectScopedTags(concept, "repo");
   if (scope.projectKey !== undefined) {
-    if (repoTags.length > 0 && !repoTags.includes(scope.projectKey)) return null;
-    if (repoTags.includes(scope.projectKey)) {
+    const projectKeys = scope.projectKeys ?? [scope.projectKey];
+    const matchedProjectKey = projectKeys.find((projectKey) => repoTags.includes(projectKey));
+    if (repoTags.length > 0 && matchedProjectKey === undefined) return null;
+    if (matchedProjectKey !== undefined) {
       reasons.push(`repo:${scope.projectKey}`);
       exactMatches += 1;
     }
@@ -4441,7 +4511,12 @@ function matchOverlayScope(
 ): "repo" | "role" | "workflow" | "none" | null {
   const [root, id] = conceptId.split("/");
   if (root === "repos") {
-    if (scope.projectKey !== undefined && id !== scope.projectKey) return null;
+    if (
+      scope.projectKey !== undefined &&
+      !(scope.projectKeys ?? [scope.projectKey]).includes(id ?? "")
+    ) {
+      return null;
+    }
     return scope.projectKey === undefined ? "none" : "repo";
   }
   if (root === "roles") {