@deftai/directive 0.126.0-beta.1 → 0.126.0-beta.3

package/dist/bin.js

@@ -785,6 +785,12 @@ function lockfileRecordsExactPin(projectRoot, exactVersion, pm) {
 function ensurePackageJson(projectRoot) {
   const path = join3(projectRoot, "package.json");
   if (existsSync5(path)) {
+    const existing = readJsonObject2(path);
+    if (existing !== null && Object.keys(existing).length === 0) {
+      writeFileSync(path, `${JSON.stringify({ private: true }, null, 2)}
+`);
+      return { created: true, path };
+    }
     return { created: false, path };
   }
   writeFileSync(path, `${JSON.stringify({ private: true }, null, 2)}
@@ -1063,8 +1069,8 @@ function runPmRemove(options) {
 var WRAP_FLOOR = 40;
 var WRAP_CEILING = 100;
 var WRAP_FALLBACK = 80;
-var HUMAN_INSTALL_SCRIPT_SETTINGS_LINE = "Installation may run scripts allowed by your project's settings.";
-var INSTALL_COMMAND_LABEL = "Install command:";
+var HUMAN_INSTALL_SCRIPT_SETTINGS_LINE = "Directive skips lifecycle scripts on that add. Other project install settings still apply.";
+var PM_WILL_RUN_LABEL = "Package manager will run:";
 var HUMAN_GIT_HOOKS_INACTIVE_LINE = "Incomplete install: this folder is not a git repository yet, so git hooks will not be installed. After you run git init, run directive install --repair so hooks get installed.";
 function lockfileNameFor(pm) {
   return pm === "pnpm" ? "pnpm-lock.yaml" : "package-lock.json";
@@ -1175,10 +1181,10 @@ function writeKeyedBlock(io, lines) {
 `);
   }
 }
