Skip to content

fix(journal): avoid restoring deleted journals from known-good snapshots #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
levineam wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(journal): avoid restoring deleted journals from known-good snapshots #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions modules/jarvos-secondbrain/packages/jarvos-secondbrain-journal/src/journal-maintenance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,8 +1097,7 @@ function syncOneDate(date, config, opts = {}) {
const state = loadJournalState(journalDir);
const knownGood = state.dates?.[date];
const healthBefore = classifyJournalHealth({ existed, markdown: original, knownGood, config });
const restoreSource = (healthBefore.status === 'missing'
|| healthBefore.status === 'stub'
const restoreSource = (healthBefore.status === 'stub'
|| (healthBefore.status === 'stale' && isCatastrophicJournalShrink(healthBefore.metrics, knownGood)))
? readKnownGoodContent(journalDir, date, knownGood)
: null;
Expand Down
11 changes: 7 additions & 4 deletions modules/jarvos-secondbrain/tests/journal-maintenance.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ test('syncOneDate restores a frontmatter-only stub from known-good content and w
}
});

test('syncOneDate restores a deleted journal from known-good content', () => {
test('syncOneDate does not restore a deleted journal from known-good content', () => {
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'jarvos-journal-deleted-'));
const journalDir = path.join(tmp, 'Vault', 'Journal');
fs.mkdirSync(journalDir, { recursive: true });
Expand All @@ -553,14 +553,17 @@ test('syncOneDate restores a deleted journal from known-good content', () => {
const config = loadConfig();
syncOneDate(TEST_DATE, config, { dryRun: false });
const journalPath = path.join(journalDir, `${TEST_DATE}.md`);
const before = fs.readFileSync(journalPath, 'utf8');
const privateContent = 'PRIVATE_CONTENT_MUST_STAY_DELETED';
fs.appendFileSync(journalPath, `\n${privateContent}\n`, 'utf8');
syncOneDate(TEST_DATE, config, { dryRun: false });
assert.match(fs.readFileSync(journalPath, 'utf8'), new RegExp(privateContent));
fs.rmSync(journalPath);

const repaired = syncOneDate(TEST_DATE, config, { dryRun: false });

assert.equal(repaired.healthBefore.status, 'missing');
assert.equal(repaired.restoredKnownGood, true);
assert.equal(fs.readFileSync(journalPath, 'utf8'), before);
assert.equal(repaired.restoredKnownGood, false);
assert.doesNotMatch(fs.readFileSync(journalPath, 'utf8'), new RegExp(privateContent));
} finally {
if (previousJournalDir === undefined) delete process.env.JARVOS_JOURNAL_DIR;
else process.env.JARVOS_JOURNAL_DIR = previousJournalDir;
Expand Down
Loading