@ogygie/cli 0.8.0 → 0.9.0

package/dist/cli.js

@@ -14679,7 +14679,21 @@ var FrameworkManifestSchema = external_exports.object({
     external_exports.object({
       name: external_exports.string().describe("Published npm name, e.g. @ogygie/core"),
       path: external_exports.string().describe("Folder relative to the repo root"),
-      intent: external_exports.string().min(20)
+      intent: external_exports.string().min(20),
+      /**
+       * The spec describing this package, when one does. Named EXPLICITLY
+       * because a published npm name (`@ogygie/mcp`) is not a spec id
+       * (`ogygie-mcp`) — the other two natures of entry match by name, this
+       * one cannot. Several packages may point at the same spec: a spec of
+       * the framework often spans the core and the CLI.
+       */
+      spec: external_exports.string().nullable(),
+      /**
+       * How far along, in the SAME words as the other natures. Required, and
+       * deliberately without default: a lifecycle gate that guesses a status
+       * confirms specs nobody delivered.
+       */
+      status: external_exports.enum(["skeleton", "in-progress", "delivered"])
     })
   ),
   templates: external_exports.object({
@@ -14774,6 +14788,22 @@ var OgygieManifestSchema = external_exports.object({
     }
     packageNames.add(packageEntry.name);
   });
+  const specIdOf = (specPath) => (specPath.split("/").pop() ?? specPath).replace(/\.spec\.md$/, "");
+  const ownedSpecIds = /* @__PURE__ */ new Set([
+    ...manifest.features.map((feature) => feature.name),
+    ...packageNames
+  ]);
+  (manifest.framework?.packages ?? []).forEach((packageEntry, index) => {
+    if (packageEntry.spec === null) return;
+    const specId = specIdOf(packageEntry.spec);
+    if (ownedSpecIds.has(specId)) {
+      context.addIssue({
+        code: "custom",
+        path: ["framework", "packages", index, "spec"],
+        message: `spec "${specId}" is already owned by a feature or a product package \u2014 one spec, one owner`
+      });
+    }
+  });
   const checkPackageDependencies = (dependsOn, path) => {
     dependsOn.forEach((dependency, dependencyIndex) => {
       if (!dependency.startsWith("package:")) return;
@@ -15115,9 +15145,57 @@ async function runStudio(deps) {
   });
 }
 
+// src/commands/mcp.ts
+import { readFileSync as readFileSync4 } from "node:fs";
+import { createRequire as createRequire2 } from "node:module";
+import { join as join5 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
+var PUBLISHED_MCP_SERVER = "@ogygie/mcp/server";
+async function loadMcpFrom(projectRoot) {
+  const resolveFromProject = createRequire2(join5(projectRoot, "package.json"));
+  const entryPoint = resolveFromProject.resolve(PUBLISHED_MCP_SERVER);
+  return await import(pathToFileURL2(entryPoint).href);
+}
+function isModuleNotFound2(thrown) {
+  const code = thrown?.code;
+  return code === "ERR_MODULE_NOT_FOUND" || code === "MODULE_NOT_FOUND" || code === "ERR_PACKAGE_PATH_NOT_EXPORTED" || thrown instanceof Error && /Cannot find (package|module)/i.test(thrown.message);
+}
+async function runMcp(deps) {
+  const importMcp = deps.importMcp ?? (() => loadMcpFrom(deps.projectRoot));
+  let mcpServer;
+  try {
+    mcpServer = await importMcp();
+  } catch (thrown) {
+    const reason = thrown instanceof Error ? thrown.message : String(thrown);
+    if (isModuleNotFound2(thrown)) {
+      throwOgygieError({
+        code: "MCP_NOT_INSTALLED",
+        message: "The Ogygie MCP server is not installed in this project.",
+        file: "package.json",
+        cause: `${PUBLISHED_MCP_SERVER} cannot be resolved: ${reason}`,
+        suggestedFix: `Install it at the framework's own version (lockstep D2): pnpm add -Dw @ogygie/mcp@${deps.cliVersion}`
+      });
+    }
+    throwOgygieError({
+      code: "MCP_LOAD_FAILED",
+      message: "The Ogygie MCP server is installed but could not be loaded.",
+      file: "package.json",
+      cause: reason,
+      suggestedFix: "Reinstalling will not help: this is a framework defect. Report it with this cause, and check that @ogygie/mcp matches @ogygie/cli (lockstep D2)."
+    });
+  }
+  await mcpServer.startOgygieMcp({
+    argv: deps.argv,
+    cwd: deps.projectRoot,
+    version: deps.cliVersion,
+    token: process.env["OGYGIE_MCP_TOKEN"],
+    readConfigFile: (absolutePath) => readFileSync4(absolutePath, "utf8")
+  });
+}
+
 // 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 join5 } from "node:path";
+import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
+import { dirname as dirname2, join as join6 } from "node:path";
 
 // src/diff.ts
 function diffLines(oldText, newText) {
@@ -15185,11 +15263,11 @@ function compareVersions(a, b) {
 
 // src/commands/upgrade.ts
 function reportMissingGates(deps) {
-  const packageJsonPath = join5(deps.projectRoot, "package.json");
+  const packageJsonPath = join6(deps.projectRoot, "package.json");
   if (!existsSync4(packageJsonPath)) return;
   let scripts;
   try {
-    const parsed = JSON.parse(readFileSync4(packageJsonPath, "utf8"));
+    const parsed = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
     const scriptsValue = typeof parsed === "object" && parsed !== null ? parsed.scripts : void 0;
     if (typeof scriptsValue === "object" && scriptsValue !== null) {
       scripts = scriptsValue;
@@ -15240,8 +15318,8 @@ async function upgradeProject(deps) {
   for (const governed of governedFiles) {
     const expected = installedChecksums[governed.targetPath];
     if (expected === void 0) continue;
-    const absolutePath = join5(deps.projectRoot, governed.targetPath);
-    const actual = existsSync4(absolutePath) ? sha256Hex(readFileSync4(absolutePath, "utf8")) : "<absent>";
+    const absolutePath = join6(deps.projectRoot, governed.targetPath);
+    const actual = existsSync4(absolutePath) ? sha256Hex(readFileSync5(absolutePath, "utf8")) : "<absent>";
     if (actual !== expected) {
       throwOgygieError({
         code: "OGYGIE_GOVERNED_FILE_MODIFIED",
@@ -15255,12 +15333,12 @@ async function upgradeProject(deps) {
   const plannedWrites = [];
   const diffBlocks = [];
   for (const governed of governedFiles) {
-    const content = readFileSync4(
-      join5(deps.templatesDir, governed.templatePath),
+    const content = readFileSync5(
+      join6(deps.templatesDir, governed.templatePath),
       "utf8"
     );
-    const absolutePath = join5(deps.projectRoot, governed.targetPath);
-    const current = existsSync4(absolutePath) ? readFileSync4(absolutePath, "utf8") : "";
+    const absolutePath = join6(deps.projectRoot, governed.targetPath);
+    const current = existsSync4(absolutePath) ? readFileSync5(absolutePath, "utf8") : "";
     const diff = diffLines(current, content);
     if (diff !== "") {
       plannedWrites.push({ targetPath: governed.targetPath, content });
@@ -15280,7 +15358,7 @@ ${diff}`);
       };
     }
     for (const write of plannedWrites) {
-      const absolutePath = join5(deps.projectRoot, write.targetPath);
+      const absolutePath = join6(deps.projectRoot, write.targetPath);
       mkdirSync2(dirname2(absolutePath), { recursive: true });
       writeFileSync3(absolutePath, write.content);
     }
@@ -15301,8 +15379,8 @@ ${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 join6, relative, sep } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync6, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
+import { join as join7, 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");
@@ -15409,7 +15487,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 = join6(projectRoot, MANIFEST_FILE_NAME);
+  const manifestPath = join7(projectRoot, MANIFEST_FILE_NAME);
   if (!existsSync5(manifestPath)) {
     throwOgygieError({
       code: "OGYGIE_CLI_USAGE",
@@ -15420,7 +15498,7 @@ function readManifest(projectRoot) {
     });
   }
   const parsed = OgygieManifestSchema.safeParse(
-    JSON.parse(readFileSync5(manifestPath, "utf8"))
+    JSON.parse(readFileSync6(manifestPath, "utf8"))
   );
   if (!parsed.success) {
     throwOgygieError({
@@ -15434,13 +15512,13 @@ function readManifest(projectRoot) {
   return parsed.data;
 }
 function collectCodeFiles(projectRoot, folder) {
-  const absoluteFolder = join6(projectRoot, folder);
+  const absoluteFolder = join7(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 = join6(directory, entry);
+      const entryPath = join7(directory, entry);
       if (statSync2(entryPath).isDirectory()) {
         walk(entryPath);
         continue;
@@ -15448,7 +15526,7 @@ function collectCodeFiles(projectRoot, folder) {
       if (!CODE_EXTENSIONS.some((extension) => entry.endsWith(extension))) continue;
       files.push({
         path: relative(projectRoot, entryPath).split(sep).join("/"),
-        content: readFileSync5(entryPath, "utf8")
+        content: readFileSync6(entryPath, "utf8")
       });
     }
   };
@@ -15476,9 +15554,9 @@ function verifyVocabulary(deps) {
   const sourceFiles = productCodeFoldersOf(manifest).flatMap(
     (folder) => collectCodeFiles(deps.projectRoot, folder)
   );
-  const governed = governedFiles.filter((file2) => existsSync5(join6(deps.projectRoot, file2.targetPath))).map((file2) => ({
+  const governed = governedFiles.filter((file2) => existsSync5(join7(deps.projectRoot, file2.targetPath))).map((file2) => ({
     path: file2.targetPath,
-    content: readFileSync5(join6(deps.projectRoot, file2.targetPath), "utf8")
+    content: readFileSync6(join7(deps.projectRoot, file2.targetPath), "utf8")
   }));
   return auditProductVocabulary({
     vocabulary: manifest.vocabulary,
@@ -15590,23 +15668,23 @@ var governedChecksumsByVersion = {
 };
 
 // src/paths.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
-import { dirname as dirname3, join as join7 } from "node:path";
+import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
+import { dirname as dirname3, join as join8 } from "node:path";
 import { fileURLToPath } from "node:url";
-var PACKAGE_ROOT = join7(dirname3(fileURLToPath(import.meta.url)), "..");
+var PACKAGE_ROOT = join8(dirname3(fileURLToPath(import.meta.url)), "..");
 var PackageVersionSchema2 = external_exports.object({ version: external_exports.string() });
 function cliVersion() {
   return PackageVersionSchema2.parse(
-    JSON.parse(readFileSync6(join7(PACKAGE_ROOT, "package.json"), "utf8"))
+    JSON.parse(readFileSync7(join8(PACKAGE_ROOT, "package.json"), "utf8"))
   ).version;
 }
 function templatesDir() {
-  const embedded = join7(PACKAGE_ROOT, "templates");
+  const embedded = join8(PACKAGE_ROOT, "templates");
   if (existsSync6(embedded)) return embedded;
   return repoTemplatesDir();
 }
 function repoTemplatesDir() {
-  return join7(PACKAGE_ROOT, "..", "..", "templates");
+  return join8(PACKAGE_ROOT, "..", "..", "templates");
 }
 
 // src/cli.ts
@@ -15685,14 +15763,20 @@ ogygie verify-vocabulary \u2014 ${problems.length} probl\xE8me(s).`);
     console.log("ogygie verify-vocabulary \u2014 OK, le vocabulaire d\xE9clar\xE9 est respect\xE9.");
   } else if (command === "studio") {
     await runStudio({ projectRoot: process.cwd(), cliVersion: cliVersion() });
+  } else if (command === "mcp") {
+    await runMcp({
+      projectRoot: process.cwd(),
+      cliVersion: cliVersion(),
+      argv: process.argv.slice(3)
+    });
   } else {
     printError(
       ogygieError({
         code: "OGYGIE_CLI_USAGE",
         message: `Unknown command ${JSON.stringify(command ?? "")}.`,
         file: null,
-        cause: `expected one of: init <product-name>, upgrade, check, verify-vocabulary, studio (flags: --json, --yes)`,
-        suggestedFix: "Run `ogygie init <product-name>`, `ogygie upgrade`, `ogygie check`, `ogygie verify-vocabulary` or `ogygie studio`."
+        cause: `expected one of: init <product-name>, upgrade, check, verify-vocabulary, studio, mcp (flags: --json, --yes)`,
+        suggestedFix: "Run `ogygie init <product-name>`, `ogygie upgrade`, `ogygie check`, `ogygie verify-vocabulary`, `ogygie studio` or `ogygie mcp`."
       })
     );
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogygie/cli",
-  "version": "0.8.0",
+  "version": "0.9.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.8.0"
+    "@ogygie/core": "0.9.0"
   },
   "scripts": {
     "typecheck": "tsc -p tsconfig.json",