@ogygie/cli 0.5.3 → 0.6.0

package/dist/cli.js

@@ -14602,6 +14602,7 @@ import { join } from "node:path";
 
 // ../ogygie-core/src/manifest.schema.ts
 var FeatureNameSchema = external_exports.string().regex(/^[a-z][a-z0-9]*(-[a-z0-9]+)*$/, "kebab-case required");
+var PackageDependencySchema = external_exports.string().regex(/^package:[a-z][a-z0-9]*(-[a-z0-9]+)*$/, "expected package:<kebab-case-name>");
 var HttpRouteSchema = external_exports.object({
   method: external_exports.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
   path: external_exports.string().startsWith("/api/"),
@@ -14626,7 +14627,9 @@ var FeatureManifestSchema = external_exports.object({
   dbTables: external_exports.array(DbTableDeclarationSchema).describe(
     "Drizzle tables owned by this feature (one table = one owner). String = tenant-scoped; { name, shared: true } = shared referential"
   ),
-  dependsOn: external_exports.array(FeatureNameSchema).describe("Features imported through their index.ts \u2014 nothing else"),
+  dependsOn: external_exports.array(external_exports.union([FeatureNameSchema, PackageDependencySchema])).describe(
+    "Features imported through their index.ts, and product packages as package:<name> \u2014 nothing else"
+  ),
   status: external_exports.enum(["skeleton", "in-progress", "delivered"])
 });
 var OgygieVersionSchema = external_exports.string().regex(/^\d+\.\d+\.\d+$/, "expected a plain x.y.z version");
@@ -14654,6 +14657,14 @@ var VocabularyEntrySchema = external_exports.object({
 var ProductVocabularySchema = external_exports.object({
   entries: external_exports.array(VocabularyEntrySchema)
 });
+var PackageManifestSchema = external_exports.object({
+  name: FeatureNameSchema,
+  path: external_exports.string().describe("Folder relative to the repo root, e.g. packages/solver"),
+  intent: external_exports.string().min(20).max(300).describe("The package's 'why' in 1-3 sentences"),
+  spec: external_exports.string().nullable(),
+  dependsOn: external_exports.array(PackageDependencySchema).describe("Other PRODUCT packages, as package:<name> \u2014 never a feature: a package that depended on one would live under an app, and would be a feature"),
+  status: external_exports.enum(["skeleton", "in-progress", "delivered"])
+});
 var OgygieManifestSchema = external_exports.object({
   version: external_exports.literal(1),
   product: external_exports.object({
@@ -14684,6 +14695,7 @@ var OgygieManifestSchema = external_exports.object({
     })
   ),
   features: external_exports.array(FeatureManifestSchema),
+  packages: external_exports.array(PackageManifestSchema).optional().describe("Product code living outside every app \u2014 libraries, engines. Absent = the project has none"),
   vocabulary: ProductVocabularySchema.optional().describe(
     "The product's closed vocabulary \u2014 declared here, enforced by `ogygie verify-vocabulary`. Absent = gate silent"
   ),
@@ -14693,6 +14705,44 @@ var OgygieManifestSchema = external_exports.object({
     specsFolder: external_exports.literal("specs/")
   })
 }).superRefine((manifest, context) => {
+  const featureNames = new Set(manifest.features.map((feature) => feature.name));
+  const packageNames = /* @__PURE__ */ new Set();
+  (manifest.packages ?? []).forEach((packageEntry, index) => {
+    if (featureNames.has(packageEntry.name)) {
+      context.addIssue({
+        code: "custom",
+        path: ["packages", index, "name"],
+        message: `"${packageEntry.name}" is already the name of a feature \u2014 one name designates one thing`
+      });
+    }
+    if (packageNames.has(packageEntry.name)) {
+      context.addIssue({
+        code: "custom",
+        path: ["packages", index, "name"],
+        message: `package "${packageEntry.name}" is declared twice`
+      });
+    }
+    packageNames.add(packageEntry.name);
+  });
+  const checkPackageDependencies = (dependsOn, path) => {
+    dependsOn.forEach((dependency, dependencyIndex) => {
+      if (!dependency.startsWith("package:")) return;
+      const target = dependency.slice("package:".length);
+      if (!packageNames.has(target)) {
+        context.addIssue({
+          code: "custom",
+          path: [...path, dependencyIndex],
+          message: `dependency "${dependency}" matches no declared package`
+        });
+      }
+    });
+  };
+  manifest.features.forEach((feature, index) => {
+    checkPackageDependencies(feature.dependsOn, ["features", index, "dependsOn"]);
+  });
+  (manifest.packages ?? []).forEach((packageEntry, index) => {
+    checkPackageDependencies(packageEntry.dependsOn, ["packages", index, "dependsOn"]);
+  });
   const canonicalOwners = /* @__PURE__ */ new Map();
   const aliasOwners = /* @__PURE__ */ new Map();
   (manifest.vocabulary?.entries ?? []).forEach((entry, index) => {
@@ -14963,16 +15013,21 @@ function initProject(deps, productName2) {
 }
 
 // src/commands/studio.ts
+import { createRequire } from "node:module";
+import { join as join4 } from "node:path";
+import { pathToFileURL } from "node:url";
 var PUBLISHED_STUDIO_SERVER = "@ogygie/studio/server";
-async function loadPublishedStudio() {
-  return await import(PUBLISHED_STUDIO_SERVER);
+async function loadStudioFrom(projectRoot) {
+  const resolveFromProject = createRequire(join4(projectRoot, "package.json"));
+  const entryPoint = resolveFromProject.resolve(PUBLISHED_STUDIO_SERVER);
+  return await import(pathToFileURL(entryPoint).href);
 }
 function isModuleNotFound(thrown) {
   const code = thrown?.code;
   return code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || typeof thrown === "object" && thrown !== null && thrown instanceof Error && /Cannot find (package|module)/i.test(thrown.message);
 }
 async function runStudio(deps) {
-  const importStudio = deps.importStudio ?? loadPublishedStudio;
+  const importStudio = deps.importStudio ?? (() => loadStudioFrom(deps.projectRoot));
   let studioServer;
   try {
     studioServer = await importStudio();
@@ -15003,7 +15058,7 @@ async function runStudio(deps) {
 
 // src/commands/upgrade.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
-import { dirname as dirname2, join as join4 } from "node:path";
+import { dirname as dirname2, join as join5 } from "node:path";
 
 // src/diff.ts
 function diffLines(oldText, newText) {
@@ -15071,7 +15126,7 @@ function compareVersions(a, b) {
 
 // src/commands/upgrade.ts
 function reportMissingGates(deps) {
-  const packageJsonPath = join4(deps.projectRoot, "package.json");
+  const packageJsonPath = join5(deps.projectRoot, "package.json");
   if (!existsSync4(packageJsonPath)) return;
   let scripts;
   try {
@@ -15126,7 +15181,7 @@ async function upgradeProject(deps) {
   for (const governed of governedFiles) {
     const expected = installedChecksums[governed.targetPath];
     if (expected === void 0) continue;
-    const absolutePath = join4(deps.projectRoot, governed.targetPath);
+    const absolutePath = join5(deps.projectRoot, governed.targetPath);
     const actual = existsSync4(absolutePath) ? sha256Hex(readFileSync4(absolutePath, "utf8")) : "<absent>";
     if (actual !== expected) {
       throwOgygieError({
@@ -15142,10 +15197,10 @@ async function upgradeProject(deps) {
   const diffBlocks = [];
   for (const governed of governedFiles) {
     const content = readFileSync4(
-      join4(deps.templatesDir, governed.templatePath),
+      join5(deps.templatesDir, governed.templatePath),
       "utf8"
     );
-    const absolutePath = join4(deps.projectRoot, governed.targetPath);
+    const absolutePath = join5(deps.projectRoot, governed.targetPath);
     const current = existsSync4(absolutePath) ? readFileSync4(absolutePath, "utf8") : "";
     const diff = diffLines(current, content);
     if (diff !== "") {
@@ -15166,7 +15221,7 @@ ${diff}`);
       };
     }
     for (const write of plannedWrites) {
-      const absolutePath = join4(deps.projectRoot, write.targetPath);
+      const absolutePath = join5(deps.projectRoot, write.targetPath);
       mkdirSync2(dirname2(absolutePath), { recursive: true });
       writeFileSync3(absolutePath, write.content);
     }
@@ -15188,7 +15243,7 @@ ${diff}`);
 
 // src/commands/verify-vocabulary.ts
 import { existsSync as existsSync5, readFileSync as readFileSync5, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
-import { join as join5, relative, sep } from "node:path";
+import { join as join6, relative, sep } from "node:path";
 
 // ../ogygie-core/src/vocabulary.ts
 var TOKEN_PATTERN = new RegExp("\\p{L}[\\p{L}\\p{N}]*(?:[-_$][\\p{L}\\p{N}]+)*", "gu");
@@ -15295,7 +15350,7 @@ function auditProductVocabulary(input) {
 var CODE_EXTENSIONS = [".ts", ".tsx", ".mts", ".mjs", ".js", ".jsx"];
 var IGNORED_DIRS = /* @__PURE__ */ new Set(["node_modules", "dist", "build", ".git", "coverage"]);
 function readManifest(projectRoot) {
-  const manifestPath = join5(projectRoot, MANIFEST_FILE_NAME);
+  const manifestPath = join6(projectRoot, MANIFEST_FILE_NAME);
   if (!existsSync5(manifestPath)) {
     throwOgygieError({
       code: "OGYGIE_CLI_USAGE",
@@ -15320,13 +15375,13 @@ function readManifest(projectRoot) {
   return parsed.data;
 }
 function collectCodeFiles(projectRoot, folder) {
-  const absoluteFolder = join5(projectRoot, folder);
+  const absoluteFolder = join6(projectRoot, folder);
   if (!existsSync5(absoluteFolder)) return [];
   const files = [];
   const walk = (directory) => {
     for (const entry of readdirSync2(directory)) {
       if (IGNORED_DIRS.has(entry)) continue;
-      const entryPath = join5(directory, entry);
+      const entryPath = join6(directory, entry);
       if (statSync2(entryPath).isDirectory()) {
         walk(entryPath);
         continue;
@@ -15362,9 +15417,9 @@ function verifyVocabulary(deps) {
   const sourceFiles = productCodeFoldersOf(manifest).flatMap(
     (folder) => collectCodeFiles(deps.projectRoot, folder)
   );
-  const governed = governedFiles.filter((file2) => existsSync5(join5(deps.projectRoot, file2.targetPath))).map((file2) => ({
+  const governed = governedFiles.filter((file2) => existsSync5(join6(deps.projectRoot, file2.targetPath))).map((file2) => ({
     path: file2.targetPath,
-    content: readFileSync5(join5(deps.projectRoot, file2.targetPath), "utf8")
+    content: readFileSync5(join6(deps.projectRoot, file2.targetPath), "utf8")
   }));
   return auditProductVocabulary({
     vocabulary: manifest.vocabulary,
@@ -15436,27 +15491,39 @@ var governedChecksumsByVersion = {
     "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
     "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
     "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
+  },
+  "0.5.4": {
+    ".github/workflows/ogygie-gates.yml": "48c40efe9fe66dd0f9c3b94287026d80eae9afd6782b5833fdf8846d8662babf",
+    "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
+    "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
+    "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
+  },
+  "0.6.0": {
+    ".github/workflows/ogygie-gates.yml": "48c40efe9fe66dd0f9c3b94287026d80eae9afd6782b5833fdf8846d8662babf",
+    "AGENTS.md": "c7d51a0cd97b67343b486bdb7c54914da68d96409eaa985959d2a525c65549fd",
+    "CLAUDE.md": "785ee8d90e368806d8cf0b4d84a15f29d1dc961168bda86cf1a6c60a923c8c9b",
+    "tsconfig.base.json": "0f8919e9ed8bbc88e0308fa2fa91471dabb18d1df721bd78c04076597eba89a2"
   }
 };
 
 // src/paths.ts
 import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
-import { dirname as dirname3, join as join6 } from "node:path";
+import { dirname as dirname3, join as join7 } from "node:path";
 import { fileURLToPath } from "node:url";
-var PACKAGE_ROOT = join6(dirname3(fileURLToPath(import.meta.url)), "..");
+var PACKAGE_ROOT = join7(dirname3(fileURLToPath(import.meta.url)), "..");
 var PackageVersionSchema2 = external_exports.object({ version: external_exports.string() });
 function cliVersion() {
   return PackageVersionSchema2.parse(
-    JSON.parse(readFileSync6(join6(PACKAGE_ROOT, "package.json"), "utf8"))
+    JSON.parse(readFileSync6(join7(PACKAGE_ROOT, "package.json"), "utf8"))
   ).version;
 }
 function templatesDir() {
-  const embedded = join6(PACKAGE_ROOT, "templates");
+  const embedded = join7(PACKAGE_ROOT, "templates");
   if (existsSync6(embedded)) return embedded;
   return repoTemplatesDir();
 }
 function repoTemplatesDir() {
-  return join6(PACKAGE_ROOT, "..", "..", "templates");
+  return join7(PACKAGE_ROOT, "..", "..", "templates");
 }
 
 // src/cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygie/cli",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "Ogygie framework CLI: deterministic scaffolding (init), governed-file upgrades (upgrade) and lockstep verification (check) for Ogygie products.",
   "license": "MIT",
   "type": "module",
@@ -22,7 +22,7 @@
     "tsx": "^4.20.0",
     "typescript": "^5.8.0",
     "zod": "^4.0.0",
-    "@ogygie/core": "0.5.3"
+    "@ogygie/core": "0.6.0"
   },
   "scripts": {
     "typecheck": "tsc -p tsconfig.json",

package/templates/project/scripts/verify-manifest.ts

@@ -84,6 +84,20 @@ for (const app of manifest.apps) {
   }
 }
 
+// A declared package whose folder is absent is a lying map, exactly like a
+// phantom app (spec manifest-packages B1).
+for (const productPackage of manifest.packages ?? []) {
+  if (!existsSync(join(ROOT, productPackage.path))) {
+    report({
+      code: "MANIFEST_PACKAGE_NOT_FOUND",
+      message: `Package "${productPackage.name}" declares folder ${productPackage.path} which does not exist.`,
+      file: MANIFEST_PATH,
+      cause: `packages[].path=${productPackage.path} absent from disk`,
+      suggestedFix: "Create the folder or fix the manifest entry.",
+    });
+  }
+}
+
 const apiApp = manifest.apps.find((app) => app.type === "api");
 const featureNames = new Set(manifest.features.map((feature) => feature.name));
 

package/templates/project/scripts/verify-specs.ts

@@ -29,6 +29,7 @@ import {
   parseKnownDecisionIds,
 } from "@ogygie/core/decision-refs";
 import { OgygieManifestSchema } from "@ogygie/core/manifest";
+import { findSpecOwner, SPEC_OWNER_FIX } from "@ogygie/core/manifest-owners";
 import { ogygieError, type OgygieError } from "@ogygie/core/errors";
 
 const ROOT = new URL("..", import.meta.url).pathname;
@@ -46,7 +47,6 @@ function report(input: Parameters<typeof ogygieError>[0]): void {
 const manifest = OgygieManifestSchema.parse(
   JSON.parse(readFileSync(join(ROOT, "ogygie.manifest.json"), "utf8")),
 );
-const apiApp = manifest.apps.find((app) => app.type === "api");
 
 const specFiles = readdirSync(join(ROOT, SPECS_FOLDER)).filter(
   (fileName) => fileName.endsWith(".spec.md") && !fileName.startsWith("_"),
@@ -124,18 +124,15 @@ for (const fileName of specFiles) {
     }
   }
 
-  const manifestFeature = manifest.features.find(
-    (feature) => feature.name === frontmatter.id,
-  );
-  const featureDir =
-    apiApp !== undefined && manifestFeature !== undefined
-      ? join(ROOT, apiApp.path, manifestFeature.folder)
-      : null;
+  // The map confirms a spec through a feature OR a product package: the rule
+  // is unchanged, the natures able to confirm are two (spec manifest-packages).
+  const owner = findSpecOwner(manifest, frontmatter.id);
+  const ownerDir = owner?.folder === null || owner === undefined ? null : join(ROOT, owner.folder);
 
   if (frontmatter.status === "draft") {
     const implemented =
-      (manifestFeature !== undefined && manifestFeature.status !== "skeleton") ||
-      (featureDir !== null && existsSync(featureDir));
+      (owner !== undefined && owner.status !== "skeleton") ||
+      (ownerDir !== null && existsSync(ownerDir));
     if (implemented) {
       report({
         code: "SPEC_DRAFT_ALREADY_IMPLEMENTED",
@@ -160,14 +157,16 @@ for (const fileName of specFiles) {
           "Implement the deferred behaviors (their blocking features now exist?) and empty `deferred`, or keep the spec in validated.",
       });
     }
-    if (manifestFeature === undefined || manifestFeature.status !== "delivered") {
+    if (owner === undefined || owner.status !== "delivered") {
       report({
         code: "SPEC_IMPLEMENTED_NOT_DELIVERED",
         message: `Spec ${fileName} is implemented but the manifest does not say status "delivered".`,
         file: specPath,
-        cause: `manifest status=${manifestFeature?.status ?? "absent"}`,
-        suggestedFix:
-          "Set the feature's status to delivered in the manifest, or keep the spec in validated.",
+        cause:
+          owner === undefined
+            ? "no feature and no package of that name in the manifest"
+            : `${owner.kind} "${owner.name}" status=${owner.status}`,
+        suggestedFix: SPEC_OWNER_FIX,
       });
     }
   }