Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Merge pull request #2 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #3 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #2 from CraigBuckmaster/master - #3

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #2 from CraigBuckmaster/master#3
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

Copy link
Copy Markdown
Owner

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…

Merge pull request #1 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit 9f54616 into masterMar 13, 2026
CraigBuckmaster added a commit that referenced this pull request Mar 13, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
…-push-for-genesis-chapters
Merge pull request #2 from CraigBuckmaster/master
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
Merge pull request #3 from CraigBuckmaster/codex/review-recent-master…
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
…reenHeader component + 8 screen migrations
P1 fixes from UI_UX_AUDIT.md:
1. ErrorBoundary (#2): wraps RootNavigator in App.tsx. Prod crashes now
show a styled recovery screen with Retry button instead of white screen.
2. NotesOverlay (#1): rendered in ChapterScreen with notesOverlayOpen
state from readerStore. Notes toggle actually opens the overlay now.
Added bookName prop for proper display name (was showing raw bookId).
3. Back navigation (#3): new ScreenHeader component replaces 8 separate
header implementations. ArrowLeft back button, title, optional subtitle,
optional titleColor override, accessibility role/label built in.
Screens gaining back buttons: BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, PlanDetailScreen, ScholarBioScreen, WordStudyDetailScreen.
Screens migrated to shared component: SettingsScreen, ChapterListScreen.
Removed ~50 lines of duplicated header styles.
Files: 12 changed, +145/-93
CraigBuckmaster pushed a commit that referenced this pull request Apr 3, 2026
CodeQL alert #3: The regex /<[^>]*>/g only strips tags in one pass,
so crafted input like <scr<script>ipt> could survive. Loop until
no tags remain to fully sanitize.
https://claude.ai/code/session_012iuiZXQvD4jD9oTbQoCZ6z
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster