Normalize remote history cursor fields

Author: SqlRush

docs/first-second-parity-audit.md

@@ -198,7 +198,7 @@ M6 progress now includes:
 - `internal/session`: remote-history response parsing now recursively unwraps GraphQL/session/HAL containers such as `data.session.events`, `data.projectSession.eventConnection`, `conversation`, `remoteHistory`, and `_embedded` before applying `nodes`/`edges[].node` event-list and `pageInfo` pagination parsing.
 - `internal/session`: remote-history response parsing now also unwraps GraphQL `viewer` and `node` containers, covering shapes such as `data.viewer.session.events` and `data.node.eventConnection` while preserving the same cursor pagination behavior.
 - `internal/session`: remote-history link pagination now accepts `links`/`_links` `next`/`previous`/`prev`/`older` string URLs or `{href,url,uri,link}` objects and extracts before/cursor query parameters for continuation.
-- `internal/session`: remote-history link pagination now also accepts link objects and link-array items that carry cursor fields directly, such as `cursor`, `beforeId`, and `lastEvaluatedKey`, instead of requiring href/url links.
+- `internal/session`: remote-history link pagination now also accepts link objects and link-array items that carry cursor fields directly, such as `cursor`, `beforeId`, and `lastEvaluatedKey`, including `_`/`-` field-name variants, instead of requiring href/url links.
 - `internal/session`: remote-history event selection now prefers materialized event payloads over JSON:API relationship identifier lists, so `relationships.events.data` `{type,id}` links can resolve through top-level `included` resources instead of yielding empty SDK events.
 - `internal/session`: remote-history event-list arrays now also flatten JSON:API/session resource wrappers that contain nested relationship event pages, merge their nested pagination fields, and skip clearly non-event resources such as tool/task records instead of materializing empty SDK events.
 - `internal/session`: remote-history link pagination now also accepts RFC/JSON:API-style `links` arrays with relation values from `rel`, `relation`, `name`, `type`, `kind`, or `label`, such as `previous`, `prev`, `older`, and `next`, including `_`/`-` page/link/cursor suffix variants.

internal/session/remote_history.go

@@ -1031,20 +1031,48 @@ func firstObjectRawField(raw map[string]json.RawMessage, names ...string) json.R
 func remoteHistoryStringField(raw map[string]json.RawMessage, names ...string) string {
 	for _, name := range names {
 		value, ok := raw[name]
-		if !ok || len(bytes.TrimSpace(value)) == 0 || bytes.Equal(bytes.TrimSpace(value), []byte("null")) {
+		if !ok {
 			continue
 		}
-		var text string
-		if err := json.Unmarshal(value, &text); err == nil {
+		if text, ok := remoteHistoryStringRawValue(value); ok {
 			return text
 		}
-		if text, ok := jsonNumberString(value); ok {
-			return text
+	}
+	for _, name := range names {
+		normalizedName := remoteHistoryNormalizedFieldName(name)
+		for rawName, value := range raw {
+			if remoteHistoryNormalizedFieldName(rawName) != normalizedName {
+				continue
+			}
+			if text, ok := remoteHistoryStringRawValue(value); ok {
+				return text
+			}
 		}
 	}
 	return ""
 }
 
+func remoteHistoryStringRawValue(value json.RawMessage) (string, bool) {
+	if len(bytes.TrimSpace(value)) == 0 || bytes.Equal(bytes.TrimSpace(value), []byte("null")) {
+		return "", false
+	}
+	var text string
+	if err := json.Unmarshal(value, &text); err == nil {
+		return text, true
+	}
+	if text, ok := jsonNumberString(value); ok {
+		return text, true
+	}
+	return "", false
+}
+
+func remoteHistoryNormalizedFieldName(name string) string {
+	name = strings.ToLower(strings.TrimSpace(name))
+	name = strings.ReplaceAll(name, "_", "")
+	name = strings.ReplaceAll(name, "-", "")
+	return name
+}
+
 func remoteHistoryCursorField(raw map[string]json.RawMessage) string {
 	return firstNonEmpty(
 		remoteHistoryStringField(raw, "before_id", "beforeId"),

internal/session/remote_history_test.go

@@ -713,9 +713,9 @@ func TestFetchRemoteHistoryAcceptsLinkObjectCursorFields(t *testing.T) {
 		w.Header().Set("Content-Type", "application/json")
 		switch r.URL.Query().Get("before_id") {
 		case "":
-			_, _ = w.Write([]byte(`{"data":[{"type":"status","session_id":"s","status":"latest"}],"links":{"older":{"lastEvaluatedKey":"evt_object"}}}`))
+			_, _ = w.Write([]byte(`{"data":[{"type":"status","session_id":"s","status":"latest"}],"links":{"older":{"last-evaluated-key":"evt_object"}}}`))
 		case "evt_object":
-			_, _ = w.Write([]byte(`{"data":[{"type":"status","session_id":"s","status":"older"}],"links":[{"rel":"previous","cursor":"evt_array"}]}`))
+			_, _ = w.Write([]byte(`{"data":[{"type":"status","session_id":"s","status":"older"}],"links":[{"rel":"previous","before-id":"evt_array"}]}`))
 		case "evt_array":
 			_, _ = w.Write([]byte(`{"data":[{"type":"status","session_id":"s","status":"oldest"}],"links":{"next":null}}`))
 		default: