@bigking67/pi-67 0.10.12 → 0.10.13

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.10.13]
+
+- Normalizes `settings.json` BOM/CRLF line endings during `update --repair`
+  even when the runtime `lastChangelogVersion` marker is already absent,
+  clearing Windows Git EOL false-dirty states without changing provider,
+  model, theme, or other JSON content.
+
 ## [0.10.12]
 
 - Pins `settings.json` to LF line endings in `.gitattributes` while preserving

package/package.json

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

package/scripts/check.mjs

@@ -9,6 +9,7 @@ import { parseCommandOptions, splitGlobalArgs } from "../src/lib/args.mjs";
 import { readExtensionRegistry, validateExtensionRegistry } from "../src/lib/extension-registry.mjs";
 import { buildPlanDecisions, classifyGitShort } from "../src/lib/update-plan.mjs";
 import {
+  migrateSettingsRuntimeState,
   mergeSettingsRuntimeMarkerIntoState,
   settingsRuntimeMarkerFromObject,
   stripSettingsRuntimeMarkerText,
@@ -406,6 +407,27 @@ function runSettingsRuntimeStateSelfTests() {
       state.runtimeMarkers.lastChangelogVersion.storage === "state.json",
     "settings runtime marker must migrate into state runtimeMarkers",
   );
+  const tmpRoot = fs.mkdtempSync(path.join(os.tmpdir(), "pi67-settings-runtime-state-"));
+  const agentDir = path.join(tmpRoot, "agent");
+  const stateDir = path.join(tmpRoot, "state");
+  fs.mkdirSync(agentDir, { recursive: true });
+  fs.writeFileSync(path.join(agentDir, "settings.json"), "{\r\n  \"theme\": \"gruvbox-dark\"\r\n}\r\n", "utf8");
+  const lineEndingResult = migrateSettingsRuntimeState(
+    { agentDir, repoRoot: agentDir, stateDir },
+    { normalizeSettingsJson: true },
+  );
+  const normalizedSettings = fs.readFileSync(path.join(agentDir, "settings.json"), "utf8");
+  assert(lineEndingResult.markerFound === false, "line-ending normalization must not require runtime marker");
+  assert(lineEndingResult.settingsNormalized === true, "CRLF settings.json must be normalized under --normalize");
+  assert(
+    lineEndingResult.settingsNormalizeReasons.includes("line-endings"),
+    "settings normalization must classify CRLF as line-endings",
+  );
+  assert(
+    normalizedSettings === "{\n  \"theme\": \"gruvbox-dark\"\n}\n",
+    "settings line-ending normalization must preserve JSON content and indentation",
+  );
+  fs.rmSync(tmpRoot, { recursive: true, force: true });
 }
 
 function runUpdatePreflightMigrationSelfTests() {

package/src/commands/install.mjs

@@ -58,7 +58,7 @@ export async function installCommand(ctx, argv) {
       info("Migrated settings.json lastChangelogVersion to ignored state: ~/.pi/pi67/state.json");
     }
     if (runtimeState.settingsNormalized) {
-      info("Normalized settings.json by removing runtime-only lastChangelogVersion.");
+      info("Normalized settings.json runtime marker/line endings.");
     }
     if (runtimeState.gitFilterInstalled) {
       info("Installed local git clean filter for future settings.json runtime markers.");

package/src/commands/update.mjs

@@ -100,7 +100,7 @@ function reportSettingsRuntimeStateMigration(ctx, options = {}) {
     info(`${phase}${dryRun ? "would migrate" : "Migrated"} settings.json lastChangelogVersion to ignored state: ~/.pi/pi67/state.json`);
   }
   if (result.settingsNormalized) {
-    info(`${phase}${dryRun ? "would normalize" : "Normalized"} settings.json by removing runtime-only lastChangelogVersion.`);
+    info(`${phase}${dryRun ? "would normalize" : "Normalized"} settings.json runtime marker/line endings.`);
   }
   if (result.gitFilterInstalled) {
     info(`${phase}${dryRun ? "would install" : "Installed"} local git clean filter for future settings.json runtime markers.`);

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

@@ -67,6 +67,7 @@ export function migrateSettingsRuntimeState(ctx, options = {}) {
     markerValue: "",
     stateWritten: false,
     settingsNormalized: false,
+    settingsNormalizeReasons: [],
     gitFilterInstalled: false,
     skipped: [],
     errors: [],
@@ -75,10 +76,12 @@ export function migrateSettingsRuntimeState(ctx, options = {}) {
   if (!fs.existsSync(settingsPath)) {
     result.skipped.push("settings.json missing");
   } else {
+    let rawSettingsText = "";
     let settingsText = "";
     let settings = null;
     try {
-      settingsText = fs.readFileSync(settingsPath, "utf8").replace(/^\uFEFF/, "");
+      rawSettingsText = fs.readFileSync(settingsPath, "utf8");
+      settingsText = rawSettingsText.replace(/^\uFEFF/, "");
       settings = JSON.parse(settingsText);
     } catch (error) {
       result.errors.push(`settings.json is not valid JSON: ${error.message}`);
@@ -95,14 +98,28 @@ export function migrateSettingsRuntimeState(ctx, options = {}) {
       }
       if (normalizeSettingsJson) {
         const normalizedText = stableSettingsJson(stripSettingsRuntimeMarker(settings));
-        if (normalizedText !== settingsText) {
+        if (normalizedText !== rawSettingsText) {
           if (!dryRun) {
             fs.writeFileSync(settingsPath, normalizedText, "utf8");
           }
           result.settingsNormalized = true;
+          result.settingsNormalizeReasons.push("runtime-marker");
+          if (normalizeSettingsTextLineEndings(rawSettingsText) !== rawSettingsText) {
+            result.settingsNormalizeReasons.push("line-endings");
+          }
         }
       }
     } else {
+      if (normalizeSettingsJson && settings) {
+        const normalizedText = normalizeSettingsTextLineEndings(rawSettingsText);
+        if (normalizedText !== rawSettingsText) {
+          if (!dryRun) {
+            fs.writeFileSync(settingsPath, normalizedText, "utf8");
+          }
+          result.settingsNormalized = true;
+          result.settingsNormalizeReasons.push("line-endings");
+        }
+      }
       result.skipped.push("settings.json runtime marker absent");
     }
   }
@@ -117,6 +134,12 @@ export function migrateSettingsRuntimeState(ctx, options = {}) {
   return result;
 }
 
+export function normalizeSettingsTextLineEndings(text) {
+  return String(text || "")
+    .replace(/^\uFEFF/, "")
+    .replace(/\r\n?/g, "\n");
+}
+
 export function installSettingsRuntimeGitFilter(ctx, options = {}) {
   const result = {
     installed: false,

package/src/tools/settings-runtime-state-filter.mjs

@@ -51,7 +51,7 @@ function printHuman(result) {
     console.log("PASS settings.json runtime marker is already absent");
   }
   if (result.settingsNormalized) {
-    console.log("PASS normalized settings.json by removing runtime-only lastChangelogVersion");
+    console.log("PASS normalized settings.json runtime marker/line endings");
   }
   if (result.gitFilterInstalled) {
     console.log("PASS installed local git clean filter for settings.json runtime marker");