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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
2 changes: 1 addition & 1 deletion app/src/components/guidedStudy/EvidenceTrailRow.tsx
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { StyleSheet, Text, TouchableOpacity, View } from 'react-native';
import { ChevronRight } from 'lucide-react-native';
import { ConfidenceBadge } from './ConfidenceBadge';
import { fontFamily, MIN_TOUCH_TARGET, radii, spacing, useTheme } from '../../theme';
import type { GuidedEvidenceTrailItem } from '../../services/guidedStudy';
import { ConfidenceBadge } from './ConfidenceBadge';

interface Props {
item: GuidedEvidenceTrailItem;
Expand Down
9 changes: 4 additions & 5 deletions app/src/hooks/useAmicusChapterStudyThread.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,11 @@ export function useAmicusChapterStudyThread(chapterRef: string | null) {

useEffect(() => {
let cancelled = false;
if (!chapterRef) {
setThreadId(null);
return;
}

void (async () => {
if (!chapterRef) {
if (!cancelled) setThreadId(null);
return;
}
try {
const next = await getLatestStudyAmicusThreadIdForChapter(chapterRef);
if (!cancelled) setThreadId(next);
Expand Down
2 changes: 1 addition & 1 deletion app/src/hooks/useAmicusContext.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { useMemo } from 'react';
import { useAmicusChipContext } from './useAmicusChipContext';
import type { ChipContext } from '@/hooks/useAmicusChips';
import {
buildAmicusContextEnvelope,
Expand All@@ -7,7 +8,6 @@ import {
type AmicusGuidedStudyContext,
} from '@/services/amicus/context';
import type { AmicusSeedChapterRef } from '@/services/amicus/deepLink';
import { useAmicusChipContext } from './useAmicusChipContext';

export interface UseAmicusContextOptions {
entryPoint: AmicusEntryPoint;
Expand Down
40 changes: 7 additions & 33 deletions app/src/screens/AmicusThreadScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,34 +117,6 @@ export default function AmicusThreadScreen(): React.ReactElement {
};
}, [threadId]);

const handleSend = useCallback(
async (text: string) => {
// Pre-flight access check (#1460).
if (access.reason === 'not_premium') {
navigation.navigate('Paywall');
return;
}
if (access.reason === 'monthly_cap_reached' || access.reason === 'offline') {
logger.info('Amicus', `send blocked: ${access.reason}`);
return;
}

const authToken = await getAmicusAuthToken();
if (!authToken) {
logger.warn('Amicus', 'no auth token — aborting send');
return;
}
// Gate on one-time privacy acknowledgement (#1458).
const accepted = await requestAmicusConsent();
if (!accepted) {
logger.info('Amicus', 'opt-in declined — not sending');
return;
}
await sendMessage(text, authToken);
},
[sendMessage, requestAmicusConsent, access.reason, navigation],
);

const persistThreadIntelligence = useCallback(
async (text: string, action?: AmicusStudyActionSeed) => {
const derived = deriveThreadIntelligence({
Expand DownExpand Up@@ -184,15 +156,13 @@ export default function AmicusThreadScreen(): React.ReactElement {
}
},
[
linkedQuestion?.question_text,
questionText,
seedChapterRef,
seedGuidedContext?.keyConnection,
seedGuidedContext?.openQuestionText,
seedGuidedContext?.takeaway,
thread,
threadContext?.key_connection,
threadContext?.open_question_id,
threadContext?.takeaway,
threadId,
],
Expand DownExpand Up@@ -227,15 +197,19 @@ export default function AmicusThreadScreen(): React.ReactElement {

// Auto-send the seed query once per mount when navigated in from the
// home card / deep-link handoff (#1467). Guarded by a ref so rapid
// re-renders don't re-dispatch.
// re-renders don't re-dispatch. Deferred with queueMicrotask so the
// setState calls sendWithContext performs don't run synchronously
// within the effect body (react-hooks/set-state-in-effect).
const autoSentRef = useRef(false);
useEffect(() => {
if (autoSentRef.current) return;
if (!initialQuery) return;
if (messages.length > 0) return;
if (isStreaming) return;
autoSentRef.current = true;
void sendWithContext(initialQuery);
queueMicrotask(() => {
void sendWithContext(initialQuery);
});
}, [initialQuery, messages.length, isStreaming, sendWithContext]);

const handleExport = useCallback(async () => {
Expand DownExpand Up@@ -316,7 +290,7 @@ export default function AmicusThreadScreen(): React.ReactElement {
} catch (err) {
logger.warn('Amicus', 'failed to update linked question status', err);
}
}, [linkedQuestion, seedChapterRef, thread?.chapter_ref, threadId]);
}, [linkedQuestion, seedChapterRef, thread, threadId]);

return (
<SafeAreaView style={[styles.container, { backgroundColor: base.bg }]}>
Expand Down
9 changes: 5 additions & 4 deletions app/src/services/amicus/__tests__/studyLaunch.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { launchAmicusStudyThread, promotePeekToAmicusThread } from '@/services/amicus/studyLaunch';
import {
getAmicusThreadIdForGuidedQuestion,
Expand DownExpand Up@@ -56,7 +57,7 @@ describe('launchAmicusStudyThread', () => {

it('reuses an existing linked question thread when available', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetThreadIdForQuestion.mockResolvedValueOnce('t-linked');

await launchAmicusStudyThread(navigation, {
Expand All@@ -80,7 +81,7 @@ describe('launchAmicusStudyThread', () => {

it('creates a new seeded thread when no existing study thread is found', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await launchAmicusStudyThread(navigation, {
entryPoint: 'guided_study',
Expand All@@ -107,7 +108,7 @@ describe('launchAmicusStudyThread', () => {

it('promotes peek messages into an existing study-linked thread when one exists', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;
mockGetLatestThreadIdForChapter.mockResolvedValueOnce('t-existing');

await promotePeekToAmicusThread(navigation, {
Expand DownExpand Up@@ -141,7 +142,7 @@ describe('launchAmicusStudyThread', () => {

it('falls back to a new thread when no existing study-linked thread is found for peek promotion', async () => {
const parent = { navigate: jest.fn() };
const navigation = { getParent: () => parent } as any;
const navigation = { getParent: () => parent } as unknown as NavigationProp<ParamListBase>;

await promotePeekToAmicusThread(navigation, {
chapterRef: { book_id: 'genesis', chapter_num: 1 },
Expand Down
2 changes: 1 addition & 1 deletion app/src/services/amicus/context.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { ChipContext } from '@/hooks/useAmicusChips';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, parseChapterRef, type AmicusSeedChapterRef } from './deepLink';

export type AmicusEntryPoint =
| 'fab'
Expand Down
6 changes: 3 additions & 3 deletions app/src/services/amicus/studyLaunch.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
import type { NavigationProp, ParamListBase } from '@react-navigation/native';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';
import {
getAmicusThreadIdForGuidedQuestion,
getAmicusThreadIdForGuidedSession,
Expand All@@ -12,9 +15,6 @@ import {
import type { AmicusDraftMessage } from '@/types';
import { logger } from '@/utils/logger';
import type { GuidedStudyStep } from '@/types';
import { formatChapterRef, type AmicusSeedChapterRef } from './deepLink';
import type { AmicusGuidedStudyContext } from './context';
import { deriveThreadIntelligence } from './threadIntelligence';

export interface LaunchAmicusStudyThreadInput {
entryPoint: 'guided_study' | 'my_study';
Expand Down
Loading