-function writeInstallCommandAndScriptDisclosure(io, command) {
-  if (!command) return;
+function writePmCommandAndScriptVerbose(io, command, verbosity) {
+  if (verbosity < 1 || !command) return;
   writeBlank(io);
-  io.writeOut(`${INSTALL_COMMAND_LABEL}
+  io.writeOut(`${PM_WILL_RUN_LABEL}
 `);
   io.writeOut(`  ${command}
 `);
@@ -1211,10 +1217,12 @@ function presentFirstInstallPlan(io, fields) {
     `add Directive ${fields.version} to this project's development tools with ${fields.pm}`
   );
   writeBullet(io, `update ${lock}`);
-  writeBullet(io, "set up Directive's project files");
+  writeBullet(io, "create Directive's project files for this folder");
+  writeBlank(io);
+  writeHumanParagraph(io, "Your other project files stay as they are.");
   writeBlank(io);
   writeDisclosures(io, fields);
-  writeInstallCommandAndScriptDisclosure(io, fields.pmCommand);
+  writePmCommandAndScriptVerbose(io, fields.pmCommand, fields.verbosity);
   if (fields.verbosity >= 1) {
     writeBlank(io);
     const keyed = [
@@ -1246,28 +1254,27 @@ function presentRepairPlan(io, fields) {
   writeLabeled(io, "Directive version:", `${fields.version} (unchanged)`);
   writeBlank(io);
   if (!fields.needsPmRestore) {
-    writeHumanParagraph(io, "The installed package is healthy. No reinstall is needed.");
+    writeHumanParagraph(io, "The installed package looks fine. No reinstall is needed.");
     writeBlank(io);
-    io.writeOut("If you approve, Directive will:\n");
-    writeBullet(io, `rerun setup using Directive ${fields.version}`);
-    writeBullet(io, "recreate missing managed project files as needed");
-    writeBlank(io);
-    writeHumanParagraph(io, "Your existing settings and other files will be preserved.");
+    writeHumanParagraph(io, "You may still refresh the setup. If you approve, Directive will:");
+    writeBullet(io, `check this project's Directive-managed files for ${fields.version}`);
+    writeBullet(io, "write only what is missing or out of date");
+    writeBullet(io, "leave matching files and your other project files alone");
   } else {
     writeHumanParagraph(
       io,
-      `The installed package needs restoration (${fields.restoreReason ?? "mismatch"}).`
+      "The installed package needs to be restored (missing or wrong version on disk)."
     );
     writeBlank(io);
     io.writeOut("If you approve, Directive will:\n");
-    writeBullet(io, `restore the Directive ${fields.version} pin with ${fields.pm}`);
+    writeBullet(io, `reinstall Directive ${fields.version} with ${fields.pm}`);
     writeBullet(io, "rerun project setup");
     writeBlank(io);
-    writeHumanParagraph(io, "Your existing settings and other files will be preserved.");
+    writeHumanParagraph(io, "Your existing settings and other files stay as they are.");
   }
   writeBlank(io);
   writeDisclosures(io, fields);
-  writeInstallCommandAndScriptDisclosure(io, fields.pmCommand);
+  writePmCommandAndScriptVerbose(io, fields.pmCommand, fields.verbosity);
   if (fields.verbosity >= 1) {
     writeBlank(io);
     const keyed = [
@@ -1299,47 +1306,51 @@ function presentUpgradePlan(io, fields) {
   writeLabeled(io, "Current version:", fields.currentVersion);
   writeLabeled(io, "Target version:", fields.targetVersion);
   writeBlank(io);
-  if (fields.oldStyle) {
-    writeHumanParagraph(io, "This project uses an older Directive layout (old-style).");
-  } else if (fields.convertShapeId) {
+  if (fields.oldStyle || fields.convertShapeId) {
+    writeHumanParagraph(io, "This project still uses an older Directive layout.");
     writeHumanParagraph(
       io,
-      `This project uses a historical Directive layout ('${fields.convertShapeId}').`
+      "A copied tree of Directive files may sit under .deft/core."
     );
-  }
-  io.writeOut("If you approve, Directive will:\n");
-  if (fields.oldStyle) {
-    writeBullet(io, "remove the legacy `.deft/core` content copy (including any local edits)");
+    writeHumanParagraph(
+      io,
+      "The project version is still recorded as the old @deftai/directive package."
+    );
+    writeBlank(io);
+    io.writeOut("If you approve, Directive will:\n");
     writeBullet(
       io,
-      `replace the legacy launcher pin with Directive ${fields.targetVersion}`
+      "remove the copied .deft/core tree (including any local edits there)"
     );
-    writeBullet(io, `update ${lock}`);
-    writeBullet(io, "run setup and any required project-data migrations");
-  } else if (fields.convertShapeId) {
     writeBullet(
       io,
-      "remove the legacy install footprint (keeping xbrief/ and your files)"
+      `switch the project to Directive ${fields.targetVersion} as a normal project dependency`
     );
-    writeBullet(io, `add Directive ${fields.targetVersion} with ${fields.pm}`);
     writeBullet(io, `update ${lock}`);
-    writeBullet(io, "run setup and any required project-data migrations");
+    writeBullet(io, "run setup and any needed data updates for that version");
+    writeBlank(io);
+    writeHumanParagraph(io, "Your existing project settings stay as they are.");
+    writeHumanParagraph(io, "Your notes and briefs under xbrief/ stay as they are.");
   } else if (fields.versionChange) {
-    writeBullet(io, `update the exact version in package.json to ${fields.targetVersion}`);
+    io.writeOut("If you approve, Directive will:\n");
+    writeBullet(io, `change this project's Directive version to ${fields.targetVersion}`);
     writeBullet(io, `update ${lock}`);
-    writeBullet(io, "run project setup and any required project-data migrations");
+    writeBullet(io, "run project setup and any needed data updates for that version");
+    writeBlank(io);
+    writeHumanParagraph(io, "Your existing project settings stay as they are.");
   } else {
+    io.writeOut("If you approve, Directive will:\n");
     writeBullet(
       io,
       `finish equal-version work for Directive ${fields.targetVersion}` + (fields.needSetup ? " (setup, then migration as needed)" : " (migration as needed)")
     );
+    writeBlank(io);
+    writeHumanParagraph(io, "Your existing project settings stay as they are.");
   }
   writeBlank(io);
-  writeHumanParagraph(io, "Your existing project settings will be preserved.");
-  writeBlank(io);
   writeDisclosures(io, fields);
   if (fields.versionChange) {
-    writeInstallCommandAndScriptDisclosure(io, fields.pmCommand);
+    writePmCommandAndScriptVerbose(io, fields.pmCommand, fields.verbosity);
   }
   if (fields.verbosity >= 1) {
     writeBlank(io);
@@ -1347,7 +1358,7 @@ function presentUpgradePlan(io, fields) {
       `operation: upgrade`,
       `root: ${fields.projectRoot}`,
       `package manager: ${fields.pm} (${fields.pmEvidence})`,
-      `current: @deftai/directive-runtime@${fields.currentVersion}${fields.oldStyle ? " (old-style)" : ""}`,
+      `current: @deftai/directive-runtime@${fields.currentVersion}${fields.oldStyle ? " (older layout)" : ""}`,
       `target: @deftai/directive-runtime@${fields.targetVersion}`,
       fields.versionChange ? `PM: exact add target (pin + lockfile change)` : `PM: none (equal version; package already matches pin)`,
       fields.versionChange && fields.pmCommand ? `PM command: ${fields.pmCommand}` : `PM command: (none)`,
@@ -1357,11 +1368,11 @@ function presentUpgradePlan(io, fields) {
       `global launcher: unchanged`,
       INSTALL_SCRIPT_POLICY_PLAN_LINE
     ];
-    if (fields.oldStyle) {
+    if (fields.oldStyle || fields.convertShapeId) {
       keyed.splice(
         5,
         0,
-        `remove: .deft/core (legacy content copy, even if edited)`,
+        `remove: .deft/core (copied content tree, even if edited)`,
         `replace: @deftai/directive pin \u2192 @deftai/directive-runtime@${fields.targetVersion}`
       );
     }
@@ -1455,7 +1466,7 @@ function writeUninstallActionBullets(io, removal, pm) {
   if (removal.willRemovePin) {
     writeBullet(
       io,
-      pm ? `remove the Directive runtime pin with ${pm}` : "remove the Directive runtime pin from package.json"
+      pm ? `remove the Directive version from this project's development tools with ${pm}` : "remove the Directive version from this project's package.json"
     );
   }
   if (removal.skillPointers === 0 && removal.hostHooks === 0 && wiringBits.length === 0 && !removal.willRemovePin && removal.other === 0) {
@@ -1485,12 +1496,7 @@ function presentUninstallPlan(io, fields) {
     );
   }
   writeBlank(io);
-  writePmCommandVerbose(
-    io,
-    "Package manager command (Directive runs this):",
-    fields.pmCommand,
-    fields.verbosity
-  );
+  writePmCommandVerbose(io, PM_WILL_RUN_LABEL, fields.pmCommand, fields.verbosity);
   if (fields.verbosity >= 1) {
     writeBlank(io);
     if (fields.removal && fields.removal.pathInventory.length > 0) {
@@ -1699,7 +1705,7 @@ function presentUninstallSuccess(io, opts) {
     if (opts.removal.hostHooks > 0) parts.push("host hooks");
     if (opts.removal.gitHooks > 0 || opts.removal.projectWiring > 0) parts.push("project wiring");
     if (opts.removal.legacyCore) parts.push("legacy core");
-    if (opts.removal.willRemovePin) parts.push("the runtime pin");
+    if (opts.removal.willRemovePin) parts.push("the Directive version from development tools");
   }
   if (parts.length > 0) {
     writeHumanParagraph(io, `Removed ${parts.join(", ")}.`);
@@ -1774,18 +1780,18 @@ function presentSetupFailedAfterInstall(io, opts) {
   }
   if (opts.operation === "install" || opts.operation === "upgrade") {
     io.writeErr(
-      `The project pin and lockfile now reference Directive ${opts.version}.
+      `The project version and lockfile already reference Directive ${opts.version}.
 `
     );
     writeBlankErr(io);
   }
-  io.writeErr("Correct the cause, then run:\n");
+  io.writeErr("Fix the cause, then run:\n");
   io.writeErr("  directive install --repair\n");
   if (opts.operation === "upgrade") {
     io.writeErr("  (or directive upgrade again for data migration)\n");
   }
   writeBlankErr(io);
-  io.writeErr("Review the existing changes before committing.\n");
+  io.writeErr("Review the existing changes before you commit.\n");
 }
 function presentMigrateFailedAfterUpgrade(io, opts) {
   if (opts.versionChange) {
@@ -3653,6 +3659,9 @@ function runUpgrade(projectRoot, state, argv, launcherVersion, io = defaultIo(),
   if (stale !== null) return stale;
   if (versionChange) {
     if (state.oldStyle || convertViaRemovals) {
+      if (convertViaRemovals && !existsSync7(join6(projectRoot, "package.json"))) {
+        ensurePackageJson(projectRoot);
+      }
       for (const packageName of RETIRED_DIRECTIVE_PACKAGE_NAMES) {
         const rm = deps.runPmRemove?.({ projectRoot, pm: pmDetect.pm, packageName }) ?? runPmRemove({ projectRoot, pm: pmDetect.pm, packageName, env });
         if (!rm.ok && rm.interrupted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deftai/directive",
-  "version": "0.126.0-beta.1",
+  "version": "0.126.0-beta.3",
   "description": "Directive launcher — finds the project pin and hands off to @deftai/directive-runtime.",
   "license": "MIT",
   "homepage": "https://deftai.github.io/directive/",