mirror of
https://github.com/kennethnym/freya
synced 2026-06-20 16:41:18 +01:00
Compare commits
1 Commits
feat/upgra
...
fix/expo-5
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc91a048c9
|
@@ -1,134 +0,0 @@
|
||||
---
|
||||
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.
|
||||
@@ -1,4 +0,0 @@
|
||||
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."
|
||||
@@ -1,132 +0,0 @@
|
||||
# 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/
|
||||
@@ -1,160 +0,0 @@
|
||||
# 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/
|
||||
@@ -1,124 +0,0 @@
|
||||
# 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/
|
||||
@@ -1,79 +0,0 @@
|
||||
# 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
|
||||
@@ -1,79 +0,0 @@
|
||||
# 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
|
||||
@@ -1,59 +0,0 @@
|
||||
# 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.
|
||||
@@ -1,61 +0,0 @@
|
||||
# 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
|
||||
@@ -1,4 +1,3 @@
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||
@@ -7,6 +6,7 @@ import type {
|
||||
ConversationStorageEntry,
|
||||
} from "./conversation-recording-query-agent.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { ConversationRecordingQueryAgent } from "./conversation-recording-query-agent.ts"
|
||||
import {
|
||||
createQueryAgentEventListeners,
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import type { ConversationEntryMetadata } from "@freya/core"
|
||||
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { randomUUID } from "node:crypto"
|
||||
|
||||
import type {
|
||||
AppendConversationEntryInput,
|
||||
ConversationEntryRow,
|
||||
} from "../conversations/storage.ts"
|
||||
import type { ConversationEntryMetadata } from "../conversations/types.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import {
|
||||
createQueryAgentEventListeners,
|
||||
QueryAgentEvent,
|
||||
@@ -20,7 +19,6 @@ import {
|
||||
type QueryAgentStreamEvent,
|
||||
} from "./query-agent.ts"
|
||||
|
||||
/** Storage operations used to persist and replay query-agent conversation entries. */
|
||||
export interface ConversationStorage {
|
||||
getOrCreateConversation(): Promise<{ id: string }>
|
||||
appendEntry(
|
||||
@@ -30,13 +28,11 @@ export interface ConversationStorage {
|
||||
listEntries(conversationId: string): Promise<ConversationStorageEntry[]>
|
||||
}
|
||||
|
||||
/** Minimal persisted entry shape needed by recording and replay agents. */
|
||||
export type ConversationStorageEntry = Pick<
|
||||
ConversationEntryRow,
|
||||
"id" | "sequence" | "kind" | "payload" | "metadata" | "createdAt"
|
||||
>
|
||||
|
||||
/** Configuration for wrapping a QueryAgent with conversation recording. */
|
||||
export interface ConversationRecordingQueryAgentConfig {
|
||||
agent: QueryAgent
|
||||
storage: ConversationStorage
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
||||
|
||||
import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||
import type { QueryAgentStreamEvent } from "./query-agent.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { QueryAgentEvent } from "./query-agent.ts"
|
||||
|
||||
interface FakePiSession {
|
||||
|
||||
@@ -33,25 +33,13 @@ import {
|
||||
import { createSessionManager } from "./session-manager.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"]
|
||||
|
||||
/** Pi event emitted when a message finishes. */
|
||||
type PiMessageEndEvent = Extract<AgentSessionEvent, { type: "message_end" }>
|
||||
|
||||
/** Message payload carried by Pi's message-end event. */
|
||||
type PiAgentMessage = PiMessageEndEvent["message"]
|
||||
|
||||
/** Pi event emitted when an agent run finishes. */
|
||||
type PiAgentEndEvent = Extract<AgentSessionEvent, { type: "agent_end" }>
|
||||
|
||||
/** Session manager created for Pi conversation replay. */
|
||||
type PiSessionManager = ReturnType<typeof createSessionManager>
|
||||
|
||||
/** Message shape accepted by the replay session manager. */
|
||||
type PiSessionMessage = Parameters<PiSessionManager["appendMessage"]>[0]
|
||||
|
||||
/** Configuration for the Pi-backed query agent. */
|
||||
export interface PiQueryAgentConfig {
|
||||
toolbox: QueryAgentToolbox
|
||||
apiKey?: string
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { createSessionManager } from "./session-manager.ts"
|
||||
|
||||
describe("createSessionManager", () => {
|
||||
|
||||
@@ -1,21 +1,18 @@
|
||||
import { SessionManager } from "@earendil-works/pi-coding-agent"
|
||||
import { tmpdir } from "node:os"
|
||||
|
||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||
|
||||
import {
|
||||
AssistantMessagePayload,
|
||||
ContextSummaryPayload,
|
||||
ConversationEntryKind,
|
||||
UserMessagePayload,
|
||||
} from "@freya/core"
|
||||
import { tmpdir } from "node:os"
|
||||
} from "../conversations/types.ts"
|
||||
|
||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||
|
||||
/** Message shape accepted by Pi's SessionManager.appendMessage API. */
|
||||
type PiMessage = Parameters<SessionManager["appendMessage"]>[0]
|
||||
|
||||
/** Assistant message variant required when replaying stored assistant entries. */
|
||||
type PiAssistantMessage = Extract<PiMessage, { role: "assistant" }>
|
||||
|
||||
/** Inputs required to rebuild a Pi session manager from stored conversation entries. */
|
||||
export interface CreateSessionManagerInput {
|
||||
cwd?: string
|
||||
entries: ConversationStorageEntry[]
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
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,55 +1,21 @@
|
||||
import { ConversationEntryKind, ConversationEntryVisibility } from "@freya/core"
|
||||
import { beforeEach, describe, expect, mock, test } from "bun:test"
|
||||
import { Hono } from "hono"
|
||||
|
||||
import type { Database } from "../db/index.ts"
|
||||
import type {
|
||||
ConversationEntryRow,
|
||||
ConversationRow,
|
||||
ListConversationEntriesParams,
|
||||
} from "./storage.ts"
|
||||
import type { ConversationRow } from "./storage.ts"
|
||||
|
||||
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||
import { ConversationNotFoundError } from "./errors.ts"
|
||||
import { registerConversationsHttpHandlers } from "./http.ts"
|
||||
|
||||
const MockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
||||
const ConversationId = "11111111-1111-4111-8111-111111111111"
|
||||
const MissingConversationId = "22222222-2222-4222-8222-222222222222"
|
||||
|
||||
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", () => ({
|
||||
conversations: (_db: Database, userId: string) => ({
|
||||
async listConversations(): Promise<ConversationRow[]> {
|
||||
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
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
@@ -78,39 +44,9 @@ 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", () => {
|
||||
beforeEach(() => {
|
||||
conversationRowsByUser.clear()
|
||||
conversationEntryRowsByUserAndConversation.clear()
|
||||
listEntriesCalls.length = 0
|
||||
})
|
||||
|
||||
test("returns 401 without auth", async () => {
|
||||
@@ -172,162 +108,3 @@ 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,38 +1,23 @@
|
||||
import type { Context, Hono } from "hono"
|
||||
|
||||
import { ConversationEntryVisibility } from "@freya/core"
|
||||
import { type } from "arktype"
|
||||
import { createMiddleware } from "hono/factory"
|
||||
|
||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||
import type { Database } from "../db/index.ts"
|
||||
import type { ConversationRow } from "./storage.ts"
|
||||
|
||||
import { ConversationNotFoundError } from "./errors.ts"
|
||||
import { conversations } from "./storage.ts"
|
||||
|
||||
/** Hono environment populated by the conversations route middleware. */
|
||||
type Env = {
|
||||
Variables: {
|
||||
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 {
|
||||
db: Database
|
||||
authSessionMiddleware: AuthSessionMiddleware
|
||||
}
|
||||
|
||||
const ConversationIdParam = type("string.uuid")
|
||||
|
||||
export function registerConversationsHttpHandlers(
|
||||
app: Hono,
|
||||
{ db, authSessionMiddleware }: ConversationsHttpHandlersDeps,
|
||||
@@ -43,7 +28,6 @@ export function registerConversationsHttpHandlers(
|
||||
})
|
||||
|
||||
app.get("/api/conversations", inject, authSessionMiddleware, handleListConversations)
|
||||
app.get("/api/conversations/:id/entries", inject, authSessionMiddleware, handleListEntries)
|
||||
}
|
||||
|
||||
async function handleListConversations(c: Context<Env>) {
|
||||
@@ -51,54 +35,10 @@ async function handleListConversations(c: Context<Env>) {
|
||||
const db = c.get("db")
|
||||
|
||||
return c.json({
|
||||
conversations: (await conversations(db, user.id).listConversations()).map(
|
||||
serializeConversation,
|
||||
),
|
||||
conversations: (await conversations(db, user.id).listConversations()).map((row) => ({
|
||||
id: row.id,
|
||||
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,18 +1,17 @@
|
||||
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 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 {
|
||||
conversationEntries,
|
||||
@@ -20,21 +19,23 @@ import {
|
||||
files,
|
||||
user,
|
||||
} from "../db/schema.ts"
|
||||
import { ConversationNotFoundError } from "./errors.ts"
|
||||
import {
|
||||
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
|
||||
|
||||
/** Database row shape for an entry in a conversation timeline. */
|
||||
export type ConversationEntryRow = typeof conversationEntries.$inferSelect
|
||||
|
||||
/** Database row shape for an uploaded file referenced by conversations. */
|
||||
export type FileRow = typeof files.$inferSelect
|
||||
|
||||
/** Input required to create a stored file record. */
|
||||
export interface CreateFileInput {
|
||||
storageKey: string
|
||||
originalName?: string
|
||||
@@ -43,27 +44,23 @@ export interface CreateFileInput {
|
||||
metadata?: Record<string, unknown>
|
||||
}
|
||||
|
||||
/** Input for creating a file and appending its attachment entry together. */
|
||||
export interface AppendAttachmentEntryInput {
|
||||
file: CreateFileInput
|
||||
payload: AttachmentPayload
|
||||
visibility?: ConversationEntryVisibility
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
metadata?: ConversationEntryMetadata
|
||||
}
|
||||
|
||||
/** Result returned after a file-backed attachment entry is appended. */
|
||||
export interface AppendAttachmentEntryResult {
|
||||
file: FileRow
|
||||
entry: ConversationEntryRow
|
||||
}
|
||||
|
||||
/** Common fields accepted when appending any conversation entry. */
|
||||
interface AppendConversationEntryBase {
|
||||
visibility?: ConversationEntryVisibility
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
metadata?: ConversationEntryMetadata
|
||||
}
|
||||
|
||||
/** Discriminated input for appending any supported entry kind to a conversation. */
|
||||
export type AppendConversationEntryInput =
|
||||
| (AppendConversationEntryBase & {
|
||||
kind: typeof ConversationEntryKind.UserMessage
|
||||
@@ -94,13 +91,12 @@ export type AppendConversationEntryInput =
|
||||
fileId?: never
|
||||
})
|
||||
|
||||
/** Filters accepted when listing conversation entries. */
|
||||
export interface ListConversationEntriesParams {
|
||||
visibility?: ConversationEntryVisibility
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
}
|
||||
|
||||
export function conversations(db: Database, userId: string) {
|
||||
const storage = {
|
||||
return {
|
||||
async createConversation(): Promise<ConversationRow> {
|
||||
return insertConversation(db, userId)
|
||||
},
|
||||
@@ -113,18 +109,6 @@ export function conversations(db: Database, userId: string) {
|
||||
.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> {
|
||||
return db.transaction(async (tx) => {
|
||||
await requireUserForUpdate(tx, userId)
|
||||
@@ -143,12 +127,12 @@ export function conversations(db: Database, userId: string) {
|
||||
conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationEntryRow> {
|
||||
const kind = conversationEntryKind.assert(input.kind)
|
||||
const visibility = conversationEntryVisibility.assert(
|
||||
const kind = ConversationEntryKindInput.assert(input.kind)
|
||||
const visibility = ConversationEntryVisibilityInput.assert(
|
||||
input.visibility ?? defaultVisibilityForKind(kind),
|
||||
)
|
||||
const payload = payloadForKind(kind, input.payload)
|
||||
const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
|
||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
||||
let fileId: string | null = null
|
||||
|
||||
if (input.kind === ConversationEntryKind.Attachment) {
|
||||
@@ -157,9 +141,7 @@ export function conversations(db: Database, userId: string) {
|
||||
}
|
||||
|
||||
const rows = await db.transaction(async (tx) => {
|
||||
if (!(await findConversationForUpdate(tx, userId, conversationId))) {
|
||||
throw new ConversationNotFoundError(conversationId, userId)
|
||||
}
|
||||
await requireConversationForUpdate(tx, userId, conversationId)
|
||||
const sequence = await nextSequence(tx, conversationId)
|
||||
|
||||
const rows = await tx
|
||||
@@ -186,16 +168,14 @@ export function conversations(db: Database, userId: string) {
|
||||
conversationId: string,
|
||||
input: AppendAttachmentEntryInput,
|
||||
): Promise<AppendAttachmentEntryResult> {
|
||||
const payload = AttachmentPayload.assert(input.payload)
|
||||
const visibility = conversationEntryVisibility.assert(
|
||||
const payload = AttachmentPayloadSchema.assert(input.payload)
|
||||
const visibility = ConversationEntryVisibilityInput.assert(
|
||||
input.visibility ?? defaultVisibilityForKind(ConversationEntryKind.Attachment),
|
||||
)
|
||||
const metadata = ConversationEntryMetadata.assert(input.metadata ?? {})
|
||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
||||
|
||||
return db.transaction(async (tx) => {
|
||||
if (!(await findConversationForUpdate(tx, userId, conversationId))) {
|
||||
throw new ConversationNotFoundError(conversationId, userId)
|
||||
}
|
||||
await requireConversationForUpdate(tx, userId, conversationId)
|
||||
|
||||
const file = await insertFile(tx, userId, input.file)
|
||||
const sequence = await nextSequence(tx, conversationId)
|
||||
@@ -224,9 +204,7 @@ export function conversations(db: Database, userId: string) {
|
||||
conversationId: string,
|
||||
params: ListConversationEntriesParams = {},
|
||||
): Promise<ConversationEntryRow[]> {
|
||||
if (!(await storage.getConversation(conversationId))) {
|
||||
throw new ConversationNotFoundError(conversationId, userId)
|
||||
}
|
||||
await requireConversation(db, userId, conversationId)
|
||||
|
||||
if (params.visibility) {
|
||||
return db
|
||||
@@ -248,27 +226,25 @@ export function conversations(db: Database, userId: string) {
|
||||
.orderBy(asc(conversationEntries.sequence))
|
||||
},
|
||||
}
|
||||
|
||||
return storage
|
||||
}
|
||||
|
||||
function payloadForKind(
|
||||
kind: ConversationEntryKind,
|
||||
kind: ConversationEntryKindType,
|
||||
payload: AppendConversationEntryInput["payload"],
|
||||
): ConversationEntryPayload {
|
||||
switch (kind) {
|
||||
case ConversationEntryKind.UserMessage:
|
||||
return UserMessagePayload.assert(payload)
|
||||
return UserMessagePayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.AssistantMessage:
|
||||
return AssistantMessagePayload.assert(payload)
|
||||
return AssistantMessagePayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.Attachment:
|
||||
return AttachmentPayload.assert(payload)
|
||||
return AttachmentPayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.ContextSummary:
|
||||
return ContextSummaryPayload.assert(payload)
|
||||
return ContextSummaryPayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.ToolCall:
|
||||
case ConversationEntryKind.ToolResult:
|
||||
case ConversationEntryKind.SystemNote:
|
||||
return GenericObjectPayload.assert(payload)
|
||||
return GenericObjectPayloadSchema.assert(payload)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -283,11 +259,25 @@ async function requireUserForUpdate(db: Database, userId: string): Promise<void>
|
||||
requireRow(rows, `User not found: ${userId}`)
|
||||
}
|
||||
|
||||
async function findConversationForUpdate(
|
||||
async function requireConversation(
|
||||
db: Database,
|
||||
userId: string,
|
||||
conversationId: string,
|
||||
): Promise<ConversationRow | null> {
|
||||
): Promise<ConversationRow> {
|
||||
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
|
||||
.select()
|
||||
.from(conversationsTable)
|
||||
@@ -295,7 +285,7 @@ async function findConversationForUpdate(
|
||||
.limit(1)
|
||||
.for("update")
|
||||
|
||||
return rows[0] ?? null
|
||||
return requireRow(rows, `Conversation not found: ${conversationId}`)
|
||||
}
|
||||
|
||||
async function latestConversation(db: Database, userId: string): Promise<ConversationRow | null> {
|
||||
@@ -374,7 +364,9 @@ function requireRow<T>(rows: T[], message = "Expected database row"): T {
|
||||
return row
|
||||
}
|
||||
|
||||
function defaultVisibilityForKind(kind: ConversationEntryKind): ConversationEntryVisibility {
|
||||
function defaultVisibilityForKind(
|
||||
kind: ConversationEntryKindType,
|
||||
): ConversationEntryVisibilityType {
|
||||
switch (kind) {
|
||||
case ConversationEntryKind.UserMessage:
|
||||
case ConversationEntryKind.AssistantMessage:
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
ConversationEntryMetadata,
|
||||
GenericObjectPayload,
|
||||
UserMessagePayload,
|
||||
} from "./conversation"
|
||||
} from "./types.ts"
|
||||
|
||||
describe("conversation entry schemas", () => {
|
||||
test("parses valid user message payloads", () => {
|
||||
@@ -1,6 +1,5 @@
|
||||
import { type } from "arktype"
|
||||
|
||||
/** Entry kinds supported by the persisted conversation timeline. */
|
||||
export const ConversationEntryKind = {
|
||||
UserMessage: "user_message",
|
||||
AssistantMessage: "assistant_message",
|
||||
@@ -11,21 +10,17 @@ export const ConversationEntryKind = {
|
||||
SystemNote: "system_note",
|
||||
} as const
|
||||
|
||||
/** Discriminator for the payload shape and handling of a conversation entry. */
|
||||
export type ConversationEntryKind =
|
||||
(typeof ConversationEntryKind)[keyof typeof ConversationEntryKind]
|
||||
|
||||
/** Visibility scopes supported by stored conversation entries. */
|
||||
export const ConversationEntryVisibility = {
|
||||
UserVisible: "user_visible",
|
||||
Internal: "internal",
|
||||
} as const
|
||||
|
||||
/** Indicates whether a conversation entry should be exposed to the user. */
|
||||
export type ConversationEntryVisibility =
|
||||
(typeof ConversationEntryVisibility)[keyof typeof ConversationEntryVisibility]
|
||||
|
||||
/** Attachment media categories accepted by conversation entries. */
|
||||
export const AttachmentType = {
|
||||
Image: "image",
|
||||
Audio: "audio",
|
||||
@@ -34,64 +29,57 @@ export const AttachmentType = {
|
||||
Other: "other",
|
||||
} as const
|
||||
|
||||
/** File or media category associated with an attachment payload. */
|
||||
export type AttachmentType = (typeof AttachmentType)[keyof typeof AttachmentType]
|
||||
|
||||
/** Plain text content part for a message. */
|
||||
export const TextMessagePart = type({
|
||||
export const ConversationEntryKindInput = type.enumerated(...Object.values(ConversationEntryKind))
|
||||
export const ConversationEntryVisibilityInput = type.enumerated(
|
||||
...Object.values(ConversationEntryVisibility),
|
||||
)
|
||||
export const AttachmentTypeInput = type.enumerated(...Object.values(AttachmentType))
|
||||
|
||||
const TextMessagePart = type({
|
||||
"+": "reject",
|
||||
type: "'text'",
|
||||
text: "string",
|
||||
})
|
||||
|
||||
/** Structured JSON content part for a message. */
|
||||
export const JsonMessagePart = type({
|
||||
const JsonMessagePart = type({
|
||||
"+": "reject",
|
||||
type: "'json'",
|
||||
value: "unknown",
|
||||
})
|
||||
|
||||
/** Content part variants supported by user and assistant messages. */
|
||||
export const MessagePart = type.or(TextMessagePart, JsonMessagePart)
|
||||
|
||||
/** A structured content part inside a user or assistant message payload. */
|
||||
export type MessagePart = typeof MessagePart.infer
|
||||
|
||||
/** User-authored message entry payload. */
|
||||
export const UserMessagePayload = type({
|
||||
"+": "reject",
|
||||
role: "'user'",
|
||||
parts: MessagePart.array().atLeastLength(1),
|
||||
})
|
||||
|
||||
/** Payload stored for a conversation entry containing a user message. */
|
||||
export type UserMessagePayload = typeof UserMessagePayload.infer
|
||||
|
||||
/** Assistant-authored message entry payload. */
|
||||
export const AssistantMessagePayload = type({
|
||||
"+": "reject",
|
||||
role: "'assistant'",
|
||||
parts: MessagePart.array().atLeastLength(1),
|
||||
})
|
||||
|
||||
/** Payload stored for a conversation entry containing an assistant message. */
|
||||
export type AssistantMessagePayload = typeof AssistantMessagePayload.infer
|
||||
|
||||
/** Attachment entry payload. */
|
||||
export const AttachmentPayload = type({
|
||||
"+": "reject",
|
||||
role: type.enumerated("user", "assistant"),
|
||||
name: "string",
|
||||
mimeType: "string",
|
||||
attachmentType: type.enumerated(...Object.values(AttachmentType)),
|
||||
attachmentType: AttachmentTypeInput,
|
||||
"caption?": "string",
|
||||
})
|
||||
|
||||
/** Payload stored for a conversation entry that references an uploaded file. */
|
||||
export type AttachmentPayload = typeof AttachmentPayload.infer
|
||||
|
||||
/** Durable facts extracted from compacted conversation history. */
|
||||
export const ContextSummary = type({
|
||||
const ContextSummary = type({
|
||||
"+": "reject",
|
||||
"userIntent?": "string",
|
||||
durableFacts: type.string.array(),
|
||||
@@ -101,10 +89,6 @@ export const ContextSummary = type({
|
||||
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({
|
||||
"+": "reject",
|
||||
covers: type({
|
||||
@@ -117,10 +101,8 @@ export const ContextSummaryPayload = type({
|
||||
"sourceEntryIds?": type.string.array(),
|
||||
})
|
||||
|
||||
/** Payload describing a compaction summary and the sequence range it covers. */
|
||||
export type ContextSummaryPayload = typeof ContextSummaryPayload.infer
|
||||
|
||||
/** Model invocation metadata recorded on generated entries. */
|
||||
export const ModelRunMetadata = type({
|
||||
"+": "reject",
|
||||
route: "string",
|
||||
@@ -134,25 +116,18 @@ export const ModelRunMetadata = type({
|
||||
"providerRequestId?": "string",
|
||||
})
|
||||
|
||||
/** Metadata describing the model run that produced a conversation entry. */
|
||||
export type ModelRunMetadata = typeof ModelRunMetadata.infer
|
||||
|
||||
/** Arbitrary metadata stored alongside conversation entries. */
|
||||
export const ConversationEntryMetadata = type({
|
||||
"modelRun?": ModelRunMetadata,
|
||||
"[string]": "unknown",
|
||||
})
|
||||
|
||||
/** Metadata bag attached to a conversation entry. */
|
||||
export type ConversationEntryMetadata = typeof ConversationEntryMetadata.infer
|
||||
|
||||
/** Generic object payload used by operational entries. */
|
||||
export const GenericObjectPayload = type("Record<string, unknown>")
|
||||
|
||||
/** Fallback payload shape for tool calls, tool results, and system notes. */
|
||||
export type GenericObjectPayload = typeof GenericObjectPayload.infer
|
||||
|
||||
/** Union of payload shapes that can be stored on a conversation entry. */
|
||||
export type ConversationEntryPayload =
|
||||
| UserMessagePayload
|
||||
| AssistantMessagePayload
|
||||
@@ -1,10 +1,3 @@
|
||||
import {
|
||||
ConversationEntryVisibility,
|
||||
type ConversationEntryKind,
|
||||
type ConversationEntryMetadata,
|
||||
type ConversationEntryPayload,
|
||||
type ConversationEntryVisibility as ConversationEntryVisibilityType,
|
||||
} from "@freya/core"
|
||||
import { sql } from "drizzle-orm"
|
||||
import {
|
||||
boolean,
|
||||
@@ -20,6 +13,14 @@ import {
|
||||
uuid,
|
||||
} 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
|
||||
// Re-exported from CLI-generated schema.
|
||||
|
||||
@@ -11,7 +11,6 @@ import { registerAuthHandlers } from "./auth/http.ts"
|
||||
import { createAuth } from "./auth/index.ts"
|
||||
import { createRequireSession } from "./auth/session-middleware.ts"
|
||||
import { CalDavSourceProvider } from "./caldav/provider.ts"
|
||||
import { registerConversationsHttpHandlers } from "./conversations/http.ts"
|
||||
import { createDatabase } from "./db/index.ts"
|
||||
import { registerFeedHttpHandlers } from "./engine/http.ts"
|
||||
import { createFeedEnhancer } from "./enhancement/enhance-feed.ts"
|
||||
@@ -130,7 +129,6 @@ function main() {
|
||||
sessionManager,
|
||||
authSessionMiddleware,
|
||||
})
|
||||
registerConversationsHttpHandlers(app, { db, authSessionMiddleware })
|
||||
if (isDebugMode) {
|
||||
registerDebugAgentHttpHandlers(app, {
|
||||
authSessionMiddleware,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
||||
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { LocationSource } from "@freya/source-location"
|
||||
import { WeatherSource } from "@freya/source-weatherkit"
|
||||
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
||||
@@ -10,6 +9,7 @@ import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||
import type { Database } from "../db/index.ts"
|
||||
import type { FeedSourceProvider } from "./feed-source-provider.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { CredentialEncryptor } from "../lib/crypto.ts"
|
||||
import {
|
||||
CredentialStorageUnavailableError,
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@freya/core"
|
||||
|
||||
import { ConversationEntryKind } from "@freya/core"
|
||||
import { LocationSource } from "@freya/source-location"
|
||||
import { describe, expect, spyOn, test } from "bun:test"
|
||||
|
||||
@@ -10,6 +9,7 @@ import type {
|
||||
} from "../agent/conversation-recording-query-agent.ts"
|
||||
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { UserSession } from "./user-session.ts"
|
||||
|
||||
function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
||||
|
||||
1
bun.lock
1
bun.lock
@@ -172,7 +172,6 @@
|
||||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"@standard-schema/spec": "^1.1.0",
|
||||
"arktype": "^2.1.29",
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@json-render/core": "*",
|
||||
|
||||
@@ -8,8 +8,7 @@
|
||||
"test": "bun test ."
|
||||
},
|
||||
"dependencies": {
|
||||
"@standard-schema/spec": "^1.1.0",
|
||||
"arktype": "^2.1.29"
|
||||
"@standard-schema/spec": "^1.1.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@json-render/core": "*",
|
||||
|
||||
@@ -6,25 +6,6 @@ export { Context, contextKey, serializeKey } from "./context"
|
||||
export type { ActionDefinition } 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
|
||||
export type { FeedItem, FeedItemRenderer, FeedItemSignals, RenderedFeedItem, Slot } from "./feed"
|
||||
export { TimeRelevance } from "./feed"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"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