mirror of
https://github.com/kennethnym/freya
synced 2026-07-01 05:41:15 +01:00
Compare commits
11 Commits
feat/agent
...
dev/nvim
| Author | SHA1 | Date | |
|---|---|---|---|
|
b01daf0bc4
|
|||
| 2e6cae4d02 | |||
| 8cf38d609b | |||
| e6af1b7851 | |||
| 769fd5c77d | |||
| 6cc0f7669a | |||
| 63e71fb828 | |||
| e9f97d6f02 | |||
| e52e057548 | |||
| d3d9def260 | |||
| 227f196d5e |
134
.agents/skills/upgrading-expo/SKILL.md
Normal file
134
.agents/skills/upgrading-expo/SKILL.md
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
---
|
||||||
|
name: upgrading-expo
|
||||||
|
description: Guidelines for upgrading Expo SDK versions and fixing dependency issues
|
||||||
|
version: 1.0.0
|
||||||
|
license: MIT
|
||||||
|
---
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- ./references/react-19.md -- SDK +54: React 19 changes (useContext → use, Context.Provider → Context, forwardRef removal)
|
||||||
|
- ./references/new-architecture.md -- SDK +53: New Architecture migration guide
|
||||||
|
- ./references/react-compiler.md -- SDK +54: React Compiler setup and migration guide
|
||||||
|
- ./references/native-tabs.md -- SDK +55: Native tabs changes (Icon/Label/Badge now accessed via NativeTabs.Trigger.\*)
|
||||||
|
- ./references/expo-av-to-audio.md -- SDK +55: Migrate audio playback and recording from expo-av to expo-audio
|
||||||
|
- ./references/expo-av-to-video.md -- SDK +55: Migrate video playback from expo-av to expo-video
|
||||||
|
- ./references/react-navigation-to-expo-router.md -- SDK +56: Migrate `@react-navigation/*` imports to `expo-router` entry points (codemod + manual mapping)
|
||||||
|
|
||||||
|
## Beta/Preview Releases
|
||||||
|
|
||||||
|
Beta versions use `.preview` suffix (e.g., `55.0.0-preview.2`), published under `@next` tag.
|
||||||
|
|
||||||
|
Check if latest is beta: https://exp.host/--/api/v2/versions (look for `-preview` in `expoVersion`)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx expo install expo@next --fix # install beta
|
||||||
|
```
|
||||||
|
|
||||||
|
## Step-by-Step Upgrade Process
|
||||||
|
|
||||||
|
1. Upgrade Expo and dependencies
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx expo install expo@latest
|
||||||
|
npx expo install --fix
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Run diagnostics: `npx expo-doctor`
|
||||||
|
|
||||||
|
3. Clear caches and reinstall
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx expo export -p ios --clear
|
||||||
|
rm -rf node_modules .expo
|
||||||
|
watchman watch-del-all
|
||||||
|
```
|
||||||
|
|
||||||
|
## Breaking Changes Checklist
|
||||||
|
|
||||||
|
- Check for removed APIs in release notes
|
||||||
|
- Update import paths for moved modules
|
||||||
|
- Review native module changes requiring prebuild
|
||||||
|
- Test all camera, audio, and video features
|
||||||
|
- Verify navigation still works correctly
|
||||||
|
|
||||||
|
## Prebuild for Native Changes
|
||||||
|
|
||||||
|
**First check if `ios/` and `android/` directories exist in the project.** If neither directory exists, the project uses Continuous Native Generation (CNG) and native projects are regenerated at build time — skip this section and "Clear caches for bare workflow" entirely.
|
||||||
|
|
||||||
|
If upgrading requires native changes:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx expo prebuild --clean
|
||||||
|
```
|
||||||
|
|
||||||
|
This regenerates the `ios` and `android` directories. Ensure the project is not a bare workflow app before running this command.
|
||||||
|
|
||||||
|
## Clear caches for bare workflow
|
||||||
|
|
||||||
|
These steps only apply when `ios/` and/or `android/` directories exist in the project:
|
||||||
|
|
||||||
|
- Clear the cocoapods cache for iOS: `cd ios && pod install --repo-update`
|
||||||
|
- Clear derived data for Xcode: `npx expo run:ios --no-build-cache`
|
||||||
|
- Clear the Gradle cache for Android: `cd android && ./gradlew clean`
|
||||||
|
|
||||||
|
## Housekeeping
|
||||||
|
|
||||||
|
- Review release notes for the target SDK version at https://expo.dev/changelog
|
||||||
|
- If using Expo SDK 54 or later, ensure react-native-worklets is installed — this is required for react-native-reanimated to work.
|
||||||
|
- Enable React Compiler in SDK 54+ by adding `"experiments": { "reactCompiler": true }` to app.json — it's stable and recommended
|
||||||
|
- Delete sdkVersion from `app.json` to let Expo manage it automatically
|
||||||
|
- Remove implicit packages from `package.json`: `@babel/core`, `babel-preset-expo`, `expo-constants`.
|
||||||
|
- If the babel.config.js only contains 'babel-preset-expo', delete the file
|
||||||
|
- If the metro.config.js only contains expo defaults, delete the file
|
||||||
|
|
||||||
|
## Deprecated Packages
|
||||||
|
|
||||||
|
| Old Package | Replacement |
|
||||||
|
| -------------------- | ---------------------------------------------------- |
|
||||||
|
| `expo-av` | `expo-audio` and `expo-video` |
|
||||||
|
| `expo-permissions` | Individual package permission APIs |
|
||||||
|
| `@expo/vector-icons` | `expo-symbols` (for SF Symbols) |
|
||||||
|
| `AsyncStorage` | `expo-sqlite/localStorage/install` |
|
||||||
|
| `expo-app-loading` | `expo-splash-screen` |
|
||||||
|
| expo-linear-gradient | experimental_backgroundImage + CSS gradients in View |
|
||||||
|
|
||||||
|
When migrating deprecated packages, update all code usage before removing the old package. For expo-av, consult the migration references to convert Audio.Sound to useAudioPlayer, Audio.Recording to useAudioRecorder, and Video components to VideoView with useVideoPlayer.
|
||||||
|
|
||||||
|
## expo.install.exclude
|
||||||
|
|
||||||
|
Check if package.json has excluded packages:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"expo": { "install": { "exclude": ["react-native-reanimated"] } }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Exclusions are often workarounds that may no longer be needed after upgrading. Review each one.
|
||||||
|
## Removing patches
|
||||||
|
|
||||||
|
Check if there are any outdated patches in the `patches/` directory. Remove them if they are no longer needed.
|
||||||
|
|
||||||
|
## Postcss
|
||||||
|
|
||||||
|
- `autoprefixer` isn't needed in SDK +53. Remove it from dependencies and check `postcss.config.js` or `postcss.config.mjs` to remove it from the plugins list.
|
||||||
|
- Use `postcss.config.mjs` in SDK +53.
|
||||||
|
|
||||||
|
## Metro
|
||||||
|
|
||||||
|
Remove redundant metro config options:
|
||||||
|
|
||||||
|
- resolver.unstable_enablePackageExports is enabled by default in SDK +53.
|
||||||
|
- `experimentalImportSupport` is enabled by default in SDK +54.
|
||||||
|
- `EXPO_USE_FAST_RESOLVER=1` is removed in SDK +54.
|
||||||
|
- cjs and mjs extensions are supported by default in SDK +50.
|
||||||
|
- Expo webpack is deprecated, migrate to [Expo Router and Metro web](https://docs.expo.dev/router/migrate/from-expo-webpack/).
|
||||||
|
|
||||||
|
## Hermes engine v1
|
||||||
|
|
||||||
|
Since SDK 55, users can opt-in to use Hermes engine v1 for improved runtime performance. This requires setting `useHermesV1: true` in the `expo-build-properties` config plugin, and may require a specific version of the `hermes-compiler` npm package. Hermes v1 will become a default in some future SDK release.
|
||||||
|
|
||||||
|
## New Architecture
|
||||||
|
|
||||||
|
The new architecture is enabled by default, the app.json field `"newArchEnabled": true` is no longer needed as it's the default. Expo Go only supports the new architecture as of SDK +53.
|
||||||
4
.agents/skills/upgrading-expo/agents/openai.yaml
Normal file
4
.agents/skills/upgrading-expo/agents/openai.yaml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
interface:
|
||||||
|
display_name: "Upgrading Expo"
|
||||||
|
short_description: "Upgrade Expo SDKs, fix dependencies, adopt React 19 / React Compiler, and migrate deprecated Expo packages"
|
||||||
|
default_prompt: "Use $upgrading-expo to upgrade an Expo SDK, run diagnostics, fix dependency conflicts, decide whether prebuild/cache clearing applies, and migrate away from deprecated Expo packages."
|
||||||
132
.agents/skills/upgrading-expo/references/expo-av-to-audio.md
Normal file
132
.agents/skills/upgrading-expo/references/expo-av-to-audio.md
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
# Migrating from expo-av to expo-audio
|
||||||
|
|
||||||
|
## Imports
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before
|
||||||
|
import { Audio } from 'expo-av';
|
||||||
|
|
||||||
|
// After
|
||||||
|
import { useAudioPlayer, useAudioRecorder, RecordingPresets, AudioModule, setAudioModeAsync } from 'expo-audio';
|
||||||
|
```
|
||||||
|
|
||||||
|
## Audio Playback
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const [sound, setSound] = useState<Audio.Sound>();
|
||||||
|
|
||||||
|
async function playSound() {
|
||||||
|
const { sound } = await Audio.Sound.createAsync(require('./audio.mp3'));
|
||||||
|
setSound(sound);
|
||||||
|
await sound.playAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
return sound ? () => { sound.unloadAsync(); } : undefined;
|
||||||
|
}, [sound]);
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-audio)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const player = useAudioPlayer(require('./audio.mp3'));
|
||||||
|
|
||||||
|
// Play
|
||||||
|
player.play();
|
||||||
|
```
|
||||||
|
|
||||||
|
## Audio Recording
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const [recording, setRecording] = useState<Audio.Recording>();
|
||||||
|
|
||||||
|
async function startRecording() {
|
||||||
|
await Audio.requestPermissionsAsync();
|
||||||
|
await Audio.setAudioModeAsync({ allowsRecordingIOS: true, playsInSilentModeIOS: true });
|
||||||
|
const { recording } = await Audio.Recording.createAsync(Audio.RecordingOptionsPresets.HIGH_QUALITY);
|
||||||
|
setRecording(recording);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function stopRecording() {
|
||||||
|
await recording?.stopAndUnloadAsync();
|
||||||
|
const uri = recording?.getURI();
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-audio)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const recorder = useAudioRecorder(RecordingPresets.HIGH_QUALITY);
|
||||||
|
|
||||||
|
async function startRecording() {
|
||||||
|
await AudioModule.requestRecordingPermissionsAsync();
|
||||||
|
await recorder.prepareToRecordAsync();
|
||||||
|
recorder.record();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function stopRecording() {
|
||||||
|
await recorder.stop();
|
||||||
|
const uri = recorder.uri;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Audio Mode
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
await Audio.setAudioModeAsync({
|
||||||
|
allowsRecordingIOS: true,
|
||||||
|
playsInSilentModeIOS: true,
|
||||||
|
staysActiveInBackground: true,
|
||||||
|
interruptionModeIOS: InterruptionModeIOS.DoNotMix,
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-audio)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
await setAudioModeAsync({
|
||||||
|
playsInSilentMode: true,
|
||||||
|
shouldPlayInBackground: true,
|
||||||
|
interruptionMode: 'doNotMix',
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
## API Mapping
|
||||||
|
|
||||||
|
| expo-av | expo-audio |
|
||||||
|
|---------|------------|
|
||||||
|
| `Audio.Sound.createAsync()` | `useAudioPlayer(source)` |
|
||||||
|
| `sound.playAsync()` | `player.play()` |
|
||||||
|
| `sound.pauseAsync()` | `player.pause()` |
|
||||||
|
| `sound.setPositionAsync(ms)` | `player.seekTo(seconds)` |
|
||||||
|
| `sound.setVolumeAsync(vol)` | `player.volume = vol` |
|
||||||
|
| `sound.setRateAsync(rate)` | `player.playbackRate = rate` |
|
||||||
|
| `sound.setIsLoopingAsync(loop)` | `player.loop = loop` |
|
||||||
|
| `sound.unloadAsync()` | Automatic via hook |
|
||||||
|
| `playbackStatus.positionMillis` | `player.currentTime` (seconds) |
|
||||||
|
| `playbackStatus.durationMillis` | `player.duration` (seconds) |
|
||||||
|
| `playbackStatus.isPlaying` | `player.playing` |
|
||||||
|
| `Audio.Recording.createAsync()` | `useAudioRecorder(preset)` |
|
||||||
|
| `Audio.RecordingOptionsPresets.*` | `RecordingPresets.*` |
|
||||||
|
| `recording.stopAndUnloadAsync()` | `recorder.stop()` |
|
||||||
|
| `recording.getURI()` | `recorder.uri` |
|
||||||
|
| `Audio.requestPermissionsAsync()` | `AudioModule.requestRecordingPermissionsAsync()` |
|
||||||
|
|
||||||
|
## Key Differences
|
||||||
|
|
||||||
|
- **No auto-reset on finish**: After `play()` completes, the player stays paused at the end. To replay, call `player.seekTo(0)` then `play()`
|
||||||
|
- **Time in seconds**: expo-audio uses seconds, not milliseconds (matching web standards)
|
||||||
|
- **Immediate loading**: Audio loads immediately when the hook mounts—no explicit preloading needed
|
||||||
|
- **Automatic cleanup**: No need to call `unloadAsync()`, hooks handle resource cleanup on unmount
|
||||||
|
- **Multiple players**: Create multiple `useAudioPlayer` instances and store them—all load immediately
|
||||||
|
- **Direct property access**: Set volume, rate, loop directly on the player object (`player.volume = 0.5`)
|
||||||
|
|
||||||
|
## API Reference
|
||||||
|
|
||||||
|
https://docs.expo.dev/versions/latest/sdk/audio/
|
||||||
160
.agents/skills/upgrading-expo/references/expo-av-to-video.md
Normal file
160
.agents/skills/upgrading-expo/references/expo-av-to-video.md
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
# Migrating from expo-av to expo-video
|
||||||
|
|
||||||
|
## Imports
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before
|
||||||
|
import { Video, ResizeMode } from 'expo-av';
|
||||||
|
|
||||||
|
// After
|
||||||
|
import { useVideoPlayer, VideoView, VideoSource } from 'expo-video';
|
||||||
|
import { useEvent, useEventListener } from 'expo';
|
||||||
|
```
|
||||||
|
|
||||||
|
## Video Playback
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const videoRef = useRef<Video>(null);
|
||||||
|
const [status, setStatus] = useState({});
|
||||||
|
|
||||||
|
<Video
|
||||||
|
ref={videoRef}
|
||||||
|
source={{ uri: 'https://example.com/video.mp4' }}
|
||||||
|
style={{ width: 350, height: 200 }}
|
||||||
|
resizeMode={ResizeMode.CONTAIN}
|
||||||
|
isLooping
|
||||||
|
onPlaybackStatusUpdate={setStatus}
|
||||||
|
/>
|
||||||
|
|
||||||
|
// Control
|
||||||
|
videoRef.current?.playAsync();
|
||||||
|
videoRef.current?.pauseAsync();
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-video)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const player = useVideoPlayer('https://example.com/video.mp4', player => {
|
||||||
|
player.loop = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
const { isPlaying } = useEvent(player, 'playingChange', { isPlaying: player.playing });
|
||||||
|
|
||||||
|
<VideoView
|
||||||
|
player={player}
|
||||||
|
style={{ width: 350, height: 200 }}
|
||||||
|
contentFit="contain"
|
||||||
|
/>
|
||||||
|
|
||||||
|
// Control
|
||||||
|
player.play();
|
||||||
|
player.pause();
|
||||||
|
```
|
||||||
|
|
||||||
|
## Status Updates
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<Video
|
||||||
|
onPlaybackStatusUpdate={status => {
|
||||||
|
if (status.isLoaded) {
|
||||||
|
console.log(status.positionMillis, status.durationMillis, status.isPlaying);
|
||||||
|
if (status.didJustFinish) console.log('finished');
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-video)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Reactive state
|
||||||
|
const { isPlaying } = useEvent(player, 'playingChange', { isPlaying: player.playing });
|
||||||
|
|
||||||
|
// Side effects
|
||||||
|
useEventListener(player, 'playToEnd', () => console.log('finished'));
|
||||||
|
|
||||||
|
// Direct access
|
||||||
|
console.log(player.currentTime, player.duration, player.playing);
|
||||||
|
```
|
||||||
|
|
||||||
|
## Local Files
|
||||||
|
|
||||||
|
### Before (expo-av)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<Video source={require('./video.mp4')} />
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (expo-video)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
const player = useVideoPlayer({ assetId: require('./video.mp4') });
|
||||||
|
```
|
||||||
|
|
||||||
|
## Fullscreen and PiP
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<VideoView
|
||||||
|
player={player}
|
||||||
|
allowsFullscreen
|
||||||
|
allowsPictureInPicture
|
||||||
|
onFullscreenEnter={() => {}}
|
||||||
|
onFullscreenExit={() => {}}
|
||||||
|
/>
|
||||||
|
```
|
||||||
|
|
||||||
|
For PiP and background playback, add to app.json:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"expo": {
|
||||||
|
"plugins": [
|
||||||
|
["expo-video", { "supportsBackgroundPlayback": true, "supportsPictureInPicture": true }]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## API Mapping
|
||||||
|
|
||||||
|
| expo-av | expo-video |
|
||||||
|
|---------|------------|
|
||||||
|
| `<Video>` | `<VideoView>` |
|
||||||
|
| `ref={videoRef}` | `player={useVideoPlayer()}` |
|
||||||
|
| `source={{ uri }}` | Pass to `useVideoPlayer(uri)` |
|
||||||
|
| `resizeMode={ResizeMode.CONTAIN}` | `contentFit="contain"` |
|
||||||
|
| `isLooping` | `player.loop = true` |
|
||||||
|
| `shouldPlay` | `player.play()` in setup |
|
||||||
|
| `isMuted` | `player.muted = true` |
|
||||||
|
| `useNativeControls` | `nativeControls={true}` |
|
||||||
|
| `onPlaybackStatusUpdate` | `useEvent` / `useEventListener` |
|
||||||
|
| `videoRef.current.playAsync()` | `player.play()` |
|
||||||
|
| `videoRef.current.pauseAsync()` | `player.pause()` |
|
||||||
|
| `videoRef.current.replayAsync()` | `player.replay()` |
|
||||||
|
| `videoRef.current.setPositionAsync(ms)` | `player.currentTime = seconds` |
|
||||||
|
| `status.positionMillis` | `player.currentTime` (seconds) |
|
||||||
|
| `status.durationMillis` | `player.duration` (seconds) |
|
||||||
|
| `status.didJustFinish` | `useEventListener(player, 'playToEnd')` |
|
||||||
|
|
||||||
|
## Key Differences
|
||||||
|
|
||||||
|
- **Separate player and view**: Player logic decoupled from the view—one player can be used across multiple views
|
||||||
|
- **Time in seconds**: Uses seconds, not milliseconds
|
||||||
|
- **Event system**: Uses `useEvent`/`useEventListener` from `expo` instead of callback props
|
||||||
|
- **Video preloading**: Create a player without mounting a VideoView to preload for faster transitions
|
||||||
|
- **Built-in caching**: Set `useCaching: true` in VideoSource for persistent offline caching
|
||||||
|
|
||||||
|
## Known Issues
|
||||||
|
|
||||||
|
- **Uninstall expo-av first**: On Android, having both expo-av and expo-video installed can cause VideoView to show a black screen. Uninstall expo-av before installing expo-video
|
||||||
|
- **Android: Reusing players**: Mounting the same player in multiple VideoViews simultaneously can cause black screens on Android (works on iOS)
|
||||||
|
- **Android: currentTime in setup**: Setting `player.currentTime` in the `useVideoPlayer` setup callback may not work on Android—set it after mount instead
|
||||||
|
- **Changing source**: Use `player.replace(newSource)` to change videos without recreating the player
|
||||||
|
|
||||||
|
## API Reference
|
||||||
|
|
||||||
|
https://docs.expo.dev/versions/latest/sdk/video/
|
||||||
124
.agents/skills/upgrading-expo/references/native-tabs.md
Normal file
124
.agents/skills/upgrading-expo/references/native-tabs.md
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
# Native Tabs Migration (SDK 55)
|
||||||
|
|
||||||
|
In SDK 55, `Label`, `Icon`, `Badge`, and `VectorIcon` are now accessed as static properties on `NativeTabs.Trigger` rather than separate imports.
|
||||||
|
|
||||||
|
## Import Changes
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// SDK 53/54
|
||||||
|
import {
|
||||||
|
NativeTabs,
|
||||||
|
Icon,
|
||||||
|
Label,
|
||||||
|
Badge,
|
||||||
|
VectorIcon,
|
||||||
|
} from "expo-router/unstable-native-tabs";
|
||||||
|
|
||||||
|
// SDK 55+
|
||||||
|
import { NativeTabs } from "expo-router/unstable-native-tabs";
|
||||||
|
```
|
||||||
|
|
||||||
|
## Component Changes
|
||||||
|
|
||||||
|
| SDK 53/54 | SDK 55+ |
|
||||||
|
| ---------------- | ----------------------------------- |
|
||||||
|
| `<Icon />` | `<NativeTabs.Trigger.Icon />` |
|
||||||
|
| `<Label />` | `<NativeTabs.Trigger.Label />` |
|
||||||
|
| `<Badge />` | `<NativeTabs.Trigger.Badge />` |
|
||||||
|
| `<VectorIcon />` | `<NativeTabs.Trigger.VectorIcon />` |
|
||||||
|
| (n/a) | `<NativeTabs.BottomAccessory />` |
|
||||||
|
|
||||||
|
## New in SDK 55
|
||||||
|
|
||||||
|
### BottomAccessory
|
||||||
|
|
||||||
|
New component for Apple Music-style mini players on iOS +26 that float above the tab bar:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<NativeTabs>
|
||||||
|
<NativeTabs.BottomAccessory>
|
||||||
|
{/* Content above tabs */}
|
||||||
|
</NativeTabs.BottomAccessory>
|
||||||
|
<NativeTabs.Trigger name="(index)">
|
||||||
|
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
</NativeTabs>
|
||||||
|
```
|
||||||
|
|
||||||
|
On Android and web, this component will render as a no-op. Position a view absolutely above the tab bar instead.
|
||||||
|
|
||||||
|
### Icon `md` Prop
|
||||||
|
|
||||||
|
New `md` prop for Material icon glyphs on Android (alongside existing `drawable`):
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
<NativeTabs.Trigger.Icon sf="house" md="home" />
|
||||||
|
```
|
||||||
|
|
||||||
|
## Full Migration Example
|
||||||
|
|
||||||
|
### Before (SDK 53/54)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
import {
|
||||||
|
NativeTabs,
|
||||||
|
Icon,
|
||||||
|
Label,
|
||||||
|
Badge,
|
||||||
|
} from "expo-router/unstable-native-tabs";
|
||||||
|
|
||||||
|
export default function TabLayout() {
|
||||||
|
return (
|
||||||
|
<NativeTabs minimizeBehavior="onScrollDown">
|
||||||
|
<NativeTabs.Trigger name="(index)">
|
||||||
|
<Label>Home</Label>
|
||||||
|
<Icon sf="house.fill" />
|
||||||
|
<Badge>3</Badge>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
<NativeTabs.Trigger name="(settings)">
|
||||||
|
<Label>Settings</Label>
|
||||||
|
<Icon sf="gear" />
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
<NativeTabs.Trigger name="(search)" role="search">
|
||||||
|
<Label>Search</Label>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
</NativeTabs>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### After (SDK 55+)
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
import { NativeTabs } from "expo-router/unstable-native-tabs";
|
||||||
|
|
||||||
|
export default function TabLayout() {
|
||||||
|
return (
|
||||||
|
<NativeTabs minimizeBehavior="onScrollDown">
|
||||||
|
<NativeTabs.Trigger name="(index)">
|
||||||
|
<NativeTabs.Trigger.Label>Home</NativeTabs.Trigger.Label>
|
||||||
|
<NativeTabs.Trigger.Icon sf="house.fill" md="home" />
|
||||||
|
<NativeTabs.Trigger.Badge>3</NativeTabs.Trigger.Badge>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
<NativeTabs.Trigger name="(settings)">
|
||||||
|
<NativeTabs.Trigger.Label>Settings</NativeTabs.Trigger.Label>
|
||||||
|
<NativeTabs.Trigger.Icon sf="gear" md="settings" />
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
<NativeTabs.Trigger name="(search)" role="search">
|
||||||
|
<NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
|
||||||
|
</NativeTabs.Trigger>
|
||||||
|
</NativeTabs>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Migration Checklist
|
||||||
|
|
||||||
|
1. Remove `Icon`, `Label`, `Badge`, `VectorIcon` from imports
|
||||||
|
2. Keep only `NativeTabs` import from `expo-router/unstable-native-tabs`
|
||||||
|
3. Replace `<Icon />` with `<NativeTabs.Trigger.Icon />`
|
||||||
|
4. Replace `<Label />` with `<NativeTabs.Trigger.Label />`
|
||||||
|
5. Replace `<Badge />` with `<NativeTabs.Trigger.Badge />`
|
||||||
|
6. Replace `<VectorIcon />` with `<NativeTabs.Trigger.VectorIcon />`
|
||||||
|
|
||||||
|
- Read docs for more info https://docs.expo.dev/versions/v55.0.0/sdk/router-native-tabs/
|
||||||
79
.agents/skills/upgrading-expo/references/new-architecture.md
Normal file
79
.agents/skills/upgrading-expo/references/new-architecture.md
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
# New Architecture
|
||||||
|
|
||||||
|
The New Architecture is enabled by default in Expo SDK 53+. It replaces the legacy bridge with a faster, synchronous communication layer between JavaScript and native code.
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
Full guide: https://docs.expo.dev/guides/new-architecture/
|
||||||
|
|
||||||
|
## What Changed
|
||||||
|
|
||||||
|
- **JSI (JavaScript Interface)** — Direct synchronous calls between JS and native
|
||||||
|
- **Fabric** — New rendering system with concurrent features
|
||||||
|
- **TurboModules** — Lazy-loaded native modules with type safety
|
||||||
|
|
||||||
|
## SDK Compatibility
|
||||||
|
|
||||||
|
| SDK Version | New Architecture Status |
|
||||||
|
| ----------- | ----------------------- |
|
||||||
|
| SDK 53+ | Enabled by default |
|
||||||
|
| SDK 52 | Opt-in via app.json |
|
||||||
|
| SDK 51- | Experimental |
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
New Architecture is enabled by default. To explicitly disable (not recommended):
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"expo": {
|
||||||
|
"newArchEnabled": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Expo Go
|
||||||
|
|
||||||
|
Expo Go only supports the New Architecture as of SDK 53. Apps using the old architecture must use development builds.
|
||||||
|
|
||||||
|
## Common Migration Issues
|
||||||
|
|
||||||
|
### Native Module Compatibility
|
||||||
|
|
||||||
|
Some older native modules may not support the New Architecture. Check:
|
||||||
|
|
||||||
|
1. Module documentation for New Architecture support
|
||||||
|
2. GitHub issues for compatibility discussions
|
||||||
|
3. Consider alternatives if module is unmaintained
|
||||||
|
|
||||||
|
### Reanimated
|
||||||
|
|
||||||
|
React Native Reanimated requires `react-native-worklets` in SDK 54+:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx expo install react-native-worklets
|
||||||
|
```
|
||||||
|
|
||||||
|
### Layout Animations
|
||||||
|
|
||||||
|
Some layout animations behave differently. Test thoroughly after upgrading.
|
||||||
|
|
||||||
|
## Verifying New Architecture
|
||||||
|
|
||||||
|
Check if New Architecture is active:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
import { Platform } from "react-native";
|
||||||
|
|
||||||
|
// Returns true if Fabric is enabled
|
||||||
|
const isNewArch = global._IS_FABRIC !== undefined;
|
||||||
|
```
|
||||||
|
|
||||||
|
Verify from the command line if the currently running app uses the New Architecture: `bunx xcobra expo eval "_IS_FABRIC"` -> `true`
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
1. **Clear caches** — `npx expo start --clear`
|
||||||
|
2. **Clean prebuild** — `npx expo prebuild --clean`
|
||||||
|
3. **Check native modules** — Ensure all dependencies support New Architecture
|
||||||
|
4. **Review console warnings** — Legacy modules log compatibility warnings
|
||||||
79
.agents/skills/upgrading-expo/references/react-19.md
Normal file
79
.agents/skills/upgrading-expo/references/react-19.md
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
# React 19
|
||||||
|
|
||||||
|
React 19 is included in Expo SDK 54. This release simplifies several common patterns.
|
||||||
|
|
||||||
|
## Context Changes
|
||||||
|
|
||||||
|
### useContext → use
|
||||||
|
|
||||||
|
The `use` hook replaces `useContext`:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before (React 18)
|
||||||
|
import { useContext } from "react";
|
||||||
|
const value = useContext(MyContext);
|
||||||
|
|
||||||
|
// After (React 19)
|
||||||
|
import { use } from "react";
|
||||||
|
const value = use(MyContext);
|
||||||
|
```
|
||||||
|
|
||||||
|
- The `use` hook can also read promises, enabling Suspense-based data fetching.
|
||||||
|
- `use` can be called conditionally, this simplifies components that consume multiple contexts.
|
||||||
|
|
||||||
|
### Context.Provider → Context
|
||||||
|
|
||||||
|
Context providers no longer need the `.Provider` suffix:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before (React 18)
|
||||||
|
<ThemeContext.Provider value={theme}>
|
||||||
|
{children}
|
||||||
|
</ThemeContext.Provider>
|
||||||
|
|
||||||
|
// After (React 19)
|
||||||
|
<ThemeContext value={theme}>
|
||||||
|
{children}
|
||||||
|
</ThemeContext>
|
||||||
|
```
|
||||||
|
|
||||||
|
## ref as a Prop
|
||||||
|
|
||||||
|
### Removing forwardRef
|
||||||
|
|
||||||
|
Components can now receive `ref` as a regular prop. `forwardRef` is no longer needed:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before (React 18)
|
||||||
|
import { forwardRef } from "react";
|
||||||
|
|
||||||
|
const Input = forwardRef<TextInput, Props>((props, ref) => {
|
||||||
|
return <TextInput ref={ref} {...props} />;
|
||||||
|
});
|
||||||
|
|
||||||
|
// After (React 19)
|
||||||
|
function Input({ ref, ...props }: Props & { ref?: React.Ref<TextInput> }) {
|
||||||
|
return <TextInput ref={ref} {...props} />;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Migration Steps
|
||||||
|
|
||||||
|
1. Remove `forwardRef` wrapper
|
||||||
|
2. Add `ref` to the props destructuring
|
||||||
|
3. Update the type to include `ref?: React.Ref<T>`
|
||||||
|
|
||||||
|
## Other React 19 Features
|
||||||
|
|
||||||
|
- **Actions** — Functions that handle async transitions
|
||||||
|
- **useOptimistic** — Optimistic UI updates
|
||||||
|
- **useFormStatus** — Form submission state (web)
|
||||||
|
- **Document Metadata** — Native `<title>` and `<meta>` support (web)
|
||||||
|
|
||||||
|
## Cleanup Checklist
|
||||||
|
|
||||||
|
When upgrading to SDK 54:
|
||||||
|
|
||||||
|
- [ ] Replace `useContext` with `use`
|
||||||
|
- [ ] Remove `.Provider` from Context components
|
||||||
|
- [ ] Remove `forwardRef` wrappers, use `ref` prop instead
|
||||||
59
.agents/skills/upgrading-expo/references/react-compiler.md
Normal file
59
.agents/skills/upgrading-expo/references/react-compiler.md
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
# React Compiler
|
||||||
|
|
||||||
|
React Compiler is stable in Expo SDK 54 and later. It automatically memoizes components and hooks, eliminating the need for manual `useMemo`, `useCallback`, and `React.memo`.
|
||||||
|
|
||||||
|
## Enabling React Compiler
|
||||||
|
|
||||||
|
Add to `app.json`:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"expo": {
|
||||||
|
"experiments": {
|
||||||
|
"reactCompiler": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## What React Compiler Does
|
||||||
|
|
||||||
|
- Automatically memoizes components and values
|
||||||
|
- Eliminates unnecessary re-renders
|
||||||
|
- Removes the need for manual `useMemo` and `useCallback`
|
||||||
|
- Works with existing code without modifications
|
||||||
|
|
||||||
|
## Cleanup After Enabling
|
||||||
|
|
||||||
|
Once React Compiler is enabled, you can remove manual memoization:
|
||||||
|
|
||||||
|
```tsx
|
||||||
|
// Before (manual memoization)
|
||||||
|
const memoizedValue = useMemo(() => computeExpensive(a, b), [a, b]);
|
||||||
|
const memoizedCallback = useCallback(() => doSomething(a), [a]);
|
||||||
|
const MemoizedComponent = React.memo(MyComponent);
|
||||||
|
|
||||||
|
// After (React Compiler handles it)
|
||||||
|
const value = computeExpensive(a, b);
|
||||||
|
const callback = () => doSomething(a);
|
||||||
|
// Just use MyComponent directly
|
||||||
|
```
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- Expo SDK 54 or later
|
||||||
|
- New Architecture enabled (default in SDK 54+)
|
||||||
|
|
||||||
|
## Verifying It's Working
|
||||||
|
|
||||||
|
React Compiler runs at build time. Check the Metro bundler output for compilation messages. You can also use React DevTools to verify components are being optimized.
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
If you encounter issues:
|
||||||
|
|
||||||
|
1. Ensure New Architecture is enabled
|
||||||
|
2. Clear Metro cache: `npx expo start --clear`
|
||||||
|
3. Check for incompatible patterns in your code (rare)
|
||||||
|
|
||||||
|
React Compiler is designed to work with idiomatic React code. If it can't safely optimize a component, it skips that component without breaking your app.
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
# Migrating from react-navigation to expo-router
|
||||||
|
|
||||||
|
In SDK 56+, application code must not import from `@react-navigation/*` directly. Repoint those imports to the matching `expo-router` entry points. Runtime API is unchanged — only the module specifiers move.
|
||||||
|
|
||||||
|
## Steps
|
||||||
|
|
||||||
|
1. Prefer the automated codemod (see below). If it is not viable, fall back to the manual mapping.
|
||||||
|
2. Replace imports using the table. Use the entry point that matches the `@react-navigation/*` source.
|
||||||
|
3. After rewriting, check whether any of the rewritten imports are deprecated in `expo-router` (see [Check for deprecated imports](#check-for-deprecated-imports)). If so, surface the deprecation reason and the suggested replacement to the user before continuing.
|
||||||
|
4. Validate: search for remaining `@react-navigation/` references in source files, then run typecheck/build/start.
|
||||||
|
5. Remove `@react-navigation/*` packages that are no longer imported from `package.json` and reinstall (delete `node_modules` if needed).
|
||||||
|
|
||||||
|
## Automated migration (preferred)
|
||||||
|
|
||||||
|
Run from the project root over your application code (replace `src` with the actual directory or glob):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npx expo-codemod sdk-56-expo-router-react-navigation-replace src
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npx expo-codemod sdk-56-expo-router-react-navigation-replace '**/*.{ts,tsx,js,jsx}'
|
||||||
|
```
|
||||||
|
|
||||||
|
## Manual API mapping
|
||||||
|
|
||||||
|
| React Navigation source | Expo Router target |
|
||||||
|
| ------------------------------------- | ------------------------------------------------------------------------ |
|
||||||
|
| `@react-navigation/native` | `expo-router/react-navigation` |
|
||||||
|
| `@react-navigation/core` | `expo-router/react-navigation` |
|
||||||
|
| `@react-navigation/elements` | `expo-router/react-navigation` |
|
||||||
|
| `@react-navigation/routers` | `expo-router/react-navigation` |
|
||||||
|
| `@react-navigation/stack` | `expo-router/js-stack` |
|
||||||
|
| `@react-navigation/bottom-tabs` | `expo-router/js-tabs` |
|
||||||
|
| `@react-navigation/material-top-tabs` | `expo-router/js-top-tabs` |
|
||||||
|
| `@react-navigation/native-stack` | No direct equivalent. Use the `Stack` layout from `expo-router` instead. |
|
||||||
|
|
||||||
|
**Stack caveat:** Do NOT rewrite `import { Stack } from "expo-router"` to `expo-router/js-stack`. The root `Stack` is the Expo Router layout component used in route files; only use `expo-router/js-stack` when replacing a `@react-navigation/stack` JS stack navigator.
|
||||||
|
|
||||||
|
If you encounter a symbol that has no replacement, ask the user to file an issue in the `expo/expo` repository describing what is needed and why.
|
||||||
|
|
||||||
|
## Check for deprecated imports
|
||||||
|
|
||||||
|
A successful rewrite to `expo-router/*` does not guarantee the new import is the recommended one. Some symbols are re-exported as deprecated shims and the project may need to migrate further (for example, to a different `expo-router` API or to a first-party Expo package).
|
||||||
|
|
||||||
|
For each symbol rewritten in step 2:
|
||||||
|
|
||||||
|
1. Resolve the rewritten module to its source in `node_modules` (e.g., `node_modules/expo-router/build/react-navigation.d.ts`, `js-stack`, `js-tabs`, `js-top-tabs`).
|
||||||
|
2. Look for a `@deprecated` JSDoc tag on the named export, or a runtime deprecation warning in the implementation file.
|
||||||
|
3. If deprecated, capture both the reason and the recommended replacement from the JSDoc/comment.
|
||||||
|
4. Report each deprecated symbol to the user with: the import path, the symbol, the deprecation reason, and the suggested replacement. Wait for the user to confirm before mass-applying further changes.
|
||||||
|
|
||||||
|
## Done when
|
||||||
|
|
||||||
|
1. No `@react-navigation/*` imports remain in source files.
|
||||||
|
2. No unused `@react-navigation/*` entries remain in `package.json`.
|
||||||
|
3. Typecheck and bundler start without `@react-navigation/*` errors.
|
||||||
|
|
||||||
|
## Reference
|
||||||
|
|
||||||
|
- Official Expo Router SDK 55 → 56 migration guide: https://docs.expo.dev/router/migrate/sdk-55-to-56
|
||||||
19
.nvim.lua
Normal file
19
.nvim.lua
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
local ok, conform = pcall(require, "conform")
|
||||||
|
if not ok then
|
||||||
|
vim.notify("conform.nvim not loaded", vim.log.levels.WARN)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
conform.setup({
|
||||||
|
formatters_by_ft = {
|
||||||
|
javascript = { "oxfmt" },
|
||||||
|
javascriptreact = { "oxfmt" },
|
||||||
|
typescript = { "oxfmt" },
|
||||||
|
typescriptreact = { "oxfmt" },
|
||||||
|
json = { "oxfmt" },
|
||||||
|
jsonc = { "oxfmt" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.enable("tsgo")
|
||||||
|
vim.lsp.enable("oxlint")
|
||||||
20
.zed/settings.json
Normal file
20
.zed/settings.json
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
// Folder-specific settings
|
||||||
|
//
|
||||||
|
// For a full list of overridable settings, and general information on folder-specific settings,
|
||||||
|
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
|
||||||
|
{
|
||||||
|
"languages": {
|
||||||
|
"TypeScript": {
|
||||||
|
"formatter": { "language_server": { "name": "oxfmt" } }
|
||||||
|
},
|
||||||
|
"TSX": {
|
||||||
|
"formatter": { "language_server": { "name": "oxfmt" } }
|
||||||
|
},
|
||||||
|
"JavaScript": {
|
||||||
|
"formatter": { "language_server": { "name": "oxfmt" } }
|
||||||
|
},
|
||||||
|
"JSX": {
|
||||||
|
"formatter": { "language_server": { "name": "oxfmt" } }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
AGENTS.md
11
AGENTS.md
@@ -39,4 +39,13 @@ Use Bun exclusively. Do not use npm or yarn.
|
|||||||
|
|
||||||
- Branch: `feat/<task>`, `fix/<task>`, `ci/<task>`, etc.
|
- Branch: `feat/<task>`, `fix/<task>`, `ci/<task>`, etc.
|
||||||
- Commits: conventional commit format, title <= 50 chars
|
- Commits: conventional commit format, title <= 50 chars
|
||||||
- Signing: If `GPG_PRIVATE_KEY_PASSPHRASE` env var is available, use it to sign commits with `git commit -S`
|
|
||||||
|
## Nix
|
||||||
|
|
||||||
|
Use the Nix dev shell for project commands by default.
|
||||||
|
|
||||||
|
- Run repo tooling through `nix develop -c`, e.g. `nix develop -c bun test`.
|
||||||
|
- Use Bun exclusively inside the Nix shell.
|
||||||
|
- Do not use host `bun`, `node`, `tsc`, or package binaries for project tasks unless explicitly checking host behavior.
|
||||||
|
- Simple inspection commands like `rg`, `sed`, `ls`, and `git status` may run outside Nix.
|
||||||
|
- While `flake.nix` is untracked, use `nix develop path:. -c <command>`.
|
||||||
|
|||||||
@@ -21,8 +21,8 @@
|
|||||||
"lucide-react": "^0.577.0",
|
"lucide-react": "^0.577.0",
|
||||||
"next-themes": "^0.4.6",
|
"next-themes": "^0.4.6",
|
||||||
"radix-ui": "^1.4.3",
|
"radix-ui": "^1.4.3",
|
||||||
"react": "^19.2.0",
|
"react": "19.2.3",
|
||||||
"react-dom": "^19.2.0",
|
"react-dom": "19.2.3",
|
||||||
"shadcn": "^4.0.8",
|
"shadcn": "^4.0.8",
|
||||||
"sonner": "^2.0.7",
|
"sonner": "^2.0.7",
|
||||||
"tailwind-merge": "^3.5.0",
|
"tailwind-merge": "^3.5.0",
|
||||||
|
|||||||
@@ -7,5 +7,9 @@
|
|||||||
"format": "oxfmt --write .",
|
"format": "oxfmt --write .",
|
||||||
"start": "bun run src/agent-test-cli.ts",
|
"start": "bun run src/agent-test-cli.ts",
|
||||||
"typecheck": "bun tsc --noEmit"
|
"typecheck": "bun tsc --noEmit"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@freya/agent-protocol": "workspace:*",
|
||||||
|
"@nym.sh/jrpc": "^0.1.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
|
import type {
|
||||||
|
AgentClientApi,
|
||||||
|
AgentEvent,
|
||||||
|
AgentServerApi,
|
||||||
|
SendMessageResult,
|
||||||
|
} from "@freya/agent-protocol"
|
||||||
|
import type { JrpcChannel, JrpcMessage, JsonRpcMessage } from "@nym.sh/jrpc"
|
||||||
|
|
||||||
|
import { JsonRpcClient, JsonRpcServer } from "@nym.sh/jrpc"
|
||||||
|
|
||||||
type JsonObject = Record<string, unknown>
|
type JsonObject = Record<string, unknown>
|
||||||
|
|
||||||
interface AuthUser {
|
interface AuthUser {
|
||||||
@@ -15,10 +25,6 @@ interface AuthSession {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
interface QueryResponse {
|
|
||||||
message: string
|
|
||||||
}
|
|
||||||
|
|
||||||
interface QueryToolDefinition {
|
interface QueryToolDefinition {
|
||||||
name: string
|
name: string
|
||||||
label: string
|
label: string
|
||||||
@@ -60,6 +66,219 @@ class CookieJar {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class AgentWebSocketSession implements AgentClientApi {
|
||||||
|
private readonly channel: WebSocketJrpcChannel
|
||||||
|
private readonly client: JsonRpcClient<AgentServerApi>
|
||||||
|
private readonly server: JsonRpcServer<AgentClientApi>
|
||||||
|
private conversationId: string | undefined
|
||||||
|
private responseHadText = false
|
||||||
|
|
||||||
|
private constructor(channel: WebSocketJrpcChannel) {
|
||||||
|
this.channel = channel
|
||||||
|
this.client = new JsonRpcClient<AgentServerApi>(channel)
|
||||||
|
this.server = new JsonRpcServer<AgentClientApi>(
|
||||||
|
{
|
||||||
|
notify: this.notify.bind(this),
|
||||||
|
},
|
||||||
|
channel,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
static async connect(backendUrl: string, cookies: CookieJar): Promise<AgentWebSocketSession> {
|
||||||
|
const channel = new WebSocketJrpcChannel(agentWebSocketUrl(backendUrl), cookies.header())
|
||||||
|
const session = new AgentWebSocketSession(channel)
|
||||||
|
|
||||||
|
try {
|
||||||
|
await channel.waitUntilOpen()
|
||||||
|
void session.server.start().catch((err: unknown) => {
|
||||||
|
if (!channel.isClosed()) {
|
||||||
|
console.error(`\nWebSocket JSON-RPC failed: ${formatError(err)}\n`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
await session.client.call("ping")
|
||||||
|
} catch (err) {
|
||||||
|
channel.close()
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
|
||||||
|
return session
|
||||||
|
}
|
||||||
|
|
||||||
|
async ask(message: string): Promise<void> {
|
||||||
|
this.responseHadText = false
|
||||||
|
|
||||||
|
const result = await this.sendMessage(message)
|
||||||
|
if (result.conversationId) {
|
||||||
|
this.conversationId = result.conversationId
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.responseHadText) {
|
||||||
|
console.log(`\nagent> ${result.message || "(no message)"}`)
|
||||||
|
}
|
||||||
|
console.log("")
|
||||||
|
}
|
||||||
|
|
||||||
|
notify(event: AgentEvent): void {
|
||||||
|
switch (event.type) {
|
||||||
|
case "conversation_started":
|
||||||
|
this.conversationId = event.conversationId
|
||||||
|
break
|
||||||
|
case "message_created":
|
||||||
|
this.printMessage(event.text)
|
||||||
|
break
|
||||||
|
case "tool_started":
|
||||||
|
console.log(`\ntool> ${event.toolName} started`)
|
||||||
|
break
|
||||||
|
case "tool_finished":
|
||||||
|
console.log(`tool> ${event.toolName} ${event.ok ? "finished" : "failed"}`)
|
||||||
|
break
|
||||||
|
case "message_finished":
|
||||||
|
break
|
||||||
|
case "message_failed":
|
||||||
|
console.log(`\nagent! ${event.error}`)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
describeConversation(): string {
|
||||||
|
return this.conversationId ? `Conversation: ${this.conversationId}` : "No conversation yet."
|
||||||
|
}
|
||||||
|
|
||||||
|
close(): void {
|
||||||
|
this.channel.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
private async sendMessage(message: string): Promise<SendMessageResult> {
|
||||||
|
return this.client.call("sendMessage", message)
|
||||||
|
}
|
||||||
|
|
||||||
|
private printMessage(text: string): void {
|
||||||
|
if (text === "") return
|
||||||
|
|
||||||
|
console.log(`\nagent> ${text}`)
|
||||||
|
this.responseHadText = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class WebSocketJrpcChannel implements JrpcChannel {
|
||||||
|
private readonly ws: WebSocket
|
||||||
|
private readonly opened: Promise<void>
|
||||||
|
private closed = false
|
||||||
|
private openedOnce = false
|
||||||
|
private queue: JrpcMessage[] = []
|
||||||
|
private waiters: Array<(result: IteratorResult<JrpcMessage, void>) => void> = []
|
||||||
|
|
||||||
|
constructor(url: string, cookieHeader?: string) {
|
||||||
|
this.ws = new WebSocket(url, createWebSocketOptions(cookieHeader))
|
||||||
|
this.opened = new Promise((resolve, reject) => {
|
||||||
|
this.ws.onopen = () => {
|
||||||
|
this.openedOnce = true
|
||||||
|
resolve()
|
||||||
|
}
|
||||||
|
this.ws.onerror = () => {
|
||||||
|
if (!this.openedOnce) {
|
||||||
|
reject(new Error(`Could not connect to ${url}`))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.ws.onclose = (event) => {
|
||||||
|
if (!this.openedOnce) {
|
||||||
|
reject(new Error(formatWebSocketClose(url, event)))
|
||||||
|
}
|
||||||
|
this.close()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.ws.onmessage = (event) => {
|
||||||
|
this.receive(event.data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
waitUntilOpen(): Promise<void> {
|
||||||
|
return this.opened
|
||||||
|
}
|
||||||
|
|
||||||
|
isClosed(): boolean {
|
||||||
|
return this.closed
|
||||||
|
}
|
||||||
|
|
||||||
|
async send(msg: JsonRpcMessage): Promise<void> {
|
||||||
|
await this.opened
|
||||||
|
if (this.closed || this.ws.readyState !== WebSocket.OPEN) {
|
||||||
|
throw new Error("JSON-RPC WebSocket channel is closed")
|
||||||
|
}
|
||||||
|
|
||||||
|
this.ws.send(JSON.stringify(msg))
|
||||||
|
}
|
||||||
|
|
||||||
|
async next(): Promise<IteratorResult<JrpcMessage, void>> {
|
||||||
|
const msg = this.queue.shift()
|
||||||
|
if (msg) {
|
||||||
|
return { done: false, value: msg }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.closed) {
|
||||||
|
return { done: true, value: undefined }
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
this.waiters.push(resolve)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
async return(): Promise<IteratorResult<JrpcMessage, void>> {
|
||||||
|
this.close()
|
||||||
|
return { done: true, value: undefined }
|
||||||
|
}
|
||||||
|
|
||||||
|
async throw(error?: unknown): Promise<IteratorResult<JrpcMessage, void>> {
|
||||||
|
this.close()
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
|
||||||
|
async [Symbol.asyncDispose](): Promise<void> {
|
||||||
|
await this.return()
|
||||||
|
}
|
||||||
|
|
||||||
|
close(): void {
|
||||||
|
if (this.closed) return
|
||||||
|
|
||||||
|
this.closed = true
|
||||||
|
for (const resolve of this.waiters.splice(0)) {
|
||||||
|
resolve({ done: true, value: undefined })
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.OPEN) {
|
||||||
|
this.ws.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Symbol.asyncIterator](): AsyncGenerator<JrpcMessage, void, unknown> {
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
|
private receive(message: unknown): void {
|
||||||
|
const parsed = parseJrpcMessage(message)
|
||||||
|
if (!parsed) {
|
||||||
|
this.ws.close(1003, "Invalid JSON-RPC message")
|
||||||
|
this.close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.push(parsed)
|
||||||
|
}
|
||||||
|
|
||||||
|
private push(msg: JrpcMessage): void {
|
||||||
|
if (this.closed) return
|
||||||
|
|
||||||
|
const resolve = this.waiters.shift()
|
||||||
|
if (resolve) {
|
||||||
|
resolve({ done: false, value: msg })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.queue.push(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function main(): Promise<void> {
|
async function main(): Promise<void> {
|
||||||
if (wantsHelp()) {
|
if (wantsHelp()) {
|
||||||
printUsage()
|
printUsage()
|
||||||
@@ -111,73 +330,72 @@ async function runChatLoop(
|
|||||||
cookies: CookieJar,
|
cookies: CookieJar,
|
||||||
session: AuthSession,
|
session: AuthSession,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
|
const agent = await AgentWebSocketSession.connect(backendUrl, cookies)
|
||||||
|
console.log("Connected to /api/agent/ws")
|
||||||
printHelp()
|
printHelp()
|
||||||
|
|
||||||
for (;;) {
|
try {
|
||||||
const input = askOptional("you> ")?.trim()
|
for (;;) {
|
||||||
if (!input) continue
|
const input = askOptional("you> ")?.trim()
|
||||||
|
if (!input) continue
|
||||||
|
|
||||||
if (input === "/quit" || input === "/exit") {
|
if (input === "/quit" || input === "/exit") {
|
||||||
console.log("Bye.")
|
console.log("Bye.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input === "/help") {
|
if (input === "/help") {
|
||||||
printHelp()
|
printHelp()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input === "/session") {
|
if (input === "/session") {
|
||||||
console.log(`${session.user.name || session.user.email} (${session.user.id})`)
|
console.log(`${session.user.name || session.user.email} (${session.user.id})`)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input === "/tools") {
|
if (input === "/conversation") {
|
||||||
await runCliCommand(() => listQueryTools(backendUrl, cookies))
|
console.log(agent.describeConversation())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.startsWith("/tool ")) {
|
if (input === "/tools") {
|
||||||
await runCliCommand(() => executeQueryTool(backendUrl, cookies, input.slice("/tool ".length)))
|
await runCliCommand(() => listQueryTools(backendUrl, cookies))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.startsWith("/actions ")) {
|
if (input.startsWith("/tool ")) {
|
||||||
await runCliCommand(() =>
|
await runCliCommand(() =>
|
||||||
listSourceActions(backendUrl, cookies, input.slice("/actions ".length)),
|
executeQueryTool(backendUrl, cookies, input.slice("/tool ".length)),
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.startsWith("/action ")) {
|
if (input.startsWith("/actions ")) {
|
||||||
await runCliCommand(() =>
|
await runCliCommand(() =>
|
||||||
executeSourceAction(backendUrl, cookies, input.slice("/action ".length)),
|
listSourceActions(backendUrl, cookies, input.slice("/actions ".length)),
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
if (input.startsWith("/action ")) {
|
||||||
await askAgent(backendUrl, cookies, input)
|
await runCliCommand(() =>
|
||||||
} catch (err) {
|
executeSourceAction(backendUrl, cookies, input.slice("/action ".length)),
|
||||||
console.error(`\n${formatError(err)}\n`)
|
)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await agent.ask(input)
|
||||||
|
} catch (err) {
|
||||||
|
console.error(`\n${formatError(err)}\n`)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} finally {
|
||||||
|
agent.close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function askAgent(backendUrl: string, cookies: CookieJar, message: string): Promise<void> {
|
|
||||||
const data = await requestJson(backendUrl, cookies, "/api/agent", {
|
|
||||||
method: "POST",
|
|
||||||
body: { message },
|
|
||||||
})
|
|
||||||
|
|
||||||
if (!isQueryResponse(data)) {
|
|
||||||
throw new Error("Query returned an unexpected response shape")
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`\nagent> ${data.message || "(no message)"}`)
|
|
||||||
console.log("")
|
|
||||||
}
|
|
||||||
|
|
||||||
async function runCliCommand(command: () => Promise<void>): Promise<void> {
|
async function runCliCommand(command: () => Promise<void>): Promise<void> {
|
||||||
try {
|
try {
|
||||||
await command()
|
await command()
|
||||||
@@ -327,7 +545,7 @@ async function requestJson(
|
|||||||
|
|
||||||
function printIntro(): void {
|
function printIntro(): void {
|
||||||
console.log("FREYA agent test CLI")
|
console.log("FREYA agent test CLI")
|
||||||
console.log("Connect to a backend, sign in, then send test messages to /api/agent.\n")
|
console.log("Connect to a backend, sign in, then send test messages to /api/agent/ws.\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
function printUsage(): void {
|
function printUsage(): void {
|
||||||
@@ -348,6 +566,7 @@ function printHelp(): void {
|
|||||||
console.log(" /tool Execute an agent debug tool with JSON params")
|
console.log(" /tool Execute an agent debug tool with JSON params")
|
||||||
console.log(" /actions List source actions: /actions <source-id>")
|
console.log(" /actions List source actions: /actions <source-id>")
|
||||||
console.log(" /action Execute source action: /action <source-id> <action-id> <json-params>")
|
console.log(" /action Execute source action: /action <source-id> <action-id> <json-params>")
|
||||||
|
console.log(" /conversation Show the current websocket conversation")
|
||||||
console.log(" /session Show the signed-in user")
|
console.log(" /session Show the signed-in user")
|
||||||
console.log(" /help Show commands")
|
console.log(" /help Show commands")
|
||||||
console.log(" /quit Exit\n")
|
console.log(" /quit Exit\n")
|
||||||
@@ -417,6 +636,33 @@ function normalizeBackendUrl(value: string): string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function agentWebSocketUrl(backendUrl: string): string {
|
||||||
|
const url = new URL(backendUrl)
|
||||||
|
url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
|
||||||
|
url.pathname = "/api/agent/ws"
|
||||||
|
url.search = ""
|
||||||
|
url.hash = ""
|
||||||
|
return url.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
function createWebSocketOptions(cookieHeader?: string): Bun.WebSocketOptions | undefined {
|
||||||
|
if (!cookieHeader) return undefined
|
||||||
|
|
||||||
|
return {
|
||||||
|
headers: {
|
||||||
|
Cookie: cookieHeader,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatWebSocketClose(
|
||||||
|
url: string,
|
||||||
|
event: { code: number; reason: string; wasClean: boolean },
|
||||||
|
): string {
|
||||||
|
const reason = event.reason ? `: ${event.reason}` : ""
|
||||||
|
return `Could not connect to ${url} (${event.code}${reason})`
|
||||||
|
}
|
||||||
|
|
||||||
function formatPromptLabel(label: string, defaultValue?: string): string {
|
function formatPromptLabel(label: string, defaultValue?: string): string {
|
||||||
return defaultValue ? `${label} (${defaultValue}): ` : `${label}: `
|
return defaultValue ? `${label} (${defaultValue}): ` : `${label}: `
|
||||||
}
|
}
|
||||||
@@ -511,6 +757,25 @@ function splitSetCookieHeader(header: string): string[] {
|
|||||||
return parts.filter(Boolean)
|
return parts.filter(Boolean)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function parseJrpcMessage(message: unknown): JrpcMessage | null {
|
||||||
|
const text = webSocketMessageText(message)
|
||||||
|
if (!text) return null
|
||||||
|
|
||||||
|
try {
|
||||||
|
const value: unknown = JSON.parse(text)
|
||||||
|
return isJrpcMessage(value) ? value : null
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function webSocketMessageText(message: unknown): string | null {
|
||||||
|
if (typeof message === "string") return message
|
||||||
|
if (message instanceof Uint8Array) return Buffer.from(message).toString("utf8")
|
||||||
|
if (message instanceof ArrayBuffer) return Buffer.from(message).toString("utf8")
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
async function readResponseError(response: Response, path: string): Promise<string> {
|
async function readResponseError(response: Response, path: string): Promise<string> {
|
||||||
const text = await response.text()
|
const text = await response.text()
|
||||||
if (response.status === 404 && path === "/api/agent") {
|
if (response.status === 404 && path === "/api/agent") {
|
||||||
@@ -548,11 +813,6 @@ function isAuthSession(value: unknown): value is AuthSession {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function isQueryResponse(value: unknown): value is QueryResponse {
|
|
||||||
if (!isJsonObject(value)) return false
|
|
||||||
return typeof value.message === "string"
|
|
||||||
}
|
|
||||||
|
|
||||||
function isQueryToolsResponse(value: unknown): value is QueryToolsResponse {
|
function isQueryToolsResponse(value: unknown): value is QueryToolsResponse {
|
||||||
if (!isJsonObject(value) || !Array.isArray(value.tools)) return false
|
if (!isJsonObject(value) || !Array.isArray(value.tools)) return false
|
||||||
return value.tools.every(isQueryToolDefinition)
|
return value.tools.every(isQueryToolDefinition)
|
||||||
@@ -585,6 +845,33 @@ function isSourceActionDefinition(value: unknown): value is { id: string; descri
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isJrpcMessage(value: unknown): value is JrpcMessage {
|
||||||
|
if (!isJsonObject(value) || value.jsonrpc !== "2.0" || typeof value.id !== "number") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("method" in value) {
|
||||||
|
return (
|
||||||
|
typeof value.method === "string" &&
|
||||||
|
(value.params === undefined || Array.isArray(value.params))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("result" in value) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("error" in value) {
|
||||||
|
return isJsonRpcErrorObject(value.error)
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
function isJsonRpcErrorObject(value: unknown): boolean {
|
||||||
|
return isJsonObject(value) && typeof value.code === "number" && typeof value.message === "string"
|
||||||
|
}
|
||||||
|
|
||||||
function isJsonObject(value: unknown): value is JsonObject {
|
function isJsonObject(value: unknown): value is JsonObject {
|
||||||
return typeof value === "object" && value !== null && !Array.isArray(value)
|
return typeof value === "object" && value !== null && !Array.isArray(value)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||||
@@ -6,7 +7,6 @@ import type {
|
|||||||
ConversationStorageEntry,
|
ConversationStorageEntry,
|
||||||
} from "./conversation-recording-query-agent.ts"
|
} from "./conversation-recording-query-agent.ts"
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import { ConversationRecordingQueryAgent } from "./conversation-recording-query-agent.ts"
|
import { ConversationRecordingQueryAgent } from "./conversation-recording-query-agent.ts"
|
||||||
import {
|
import {
|
||||||
createQueryAgentEventListeners,
|
createQueryAgentEventListeners,
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
|
import type { ConversationEntryMetadata } from "@freya/core"
|
||||||
|
|
||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { randomUUID } from "node:crypto"
|
import { randomUUID } from "node:crypto"
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
AppendConversationEntryInput,
|
AppendConversationEntryInput,
|
||||||
ConversationEntryRow,
|
ConversationEntryRow,
|
||||||
} from "../conversations/storage.ts"
|
} from "../conversations/storage.ts"
|
||||||
import type { ConversationEntryMetadata } from "../conversations/types.ts"
|
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import {
|
import {
|
||||||
createQueryAgentEventListeners,
|
createQueryAgentEventListeners,
|
||||||
QueryAgentEvent,
|
QueryAgentEvent,
|
||||||
@@ -19,6 +20,7 @@ import {
|
|||||||
type QueryAgentStreamEvent,
|
type QueryAgentStreamEvent,
|
||||||
} from "./query-agent.ts"
|
} from "./query-agent.ts"
|
||||||
|
|
||||||
|
/** Storage operations used to persist and replay query-agent conversation entries. */
|
||||||
export interface ConversationStorage {
|
export interface ConversationStorage {
|
||||||
getOrCreateConversation(): Promise<{ id: string }>
|
getOrCreateConversation(): Promise<{ id: string }>
|
||||||
appendEntry(
|
appendEntry(
|
||||||
@@ -28,11 +30,13 @@ export interface ConversationStorage {
|
|||||||
listEntries(conversationId: string): Promise<ConversationStorageEntry[]>
|
listEntries(conversationId: string): Promise<ConversationStorageEntry[]>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Minimal persisted entry shape needed by recording and replay agents. */
|
||||||
export type ConversationStorageEntry = Pick<
|
export type ConversationStorageEntry = Pick<
|
||||||
ConversationEntryRow,
|
ConversationEntryRow,
|
||||||
"id" | "sequence" | "kind" | "payload" | "metadata" | "createdAt"
|
"id" | "sequence" | "kind" | "payload" | "metadata" | "createdAt"
|
||||||
>
|
>
|
||||||
|
|
||||||
|
/** Configuration for wrapping a QueryAgent with conversation recording. */
|
||||||
export interface ConversationRecordingQueryAgentConfig {
|
export interface ConversationRecordingQueryAgentConfig {
|
||||||
agent: QueryAgent
|
agent: QueryAgent
|
||||||
storage: ConversationStorage
|
storage: ConversationStorage
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
||||||
|
|
||||||
import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||||
import type { QueryAgentStreamEvent } from "./query-agent.ts"
|
import type { QueryAgentStreamEvent } from "./query-agent.ts"
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import { QueryAgentEvent } from "./query-agent.ts"
|
import { QueryAgentEvent } from "./query-agent.ts"
|
||||||
|
|
||||||
interface FakePiSession {
|
interface FakePiSession {
|
||||||
|
|||||||
@@ -33,13 +33,25 @@ import {
|
|||||||
import { createSessionManager } from "./session-manager.ts"
|
import { createSessionManager } from "./session-manager.ts"
|
||||||
import { createFreyaAgentTools, FREYA_AGENT_TOOL_NAMES } from "./tools.ts"
|
import { createFreyaAgentTools, FREYA_AGENT_TOOL_NAMES } from "./tools.ts"
|
||||||
|
|
||||||
|
/** Active Pi SDK session instance returned by createAgentSession. */
|
||||||
type PiSession = Awaited<ReturnType<typeof createAgentSession>>["session"]
|
type PiSession = Awaited<ReturnType<typeof createAgentSession>>["session"]
|
||||||
|
|
||||||
|
/** Pi event emitted when a message finishes. */
|
||||||
type PiMessageEndEvent = Extract<AgentSessionEvent, { type: "message_end" }>
|
type PiMessageEndEvent = Extract<AgentSessionEvent, { type: "message_end" }>
|
||||||
|
|
||||||
|
/** Message payload carried by Pi's message-end event. */
|
||||||
type PiAgentMessage = PiMessageEndEvent["message"]
|
type PiAgentMessage = PiMessageEndEvent["message"]
|
||||||
|
|
||||||
|
/** Pi event emitted when an agent run finishes. */
|
||||||
type PiAgentEndEvent = Extract<AgentSessionEvent, { type: "agent_end" }>
|
type PiAgentEndEvent = Extract<AgentSessionEvent, { type: "agent_end" }>
|
||||||
|
|
||||||
|
/** Session manager created for Pi conversation replay. */
|
||||||
type PiSessionManager = ReturnType<typeof createSessionManager>
|
type PiSessionManager = ReturnType<typeof createSessionManager>
|
||||||
|
|
||||||
|
/** Message shape accepted by the replay session manager. */
|
||||||
type PiSessionMessage = Parameters<PiSessionManager["appendMessage"]>[0]
|
type PiSessionMessage = Parameters<PiSessionManager["appendMessage"]>[0]
|
||||||
|
|
||||||
|
/** Configuration for the Pi-backed query agent. */
|
||||||
export interface PiQueryAgentConfig {
|
export interface PiQueryAgentConfig {
|
||||||
toolbox: QueryAgentToolbox
|
toolbox: QueryAgentToolbox
|
||||||
apiKey?: string
|
apiKey?: string
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, test } from "bun:test"
|
||||||
|
|
||||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import { createSessionManager } from "./session-manager.ts"
|
import { createSessionManager } from "./session-manager.ts"
|
||||||
|
|
||||||
describe("createSessionManager", () => {
|
describe("createSessionManager", () => {
|
||||||
|
|||||||
@@ -1,18 +1,21 @@
|
|||||||
import { SessionManager } from "@earendil-works/pi-coding-agent"
|
import { SessionManager } from "@earendil-works/pi-coding-agent"
|
||||||
import { tmpdir } from "node:os"
|
|
||||||
|
|
||||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
AssistantMessagePayload,
|
AssistantMessagePayload,
|
||||||
ContextSummaryPayload,
|
ContextSummaryPayload,
|
||||||
ConversationEntryKind,
|
ConversationEntryKind,
|
||||||
UserMessagePayload,
|
UserMessagePayload,
|
||||||
} from "../conversations/types.ts"
|
} from "@freya/core"
|
||||||
|
import { tmpdir } from "node:os"
|
||||||
|
|
||||||
|
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||||
|
|
||||||
|
/** Message shape accepted by Pi's SessionManager.appendMessage API. */
|
||||||
type PiMessage = Parameters<SessionManager["appendMessage"]>[0]
|
type PiMessage = Parameters<SessionManager["appendMessage"]>[0]
|
||||||
|
|
||||||
|
/** Assistant message variant required when replaying stored assistant entries. */
|
||||||
type PiAssistantMessage = Extract<PiMessage, { role: "assistant" }>
|
type PiAssistantMessage = Extract<PiMessage, { role: "assistant" }>
|
||||||
|
|
||||||
|
/** Inputs required to rebuild a Pi session manager from stored conversation entries. */
|
||||||
export interface CreateSessionManagerInput {
|
export interface CreateSessionManagerInput {
|
||||||
cwd?: string
|
cwd?: string
|
||||||
entries: ConversationStorageEntry[]
|
entries: ConversationStorageEntry[]
|
||||||
|
|||||||
11
apps/freya-backend/src/conversations/errors.ts
Normal file
11
apps/freya-backend/src/conversations/errors.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
export class ConversationNotFoundError extends Error {
|
||||||
|
readonly conversationId: string
|
||||||
|
readonly userId: string
|
||||||
|
|
||||||
|
constructor(conversationId: string, userId: string) {
|
||||||
|
super(`Conversation "${conversationId}" not found for user "${userId}"`)
|
||||||
|
this.name = "ConversationNotFoundError"
|
||||||
|
this.conversationId = conversationId
|
||||||
|
this.userId = userId
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,21 +1,55 @@
|
|||||||
|
import { ConversationEntryKind, ConversationEntryVisibility } from "@freya/core"
|
||||||
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
||||||
import { Hono } from "hono"
|
import { Hono } from "hono"
|
||||||
|
|
||||||
import type { Database } from "../db/index.ts"
|
import type { Database } from "../db/index.ts"
|
||||||
import type { ConversationRow } from "./storage.ts"
|
import type {
|
||||||
|
ConversationEntryRow,
|
||||||
|
ConversationRow,
|
||||||
|
ListConversationEntriesParams,
|
||||||
|
} from "./storage.ts"
|
||||||
|
|
||||||
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
|
import { ConversationNotFoundError } from "./errors.ts"
|
||||||
import { registerConversationsHttpHandlers } from "./http.ts"
|
import { registerConversationsHttpHandlers } from "./http.ts"
|
||||||
|
|
||||||
const MockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
const MockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
||||||
|
const ConversationId = "11111111-1111-4111-8111-111111111111"
|
||||||
|
const MissingConversationId = "22222222-2222-4222-8222-222222222222"
|
||||||
|
|
||||||
const conversationRowsByUser = new Map<string, ConversationRow[]>()
|
const conversationRowsByUser = new Map<string, ConversationRow[]>()
|
||||||
|
const conversationEntryRowsByUserAndConversation = new Map<string, ConversationEntryRow[]>()
|
||||||
|
const listEntriesCalls: Array<{
|
||||||
|
userId: string
|
||||||
|
conversationId: string
|
||||||
|
params: ListConversationEntriesParams
|
||||||
|
}> = []
|
||||||
|
|
||||||
mock.module("./storage.ts", () => ({
|
mock.module("./storage.ts", () => ({
|
||||||
conversations: (_db: Database, userId: string) => ({
|
conversations: (_db: Database, userId: string) => ({
|
||||||
async listConversations(): Promise<ConversationRow[]> {
|
async listConversations(): Promise<ConversationRow[]> {
|
||||||
return conversationRowsByUser.get(userId) ?? []
|
return conversationRowsByUser.get(userId) ?? []
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async listEntries(
|
||||||
|
conversationId: string,
|
||||||
|
params: ListConversationEntriesParams = {},
|
||||||
|
): Promise<ConversationEntryRow[]> {
|
||||||
|
listEntriesCalls.push({ userId, conversationId, params })
|
||||||
|
|
||||||
|
const rows = conversationEntryRowsByUserAndConversation.get(
|
||||||
|
conversationEntriesKey(userId, conversationId),
|
||||||
|
)
|
||||||
|
if (!rows) {
|
||||||
|
throw new ConversationNotFoundError(conversationId, userId)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (params.visibility) {
|
||||||
|
return rows.filter((row) => row.visibility === params.visibility)
|
||||||
|
}
|
||||||
|
|
||||||
|
return rows
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -44,9 +78,39 @@ function createConversationRow(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function createConversationEntryRow(
|
||||||
|
id: string,
|
||||||
|
conversationId: string,
|
||||||
|
sequence: number,
|
||||||
|
kind: ConversationEntryRow["kind"],
|
||||||
|
visibility: ConversationEntryRow["visibility"],
|
||||||
|
payload: ConversationEntryRow["payload"],
|
||||||
|
createdAt: string,
|
||||||
|
metadata: ConversationEntryRow["metadata"] = {},
|
||||||
|
fileId: string | null = null,
|
||||||
|
): ConversationEntryRow {
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
conversationId,
|
||||||
|
sequence,
|
||||||
|
kind,
|
||||||
|
visibility,
|
||||||
|
fileId,
|
||||||
|
payload,
|
||||||
|
metadata,
|
||||||
|
createdAt: new Date(createdAt),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function conversationEntriesKey(userId: string, conversationId: string): string {
|
||||||
|
return `${userId}:${conversationId}`
|
||||||
|
}
|
||||||
|
|
||||||
describe("GET /api/conversations", () => {
|
describe("GET /api/conversations", () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
conversationRowsByUser.clear()
|
conversationRowsByUser.clear()
|
||||||
|
conversationEntryRowsByUserAndConversation.clear()
|
||||||
|
listEntriesCalls.length = 0
|
||||||
})
|
})
|
||||||
|
|
||||||
test("returns 401 without auth", async () => {
|
test("returns 401 without auth", async () => {
|
||||||
@@ -108,3 +172,162 @@ describe("GET /api/conversations", () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe("GET /api/conversations/:id/entries", () => {
|
||||||
|
beforeEach(() => {
|
||||||
|
conversationRowsByUser.clear()
|
||||||
|
conversationEntryRowsByUserAndConversation.clear()
|
||||||
|
listEntriesCalls.length = 0
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 401 without auth", async () => {
|
||||||
|
const app = buildTestApp()
|
||||||
|
|
||||||
|
const res = await app.request("/api/conversations/conversation-1/entries")
|
||||||
|
|
||||||
|
expect(res.status).toBe(401)
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns user-visible entries for the authenticated user", async () => {
|
||||||
|
conversationEntryRowsByUserAndConversation.set(
|
||||||
|
conversationEntriesKey(MockUserId, ConversationId),
|
||||||
|
[
|
||||||
|
createConversationEntryRow(
|
||||||
|
"entry-user",
|
||||||
|
ConversationId,
|
||||||
|
1,
|
||||||
|
ConversationEntryKind.UserMessage,
|
||||||
|
ConversationEntryVisibility.UserVisible,
|
||||||
|
{
|
||||||
|
role: "user",
|
||||||
|
parts: [{ type: "text", text: "What is on today?" }],
|
||||||
|
},
|
||||||
|
"2026-06-17T09:30:00.000Z",
|
||||||
|
),
|
||||||
|
createConversationEntryRow(
|
||||||
|
"entry-tool",
|
||||||
|
ConversationId,
|
||||||
|
2,
|
||||||
|
ConversationEntryKind.ToolCall,
|
||||||
|
ConversationEntryVisibility.Internal,
|
||||||
|
{
|
||||||
|
toolName: "freya_list_context",
|
||||||
|
input: {},
|
||||||
|
},
|
||||||
|
"2026-06-17T09:30:01.000Z",
|
||||||
|
),
|
||||||
|
createConversationEntryRow(
|
||||||
|
"entry-assistant",
|
||||||
|
ConversationId,
|
||||||
|
3,
|
||||||
|
ConversationEntryKind.AssistantMessage,
|
||||||
|
ConversationEntryVisibility.UserVisible,
|
||||||
|
{
|
||||||
|
role: "assistant",
|
||||||
|
parts: [{ type: "text", text: "You have two calendar events." }],
|
||||||
|
},
|
||||||
|
"2026-06-17T09:30:02.000Z",
|
||||||
|
{ runId: "run-1" },
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
const app = buildTestApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request(`/api/conversations/${ConversationId}/entries`)
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
expect(listEntriesCalls).toEqual([
|
||||||
|
{
|
||||||
|
userId: MockUserId,
|
||||||
|
conversationId: ConversationId,
|
||||||
|
params: { visibility: ConversationEntryVisibility.UserVisible },
|
||||||
|
},
|
||||||
|
])
|
||||||
|
|
||||||
|
const body = (await res.json()) as { entries: unknown[] }
|
||||||
|
expect(body).toEqual({
|
||||||
|
entries: [
|
||||||
|
{
|
||||||
|
id: "entry-user",
|
||||||
|
conversationId: ConversationId,
|
||||||
|
sequence: 1,
|
||||||
|
kind: ConversationEntryKind.UserMessage,
|
||||||
|
visibility: ConversationEntryVisibility.UserVisible,
|
||||||
|
fileId: null,
|
||||||
|
payload: {
|
||||||
|
role: "user",
|
||||||
|
parts: [{ type: "text", text: "What is on today?" }],
|
||||||
|
},
|
||||||
|
metadata: {},
|
||||||
|
createdAt: "2026-06-17T09:30:00.000Z",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "entry-assistant",
|
||||||
|
conversationId: ConversationId,
|
||||||
|
sequence: 3,
|
||||||
|
kind: ConversationEntryKind.AssistantMessage,
|
||||||
|
visibility: ConversationEntryVisibility.UserVisible,
|
||||||
|
fileId: null,
|
||||||
|
payload: {
|
||||||
|
role: "assistant",
|
||||||
|
parts: [{ type: "text", text: "You have two calendar events." }],
|
||||||
|
},
|
||||||
|
metadata: { runId: "run-1" },
|
||||||
|
createdAt: "2026-06-17T09:30:02.000Z",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns an empty list when the conversation has no user-visible entries", async () => {
|
||||||
|
conversationEntryRowsByUserAndConversation.set(
|
||||||
|
conversationEntriesKey(MockUserId, ConversationId),
|
||||||
|
[
|
||||||
|
createConversationEntryRow(
|
||||||
|
"entry-tool",
|
||||||
|
ConversationId,
|
||||||
|
1,
|
||||||
|
ConversationEntryKind.ToolResult,
|
||||||
|
ConversationEntryVisibility.Internal,
|
||||||
|
{ toolCallId: "call-1", output: { ok: true } },
|
||||||
|
"2026-06-17T09:30:00.000Z",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
const app = buildTestApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request(`/api/conversations/${ConversationId}/entries`)
|
||||||
|
|
||||||
|
expect(res.status).toBe(200)
|
||||||
|
const body = (await res.json()) as { entries: unknown[] }
|
||||||
|
expect(body).toEqual({ entries: [] })
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 404 for malformed conversation ids without querying storage", async () => {
|
||||||
|
const app = buildTestApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request("/api/conversations/missing-conversation/entries")
|
||||||
|
|
||||||
|
expect(res.status).toBe(404)
|
||||||
|
expect(listEntriesCalls).toEqual([])
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body).toEqual({ error: "Conversation not found" })
|
||||||
|
})
|
||||||
|
|
||||||
|
test("returns 404 when the conversation does not exist for the user", async () => {
|
||||||
|
const app = buildTestApp("user-1")
|
||||||
|
|
||||||
|
const res = await app.request(`/api/conversations/${MissingConversationId}/entries`)
|
||||||
|
|
||||||
|
expect(res.status).toBe(404)
|
||||||
|
expect(listEntriesCalls).toEqual([
|
||||||
|
{
|
||||||
|
userId: MockUserId,
|
||||||
|
conversationId: MissingConversationId,
|
||||||
|
params: { visibility: ConversationEntryVisibility.UserVisible },
|
||||||
|
},
|
||||||
|
])
|
||||||
|
const body = (await res.json()) as { error: string }
|
||||||
|
expect(body).toEqual({ error: "Conversation not found" })
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|||||||
@@ -1,23 +1,38 @@
|
|||||||
import type { Context, Hono } from "hono"
|
import type { Context, Hono } from "hono"
|
||||||
|
|
||||||
|
import { ConversationEntryVisibility } from "@freya/core"
|
||||||
|
import { type } from "arktype"
|
||||||
import { createMiddleware } from "hono/factory"
|
import { createMiddleware } from "hono/factory"
|
||||||
|
|
||||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||||
import type { Database } from "../db/index.ts"
|
import type { Database } from "../db/index.ts"
|
||||||
|
import type { ConversationRow } from "./storage.ts"
|
||||||
|
|
||||||
|
import { ConversationNotFoundError } from "./errors.ts"
|
||||||
import { conversations } from "./storage.ts"
|
import { conversations } from "./storage.ts"
|
||||||
|
|
||||||
|
/** Hono environment populated by the conversations route middleware. */
|
||||||
type Env = {
|
type Env = {
|
||||||
Variables: {
|
Variables: {
|
||||||
db: Database
|
db: Database
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Serialized conversation summary returned by the list endpoint. */
|
||||||
|
interface ConversationSummaryResponse {
|
||||||
|
id: string
|
||||||
|
createdAt: string
|
||||||
|
updatedAt: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Dependencies required to register conversation HTTP handlers. */
|
||||||
interface ConversationsHttpHandlersDeps {
|
interface ConversationsHttpHandlersDeps {
|
||||||
db: Database
|
db: Database
|
||||||
authSessionMiddleware: AuthSessionMiddleware
|
authSessionMiddleware: AuthSessionMiddleware
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const ConversationIdParam = type("string.uuid")
|
||||||
|
|
||||||
export function registerConversationsHttpHandlers(
|
export function registerConversationsHttpHandlers(
|
||||||
app: Hono,
|
app: Hono,
|
||||||
{ db, authSessionMiddleware }: ConversationsHttpHandlersDeps,
|
{ db, authSessionMiddleware }: ConversationsHttpHandlersDeps,
|
||||||
@@ -28,6 +43,7 @@ export function registerConversationsHttpHandlers(
|
|||||||
})
|
})
|
||||||
|
|
||||||
app.get("/api/conversations", inject, authSessionMiddleware, handleListConversations)
|
app.get("/api/conversations", inject, authSessionMiddleware, handleListConversations)
|
||||||
|
app.get("/api/conversations/:id/entries", inject, authSessionMiddleware, handleListEntries)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function handleListConversations(c: Context<Env>) {
|
async function handleListConversations(c: Context<Env>) {
|
||||||
@@ -35,10 +51,54 @@ async function handleListConversations(c: Context<Env>) {
|
|||||||
const db = c.get("db")
|
const db = c.get("db")
|
||||||
|
|
||||||
return c.json({
|
return c.json({
|
||||||
conversations: (await conversations(db, user.id).listConversations()).map((row) => ({
|
conversations: (await conversations(db, user.id).listConversations()).map(
|
||||||
id: row.id,
|
serializeConversation,
|
||||||
createdAt: row.createdAt.toISOString(),
|
),
|
||||||
updatedAt: row.updatedAt.toISOString(),
|
|
||||||
})),
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function handleListEntries(c: Context<Env>) {
|
||||||
|
const user = c.get("user")!
|
||||||
|
const db = c.get("db")
|
||||||
|
const conversationId = c.req.param("id")
|
||||||
|
if (!conversationId) {
|
||||||
|
return c.json({ error: "Conversation not found" }, 404)
|
||||||
|
}
|
||||||
|
const parsedConversationId = ConversationIdParam(conversationId)
|
||||||
|
if (parsedConversationId instanceof type.errors) {
|
||||||
|
return c.json({ error: "Conversation not found" }, 404)
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const entries = await conversations(db, user.id).listEntries(parsedConversationId, {
|
||||||
|
visibility: ConversationEntryVisibility.UserVisible,
|
||||||
|
})
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
entries: entries.map((row) => ({
|
||||||
|
id: row.id,
|
||||||
|
conversationId: row.conversationId,
|
||||||
|
sequence: row.sequence,
|
||||||
|
kind: row.kind,
|
||||||
|
visibility: row.visibility,
|
||||||
|
fileId: row.fileId,
|
||||||
|
payload: row.payload,
|
||||||
|
metadata: row.metadata,
|
||||||
|
createdAt: row.createdAt.toISOString(),
|
||||||
|
})),
|
||||||
|
})
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof ConversationNotFoundError) {
|
||||||
|
return c.json({ error: "Conversation not found" }, 404)
|
||||||
|
}
|
||||||
|
throw err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function serializeConversation(row: ConversationRow): ConversationSummaryResponse {
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
createdAt: row.createdAt.toISOString(),
|
||||||
|
updatedAt: row.updatedAt.toISOString(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
|
import {
|
||||||
|
AssistantMessagePayload,
|
||||||
|
AttachmentPayload,
|
||||||
|
ConversationEntryKind,
|
||||||
|
ConversationEntryVisibility,
|
||||||
|
ContextSummaryPayload,
|
||||||
|
ConversationEntryMetadata,
|
||||||
|
GenericObjectPayload,
|
||||||
|
UserMessagePayload,
|
||||||
|
type ConversationEntryPayload,
|
||||||
|
} from "@freya/core"
|
||||||
|
import { type } from "arktype"
|
||||||
import { and, asc, desc, eq } from "drizzle-orm"
|
import { and, asc, desc, eq } from "drizzle-orm"
|
||||||
|
|
||||||
import type { Database } from "../db/index.ts"
|
import type { Database } from "../db/index.ts"
|
||||||
import type {
|
|
||||||
AssistantMessagePayload,
|
|
||||||
AttachmentPayload,
|
|
||||||
ContextSummaryPayload,
|
|
||||||
ConversationEntryKind as ConversationEntryKindType,
|
|
||||||
ConversationEntryMetadata,
|
|
||||||
ConversationEntryPayload,
|
|
||||||
ConversationEntryVisibility as ConversationEntryVisibilityType,
|
|
||||||
GenericObjectPayload,
|
|
||||||
UserMessagePayload,
|
|
||||||
} from "./types.ts"
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
conversationEntries,
|
conversationEntries,
|
||||||
@@ -19,23 +20,21 @@ import {
|
|||||||
files,
|
files,
|
||||||
user,
|
user,
|
||||||
} from "../db/schema.ts"
|
} from "../db/schema.ts"
|
||||||
import {
|
import { ConversationNotFoundError } from "./errors.ts"
|
||||||
ConversationEntryMetadata as ConversationEntryMetadataSchema,
|
|
||||||
AssistantMessagePayload as AssistantMessagePayloadSchema,
|
|
||||||
AttachmentPayload as AttachmentPayloadSchema,
|
|
||||||
ConversationEntryKind,
|
|
||||||
ConversationEntryKindInput,
|
|
||||||
ConversationEntryVisibility,
|
|
||||||
ConversationEntryVisibilityInput,
|
|
||||||
ContextSummaryPayload as ContextSummaryPayloadSchema,
|
|
||||||
GenericObjectPayload as GenericObjectPayloadSchema,
|
|
||||||
UserMessagePayload as UserMessagePayloadSchema,
|
|
||||||
} from "./types.ts"
|
|
||||||
|
|
||||||
|
const conversationEntryKind = type.enumerated(...Object.values(ConversationEntryKind))
|
||||||
|
const conversationEntryVisibility = type.enumerated(...Object.values(ConversationEntryVisibility))
|
||||||
|
|
||||||
|
/** Database row shape for a conversation owned by a user. */
|
||||||
export type ConversationRow = typeof conversationsTable.$inferSelect
|
export type ConversationRow = typeof conversationsTable.$inferSelect
|
||||||
|
|
||||||
|
/** Database row shape for an entry in a conversation timeline. */
|
||||||
export type ConversationEntryRow = typeof conversationEntries.$inferSelect
|
export type ConversationEntryRow = typeof conversationEntries.$inferSelect
|
||||||
|
|
||||||
|
/** Database row shape for an uploaded file referenced by conversations. */
|
||||||
export type FileRow = typeof files.$inferSelect
|
export type FileRow = typeof files.$inferSelect
|
||||||
|
|
||||||
|
/** Input required to create a stored file record. */
|
||||||
export interface CreateFileInput {
|
export interface CreateFileInput {
|
||||||
storageKey: string
|
storageKey: string
|
||||||
originalName?: string
|
originalName?: string
|
||||||
@@ -44,23 +43,27 @@ export interface CreateFileInput {
|
|||||||
metadata?: Record<string, unknown>
|
metadata?: Record<string, unknown>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Input for creating a file and appending its attachment entry together. */
|
||||||
export interface AppendAttachmentEntryInput {
|
export interface AppendAttachmentEntryInput {
|
||||||
file: CreateFileInput
|
file: CreateFileInput
|
||||||
payload: AttachmentPayload
|
payload: AttachmentPayload
|
||||||
visibility?: ConversationEntryVisibilityType
|
visibility?: ConversationEntryVisibility
|
||||||
metadata?: ConversationEntryMetadata
|
metadata?: ConversationEntryMetadata
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Result returned after a file-backed attachment entry is appended. */
|
||||||
export interface AppendAttachmentEntryResult {
|
export interface AppendAttachmentEntryResult {
|
||||||
file: FileRow
|
file: FileRow
|
||||||
entry: ConversationEntryRow
|
entry: ConversationEntryRow
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Common fields accepted when appending any conversation entry. */
|
||||||
interface AppendConversationEntryBase {
|
interface AppendConversationEntryBase {
|
||||||
visibility?: ConversationEntryVisibilityType
|
visibility?: ConversationEntryVisibility
|
||||||
metadata?: ConversationEntryMetadata
|
metadata?: ConversationEntryMetadata
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Discriminated input for appending any supported entry kind to a conversation. */
|
||||||
export type AppendConversationEntryInput =
|
export type AppendConversationEntryInput =
|
||||||
| (AppendConversationEntryBase & {
|
| (AppendConversationEntryBase & {
|
||||||
kind: typeof ConversationEntryKind.UserMessage
|
kind: typeof ConversationEntryKind.UserMessage
|
||||||
@@ -91,12 +94,13 @@ export type AppendConversationEntryInput =
|
|||||||
fileId?: never
|
fileId?: never
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Filters accepted when listing conversation entries. */
|
||||||
export interface ListConversationEntriesParams {
|
export interface ListConversationEntriesParams {
|
||||||
visibility?: ConversationEntryVisibilityType
|
visibility?: ConversationEntryVisibility
|
||||||
}
|
}
|
||||||
|
|
||||||
export function conversations(db: Database, userId: string) {
|
export function conversations(db: Database, userId: string) {
|
||||||
return {
|
const storage = {
|
||||||
async createConversation(): Promise<ConversationRow> {
|
async createConversation(): Promise<ConversationRow> {
|
||||||
return insertConversation(db, userId)
|
return insertConversation(db, userId)
|
||||||
},
|
},
|
||||||
@@ -109,6 +113,18 @@ export function conversations(db: Database, userId: string) {
|
|||||||
.orderBy(desc(conversationsTable.updatedAt), desc(conversationsTable.createdAt))
|
.orderBy(desc(conversationsTable.updatedAt), desc(conversationsTable.createdAt))
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async getConversation(conversationId: string): Promise<ConversationRow | null> {
|
||||||
|
const rows = await db
|
||||||
|
.select()
|
||||||
|
.from(conversationsTable)
|
||||||
|
.where(
|
||||||
|
and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)),
|
||||||
|
)
|
||||||
|
.limit(1)
|
||||||
|
|
||||||
|
return rows[0] ?? null
|
||||||
|
},
|
||||||
|
|
||||||
async getOrCreateConversation(): Promise<ConversationRow> {
|
async getOrCreateConversation(): Promise<ConversationRow> {
|
||||||
return db.transaction(async (tx) => {
|
return db.transaction(async (tx) => {
|
||||||
await requireUserForUpdate(tx, userId)
|
await requireUserForUpdate(tx, userId)
|
||||||
@@ -127,12 +143,12 @@ export function conversations(db: Database, userId: string) {
|
|||||||
conversationId: string,
|
conversationId: string,
|
||||||
input: AppendConversationEntryInput,
|
input: AppendConversationEntryInput,
|
||||||
): Promise<ConversationEntryRow> {
|
): Promise<ConversationEntryRow> {
|
||||||
const kind = ConversationEntryKindInput.assert(input.kind)
|
const kind = conversationEntryKind.assert(input.kind)
|
||||||
const visibility = ConversationEntryVisibilityInput.assert(
|
const visibility = conversationEntryVisibility.assert(
|
||||||
input.visibility ?? defaultVisibilityForKind(kind),
|
input.visibility ?? defaultVisibilityForKind(kind),
|
||||||
)
|
)
|
||||||
const payload = payloadForKind(kind, input.payload)
|
const payload = payloadForKind(kind, input.payload)
|
||||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
|
||||||
let fileId: string | null = null
|
let fileId: string | null = null
|
||||||
|
|
||||||
if (input.kind === ConversationEntryKind.Attachment) {
|
if (input.kind === ConversationEntryKind.Attachment) {
|
||||||
@@ -141,7 +157,9 @@ export function conversations(db: Database, userId: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const rows = await db.transaction(async (tx) => {
|
const rows = await db.transaction(async (tx) => {
|
||||||
await requireConversationForUpdate(tx, userId, conversationId)
|
if (!(await findConversationForUpdate(tx, userId, conversationId))) {
|
||||||
|
throw new ConversationNotFoundError(conversationId, userId)
|
||||||
|
}
|
||||||
const sequence = await nextSequence(tx, conversationId)
|
const sequence = await nextSequence(tx, conversationId)
|
||||||
|
|
||||||
const rows = await tx
|
const rows = await tx
|
||||||
@@ -168,14 +186,16 @@ export function conversations(db: Database, userId: string) {
|
|||||||
conversationId: string,
|
conversationId: string,
|
||||||
input: AppendAttachmentEntryInput,
|
input: AppendAttachmentEntryInput,
|
||||||
): Promise<AppendAttachmentEntryResult> {
|
): Promise<AppendAttachmentEntryResult> {
|
||||||
const payload = AttachmentPayloadSchema.assert(input.payload)
|
const payload = AttachmentPayload.assert(input.payload)
|
||||||
const visibility = ConversationEntryVisibilityInput.assert(
|
const visibility = conversationEntryVisibility.assert(
|
||||||
input.visibility ?? defaultVisibilityForKind(ConversationEntryKind.Attachment),
|
input.visibility ?? defaultVisibilityForKind(ConversationEntryKind.Attachment),
|
||||||
)
|
)
|
||||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
|
||||||
|
|
||||||
return db.transaction(async (tx) => {
|
return db.transaction(async (tx) => {
|
||||||
await requireConversationForUpdate(tx, userId, conversationId)
|
if (!(await findConversationForUpdate(tx, userId, conversationId))) {
|
||||||
|
throw new ConversationNotFoundError(conversationId, userId)
|
||||||
|
}
|
||||||
|
|
||||||
const file = await insertFile(tx, userId, input.file)
|
const file = await insertFile(tx, userId, input.file)
|
||||||
const sequence = await nextSequence(tx, conversationId)
|
const sequence = await nextSequence(tx, conversationId)
|
||||||
@@ -204,7 +224,9 @@ export function conversations(db: Database, userId: string) {
|
|||||||
conversationId: string,
|
conversationId: string,
|
||||||
params: ListConversationEntriesParams = {},
|
params: ListConversationEntriesParams = {},
|
||||||
): Promise<ConversationEntryRow[]> {
|
): Promise<ConversationEntryRow[]> {
|
||||||
await requireConversation(db, userId, conversationId)
|
if (!(await storage.getConversation(conversationId))) {
|
||||||
|
throw new ConversationNotFoundError(conversationId, userId)
|
||||||
|
}
|
||||||
|
|
||||||
if (params.visibility) {
|
if (params.visibility) {
|
||||||
return db
|
return db
|
||||||
@@ -226,25 +248,27 @@ export function conversations(db: Database, userId: string) {
|
|||||||
.orderBy(asc(conversationEntries.sequence))
|
.orderBy(asc(conversationEntries.sequence))
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return storage
|
||||||
}
|
}
|
||||||
|
|
||||||
function payloadForKind(
|
function payloadForKind(
|
||||||
kind: ConversationEntryKindType,
|
kind: ConversationEntryKind,
|
||||||
payload: AppendConversationEntryInput["payload"],
|
payload: AppendConversationEntryInput["payload"],
|
||||||
): ConversationEntryPayload {
|
): ConversationEntryPayload {
|
||||||
switch (kind) {
|
switch (kind) {
|
||||||
case ConversationEntryKind.UserMessage:
|
case ConversationEntryKind.UserMessage:
|
||||||
return UserMessagePayloadSchema.assert(payload)
|
return UserMessagePayload.assert(payload)
|
||||||
case ConversationEntryKind.AssistantMessage:
|
case ConversationEntryKind.AssistantMessage:
|
||||||
return AssistantMessagePayloadSchema.assert(payload)
|
return AssistantMessagePayload.assert(payload)
|
||||||
case ConversationEntryKind.Attachment:
|
case ConversationEntryKind.Attachment:
|
||||||
return AttachmentPayloadSchema.assert(payload)
|
return AttachmentPayload.assert(payload)
|
||||||
case ConversationEntryKind.ContextSummary:
|
case ConversationEntryKind.ContextSummary:
|
||||||
return ContextSummaryPayloadSchema.assert(payload)
|
return ContextSummaryPayload.assert(payload)
|
||||||
case ConversationEntryKind.ToolCall:
|
case ConversationEntryKind.ToolCall:
|
||||||
case ConversationEntryKind.ToolResult:
|
case ConversationEntryKind.ToolResult:
|
||||||
case ConversationEntryKind.SystemNote:
|
case ConversationEntryKind.SystemNote:
|
||||||
return GenericObjectPayloadSchema.assert(payload)
|
return GenericObjectPayload.assert(payload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,25 +283,11 @@ async function requireUserForUpdate(db: Database, userId: string): Promise<void>
|
|||||||
requireRow(rows, `User not found: ${userId}`)
|
requireRow(rows, `User not found: ${userId}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function requireConversation(
|
async function findConversationForUpdate(
|
||||||
db: Database,
|
db: Database,
|
||||||
userId: string,
|
userId: string,
|
||||||
conversationId: string,
|
conversationId: string,
|
||||||
): Promise<ConversationRow> {
|
): Promise<ConversationRow | null> {
|
||||||
const rows = await db
|
|
||||||
.select()
|
|
||||||
.from(conversationsTable)
|
|
||||||
.where(and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)))
|
|
||||||
.limit(1)
|
|
||||||
|
|
||||||
return requireRow(rows, `Conversation not found: ${conversationId}`)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function requireConversationForUpdate(
|
|
||||||
db: Database,
|
|
||||||
userId: string,
|
|
||||||
conversationId: string,
|
|
||||||
): Promise<ConversationRow> {
|
|
||||||
const rows = await db
|
const rows = await db
|
||||||
.select()
|
.select()
|
||||||
.from(conversationsTable)
|
.from(conversationsTable)
|
||||||
@@ -285,7 +295,7 @@ async function requireConversationForUpdate(
|
|||||||
.limit(1)
|
.limit(1)
|
||||||
.for("update")
|
.for("update")
|
||||||
|
|
||||||
return requireRow(rows, `Conversation not found: ${conversationId}`)
|
return rows[0] ?? null
|
||||||
}
|
}
|
||||||
|
|
||||||
async function latestConversation(db: Database, userId: string): Promise<ConversationRow | null> {
|
async function latestConversation(db: Database, userId: string): Promise<ConversationRow | null> {
|
||||||
@@ -364,9 +374,7 @@ function requireRow<T>(rows: T[], message = "Expected database row"): T {
|
|||||||
return row
|
return row
|
||||||
}
|
}
|
||||||
|
|
||||||
function defaultVisibilityForKind(
|
function defaultVisibilityForKind(kind: ConversationEntryKind): ConversationEntryVisibility {
|
||||||
kind: ConversationEntryKindType,
|
|
||||||
): ConversationEntryVisibilityType {
|
|
||||||
switch (kind) {
|
switch (kind) {
|
||||||
case ConversationEntryKind.UserMessage:
|
case ConversationEntryKind.UserMessage:
|
||||||
case ConversationEntryKind.AssistantMessage:
|
case ConversationEntryKind.AssistantMessage:
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
|
import {
|
||||||
|
ConversationEntryVisibility,
|
||||||
|
type ConversationEntryKind,
|
||||||
|
type ConversationEntryMetadata,
|
||||||
|
type ConversationEntryPayload,
|
||||||
|
type ConversationEntryVisibility as ConversationEntryVisibilityType,
|
||||||
|
} from "@freya/core"
|
||||||
import { sql } from "drizzle-orm"
|
import { sql } from "drizzle-orm"
|
||||||
import {
|
import {
|
||||||
boolean,
|
boolean,
|
||||||
@@ -13,14 +20,6 @@ import {
|
|||||||
uuid,
|
uuid,
|
||||||
} from "drizzle-orm/pg-core"
|
} from "drizzle-orm/pg-core"
|
||||||
|
|
||||||
import {
|
|
||||||
ConversationEntryVisibility,
|
|
||||||
type ConversationEntryKind,
|
|
||||||
type ConversationEntryMetadata,
|
|
||||||
type ConversationEntryPayload,
|
|
||||||
type ConversationEntryVisibility as ConversationEntryVisibilityType,
|
|
||||||
} from "../conversations/types.ts"
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Better Auth core tables
|
// Better Auth core tables
|
||||||
// Re-exported from CLI-generated schema.
|
// Re-exported from CLI-generated schema.
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { registerAuthHandlers } from "./auth/http.ts"
|
|||||||
import { createAuth } from "./auth/index.ts"
|
import { createAuth } from "./auth/index.ts"
|
||||||
import { createRequireSession } from "./auth/session-middleware.ts"
|
import { createRequireSession } from "./auth/session-middleware.ts"
|
||||||
import { CalDavSourceProvider } from "./caldav/provider.ts"
|
import { CalDavSourceProvider } from "./caldav/provider.ts"
|
||||||
|
import { registerConversationsHttpHandlers } from "./conversations/http.ts"
|
||||||
import { createDatabase } from "./db/index.ts"
|
import { createDatabase } from "./db/index.ts"
|
||||||
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
||||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||||
@@ -129,6 +130,7 @@ function main() {
|
|||||||
sessionManager,
|
sessionManager,
|
||||||
authSessionMiddleware,
|
authSessionMiddleware,
|
||||||
})
|
})
|
||||||
|
registerConversationsHttpHandlers(app, { db, authSessionMiddleware })
|
||||||
if (isDebugMode) {
|
if (isDebugMode) {
|
||||||
registerDebugAgentHttpHandlers(app, {
|
registerDebugAgentHttpHandlers(app, {
|
||||||
authSessionMiddleware,
|
authSessionMiddleware,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
||||||
|
|
||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { LocationSource } from "@freya/source-location"
|
import { LocationSource } from "@freya/source-location"
|
||||||
import { WeatherSource } from "@freya/source-weatherkit"
|
import { WeatherSource } from "@freya/source-weatherkit"
|
||||||
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
||||||
@@ -9,7 +10,6 @@ import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
|||||||
import type { Database } from "../db/index.ts"
|
import type { Database } from "../db/index.ts"
|
||||||
import type { FeedSourceProvider } from "./feed-source-provider.ts"
|
import type { FeedSourceProvider } from "./feed-source-provider.ts"
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import { CredentialEncryptor } from "../lib/crypto.ts"
|
import { CredentialEncryptor } from "../lib/crypto.ts"
|
||||||
import {
|
import {
|
||||||
CredentialStorageUnavailableError,
|
CredentialStorageUnavailableError,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
||||||
|
|
||||||
|
import { ConversationEntryKind } from "@freya/core"
|
||||||
import { LocationSource } from "@freya/source-location"
|
import { LocationSource } from "@freya/source-location"
|
||||||
import { describe, expect, spyOn, test } from "bun:test"
|
import { describe, expect, spyOn, test } from "bun:test"
|
||||||
|
|
||||||
@@ -9,7 +10,6 @@ import type {
|
|||||||
} from "../agent/conversation-recording-query-agent.ts"
|
} from "../agent/conversation-recording-query-agent.ts"
|
||||||
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||||
|
|
||||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
|
||||||
import { UserSession } from "./user-session.ts"
|
import { UserSession } from "./user-session.ts"
|
||||||
|
|
||||||
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
{
|
{
|
||||||
"expo": {
|
"expo": {
|
||||||
"name": "Freya",
|
"name": "Freya",
|
||||||
"slug": "freya-client",
|
"slug": "freya",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/images/icon.png",
|
||||||
"scheme": "freya",
|
"scheme": "freya",
|
||||||
"userInterfaceStyle": "automatic",
|
"userInterfaceStyle": "automatic",
|
||||||
"newArchEnabled": true,
|
|
||||||
"ios": {
|
"ios": {
|
||||||
"infoPlist": {
|
"infoPlist": {
|
||||||
"NSAppTransportSecurity": {
|
"NSAppTransportSecurity": {
|
||||||
@@ -24,7 +23,6 @@
|
|||||||
"backgroundImage": "./assets/images/android-icon-background.png",
|
"backgroundImage": "./assets/images/android-icon-background.png",
|
||||||
"monochromeImage": "./assets/images/android-icon-monochrome.png"
|
"monochromeImage": "./assets/images/android-icon-monochrome.png"
|
||||||
},
|
},
|
||||||
"edgeToEdgeEnabled": true,
|
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "sh.nym.freya"
|
"package": "sh.nym.freya"
|
||||||
},
|
},
|
||||||
@@ -54,55 +52,82 @@
|
|||||||
{
|
{
|
||||||
"fontFamily": "Inter",
|
"fontFamily": "Inter",
|
||||||
"fontDefinitions": [
|
"fontDefinitions": [
|
||||||
{ "path": "./assets/fonts/Inter_100Thin.ttf", "weight": 100 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_100Thin.ttf",
|
||||||
|
"weight": 100
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
|
"path": "./assets/fonts/Inter_100Thin_Italic.ttf",
|
||||||
"weight": 100,
|
"weight": 100,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_200ExtraLight.ttf", "weight": 200 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_200ExtraLight.ttf",
|
||||||
|
"weight": 200
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
|
"path": "./assets/fonts/Inter_200ExtraLight_Italic.ttf",
|
||||||
"weight": 200,
|
"weight": 200,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_300Light.ttf", "weight": 300 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_300Light.ttf",
|
||||||
|
"weight": 300
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_300Light_Italic.ttf",
|
"path": "./assets/fonts/Inter_300Light_Italic.ttf",
|
||||||
"weight": 300,
|
"weight": 300,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_400Regular.ttf", "weight": 400 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_400Regular.ttf",
|
||||||
|
"weight": 400
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
|
"path": "./assets/fonts/Inter_400Regular_Italic.ttf",
|
||||||
"weight": 400,
|
"weight": 400,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_500Medium.ttf", "weight": 500 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_500Medium.ttf",
|
||||||
|
"weight": 500
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
|
"path": "./assets/fonts/Inter_500Medium_Italic.ttf",
|
||||||
"weight": 500,
|
"weight": 500,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_600SemiBold.ttf", "weight": 600 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_600SemiBold.ttf",
|
||||||
|
"weight": 600
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
|
"path": "./assets/fonts/Inter_600SemiBold_Italic.ttf",
|
||||||
"weight": 600,
|
"weight": 600,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_700Bold.ttf", "weight": 700 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_700Bold.ttf",
|
||||||
|
"weight": 700
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
|
"path": "./assets/fonts/Inter_700Bold_Italic.ttf",
|
||||||
"weight": 700,
|
"weight": 700,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_800ExtraBold.ttf", "weight": 800 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_800ExtraBold.ttf",
|
||||||
|
"weight": 800
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
|
"path": "./assets/fonts/Inter_800ExtraBold_Italic.ttf",
|
||||||
"weight": 800,
|
"weight": 800,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/Inter_900Black.ttf", "weight": 900 },
|
{
|
||||||
|
"path": "./assets/fonts/Inter_900Black.ttf",
|
||||||
|
"weight": 900
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/Inter_900Black_Italic.ttf",
|
"path": "./assets/fonts/Inter_900Black_Italic.ttf",
|
||||||
"weight": 900,
|
"weight": 900,
|
||||||
@@ -113,49 +138,73 @@
|
|||||||
{
|
{
|
||||||
"fontFamily": "Source Serif 4",
|
"fontFamily": "Source Serif 4",
|
||||||
"fontDefinitions": [
|
"fontDefinitions": [
|
||||||
{ "path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf", "weight": 200 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_200ExtraLight.ttf",
|
||||||
|
"weight": 200
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_200ExtraLight_Italic.ttf",
|
||||||
"weight": 200,
|
"weight": 200,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_300Light.ttf", "weight": 300 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_300Light.ttf",
|
||||||
|
"weight": 300
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_300Light_Italic.ttf",
|
||||||
"weight": 300,
|
"weight": 300,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_400Regular.ttf", "weight": 400 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_400Regular.ttf",
|
||||||
|
"weight": 400
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_400Regular_Italic.ttf",
|
||||||
"weight": 400,
|
"weight": 400,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_500Medium.ttf", "weight": 500 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_500Medium.ttf",
|
||||||
|
"weight": 500
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_500Medium_Italic.ttf",
|
||||||
"weight": 500,
|
"weight": 500,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_600SemiBold.ttf", "weight": 600 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_600SemiBold.ttf",
|
||||||
|
"weight": 600
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_600SemiBold_Italic.ttf",
|
||||||
"weight": 600,
|
"weight": 600,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_700Bold.ttf", "weight": 700 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_700Bold.ttf",
|
||||||
|
"weight": 700
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_700Bold_Italic.ttf",
|
||||||
"weight": 700,
|
"weight": 700,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf", "weight": 800 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_800ExtraBold.ttf",
|
||||||
|
"weight": 800
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_800ExtraBold_Italic.ttf",
|
||||||
"weight": 800,
|
"weight": 800,
|
||||||
"style": "italic"
|
"style": "italic"
|
||||||
},
|
},
|
||||||
{ "path": "./assets/fonts/SourceSerif4_900Black.ttf", "weight": 900 },
|
{
|
||||||
|
"path": "./assets/fonts/SourceSerif4_900Black.ttf",
|
||||||
|
"weight": 900
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
|
"path": "./assets/fonts/SourceSerif4_900Black_Italic.ttf",
|
||||||
"weight": 900,
|
"weight": 900,
|
||||||
@@ -204,7 +253,9 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"expo-web-browser",
|
||||||
|
"expo-image"
|
||||||
],
|
],
|
||||||
"experiments": {
|
"experiments": {
|
||||||
"typedRoutes": true,
|
"typedRoutes": true,
|
||||||
@@ -213,7 +264,7 @@
|
|||||||
"extra": {
|
"extra": {
|
||||||
"router": {},
|
"router": {},
|
||||||
"eas": {
|
"eas": {
|
||||||
"projectId": "61092d23-36aa-418e-929d-ea40dc912e8f"
|
"projectId": "c54ea4e5-27da-4066-b081-db8005ecf70a"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,8 @@
|
|||||||
"ios": "expo start --ios",
|
"ios": "expo start --ios",
|
||||||
"web": "expo start --web",
|
"web": "expo start --web",
|
||||||
"lint": "expo lint",
|
"lint": "expo lint",
|
||||||
"build:ios": "eas build --profile development --platform ios --non-interactive",
|
"build:ios": "bunx eas-cli build --profile development --platform ios --non-interactive",
|
||||||
"build:ios-simulator": "eas build --profile development-simulator --platform ios --non-interactive",
|
"build:ios-simulator": "bunx eas-cli build --profile development-simulator --platform ios --non-interactive",
|
||||||
"debugger": "bun run scripts/open-debugger.ts"
|
"debugger": "bun run scripts/open-debugger.ts"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -19,42 +19,38 @@
|
|||||||
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
"@expo-google-fonts/source-serif-4": "^0.4.1",
|
||||||
"@expo/vector-icons": "^15.0.3",
|
"@expo/vector-icons": "^15.0.3",
|
||||||
"@json-render/react-native": "^0.13.0",
|
"@json-render/react-native": "^0.13.0",
|
||||||
"@react-navigation/bottom-tabs": "^7.4.0",
|
|
||||||
"@react-navigation/elements": "^2.6.3",
|
|
||||||
"@react-navigation/native": "^7.1.8",
|
|
||||||
"@tanstack/react-query": "^5.90.21",
|
"@tanstack/react-query": "^5.90.21",
|
||||||
"expo": "~54.0.33",
|
"expo": "^56.0.0",
|
||||||
"expo-constants": "~18.0.13",
|
"expo-constants": "~56.0.18",
|
||||||
"expo-dev-client": "~6.0.20",
|
"expo-dev-client": "~56.0.20",
|
||||||
"expo-font": "~14.0.11",
|
"expo-font": "~56.0.7",
|
||||||
"expo-haptics": "~15.0.8",
|
"expo-haptics": "~56.0.3",
|
||||||
"expo-image": "~3.0.11",
|
"expo-image": "~56.0.11",
|
||||||
"expo-linking": "~8.0.11",
|
"expo-linking": "~56.0.14",
|
||||||
"expo-location": "~19.0.8",
|
"expo-location": "~56.0.18",
|
||||||
"expo-router": "~6.0.23",
|
"expo-router": "~56.2.11",
|
||||||
"expo-splash-screen": "~31.0.13",
|
"expo-splash-screen": "~56.0.10",
|
||||||
"expo-status-bar": "~3.0.9",
|
"expo-status-bar": "~56.0.4",
|
||||||
"expo-symbols": "~1.0.8",
|
"expo-symbols": "~56.0.6",
|
||||||
"expo-system-ui": "~6.0.9",
|
"expo-system-ui": "~56.0.5",
|
||||||
"expo-web-browser": "~15.0.10",
|
"expo-web-browser": "~56.0.5",
|
||||||
"react": "19.1.0",
|
"react": "19.2.3",
|
||||||
"react-dom": "19.1.0",
|
"react-dom": "19.2.3",
|
||||||
"react-native": "0.81.5",
|
"react-native": "0.85.3",
|
||||||
"react-native-gesture-handler": "~2.28.0",
|
"react-native-gesture-handler": "~2.31.1",
|
||||||
"react-native-reanimated": "~4.1.1",
|
"react-native-reanimated": "4.3.1",
|
||||||
"react-native-safe-area-context": "~5.6.0",
|
"react-native-safe-area-context": "~5.7.0",
|
||||||
"react-native-screens": "~4.16.0",
|
"react-native-screens": "4.25.2",
|
||||||
"react-native-svg": "15.12.1",
|
"react-native-svg": "15.15.4",
|
||||||
"react-native-web": "~0.21.0",
|
"react-native-web": "~0.21.0",
|
||||||
"react-native-worklets": "0.5.1",
|
"react-native-worklets": "0.8.3",
|
||||||
"twrnc": "^4.16.0",
|
"twrnc": "^4.16.0",
|
||||||
"zod": "^4.3.6"
|
"zod": "^4.3.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/react": "~19.1.0",
|
"@types/react": "~19.2.10",
|
||||||
"eas-cli": "^18.0.1",
|
|
||||||
"eslint": "^9.25.0",
|
"eslint": "^9.25.0",
|
||||||
"eslint-config-expo": "~10.0.0",
|
"eslint-config-expo": "~56.0.4",
|
||||||
"typescript": "^6"
|
"typescript": "~6.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,14 +8,16 @@ import type { ServerWebSocket } from "bun"
|
|||||||
|
|
||||||
const PROXY_PORT = parseInt(process.env.PROXY_PORT || "8080", 10)
|
const PROXY_PORT = parseInt(process.env.PROXY_PORT || "8080", 10)
|
||||||
const PROXY_HOST = process.env.PROXY_HOST || "0.0.0.0"
|
const PROXY_HOST = process.env.PROXY_HOST || "0.0.0.0"
|
||||||
|
const METRO_HOST = process.env.METRO_HOST || "localhost"
|
||||||
const METRO_PORT = parseInt(process.env.METRO_PORT || "8081", 10)
|
const METRO_PORT = parseInt(process.env.METRO_PORT || "8081", 10)
|
||||||
const METRO_BASE = `http://127.0.0.1:${METRO_PORT}`
|
const METRO_BASE = `http://${METRO_HOST}:${METRO_PORT}`
|
||||||
|
const METRO_WS_BASE = `ws://${METRO_HOST}:${METRO_PORT}`
|
||||||
|
|
||||||
function forwardHeaders(headers: Headers): Headers {
|
function forwardHeaders(headers: Headers): Headers {
|
||||||
const result = new Headers(headers)
|
const result = new Headers(headers)
|
||||||
result.delete("origin")
|
result.delete("origin")
|
||||||
result.delete("referer")
|
result.delete("referer")
|
||||||
result.set("host", `127.0.0.1:${METRO_PORT}`)
|
result.set("host", `${METRO_HOST}:${METRO_PORT}`)
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +42,7 @@ Bun.serve<WsData>({
|
|||||||
|
|
||||||
// WebSocket upgrade — bridge to Metro's ws endpoint
|
// WebSocket upgrade — bridge to Metro's ws endpoint
|
||||||
if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
|
if (req.headers.get("upgrade")?.toLowerCase() === "websocket") {
|
||||||
const wsUrl = `ws://127.0.0.1:${METRO_PORT}${url.pathname}${url.search}`
|
const wsUrl = `${METRO_WS_BASE}${url.pathname}${url.search}`
|
||||||
const upstream = new WebSocket(wsUrl)
|
const upstream = new WebSocket(wsUrl)
|
||||||
|
|
||||||
// Wait for upstream to connect before upgrading the client
|
// Wait for upstream to connect before upgrading the client
|
||||||
@@ -65,12 +67,12 @@ Bun.serve<WsData>({
|
|||||||
// HTTP proxy
|
// HTTP proxy
|
||||||
const upstream = `${METRO_BASE}${url.pathname}${url.search}`
|
const upstream = `${METRO_BASE}${url.pathname}${url.search}`
|
||||||
const body = req.body ? await req.arrayBuffer() : undefined
|
const body = req.body ? await req.arrayBuffer() : undefined
|
||||||
const res = await fetch(upstream, {
|
const res = await fetchUpstream(upstream, req.method, forwardHeaders(req.headers), body)
|
||||||
method: req.method,
|
if (res == null) {
|
||||||
headers: forwardHeaders(req.headers),
|
return new Response(`Metro is not reachable on ${METRO_HOST}. Restart the Expo dev server.`, {
|
||||||
body,
|
status: 502,
|
||||||
redirect: "manual",
|
})
|
||||||
})
|
}
|
||||||
|
|
||||||
return new Response(res.body, {
|
return new Response(res.body, {
|
||||||
status: res.status,
|
status: res.status,
|
||||||
@@ -121,9 +123,7 @@ async function printDebuggerUrl() {
|
|||||||
const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
|
const target = targets.find((t) => t.reactNative?.capabilities?.prefersFuseboxFrontend)
|
||||||
if (!target) return
|
if (!target) return
|
||||||
|
|
||||||
const wsPath = target.webSocketDebuggerUrl
|
const wsPath = getProxyWebSocketPath(target.webSocketDebuggerUrl)
|
||||||
.replace(/^ws:\/\//, "")
|
|
||||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
`\n React Native DevTools:\n ${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsPath)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true\n`,
|
`\n React Native DevTools:\n ${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsPath)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true\n`,
|
||||||
@@ -131,9 +131,28 @@ async function printDebuggerUrl() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
console.log(
|
console.log(
|
||||||
`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to 127.0.0.1:${METRO_PORT}`,
|
`[proxy] listening on ${PROXY_HOST}:${PROXY_PORT}, forwarding to ${METRO_HOST}:${METRO_PORT}`,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
async function fetchUpstream(
|
||||||
|
upstream: string,
|
||||||
|
method: string,
|
||||||
|
headers: Headers,
|
||||||
|
body: ArrayBuffer | undefined,
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
return await fetch(upstream, {
|
||||||
|
method,
|
||||||
|
headers,
|
||||||
|
body,
|
||||||
|
redirect: "manual",
|
||||||
|
})
|
||||||
|
} catch {
|
||||||
|
console.error(`[proxy] ${method} ${upstream} failed; Metro is not reachable`)
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function isDebugTarget(value: unknown): value is DebugTarget {
|
function isDebugTarget(value: unknown): value is DebugTarget {
|
||||||
if (!isRecord(value) || typeof value.webSocketDebuggerUrl !== "string") return false
|
if (!isRecord(value) || typeof value.webSocketDebuggerUrl !== "string") return false
|
||||||
|
|
||||||
@@ -149,6 +168,11 @@ function isDebugTarget(value: unknown): value is DebugTarget {
|
|||||||
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
|
||||||
|
const url = new URL(webSocketDebuggerUrl)
|
||||||
|
return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
|
||||||
|
}
|
||||||
|
|
||||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||||
return typeof value === "object" && value !== null
|
return typeof value === "object" && value !== null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
import { $ } from "bun"
|
import { $ } from "bun"
|
||||||
|
|
||||||
const PROXY_PORT = process.env.PROXY_PORT || "8080"
|
const PROXY_PORT = process.env.PROXY_PORT || "8080"
|
||||||
const METRO_PORT = process.env.METRO_PORT || "8081"
|
|
||||||
const tsIp = (await $`tailscale ip -4`.text()).trim()
|
const tsIp = (await $`tailscale ip -4`.text()).trim()
|
||||||
const base = `http://${tsIp}:${PROXY_PORT}`
|
const base = `http://${tsIp}:${PROXY_PORT}`
|
||||||
|
|
||||||
@@ -37,9 +36,7 @@ if (!target) {
|
|||||||
process.exit(1)
|
process.exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
const wsUrl = target.webSocketDebuggerUrl
|
const wsUrl = getProxyWebSocketPath(target.webSocketDebuggerUrl)
|
||||||
.replace(/^ws:\/\//, "")
|
|
||||||
.replace(`127.0.0.1:${METRO_PORT}`, `${tsIp}:${PROXY_PORT}`)
|
|
||||||
|
|
||||||
const url = `${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsUrl)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true`
|
const url = `${base}/debugger-frontend/rn_fusebox.html?ws=${encodeURIComponent(wsUrl)}&sources.hide_add_folder=true&unstable_enableNetworkPanel=true`
|
||||||
|
|
||||||
@@ -71,6 +68,11 @@ function isDebugTarget(value: unknown): value is DebugTarget {
|
|||||||
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
return prefersFuseboxFrontend === undefined || typeof prefersFuseboxFrontend === "boolean"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getProxyWebSocketPath(webSocketDebuggerUrl: string) {
|
||||||
|
const url = new URL(webSocketDebuggerUrl)
|
||||||
|
return `${tsIp}:${PROXY_PORT}${url.pathname}${url.search}`
|
||||||
|
}
|
||||||
|
|
||||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||||
return typeof value === "object" && value !== null
|
return typeof value === "object" && value !== null
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,47 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
PROXY_PORT=8080
|
PROXY_PORT=${PROXY_PORT:-8080}
|
||||||
METRO_PORT=8081
|
METRO_HOST=${METRO_HOST:-localhost}
|
||||||
|
METRO_PORT=${METRO_PORT:-8081}
|
||||||
TS_IP=$(tailscale ip -4)
|
TS_IP=$(tailscale ip -4)
|
||||||
|
|
||||||
# Start a reverse proxy so Metro sees all requests as loopback.
|
port_is_open() {
|
||||||
# This makes debugger endpoints (/debugger-frontend, /json, /open-debugger)
|
(: >"/dev/tcp/$1/$2") >/dev/null 2>&1
|
||||||
# accessible through the Tailscale IP.
|
}
|
||||||
PROXY_PORT=$PROXY_PORT METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts &
|
|
||||||
|
ensure_port_available() {
|
||||||
|
local port=$1
|
||||||
|
local name=$2
|
||||||
|
|
||||||
|
if port_is_open localhost "$port"; then
|
||||||
|
echo "$name port $port is already in use." >&2
|
||||||
|
echo "Stop the existing process or set ${name}_PORT to another value." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_for_metro() {
|
||||||
|
for _ in {1..120}; do
|
||||||
|
if port_is_open "$METRO_HOST" "$METRO_PORT"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Metro did not start on ${METRO_HOST}:${METRO_PORT}." >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
ensure_port_available "$PROXY_PORT" PROXY
|
||||||
|
ensure_port_available "$METRO_PORT" METRO
|
||||||
|
|
||||||
|
# Start the proxy only after Metro is listening. Otherwise an iOS client can hit
|
||||||
|
# the proxy during Expo startup and get a misleading upstream connection error.
|
||||||
|
(
|
||||||
|
wait_for_metro
|
||||||
|
exec env PROXY_PORT=$PROXY_PORT METRO_HOST=$METRO_HOST METRO_PORT=$METRO_PORT bun run scripts/dev-proxy.ts
|
||||||
|
) &
|
||||||
PROXY_PID=$!
|
PROXY_PID=$!
|
||||||
trap "kill $PROXY_PID 2>/dev/null" EXIT
|
trap "kill $PROXY_PID 2>/dev/null" EXIT
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import Feather from "@expo/vector-icons/Feather"
|
import Feather from "@expo/vector-icons/Feather"
|
||||||
import { type PressableProps, Pressable, View } from "react-native"
|
import { type PressableProps, Pressable, type StyleProp, View, type ViewStyle } from "react-native"
|
||||||
import tw from "twrnc"
|
import tw from "twrnc"
|
||||||
|
|
||||||
import { SansSerifText } from "./sans-serif-text"
|
import { SansSerifText } from "./sans-serif-text"
|
||||||
@@ -14,9 +14,10 @@ function ButtonIcon({ name }: ButtonIconProps) {
|
|||||||
return <Feather name={name} size={18} color={tw.color("text-stone-100 dark:text-stone-200")} />
|
return <Feather name={name} size={18} color={tw.color("text-stone-100 dark:text-stone-200")} />
|
||||||
}
|
}
|
||||||
|
|
||||||
type ButtonProps = Omit<PressableProps, "children"> & {
|
type ButtonProps = Omit<PressableProps, "children" | "style"> & {
|
||||||
label: string
|
label: string
|
||||||
leadingIcon?: React.ReactNode
|
leadingIcon?: React.ReactNode
|
||||||
|
style?: StyleProp<ViewStyle>
|
||||||
trailingIcon?: React.ReactNode
|
trailingIcon?: React.ReactNode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,9 +16,9 @@
|
|||||||
"lottie-react": "^2.4.1",
|
"lottie-react": "^2.4.1",
|
||||||
"lucide-react": "^0.577.0",
|
"lucide-react": "^0.577.0",
|
||||||
"motion": "^12.35.0",
|
"motion": "^12.35.0",
|
||||||
"react": "^19.2.4",
|
"react": "19.2.3",
|
||||||
"react-aria-components": "^1.16.0",
|
"react-aria-components": "^1.16.0",
|
||||||
"react-dom": "^19.2.4",
|
"react-dom": "19.2.3",
|
||||||
"react-router": "7.12.0",
|
"react-router": "7.12.0",
|
||||||
"resend": "^6.9.3",
|
"resend": "^6.9.3",
|
||||||
"streamdown": "^2.4.0"
|
"streamdown": "^2.4.0"
|
||||||
|
|||||||
2
bunfig.toml
Normal file
2
bunfig.toml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[install]
|
||||||
|
linker = "hoisted"
|
||||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781577229,
|
||||||
|
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
286
flake.nix
Normal file
286
flake.nix
Normal file
@@ -0,0 +1,286 @@
|
|||||||
|
{
|
||||||
|
description = "FREYA development shell";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
{ nixpkgs, ... }:
|
||||||
|
let
|
||||||
|
systems = [
|
||||||
|
"x86_64-linux"
|
||||||
|
"aarch64-linux"
|
||||||
|
"x86_64-darwin"
|
||||||
|
"aarch64-darwin"
|
||||||
|
];
|
||||||
|
|
||||||
|
lib = nixpkgs.lib;
|
||||||
|
forEachSystem = lib.genAttrs systems;
|
||||||
|
pkgsFor = forEachSystem (system: import nixpkgs { inherit system; });
|
||||||
|
|
||||||
|
# App outputs are for long-running local tools and dev servers.
|
||||||
|
appScripts = {
|
||||||
|
expo = "expo";
|
||||||
|
drizzle-studio = "drizzle-studio";
|
||||||
|
freya-backend = "freya-backend";
|
||||||
|
admin-dashboard = "admin-dashboard";
|
||||||
|
agent-test-cli = "agent-test-cli";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Check outputs are the CI-like validation commands run by `nix flake check`.
|
||||||
|
checkCommands = {
|
||||||
|
format-check = "bun run format:check";
|
||||||
|
lint = "bun run lint";
|
||||||
|
test = "bun run test";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Dev-shell conveniences mirror the common app/check commands.
|
||||||
|
shellScripts = appScripts // {
|
||||||
|
freya-test = "test";
|
||||||
|
lint = "lint";
|
||||||
|
format-check = "format:check";
|
||||||
|
};
|
||||||
|
|
||||||
|
# node_modules is content-addressed. If bun.lock or package manifests
|
||||||
|
# change, Nix will report the new hash to put here.
|
||||||
|
nodeModulesHashes = {
|
||||||
|
x86_64-linux = "sha256-8uhlaQAFfCgGdUlrz8sqhtIkC/WfdasbTCi3p/NkU/w=";
|
||||||
|
};
|
||||||
|
checkSystems = lib.attrNames nodeModulesHashes;
|
||||||
|
|
||||||
|
# Dependency derivations only need the lockfile and workspace manifests,
|
||||||
|
# so source-only edits do not force Bun to reinstall.
|
||||||
|
dependencySource = lib.fileset.toSource {
|
||||||
|
root = ./.;
|
||||||
|
fileset = lib.fileset.fileFilter
|
||||||
|
(
|
||||||
|
file: file.name == "bun.lock" || file.name == "package.json" || file.name == "bunfig.toml"
|
||||||
|
) ./.;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Checks run against a clean source tree, even when using `path:.`.
|
||||||
|
# Without this filter, local node_modules can sneak into the Nix sandbox.
|
||||||
|
projectSource = builtins.path {
|
||||||
|
name = "freya-source";
|
||||||
|
path = ./.;
|
||||||
|
filter =
|
||||||
|
path: type:
|
||||||
|
let
|
||||||
|
name = builtins.baseNameOf path;
|
||||||
|
in
|
||||||
|
!(type == "directory" && (name == ".git" || name == "node_modules")) && name != "result";
|
||||||
|
};
|
||||||
|
|
||||||
|
mkBunScriptCommands =
|
||||||
|
pkgs: scripts:
|
||||||
|
let
|
||||||
|
mkBunScript =
|
||||||
|
name: script:
|
||||||
|
pkgs.writeShellApplication {
|
||||||
|
inherit name;
|
||||||
|
runtimeInputs = with pkgs; [
|
||||||
|
bun
|
||||||
|
git
|
||||||
|
];
|
||||||
|
text = ''
|
||||||
|
repo_root="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
|
||||||
|
cd "$repo_root"
|
||||||
|
exec bun run ${lib.escapeShellArg script} "$@"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
lib.mapAttrs mkBunScript scripts;
|
||||||
|
mkBunApps =
|
||||||
|
commands:
|
||||||
|
lib.mapAttrs
|
||||||
|
(name: command: {
|
||||||
|
type = "app";
|
||||||
|
program = "${command}/bin/${name}";
|
||||||
|
})
|
||||||
|
commands;
|
||||||
|
mkBunNodeModules =
|
||||||
|
system: pkgs:
|
||||||
|
pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
pname = "freya-node-modules";
|
||||||
|
version = "1";
|
||||||
|
__structuredAttrs = true;
|
||||||
|
|
||||||
|
src = dependencySource;
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
bun
|
||||||
|
cacert
|
||||||
|
nodejs
|
||||||
|
];
|
||||||
|
|
||||||
|
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
GIT_SSL_CAINFO = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
|
||||||
|
outputHashAlgo = "sha256";
|
||||||
|
outputHashMode = "recursive";
|
||||||
|
outputHash = nodeModulesHashes.${system};
|
||||||
|
|
||||||
|
# `patchShebangs` embeds Nix store interpreters in package bins. The
|
||||||
|
# check derivations also depend on bun/node, so this dependency blob
|
||||||
|
# can safely drop those references after its hash is verified.
|
||||||
|
unsafeDiscardReferences.out = true;
|
||||||
|
|
||||||
|
dontConfigure = true;
|
||||||
|
# Workspace package links are completed inside each check's source tree,
|
||||||
|
# so they are intentionally dangling in this dependency-only output.
|
||||||
|
dontFixup = true;
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
export HOME="$TMPDIR/home"
|
||||||
|
mkdir -p "$HOME"
|
||||||
|
|
||||||
|
# Keep the real workspace manifest for `--frozen-lockfile`, but
|
||||||
|
# filter out frontend workspaces that do not participate in checks.
|
||||||
|
# `--force` matters in the Nix sandbox: without it, Bun can accept
|
||||||
|
# manifest-only cached packages and leave tool binaries missing.
|
||||||
|
bun install \
|
||||||
|
--force \
|
||||||
|
--frozen-lockfile \
|
||||||
|
--ignore-scripts \
|
||||||
|
--backend copyfile \
|
||||||
|
--filter freya \
|
||||||
|
--filter '@freya/*' \
|
||||||
|
--filter '@freya/backend' \
|
||||||
|
--no-progress
|
||||||
|
|
||||||
|
patchShebangs node_modules
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p "$out"
|
||||||
|
|
||||||
|
# Keep the root install in the store; checks symlink this directly.
|
||||||
|
cp -a node_modules "$out/node_modules"
|
||||||
|
|
||||||
|
# Bun also creates per-workspace node_modules directories. These are
|
||||||
|
# mostly relative symlinks, so checks copy the symlink entries into
|
||||||
|
# their writable source tree instead of symlinking the directory.
|
||||||
|
find apps packages -mindepth 2 -maxdepth 2 -type d -name node_modules -print |
|
||||||
|
while IFS= read -r node_modules_dir; do
|
||||||
|
mkdir -p "$out/$(dirname "$node_modules_dir")"
|
||||||
|
cp -a "$node_modules_dir" "$out/$node_modules_dir"
|
||||||
|
done
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
mkBunCheck =
|
||||||
|
pkgs: nodeModules: name: command:
|
||||||
|
pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
pname = "freya-${name}";
|
||||||
|
version = "1";
|
||||||
|
|
||||||
|
src = projectSource;
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
bun
|
||||||
|
nodejs
|
||||||
|
];
|
||||||
|
|
||||||
|
dontConfigure = true;
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
runHook preBuild
|
||||||
|
|
||||||
|
export HOME="$TMPDIR/home"
|
||||||
|
mkdir -p "$HOME"
|
||||||
|
|
||||||
|
# Root dependencies are read-only and shared across checks.
|
||||||
|
ln -s "${nodeModules}/node_modules" node_modules
|
||||||
|
|
||||||
|
# Workspace node_modules contain relative symlinks back to packages/
|
||||||
|
# and apps/, so copy just those symlink entries into this source tree.
|
||||||
|
for node_modules_dir in "${nodeModules}"/apps/*/node_modules "${nodeModules}"/packages/*/node_modules; do
|
||||||
|
if [ -d "$node_modules_dir" ]; then
|
||||||
|
relative_path="''${node_modules_dir#"${nodeModules}/"}"
|
||||||
|
mkdir -p "$relative_path"
|
||||||
|
cp -a "$node_modules_dir/." "$relative_path/"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
${command}
|
||||||
|
|
||||||
|
runHook postBuild
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
|
mkdir -p "$out"
|
||||||
|
touch "$out/${name}"
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
apps = forEachSystem (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = pkgsFor.${system};
|
||||||
|
in
|
||||||
|
mkBunApps (mkBunScriptCommands pkgs appScripts)
|
||||||
|
);
|
||||||
|
|
||||||
|
checks = lib.genAttrs checkSystems (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = pkgsFor.${system};
|
||||||
|
nodeModules = mkBunNodeModules system pkgs;
|
||||||
|
in
|
||||||
|
lib.mapAttrs (mkBunCheck pkgs nodeModules) checkCommands
|
||||||
|
);
|
||||||
|
|
||||||
|
devShells = forEachSystem (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
pkgs = pkgsFor.${system};
|
||||||
|
bunScriptCommands = lib.attrValues (mkBunScriptCommands pkgs shellScripts);
|
||||||
|
commonPackages = with pkgs; [
|
||||||
|
bun
|
||||||
|
eas-cli
|
||||||
|
git
|
||||||
|
gh
|
||||||
|
gnumake
|
||||||
|
nixfmt
|
||||||
|
nodejs
|
||||||
|
openssl
|
||||||
|
pkg-config
|
||||||
|
postgresql
|
||||||
|
python3
|
||||||
|
typescript-go
|
||||||
|
watchman
|
||||||
|
];
|
||||||
|
linuxPackages = with pkgs; [
|
||||||
|
gcc
|
||||||
|
inotify-tools
|
||||||
|
tailscale
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
default = pkgs.mkShell {
|
||||||
|
packages =
|
||||||
|
commonPackages ++ bunScriptCommands ++ pkgs.lib.optionals pkgs.stdenv.isLinux linuxPackages;
|
||||||
|
|
||||||
|
SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
|
||||||
|
shellHook = ''
|
||||||
|
export PATH="$PWD/node_modules/.bin:$PATH"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
formatter = forEachSystem (system: pkgsFor.${system}.nixfmt);
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -10,6 +10,7 @@
|
|||||||
"expo": "cd apps/freya-client && bun run start",
|
"expo": "cd apps/freya-client && bun run start",
|
||||||
"drizzle-studio": "TS_IP=$(tailscale ip -4); echo \"Drizzle Studio: https://local.drizzle.studio/?host=${TS_IP}&port=4983\"; cd apps/freya-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983",
|
"drizzle-studio": "TS_IP=$(tailscale ip -4); echo \"Drizzle Studio: https://local.drizzle.studio/?host=${TS_IP}&port=4983\"; cd apps/freya-backend && bunx drizzle-kit studio --host 0.0.0.0 --port 4983",
|
||||||
"freya-backend": "TS_IP=$(tailscale ip -4); echo \"Freya Backend: http://${TS_IP}:3000\"; echo \"\"; echo \"------------------ Bun Debugger ------------------\"; echo \"https://debug.bun.sh/#${TS_IP}:6499\"; echo \"------------------ Bun Debugger ------------------\"; echo \"\"; cd apps/freya-backend && bun run dev",
|
"freya-backend": "TS_IP=$(tailscale ip -4); echo \"Freya Backend: http://${TS_IP}:3000\"; echo \"\"; echo \"------------------ Bun Debugger ------------------\"; echo \"https://debug.bun.sh/#${TS_IP}:6499\"; echo \"------------------ Bun Debugger ------------------\"; echo \"\"; cd apps/freya-backend && bun run dev",
|
||||||
|
"client": "bun run --elide-lines=0 --filter freya-client start",
|
||||||
"admin-dashboard": "TS_IP=$(tailscale ip -4); echo \"Admin Dashboard: http://${TS_IP}:5174\"; cd apps/admin-dashboard && bun run dev --host 0.0.0.0",
|
"admin-dashboard": "TS_IP=$(tailscale ip -4); echo \"Admin Dashboard: http://${TS_IP}:5174\"; cd apps/admin-dashboard && bun run dev --host 0.0.0.0",
|
||||||
"agent-test-cli": "cd apps/agent-test-cli && bun run start",
|
"agent-test-cli": "cd apps/agent-test-cli && bun run start",
|
||||||
"test": "bun run --filter '*' test",
|
"test": "bun run --filter '*' test",
|
||||||
|
|||||||
@@ -8,7 +8,8 @@
|
|||||||
"test": "bun test ."
|
"test": "bun test ."
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@standard-schema/spec": "^1.1.0"
|
"@standard-schema/spec": "^1.1.0",
|
||||||
|
"arktype": "^2.1.29"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@json-render/core": "*",
|
"@json-render/core": "*",
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
ConversationEntryMetadata,
|
ConversationEntryMetadata,
|
||||||
GenericObjectPayload,
|
GenericObjectPayload,
|
||||||
UserMessagePayload,
|
UserMessagePayload,
|
||||||
} from "./types.ts"
|
} from "./conversation"
|
||||||
|
|
||||||
describe("conversation entry schemas", () => {
|
describe("conversation entry schemas", () => {
|
||||||
test("parses valid user message payloads", () => {
|
test("parses valid user message payloads", () => {
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { type } from "arktype"
|
import { type } from "arktype"
|
||||||
|
|
||||||
|
/** Entry kinds supported by the persisted conversation timeline. */
|
||||||
export const ConversationEntryKind = {
|
export const ConversationEntryKind = {
|
||||||
UserMessage: "user_message",
|
UserMessage: "user_message",
|
||||||
AssistantMessage: "assistant_message",
|
AssistantMessage: "assistant_message",
|
||||||
@@ -10,17 +11,21 @@ export const ConversationEntryKind = {
|
|||||||
SystemNote: "system_note",
|
SystemNote: "system_note",
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
|
/** Discriminator for the payload shape and handling of a conversation entry. */
|
||||||
export type ConversationEntryKind =
|
export type ConversationEntryKind =
|
||||||
(typeof ConversationEntryKind)[keyof typeof ConversationEntryKind]
|
(typeof ConversationEntryKind)[keyof typeof ConversationEntryKind]
|
||||||
|
|
||||||
|
/** Visibility scopes supported by stored conversation entries. */
|
||||||
export const ConversationEntryVisibility = {
|
export const ConversationEntryVisibility = {
|
||||||
UserVisible: "user_visible",
|
UserVisible: "user_visible",
|
||||||
Internal: "internal",
|
Internal: "internal",
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
|
/** Indicates whether a conversation entry should be exposed to the user. */
|
||||||
export type ConversationEntryVisibility =
|
export type ConversationEntryVisibility =
|
||||||
(typeof ConversationEntryVisibility)[keyof typeof ConversationEntryVisibility]
|
(typeof ConversationEntryVisibility)[keyof typeof ConversationEntryVisibility]
|
||||||
|
|
||||||
|
/** Attachment media categories accepted by conversation entries. */
|
||||||
export const AttachmentType = {
|
export const AttachmentType = {
|
||||||
Image: "image",
|
Image: "image",
|
||||||
Audio: "audio",
|
Audio: "audio",
|
||||||
@@ -29,57 +34,64 @@ export const AttachmentType = {
|
|||||||
Other: "other",
|
Other: "other",
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
|
/** File or media category associated with an attachment payload. */
|
||||||
export type AttachmentType = (typeof AttachmentType)[keyof typeof AttachmentType]
|
export type AttachmentType = (typeof AttachmentType)[keyof typeof AttachmentType]
|
||||||
|
|
||||||
export const ConversationEntryKindInput = type.enumerated(...Object.values(ConversationEntryKind))
|
/** Plain text content part for a message. */
|
||||||
export const ConversationEntryVisibilityInput = type.enumerated(
|
export const TextMessagePart = type({
|
||||||
...Object.values(ConversationEntryVisibility),
|
|
||||||
)
|
|
||||||
export const AttachmentTypeInput = type.enumerated(...Object.values(AttachmentType))
|
|
||||||
|
|
||||||
const TextMessagePart = type({
|
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
type: "'text'",
|
type: "'text'",
|
||||||
text: "string",
|
text: "string",
|
||||||
})
|
})
|
||||||
|
|
||||||
const JsonMessagePart = type({
|
/** Structured JSON content part for a message. */
|
||||||
|
export const JsonMessagePart = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
type: "'json'",
|
type: "'json'",
|
||||||
value: "unknown",
|
value: "unknown",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Content part variants supported by user and assistant messages. */
|
||||||
export const MessagePart = type.or(TextMessagePart, JsonMessagePart)
|
export const MessagePart = type.or(TextMessagePart, JsonMessagePart)
|
||||||
|
|
||||||
|
/** A structured content part inside a user or assistant message payload. */
|
||||||
export type MessagePart = typeof MessagePart.infer
|
export type MessagePart = typeof MessagePart.infer
|
||||||
|
|
||||||
|
/** User-authored message entry payload. */
|
||||||
export const UserMessagePayload = type({
|
export const UserMessagePayload = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
role: "'user'",
|
role: "'user'",
|
||||||
parts: MessagePart.array().atLeastLength(1),
|
parts: MessagePart.array().atLeastLength(1),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Payload stored for a conversation entry containing a user message. */
|
||||||
export type UserMessagePayload = typeof UserMessagePayload.infer
|
export type UserMessagePayload = typeof UserMessagePayload.infer
|
||||||
|
|
||||||
|
/** Assistant-authored message entry payload. */
|
||||||
export const AssistantMessagePayload = type({
|
export const AssistantMessagePayload = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
role: "'assistant'",
|
role: "'assistant'",
|
||||||
parts: MessagePart.array().atLeastLength(1),
|
parts: MessagePart.array().atLeastLength(1),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Payload stored for a conversation entry containing an assistant message. */
|
||||||
export type AssistantMessagePayload = typeof AssistantMessagePayload.infer
|
export type AssistantMessagePayload = typeof AssistantMessagePayload.infer
|
||||||
|
|
||||||
|
/** Attachment entry payload. */
|
||||||
export const AttachmentPayload = type({
|
export const AttachmentPayload = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
role: type.enumerated("user", "assistant"),
|
role: type.enumerated("user", "assistant"),
|
||||||
name: "string",
|
name: "string",
|
||||||
mimeType: "string",
|
mimeType: "string",
|
||||||
attachmentType: AttachmentTypeInput,
|
attachmentType: type.enumerated(...Object.values(AttachmentType)),
|
||||||
"caption?": "string",
|
"caption?": "string",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Payload stored for a conversation entry that references an uploaded file. */
|
||||||
export type AttachmentPayload = typeof AttachmentPayload.infer
|
export type AttachmentPayload = typeof AttachmentPayload.infer
|
||||||
|
|
||||||
const ContextSummary = type({
|
/** Durable facts extracted from compacted conversation history. */
|
||||||
|
export const ContextSummary = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
"userIntent?": "string",
|
"userIntent?": "string",
|
||||||
durableFacts: type.string.array(),
|
durableFacts: type.string.array(),
|
||||||
@@ -89,6 +101,10 @@ const ContextSummary = type({
|
|||||||
importantDetails: type.string.array(),
|
importantDetails: type.string.array(),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Durable facts and follow-ups retained from compacted conversation history. */
|
||||||
|
export type ContextSummary = typeof ContextSummary.infer
|
||||||
|
|
||||||
|
/** Context-summary conversation entry payload. */
|
||||||
export const ContextSummaryPayload = type({
|
export const ContextSummaryPayload = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
covers: type({
|
covers: type({
|
||||||
@@ -101,8 +117,10 @@ export const ContextSummaryPayload = type({
|
|||||||
"sourceEntryIds?": type.string.array(),
|
"sourceEntryIds?": type.string.array(),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Payload describing a compaction summary and the sequence range it covers. */
|
||||||
export type ContextSummaryPayload = typeof ContextSummaryPayload.infer
|
export type ContextSummaryPayload = typeof ContextSummaryPayload.infer
|
||||||
|
|
||||||
|
/** Model invocation metadata recorded on generated entries. */
|
||||||
export const ModelRunMetadata = type({
|
export const ModelRunMetadata = type({
|
||||||
"+": "reject",
|
"+": "reject",
|
||||||
route: "string",
|
route: "string",
|
||||||
@@ -116,18 +134,25 @@ export const ModelRunMetadata = type({
|
|||||||
"providerRequestId?": "string",
|
"providerRequestId?": "string",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Metadata describing the model run that produced a conversation entry. */
|
||||||
export type ModelRunMetadata = typeof ModelRunMetadata.infer
|
export type ModelRunMetadata = typeof ModelRunMetadata.infer
|
||||||
|
|
||||||
|
/** Arbitrary metadata stored alongside conversation entries. */
|
||||||
export const ConversationEntryMetadata = type({
|
export const ConversationEntryMetadata = type({
|
||||||
"modelRun?": ModelRunMetadata,
|
"modelRun?": ModelRunMetadata,
|
||||||
"[string]": "unknown",
|
"[string]": "unknown",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/** Metadata bag attached to a conversation entry. */
|
||||||
export type ConversationEntryMetadata = typeof ConversationEntryMetadata.infer
|
export type ConversationEntryMetadata = typeof ConversationEntryMetadata.infer
|
||||||
|
|
||||||
|
/** Generic object payload used by operational entries. */
|
||||||
export const GenericObjectPayload = type("Record<string, unknown>")
|
export const GenericObjectPayload = type("Record<string, unknown>")
|
||||||
|
|
||||||
|
/** Fallback payload shape for tool calls, tool results, and system notes. */
|
||||||
export type GenericObjectPayload = typeof GenericObjectPayload.infer
|
export type GenericObjectPayload = typeof GenericObjectPayload.infer
|
||||||
|
|
||||||
|
/** Union of payload shapes that can be stored on a conversation entry. */
|
||||||
export type ConversationEntryPayload =
|
export type ConversationEntryPayload =
|
||||||
| UserMessagePayload
|
| UserMessagePayload
|
||||||
| AssistantMessagePayload
|
| AssistantMessagePayload
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { describe, expect, test } from "bun:test"
|
import { describe, expect, spyOn, test } from "bun:test"
|
||||||
|
|
||||||
import type { ActionDefinition, ContextEntry, ContextKey, FeedItem, FeedSource } from "./index"
|
import type { ActionDefinition, ContextEntry, ContextKey, FeedItem, FeedSource } from "./index"
|
||||||
|
|
||||||
@@ -145,6 +145,16 @@ function createAlertSource(): FeedSource<AlertFeedItem> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function waitForCondition(predicate: () => boolean, timeoutMs = 2_000): Promise<void> {
|
||||||
|
const deadline = Date.now() + timeoutMs
|
||||||
|
while (!predicate()) {
|
||||||
|
if (Date.now() > deadline) {
|
||||||
|
throw new Error("Timed out waiting for condition")
|
||||||
|
}
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
// TESTS
|
// TESTS
|
||||||
// =============================================================================
|
// =============================================================================
|
||||||
@@ -807,28 +817,35 @@ describe("FeedEngine", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("TTL resets after reactive update", async () => {
|
test("TTL resets after reactive update", async () => {
|
||||||
|
let now = 1_000
|
||||||
|
const nowSpy = spyOn(Date, "now").mockImplementation(() => now)
|
||||||
const location = createLocationSource()
|
const location = createLocationSource()
|
||||||
const weather = createWeatherSource()
|
const weather = createWeatherSource()
|
||||||
|
|
||||||
const engine = new FeedEngine({ cacheTtlMs: 100 }).register(location).register(weather)
|
const engine = new FeedEngine({ cacheTtlMs: 100 }).register(location).register(weather)
|
||||||
|
|
||||||
engine.start()
|
try {
|
||||||
|
engine.start()
|
||||||
|
|
||||||
// Initial reactive update
|
// Initial reactive update
|
||||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||||
|
|
||||||
expect(engine.lastFeed()).not.toBeNull()
|
expect(engine.lastFeed()).not.toBeNull()
|
||||||
|
|
||||||
// Wait 70ms (total 120ms from first update, past original TTL)
|
// Move past the original TTL, then trigger another update to reset it.
|
||||||
// but trigger another update at 50ms to reset TTL
|
now += 120
|
||||||
location.simulateUpdate({ lat: 52.0, lng: -0.2 })
|
location.simulateUpdate({ lat: 52.0, lng: -0.2 })
|
||||||
await new Promise((resolve) => setTimeout(resolve, 50))
|
await new Promise((resolve) => setTimeout(resolve, 50))
|
||||||
|
|
||||||
// Should still be cached because TTL was reset by second update
|
// Should still be cached because TTL was reset by second update.
|
||||||
expect(engine.lastFeed()).not.toBeNull()
|
expect(engine.lastFeed()).not.toBeNull()
|
||||||
|
|
||||||
engine.stop()
|
engine.stop()
|
||||||
|
} finally {
|
||||||
|
engine.stop()
|
||||||
|
nowSpy.mockRestore()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
test("cacheTtlMs is configurable", async () => {
|
test("cacheTtlMs is configurable", async () => {
|
||||||
@@ -869,17 +886,21 @@ describe("FeedEngine", () => {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
const engine = new FeedEngine({ cacheTtlMs: 50 }).register(source)
|
const engine = new FeedEngine({ cacheTtlMs: 20 }).register(source)
|
||||||
engine.start()
|
await engine.refresh()
|
||||||
|
|
||||||
// Wait for two TTL intervals to elapse
|
expect(fetchCount).toBe(1)
|
||||||
await new Promise((resolve) => setTimeout(resolve, 120))
|
|
||||||
|
|
||||||
// Should have auto-refreshed at least twice
|
try {
|
||||||
expect(fetchCount).toBeGreaterThanOrEqual(2)
|
engine.start()
|
||||||
expect(engine.lastFeed()).not.toBeNull()
|
|
||||||
|
|
||||||
engine.stop()
|
await waitForCondition(() => fetchCount >= 2)
|
||||||
|
|
||||||
|
expect(fetchCount).toBeGreaterThanOrEqual(2)
|
||||||
|
expect(engine.lastFeed()).not.toBeNull()
|
||||||
|
} finally {
|
||||||
|
engine.stop()
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
test("stop cancels periodic refresh", async () => {
|
test("stop cancels periodic refresh", async () => {
|
||||||
@@ -935,28 +956,25 @@ describe("FeedEngine", () => {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
const engine = new FeedEngine({ cacheTtlMs: 100 })
|
const engine = new FeedEngine({ cacheTtlMs: 10_000 })
|
||||||
.register(location)
|
.register(location)
|
||||||
.register(countingWeather)
|
.register(countingWeather)
|
||||||
|
const clearTimeoutSpy = spyOn(globalThis, "clearTimeout")
|
||||||
|
|
||||||
engine.start()
|
try {
|
||||||
|
engine.start()
|
||||||
|
|
||||||
// At 40ms, push a reactive update — this resets the timer
|
const countBeforeUpdate = fetchCount
|
||||||
await new Promise((resolve) => setTimeout(resolve, 40))
|
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
||||||
const countBeforeUpdate = fetchCount
|
await waitForCondition(() => fetchCount > countBeforeUpdate && engine.lastFeed() !== null)
|
||||||
location.simulateUpdate({ lat: 51.5, lng: -0.1 })
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 20))
|
|
||||||
|
|
||||||
// Reactive update triggered a fetch
|
// Reactive updates refresh the cache and reset the pending periodic timer.
|
||||||
expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
|
expect(fetchCount).toBeGreaterThan(countBeforeUpdate)
|
||||||
const countAfterUpdate = fetchCount
|
expect(clearTimeoutSpy).toHaveBeenCalled()
|
||||||
|
} finally {
|
||||||
// At 100ms from start (60ms after reactive update), the original
|
engine.stop()
|
||||||
// timer would have fired, but it was reset. No extra fetch yet.
|
clearTimeoutSpy.mockRestore()
|
||||||
await new Promise((resolve) => setTimeout(resolve, 40))
|
}
|
||||||
expect(fetchCount).toBe(countAfterUpdate)
|
|
||||||
|
|
||||||
engine.stop()
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,25 @@ export { Context, contextKey, serializeKey } from "./context"
|
|||||||
export type { ActionDefinition } from "./action"
|
export type { ActionDefinition } from "./action"
|
||||||
export { UnknownActionError } from "./action"
|
export { UnknownActionError } from "./action"
|
||||||
|
|
||||||
|
// Conversation
|
||||||
|
export type { ConversationEntryPayload } from "./conversation"
|
||||||
|
export {
|
||||||
|
AssistantMessagePayload,
|
||||||
|
AttachmentPayload,
|
||||||
|
AttachmentType,
|
||||||
|
ContextSummary,
|
||||||
|
ContextSummaryPayload,
|
||||||
|
ConversationEntryKind,
|
||||||
|
ConversationEntryMetadata,
|
||||||
|
ConversationEntryVisibility,
|
||||||
|
GenericObjectPayload,
|
||||||
|
JsonMessagePart,
|
||||||
|
MessagePart,
|
||||||
|
ModelRunMetadata,
|
||||||
|
TextMessagePart,
|
||||||
|
UserMessagePayload,
|
||||||
|
} from "./conversation"
|
||||||
|
|
||||||
// Feed
|
// Feed
|
||||||
export type { FeedItem, FeedItemRenderer, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
|
export type { FeedItem, FeedItemRenderer, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
|
||||||
export { TimeRelevance } from "./feed"
|
export { TimeRelevance } from "./feed"
|
||||||
|
|||||||
11
skills-lock.json
Normal file
11
skills-lock.json
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"skills": {
|
||||||
|
"upgrading-expo": {
|
||||||
|
"source": "expo/skills",
|
||||||
|
"sourceType": "github",
|
||||||
|
"skillPath": "plugins/expo/skills/upgrading-expo/SKILL.md",
|
||||||
|
"computedHash": "98d228925a442126789d90783fdd4ae5de33ab690024b575698057d2ffc44b40"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user