Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import hashlib
import os
from dataclasses import dataclass, field
from datetime import datetime
from datetime import UTC, datetime
from pathlib import Path


Expand Down Expand Up @@ -84,7 +84,11 @@ class FileManifest:
"""

entries: tuple[FileEntry, ...]
created_at: datetime = field(default_factory=datetime.now)
created_at: datetime = field(
default_factory=lambda: datetime.now(tz=UTC),
compare=False,
hash=False,
)

# Lookup cache (built lazily, not part of equality)
_path_index: dict[str, FileEntry] | None = field(default=None, compare=False, hash=False)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,19 @@ def test_effect_replay_verifies_changeset_appended(self, sample_manifest):
# Verify changeset was appended
assert len(ws_after.pending_changesets) == 1
assert ws_after.pending_changesets[0] is changeset


class TestFileManifestIdentity:
"""Regression pins for the C2 fix (tz-aware, comparison-exempt created_at)."""

def test_file_manifest_equality_ignores_created_at(self):
"""Two manifests of identical file state are equal despite distinct timestamps."""
entries = (FileEntry(path="f.txt", size_bytes=10, mtime_ns=1, content_hash="x" * 64),)
m1 = FileManifest(entries=entries) # default_factory timestamps differ per-instance
m2 = FileManifest(entries=entries)
assert m1 == m2
assert hash(m1) == hash(m2)

def test_file_manifest_created_at_is_tz_aware(self):
m = FileManifest(entries=())
assert m.created_at.tzinfo is not None
7 changes: 7 additions & 0 deletions shepherd/packages/meta/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- **File manifests now have stable snapshot identity and timezone-aware timestamps.**
`FileManifest.created_at` is recorded in UTC and no longer participates in
equality or hashing, so otherwise identical file snapshots do not compare
unequal merely because they were captured at different times.

## [0.3.0] - 2026-07-08

### Added
Expand Down
Loading