@agentxm/workspace-lint 0.28.8 → 0.28.9

package/dist/src/catalog/workspace-read-model/lint-workspace.js

@@ -45,7 +45,7 @@ import { PackManifestSchema } from "@agentxm/extension-model/unstable/packs/mani
 import { MANIFEST_FILENAME as SKILL_MANIFEST_FILENAME } from "@agentxm/extension-model/unstable/skills/manifest-schema";
 import { MANIFEST_FILENAME as SUBAGENT_MANIFEST_FILENAME } from "@agentxm/extension-model/unstable/subagents/manifest-schema";
 import { readManifestJson } from "./manifest-json.js";
-import { toExtensionTypePlural } from "@agentxm/extension-model/unstable/extensions/common";
+import { CommonManifestBaseFields, ExtensionNameSchema, ExtensionTypeSchema, toExtensionTypePlural, } from "@agentxm/extension-model/unstable/extensions/common";
 /**
  * Build the per-rule `WorkspaceRuleContext` and the flat `LintWorkspaceView`
  * via a single {@link makeWorkspaceReadModel} invocation.
@@ -131,7 +131,7 @@ const makeInstructionAccessor = (args) => Effect.gen(function* () {
 });
 const joinManifestPath = (root, filename) => root === "" || root === "." ? filename : `${root}/${filename}`;
 const buildLintWorkspaceView = (args) => Effect.gen(function* () {
-    const [skills, packs, subagents, mcpServers, hooks, rules, knowledge] = yield* Effect.all([
+    const [skills, packs, subagents, mcpServers, hooks, rules, knowledge, workspaceOwner] = yield* Effect.all([
         args.readModel.skills.installed,
         args.readModel.packs.installed,
         args.readModel.subagents.installed,
@@ -139,6 +139,7 @@ const buildLintWorkspaceView = (args) => Effect.gen(function* () {
         args.readModel.hooks.installed,
         args.readModel.rules.installed,
         args.readModel.knowledge.installed,
+        args.readModel.owner,
     ], { concurrency: "unbounded" });
     const namedSkills = skills.flatMap((skill) => {
         const built = installedSkillToInfo(args, skill);
@@ -195,6 +196,23 @@ const buildLintWorkspaceView = (args) => Effect.gen(function* () {
         populateRuleManifestJson(namedRules),
         populateKnowledgeManifestJson(namedKnowledge, args.inspectKnowledge),
     ], { concurrency: "unbounded" });
+    const installedManifests = [
+        ...skillsWithJson.map((entry) => ({
+            extensionType: "skill",
+            name: entry.name,
+            manifestPath: entry.manifestPath,
+            manifestJson: entry.info.skillJson,
+        })),
+        ...toManifests("subagent", subagentsWithJson, (c) => c.subject.subagentJson),
+        ...toManifests("mcp-server", mcpServersWithJson, (c) => c.subject.mcpServerJson),
+        ...toManifests("hook", hooksWithJson, (c) => c.subject.hookJson),
+        ...toManifests("rule", rulesWithJson, (c) => c.subject.ruleJson),
+        ...toManifests("knowledge", knowledgeWithJson, (c) => c.subject.knowledgeJson),
+    ];
+    const manifestByMember = new Map(installedManifests.map((entry) => [
+        `${entry.extensionType}\u0000${entry.name}`,
+        entry.manifestJson,
+    ]));
     return {
         view: {
             installedSkills: skillsWithJson.map((entry) => entry.info),
@@ -205,42 +223,51 @@ const buildLintWorkspaceView = (args) => Effect.gen(function* () {
             ruleContexts: rulesWithJson.map((entry) => entry.context),
             knowledgeContexts: knowledgeWithJson.map((entry) => entry.context),
         },
-        installedManifests: [
-            ...skillsWithJson.map((entry) => ({
-                extensionType: "skill",
-                name: entry.name,
-                manifestPath: entry.manifestPath,
-                manifestJson: entry.info.skillJson,
-            })),
-            ...toManifests("subagent", subagentsWithJson, (c) => c.subject.subagentJson),
-            ...toManifests("mcp-server", mcpServersWithJson, (c) => c.subject.mcpServerJson),
-            ...toManifests("hook", hooksWithJson, (c) => c.subject.hookJson),
-            ...toManifests("rule", rulesWithJson, (c) => c.subject.ruleJson),
-            ...toManifests("knowledge", knowledgeWithJson, (c) => c.subject.knowledgeJson),
-        ],
+        installedManifests,
         packDependencyReachability: buildPackDependencyReachability({
             packs: installedPacksWithJson.flatMap(toPackDependencyDeclaration),
-            members: [
-                ...skills.flatMap((entry) => memberObservation("skill", entry.resolved)),
-                ...subagents.flatMap((entry) => memberObservation("subagent", entry.resolved)),
-                ...mcpServers.flatMap((entry) => memberObservation("mcp-server", entry.resolved)),
-                ...hooks.flatMap((entry) => memberObservation("hook", entry.resolved)),
-                ...rules.flatMap((entry) => memberObservation("rule", entry.resolved)),
-                ...knowledge.flatMap((entry) => memberObservation("knowledge", entry.resolved)),
-            ],
+            members: [...skills, ...subagents, ...mcpServers, ...hooks, ...rules, ...knowledge].flatMap((entry) => memberObservation(entry, manifestByMember.get(`${entry.key.type}\u0000${entry.key.name}`), workspaceOwner)),
         }),
     };
 });
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const memberObservation = (extensionType, resolved) => {
+const MemberIdentitySchema = Schema.Struct({
+    owner: CommonManifestBaseFields.owner,
+    version: CommonManifestBaseFields.version,
+    name: ExtensionNameSchema,
+    type: ExtensionTypeSchema,
+});
+const memberObservation = (installed, manifestJson, workspaceOwner) => {
+    const extensionType = installed.key.type;
+    if (installed.installationOrigin._tag === "direct" &&
+        installed.installationOrigin.declared.entry.source === "workspace") {
+        // Workspace authorship has no accepted external lock row. Its declared
+        // package supplies the current version; agent copies and unrelated files
+        // cannot become a second resolution authority.
+        const decoded = Schema.decodeUnknownResult(MemberIdentitySchema)(manifestJson);
+        if (Result.isFailure(decoded) ||
+            Option.isNone(workspaceOwner) ||
+            decoded.success.owner !== workspaceOwner.value ||
+            decoded.success.type !== extensionType ||
+            decoded.success.name !== installed.key.name)
+            return [];
+        return [
+            {
+                fqn: `${decoded.success.owner}/${toExtensionTypePlural(extensionType)}/${decoded.success.name}`,
+                version: decoded.success.version,
+                authority: "workspace",
+            },
+        ];
+    }
+    const resolved = installed.resolved;
     if (Option.isNone(resolved) || !isRecord(resolved.value.lockEntry))
         return [];
     const entry = resolved.value.lockEntry;
     const authority = entry["type"];
     const owner = entry["owner"];
     const name = entry["name"];
-    const version = authority === "workspace" ? entry["version"] : entry["resolvedVersion"];
-    if ((authority !== "workspace" && authority !== "registry") ||
+    const version = entry["resolvedVersion"];
+    if (authority !== "registry" ||
         typeof owner !== "string" ||
         typeof name !== "string" ||
         typeof version !== "string") {

package/package.json

@@ -4,17 +4,17 @@
     "url": "https://github.com/agentxm/axm/issues"
   },
   "dependencies": {
-    "@agentxm/extension-model": "^0.28.8",
-    "@agentxm/extension-sources": "^0.28.8",
-    "@agentxm/extension-workspace": "^0.28.8",
-    "@agentxm/registry-protocol": "^0.28.8",
-    "@agentxm/workspace-operations": "^0.28.8",
-    "@agentxm/workspace-state": "^0.28.8",
+    "@agentxm/extension-model": "^0.28.9",
+    "@agentxm/extension-sources": "^0.28.9",
+    "@agentxm/extension-workspace": "^0.28.9",
+    "@agentxm/registry-protocol": "^0.28.9",
+    "@agentxm/workspace-operations": "^0.28.9",
+    "@agentxm/workspace-state": "^0.28.9",
     "effect": "4.0.0-rc.112"
   },
   "description": "AXM workspace-lint feature: workspace facts, lint rules, findings, normalization, and bounded fix planning for the axm CLI. Unstable and unsupported — use the axm.sh CLI.",
   "devDependencies": {
-    "@agentxm/agent-integration": "^0.28.8",
+    "@agentxm/agent-integration": "^0.28.9",
     "@effect/platform-node": "4.0.0-rc.112",
     "@effect/vitest": "4.0.0-rc.112",
     "@types/bun": "^1.3.14",
@@ -52,5 +52,5 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.28.8"
+  "version": "0.28.9"
 }