@bigking67/pi-67 0.10.8 → 0.10.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.10.9]
+
+- Runs settings runtime-marker migration before the local distro updater script
+  as well as after it, so latest npm manager repair can clean `M settings.json`
+  even when the local checkout still contains an older updater script.
+
 ## [0.10.8]
 
 - Adds actionable `pi-67 version` recommendations when the npm manager has

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigking67/pi-67",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "description": "Cross-platform manager CLI for the pi-67 Pi Coding Agent distribution.",
   "type": "module",
   "bin": {

package/scripts/check.mjs

@@ -42,6 +42,7 @@ runPublishTargetSelfTests();
 runShellRunnerSelfTests();
 runExtensionRegistrySelfTests();
 runSettingsRuntimeStateSelfTests();
+runUpdatePreflightMigrationSelfTests();
 runUpdatePlanSelfTests();
 runUpdateSafetySelfTests();
 
@@ -407,6 +408,94 @@ function runSettingsRuntimeStateSelfTests() {
   );
 }
 
+function runUpdatePreflightMigrationSelfTests() {
+  if (spawnSync("git", ["--version"], { encoding: "utf8" }).status !== 0) return;
+  const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "pi67-update-preflight-migration-"));
+  const home = path.join(tmpRoot, "home");
+  const repo = path.join(tmpRoot, "agent");
+  const skillsDir = path.join(tmpRoot, "skills");
+  const packagesDir = path.join(tmpRoot, "packages");
+  fs.mkdirSync(path.join(repo, "scripts"), { recursive: true });
+  fs.mkdirSync(home, { recursive: true });
+  fs.mkdirSync(skillsDir, { recursive: true });
+  fs.mkdirSync(packagesDir, { recursive: true });
+  fs.writeFileSync(path.join(repo, "VERSION"), "0.10.0\n");
+  fs.writeFileSync(path.join(repo, "settings.json"), "{\n  \"theme\": \"gruvbox-dark\"\n}\n");
+  fs.writeFileSync(path.join(repo, "scripts", "pi67-update.sh"), `#!/usr/bin/env bash
+set -euo pipefail
+agent_dir=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --agent-dir)
+      agent_dir="$2"
+      shift 2
+      ;;
+    *)
+      shift
+      ;;
+  esac
+done
+if grep -q "lastChangelogVersion" "$agent_dir/settings.json"; then
+  echo "marker still present before distro script" >&2
+  exit 44
+fi
+`);
+  for (const args of [
+    ["-C", repo, "init", "-q"],
+    ["-C", repo, "config", "user.email", "pi67-check@example.invalid"],
+    ["-C", repo, "config", "user.name", "pi67-check"],
+    ["-C", repo, "add", "VERSION", "settings.json", "scripts/pi67-update.sh"],
+    ["-C", repo, "commit", "-q", "-m", "init"],
+  ]) {
+    const result = spawnSync("git", args, { encoding: "utf8" });
+    assert(result.status === 0, `git setup failed for update preflight migration self-test: git ${args.join(" ")}\n${result.stderr}`);
+  }
+  fs.writeFileSync(path.join(repo, "settings.json"), "{\n  \"lastChangelogVersion\": \"0.80.4\",\n  \"theme\": \"gruvbox-dark\"\n}\n");
+  const env = { ...process.env, HOME: home, USERPROFILE: home };
+  const result = spawnSync(process.execPath, [
+    path.join(root, "bin", "pi-67.mjs"),
+    "--agent-dir",
+    repo,
+    "--repo-root",
+    repo,
+    "--skills-dir",
+    skillsDir,
+    "--packages-dir",
+    packagesDir,
+    "update",
+    "--repair",
+    "--no-remote",
+    "--no-npm",
+  ], {
+    cwd: root,
+    env,
+    encoding: "utf8",
+  });
+  assert(
+    result.status === 0,
+    `update must preflight-normalize settings runtime marker before calling the distro script\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`,
+  );
+  assert(
+    result.stdout.includes("Preflight: Migrated settings.json lastChangelogVersion") &&
+      result.stdout.includes("Preflight: Normalized settings.json"),
+    `update output must report preflight runtime marker migration\n${result.stdout}`,
+  );
+  const settings = JSON.parse(fs.readFileSync(path.join(repo, "settings.json"), "utf8"));
+  assert(settings.lastChangelogVersion === undefined, "update preflight migration must remove lastChangelogVersion from settings.json");
+  const state = JSON.parse(fs.readFileSync(path.join(home, ".pi", "pi67", "state.json"), "utf8"));
+  assert(
+    state.runtimeMarkers?.lastChangelogVersion?.value === "0.80.4",
+    "update preflight migration must persist lastChangelogVersion into ignored state",
+  );
+  const status = spawnSync("git", ["-C", repo, "status", "--short"], { encoding: "utf8" });
+  assert(status.status === 0, `git status failed for update preflight migration self-test\n${status.stderr}`);
+  assert(
+    !status.stdout.split(/\r?\n/).some((line) => line.trim().endsWith("settings.json")),
+    `settings.json should be clean after preflight marker migration\n${status.stdout}`,
+  );
+  fs.rmSync(tmpRoot, { recursive: true, force: true });
+}
+
 function runUpdatePlanSelfTests() {
   assert(
     classifyGitShort(" M settings.json\n?? tmp.txt").preservedRuntime.includes("settings.json"),

package/src/commands/update.mjs

@@ -61,6 +61,8 @@ export async function updateCommand(ctx, argv) {
     info(`Preserved runtime backup skipped: ${lifecycle.backupReason}`);
   }
 
+  reportSettingsRuntimeStateMigration(ctx, { dryRun, phase: "Preflight" });
+
   const args = isWindows()
     ? buildWindowsUpdateArgs(ctx, options, dryRun)
     : buildBashUpdateArgs(ctx, options, dryRun);
@@ -68,7 +70,7 @@ export async function updateCommand(ctx, argv) {
     runDistroScript(ctx, { sh: "pi67-update.sh", ps1: "pi67-update.ps1" }, args, { dryRun: false });
     if (!dryRun) {
       writeState(ctx, options.repair ? "repair" : "update");
-      reportSettingsRuntimeStateMigration(ctx);
+      reportSettingsRuntimeStateMigration(ctx, { phase: "Post-update" });
     }
   } finally {
     lifecycle.release();
@@ -86,19 +88,22 @@ export async function updateCommand(ctx, argv) {
   }
 }
 
-function reportSettingsRuntimeStateMigration(ctx) {
+function reportSettingsRuntimeStateMigration(ctx, options = {}) {
+  const dryRun = Boolean(options.dryRun);
+  const phase = options.phase ? `${options.phase}: ` : "";
   const result = migrateSettingsRuntimeState(ctx, {
     normalizeSettingsJson: true,
     installGitFilter: true,
+    dryRun,
   });
-  if (result.markerFound && result.stateWritten) {
-    info("Migrated settings.json lastChangelogVersion to ignored state: ~/.pi/pi67/state.json");
+  if (result.markerFound && (result.stateWritten || dryRun)) {
+    info(`${phase}${dryRun ? "would migrate" : "Migrated"} settings.json lastChangelogVersion to ignored state: ~/.pi/pi67/state.json`);
   }
   if (result.settingsNormalized) {
-    info("Normalized settings.json by removing runtime-only lastChangelogVersion.");
+    info(`${phase}${dryRun ? "would normalize" : "Normalized"} settings.json by removing runtime-only lastChangelogVersion.`);
   }
   if (result.gitFilterInstalled) {
-    info("Installed local git clean filter for future settings.json runtime markers.");
+    info(`${phase}${dryRun ? "would install" : "Installed"} local git clean filter for future settings.json runtime markers.`);
   }
   for (const error of result.errors) {
     warn(`settings runtime marker migration skipped: ${error}`);

package/src/lib/settings-runtime-state.mjs

@@ -138,6 +138,32 @@ export function installSettingsRuntimeGitFilter(ctx, options = {}) {
   }
 
   const cleanCommand = `node ${SETTINGS_RUNTIME_FILTER_SCRIPT} --clean`;
+  const existingClean = captureCommand("git", [
+    "-C",
+    ctx.repoRoot,
+    "config",
+    "--local",
+    "--get",
+    `filter.${SETTINGS_RUNTIME_FILTER_NAME}.clean`,
+  ]);
+  const existingRequired = captureCommand("git", [
+    "-C",
+    ctx.repoRoot,
+    "config",
+    "--local",
+    "--get",
+    `filter.${SETTINGS_RUNTIME_FILTER_NAME}.required`,
+  ]);
+  if (
+    existingClean.ok &&
+    existingClean.stdout.trim() === cleanCommand &&
+    existingRequired.ok &&
+    existingRequired.stdout.trim() === "false"
+  ) {
+    result.skipped = "settings runtime filter already installed";
+    return result;
+  }
+
   const clean = captureCommand("git", [
     "-C",
     ctx.repoRoot,