refactor(drift): update drift label messaging and enhance pull logic

This commit modifies the drift label for the "dashboard-ahead" state to provide clearer instructions for syncing down changes. Additionally, it refines the pull logic to treat cases where local and platform hashes match as "clean," allowing for a more efficient reconciliation process. This change improves user experience by simplifying the output messages during resource synchronization.

Author: vtkovapi

src/drift.ts

@@ -53,7 +53,7 @@ export function classifyDrift(input: ClassifyDriftInput): DriftDirection {
 export function formatDriftLabel(direction: DriftDirection): string {
   switch (direction) {
     case "dashboard-ahead":
-      return "[dashboard-ahead — sync down via plain pull (preserves local) or push --overwrite to take ownership]";
+      return "[dashboard-ahead — dashboard changed, local unchanged; run npm run pull to sync it down]";
     case "local-ahead":
       return "[local-ahead — run npm run push to propagate local edits up]";
     case "both-diverged":

src/pull.ts

@@ -661,11 +661,20 @@ export async function pullResourceType(
           const platformHash = hashPayload(
             canonicalizeForHash(resource, state, credReverse),
           );
-          const direction = classifyDrift({
-            localHash,
-            lastPulledHash: baseline,
-            platformHash,
-          });
+          // Local and platform already agreeing means there is nothing to
+          // reconcile, whatever the (possibly stale) baseline says — treat as
+          // clean and fall through to the write path: the rewrite is a
+          // content no-op that re-seeds the baseline from the disk form,
+          // self-healing the stale pointer. Mirrors the same guard in
+          // drift.ts's push gate.
+          const direction =
+            localHash === platformHash
+              ? "clean"
+              : classifyDrift({
+                  localHash,
+                  lastPulledHash: baseline,
+                  platformHash,
+                });
           if (driftCounts) driftCounts[direction]++;
 
           // The drift baseline now lives in the hash store, NOT in the state
@@ -695,12 +704,16 @@ export async function pullResourceType(
           }
 
           if (direction === "dashboard-ahead") {
+            // ⬇️ — local is UNCHANGED since the last sync and the dashboard
+            // moved ahead: the dashboard version is the natural next step
+            // down. Sync it without ceremony (mirror of push's silent-push
+            // rule for local-ahead). Nothing is lost — local had no edits.
+            // Fall through to the write path, which overwrites the file and
+            // re-seeds the baseline from the disk form.
             console.log(
-              `   ✏️  ${resourceId} (locally modified, preserving) ${formatDriftLabel(direction)}`,
+              `   ⬇️  ${resourceId} (dashboard ahead, local unchanged — syncing down)`,
             );
-            upsertState(newStateSection, resourceId, { uuid: resource.id });
-            skipped++;
-            continue;
+            skipLegacyPreserveChecks = true;
           }
 
           if (direction === "local-ahead") {