@gotcos/glasses-server 6.16.5 → 6.17.0

package/server/routes/welcome-context.ts

@@ -127,6 +127,19 @@ async function reverseGeocode(lat: number, lon: number): Promise<string> {
   }
 }
 
+/** Ensure a city label before any weather JSON leaves the server (3s capped). */
+async function ensureCityLabel(lat: number, lon: number, source: 'query' | 'last' | 'env'): Promise<void> {
+  if (lastKnownCity) return
+  if (source === 'env') {
+    const env = envDefaultCoords()
+    if (env?.city) {
+      lastKnownCity = env.city
+      return
+    }
+  }
+  await reverseGeocode(lat, lon)
+}
+
 export async function fetchWeather(
   queryLat?: number,
   queryLon?: number,
@@ -147,19 +160,21 @@ export async function fetchWeather(
     lastKnownLat = useLat
     lastKnownLon = useLon
     weatherFetchedAt = 0
-    // Blocker fix: wait for city before first paint (capped).
-    await reverseGeocode(useLat, useLon)
-  } else if (source === 'env' && !lastKnownCity) {
-    const env = envDefaultCoords()
-    if (env?.city) lastKnownCity = env.city
-    lastKnownLat = useLat
-    lastKnownLon = useLon
-  } else if (lastKnownLat == null) {
+    lastKnownCity = '' // force fresh reverse-geocode for the new place
+  } else if (lastKnownLat == null || lastKnownLon == null) {
     lastKnownLat = useLat
     lastKnownLon = useLon
   }
 
+  // Warning fix: never return weather (cached or fresh) without a city when
+  // we can still resolve one — closes reverse-geocode race on first paint.
+  await ensureCityLabel(useLat, useLon, source)
+
   if (cachedWeather && Date.now() - weatherFetchedAt < WEATHER_TTL_MS) {
+    // Refresh location string if geocode caught up after an older cache write.
+    if (lastKnownCity && cachedWeather.location !== lastKnownCity) {
+      cachedWeather = { ...cachedWeather, location: lastKnownCity }
+    }
     return cachedWeather
   }
 
@@ -177,13 +192,7 @@ export async function fetchWeather(
     const code = data.current?.weather_code
     if (typeof temp !== 'number' || typeof code !== 'number') return cachedWeather
 
-    if (!lastKnownCity && source === 'env') {
-      const env = envDefaultCoords()
-      if (env?.city) lastKnownCity = env.city
-    }
-    if (!lastKnownCity) {
-      await reverseGeocode(useLat, useLon)
-    }
+    await ensureCityLabel(useLat, useLon, source)
 
     cachedWeather = {
       temp: `${Math.round(temp)}\u00B0F`,

package/server/scripts/reset-message-era.ts

@@ -0,0 +1,28 @@
+#!/usr/bin/env tsx
+// Creates a fresh short-number namespace without touching sessions or archives.
+// Restart the server afterward so every new exchange is stamped into the era.
+//
+//   npx tsx server/scripts/reset-message-era.ts --confirm
+
+import { createMessageEra, currentMessageEraState } from '../lib/message-era.js'
+
+if (!process.argv.includes('--confirm')) {
+  const current = currentMessageEraState()
+  console.error(`Current message era: ${current.era}`)
+  console.error('Refusing to reset without --confirm. History will be retained.')
+  process.exit(2)
+}
+
+const next = createMessageEra()
+console.log(JSON.stringify({
+  status: 'created',
+  ...next,
+  history: 'retained',
+  restartRequired: true,
+  verify: 'GET /api/message-counter should return { max: 0 or small, era: "<era above>" } after server restart',
+  nextSteps: [
+    'Restart LaunchAgent / Control Update Server generation',
+    'Phone reconnect so syncMessageEra clears the live list',
+    'Send a test message — expect #1 (or low single digits)',
+  ],
+}, null, 2))