mirror of
https://github.com/kennethnym/aris.git
synced 2026-06-16 20:41:18 +01:00
Compare commits
1 Commits
master
...
feat/agent
| Author | SHA1 | Date | |
|---|---|---|---|
49b537b4cc
|
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"name": "@freya/agent-test-cli",
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"format": "oxfmt --write .",
|
||||
"start": "bun run src/agent-test-cli.ts",
|
||||
"typecheck": "bun tsc --noEmit"
|
||||
}
|
||||
}
|
||||
@@ -1,601 +0,0 @@
|
||||
type JsonObject = Record<string, unknown>
|
||||
|
||||
interface AuthUser {
|
||||
id: string
|
||||
name: string
|
||||
email: string
|
||||
image: string | null
|
||||
}
|
||||
|
||||
interface AuthSession {
|
||||
user: AuthUser
|
||||
session: {
|
||||
id: string
|
||||
token: string
|
||||
}
|
||||
}
|
||||
|
||||
interface QueryResponse {
|
||||
message: string
|
||||
}
|
||||
|
||||
interface QueryToolDefinition {
|
||||
name: string
|
||||
label: string
|
||||
description: string
|
||||
parameters: unknown
|
||||
}
|
||||
|
||||
interface QueryToolsResponse {
|
||||
tools: QueryToolDefinition[]
|
||||
}
|
||||
|
||||
interface ResultResponse {
|
||||
result: unknown
|
||||
}
|
||||
|
||||
interface SourceActionsResponse {
|
||||
actions: Record<string, { id: string; description?: string }>
|
||||
}
|
||||
|
||||
interface RequestOptions {
|
||||
method?: "GET" | "POST"
|
||||
body?: unknown
|
||||
}
|
||||
|
||||
class CookieJar {
|
||||
private readonly cookies = new Map<string, string>()
|
||||
|
||||
apply(response: Response): void {
|
||||
for (const header of readSetCookieHeaders(response.headers)) {
|
||||
const cookie = parseCookie(header)
|
||||
if (!cookie) continue
|
||||
this.cookies.set(cookie.name, cookie.value)
|
||||
}
|
||||
}
|
||||
|
||||
header(): string | undefined {
|
||||
if (this.cookies.size === 0) return undefined
|
||||
return [...this.cookies.entries()].map(([name, value]) => `${name}=${value}`).join("; ")
|
||||
}
|
||||
}
|
||||
|
||||
async function main(): Promise<void> {
|
||||
if (wantsHelp()) {
|
||||
printUsage()
|
||||
return
|
||||
}
|
||||
|
||||
printIntro()
|
||||
|
||||
const backendUrl = askRequired(
|
||||
"Backend URL",
|
||||
Bun.env.FREYA_BACKEND_URL ?? "http://localhost:3000",
|
||||
normalizeBackendUrl,
|
||||
)
|
||||
const email = askRequired("Email", Bun.env.FREYA_EMAIL)
|
||||
const password = askRequired("Password", Bun.env.FREYA_PASSWORD, undefined, true)
|
||||
|
||||
const cookies = new CookieJar()
|
||||
|
||||
try {
|
||||
const session = await signIn(backendUrl, cookies, email, password)
|
||||
console.log(`\nSigned in as ${session.user.email}`)
|
||||
await runChatLoop(backendUrl, cookies, session)
|
||||
} catch (err) {
|
||||
console.error(`\n${formatError(err)}`)
|
||||
}
|
||||
}
|
||||
|
||||
async function signIn(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
email: string,
|
||||
password: string,
|
||||
): Promise<AuthSession> {
|
||||
await requestJson(backendUrl, cookies, "/api/auth/sign-in/email", {
|
||||
method: "POST",
|
||||
body: { email, password },
|
||||
})
|
||||
|
||||
const data = await requestJson(backendUrl, cookies, "/api/auth/get-session")
|
||||
if (!isAuthSession(data)) {
|
||||
throw new Error("Sign-in succeeded, but no session was returned")
|
||||
}
|
||||
|
||||
return data
|
||||
}
|
||||
|
||||
async function runChatLoop(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
session: AuthSession,
|
||||
): Promise<void> {
|
||||
printHelp()
|
||||
|
||||
for (;;) {
|
||||
const input = askOptional("you> ")?.trim()
|
||||
if (!input) continue
|
||||
|
||||
if (input === "/quit" || input === "/exit") {
|
||||
console.log("Bye.")
|
||||
return
|
||||
}
|
||||
|
||||
if (input === "/help") {
|
||||
printHelp()
|
||||
continue
|
||||
}
|
||||
|
||||
if (input === "/session") {
|
||||
console.log(`${session.user.name || session.user.email} (${session.user.id})`)
|
||||
continue
|
||||
}
|
||||
|
||||
if (input === "/tools") {
|
||||
await runCliCommand(() => listQueryTools(backendUrl, cookies))
|
||||
continue
|
||||
}
|
||||
|
||||
if (input.startsWith("/tool ")) {
|
||||
await runCliCommand(() => executeQueryTool(backendUrl, cookies, input.slice("/tool ".length)))
|
||||
continue
|
||||
}
|
||||
|
||||
if (input.startsWith("/actions ")) {
|
||||
await runCliCommand(() =>
|
||||
listSourceActions(backendUrl, cookies, input.slice("/actions ".length)),
|
||||
)
|
||||
continue
|
||||
}
|
||||
|
||||
if (input.startsWith("/action ")) {
|
||||
await runCliCommand(() =>
|
||||
executeSourceAction(backendUrl, cookies, input.slice("/action ".length)),
|
||||
)
|
||||
continue
|
||||
}
|
||||
|
||||
try {
|
||||
await askAgent(backendUrl, cookies, input)
|
||||
} catch (err) {
|
||||
console.error(`\n${formatError(err)}\n`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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> {
|
||||
try {
|
||||
await command()
|
||||
} catch (err) {
|
||||
console.error(`\n${formatError(err)}\n`)
|
||||
}
|
||||
}
|
||||
|
||||
async function listQueryTools(backendUrl: string, cookies: CookieJar): Promise<void> {
|
||||
const data = await requestJson(backendUrl, cookies, "/api/agent/tools")
|
||||
if (!isQueryToolsResponse(data)) {
|
||||
throw new Error("Agent tools returned an unexpected response shape")
|
||||
}
|
||||
|
||||
console.log("")
|
||||
for (const tool of data.tools) {
|
||||
console.log(`${tool.name} - ${tool.label}`)
|
||||
console.log(` ${tool.description}`)
|
||||
console.log(` params=${formatJson(tool.parameters)}`)
|
||||
}
|
||||
console.log("")
|
||||
}
|
||||
|
||||
async function executeQueryTool(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
command: string,
|
||||
): Promise<void> {
|
||||
const parsed = splitFirst(command.trim())
|
||||
if (!parsed) {
|
||||
throw new Error("Usage: /tool <name> <json-params>; example: /tool freya_list_context {}")
|
||||
}
|
||||
|
||||
const params = parseJsonArgument(parsed.rest, {})
|
||||
const data = await requestJson(backendUrl, cookies, `/api/agent/tools/${urlPart(parsed.head)}`, {
|
||||
method: "POST",
|
||||
body: params,
|
||||
})
|
||||
if (!isResultResponse(data)) {
|
||||
throw new Error("Tool execution returned an unexpected response shape")
|
||||
}
|
||||
|
||||
console.log(`\ntool ${parsed.head}>`)
|
||||
console.log(formatJson(data.result))
|
||||
console.log("")
|
||||
}
|
||||
|
||||
async function listSourceActions(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
command: string,
|
||||
): Promise<void> {
|
||||
const sourceId = command.trim()
|
||||
if (!sourceId) {
|
||||
throw new Error("Usage: /actions <source-id>")
|
||||
}
|
||||
|
||||
const data = await requestJson(backendUrl, cookies, `/api/sources/${urlPart(sourceId)}/actions`)
|
||||
if (!isSourceActionsResponse(data)) {
|
||||
throw new Error("Source actions returned an unexpected response shape")
|
||||
}
|
||||
|
||||
const actions = Object.entries(data.actions)
|
||||
console.log("")
|
||||
if (actions.length === 0) {
|
||||
console.log(`No actions for ${sourceId}.`)
|
||||
} else {
|
||||
for (const [key, action] of actions) {
|
||||
console.log(`${sourceId}/${key}`)
|
||||
console.log(` id=${action.id}`)
|
||||
if (action.description) console.log(` ${action.description}`)
|
||||
}
|
||||
}
|
||||
console.log("")
|
||||
}
|
||||
|
||||
async function executeSourceAction(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
command: string,
|
||||
): Promise<void> {
|
||||
const source = splitFirst(command.trim())
|
||||
if (!source) {
|
||||
throw new Error(
|
||||
'Usage: /action <source-id> <action-id> <json-params>; example: /action freya.location update-location {"lat":51.5,"lng":-0.1}',
|
||||
)
|
||||
}
|
||||
|
||||
const action = splitFirst(source.rest)
|
||||
if (!action) {
|
||||
throw new Error(
|
||||
'Usage: /action <source-id> <action-id> <json-params>; example: /action freya.location update-location {"lat":51.5,"lng":-0.1}',
|
||||
)
|
||||
}
|
||||
|
||||
const params = parseJsonArgument(action.rest, {})
|
||||
const data = await requestJson(
|
||||
backendUrl,
|
||||
cookies,
|
||||
`/api/sources/${urlPart(source.head)}/actions/${urlPart(action.head)}`,
|
||||
{
|
||||
method: "POST",
|
||||
body: params,
|
||||
},
|
||||
)
|
||||
if (!isResultResponse(data)) {
|
||||
throw new Error("Source action returned an unexpected response shape")
|
||||
}
|
||||
|
||||
console.log(`\naction ${source.head}/${action.head}>`)
|
||||
console.log(formatJson(data.result))
|
||||
console.log("")
|
||||
}
|
||||
|
||||
async function requestJson(
|
||||
backendUrl: string,
|
||||
cookies: CookieJar,
|
||||
path: string,
|
||||
options: RequestOptions = {},
|
||||
): Promise<unknown> {
|
||||
const headers = new Headers()
|
||||
headers.set("Accept", "application/json")
|
||||
|
||||
const cookieHeader = cookies.header()
|
||||
if (cookieHeader) headers.set("Cookie", cookieHeader)
|
||||
|
||||
let body: string | undefined
|
||||
if (options.body !== undefined) {
|
||||
headers.set("Content-Type", "application/json")
|
||||
body = JSON.stringify(options.body)
|
||||
}
|
||||
|
||||
const response = await fetch(`${backendUrl}${path}`, {
|
||||
method: options.method ?? "GET",
|
||||
headers,
|
||||
body,
|
||||
})
|
||||
|
||||
cookies.apply(response)
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(await readResponseError(response, path))
|
||||
}
|
||||
|
||||
return response.json()
|
||||
}
|
||||
|
||||
function printIntro(): void {
|
||||
console.log("FREYA agent test CLI")
|
||||
console.log("Connect to a backend, sign in, then send test messages to /api/agent.\n")
|
||||
}
|
||||
|
||||
function printUsage(): void {
|
||||
console.log("FREYA agent test CLI")
|
||||
console.log("")
|
||||
console.log("Usage:")
|
||||
console.log(" bun run agent-test-cli")
|
||||
console.log(
|
||||
" FREYA_BACKEND_URL=http://localhost:3000 FREYA_EMAIL=user@example.com FREYA_PASSWORD=secret bun run agent-test-cli",
|
||||
)
|
||||
console.log("")
|
||||
printHelp()
|
||||
}
|
||||
|
||||
function printHelp(): void {
|
||||
console.log("\nCommands:")
|
||||
console.log(" /tools List agent debug tools")
|
||||
console.log(" /tool Execute an agent debug tool with JSON params")
|
||||
console.log(" /actions List source actions: /actions <source-id>")
|
||||
console.log(" /action Execute source action: /action <source-id> <action-id> <json-params>")
|
||||
console.log(" /session Show the signed-in user")
|
||||
console.log(" /help Show commands")
|
||||
console.log(" /quit Exit\n")
|
||||
}
|
||||
|
||||
function askRequired(
|
||||
label: string,
|
||||
defaultValue?: string,
|
||||
transform?: (value: string) => string,
|
||||
hidden = false,
|
||||
): string {
|
||||
if (hidden && defaultValue) {
|
||||
const value = defaultValue.trim()
|
||||
if (value) return transform ? transform(value) : value
|
||||
}
|
||||
|
||||
const canRetry = canRunStty()
|
||||
|
||||
for (;;) {
|
||||
const answer = hidden
|
||||
? askHidden(label, defaultValue)
|
||||
: askOptional(formatPromptLabel(label, defaultValue))
|
||||
const value = (answer || defaultValue || "").trim()
|
||||
if (!value) {
|
||||
if (!canRetry) {
|
||||
throw new Error(`${label} is required`)
|
||||
}
|
||||
console.log(`${label} is required.`)
|
||||
continue
|
||||
}
|
||||
return transform ? transform(value) : value
|
||||
}
|
||||
}
|
||||
|
||||
function askOptional(label: string): string | null {
|
||||
return prompt(label)
|
||||
}
|
||||
|
||||
function askHidden(label: string, defaultValue?: string): string | null {
|
||||
const shouldHide = !defaultValue && canRunStty()
|
||||
if (!shouldHide) return askOptional(formatPromptLabel(label, defaultValue))
|
||||
|
||||
try {
|
||||
Bun.spawnSync(["stty", "-echo"], { stdin: "inherit", stdout: "inherit", stderr: "inherit" })
|
||||
return askOptional(`${label}: `)
|
||||
} finally {
|
||||
Bun.spawnSync(["stty", "echo"], { stdin: "inherit", stdout: "inherit", stderr: "inherit" })
|
||||
console.log("")
|
||||
}
|
||||
}
|
||||
|
||||
function wantsHelp(): boolean {
|
||||
return Bun.argv.some((arg) => arg === "--help" || arg === "-h")
|
||||
}
|
||||
|
||||
function normalizeBackendUrl(value: string): string {
|
||||
const withProtocol = /^[a-z]+:\/\//i.test(value) ? value : `http://${value}`
|
||||
|
||||
try {
|
||||
const url = new URL(withProtocol)
|
||||
if (url.protocol !== "http:" && url.protocol !== "https:") {
|
||||
throw new Error("Backend URL must use http or https")
|
||||
}
|
||||
return url.toString().replace(/\/+$/, "")
|
||||
} catch {
|
||||
throw new Error(`Invalid backend URL: ${value}`)
|
||||
}
|
||||
}
|
||||
|
||||
function formatPromptLabel(label: string, defaultValue?: string): string {
|
||||
return defaultValue ? `${label} (${defaultValue}): ` : `${label}: `
|
||||
}
|
||||
|
||||
function splitFirst(value: string): { head: string; rest: string } | null {
|
||||
const trimmed = value.trim()
|
||||
if (!trimmed) return null
|
||||
|
||||
const match = /\s/.exec(trimmed)
|
||||
if (!match) {
|
||||
return { head: trimmed, rest: "" }
|
||||
}
|
||||
|
||||
const head = trimmed.slice(0, match.index)
|
||||
const rest = trimmed.slice(match.index).trim()
|
||||
return { head, rest }
|
||||
}
|
||||
|
||||
function parseJsonArgument(value: string, fallback: unknown): unknown {
|
||||
if (!value.trim()) return fallback
|
||||
|
||||
try {
|
||||
return JSON.parse(value)
|
||||
} catch (err) {
|
||||
throw new Error(`Invalid JSON params: ${formatError(err)}`)
|
||||
}
|
||||
}
|
||||
|
||||
function formatJson(value: unknown): string {
|
||||
const serialized = JSON.stringify(value, null, 2)
|
||||
return serialized ?? "undefined"
|
||||
}
|
||||
|
||||
function urlPart(value: string): string {
|
||||
return encodeURIComponent(value)
|
||||
}
|
||||
|
||||
function canRunStty(): boolean {
|
||||
const result = Bun.spawnSync(["stty", "-g"], { stdin: "inherit", stdout: "pipe", stderr: "pipe" })
|
||||
return result.exitCode === 0
|
||||
}
|
||||
|
||||
function readSetCookieHeaders(headers: Headers): string[] {
|
||||
const setCookies = headers.getSetCookie()
|
||||
if (setCookies && setCookies.length > 0) return setCookies
|
||||
|
||||
const header = headers.get("set-cookie")
|
||||
if (!header) return []
|
||||
|
||||
return splitSetCookieHeader(header)
|
||||
}
|
||||
|
||||
function parseCookie(header: string): { name: string; value: string } | null {
|
||||
const [cookiePair] = header.split(";")
|
||||
if (!cookiePair) return null
|
||||
|
||||
const index = cookiePair.indexOf("=")
|
||||
if (index <= 0) return null
|
||||
|
||||
return {
|
||||
name: cookiePair.slice(0, index).trim(),
|
||||
value: cookiePair.slice(index + 1).trim(),
|
||||
}
|
||||
}
|
||||
|
||||
function splitSetCookieHeader(header: string): string[] {
|
||||
const parts: string[] = []
|
||||
let start = 0
|
||||
let inExpires = false
|
||||
|
||||
for (let index = 0; index < header.length; index += 1) {
|
||||
const char = header[index]
|
||||
const remainder = header.slice(index).toLowerCase()
|
||||
|
||||
if (remainder.startsWith("expires=")) {
|
||||
inExpires = true
|
||||
continue
|
||||
}
|
||||
|
||||
if (inExpires && char === ";") {
|
||||
inExpires = false
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === "," && !inExpires) {
|
||||
parts.push(header.slice(start, index).trim())
|
||||
start = index + 1
|
||||
}
|
||||
}
|
||||
|
||||
parts.push(header.slice(start).trim())
|
||||
return parts.filter(Boolean)
|
||||
}
|
||||
|
||||
async function readResponseError(response: Response, path: string): Promise<string> {
|
||||
const text = await response.text()
|
||||
if (response.status === 404 && path === "/api/agent") {
|
||||
return "Backend does not expose /api/agent. Restart the WIP backend on port 3000 or check FREYA_BACKEND_URL."
|
||||
}
|
||||
if (!text) return `Request failed: ${response.status} ${response.statusText}`
|
||||
|
||||
try {
|
||||
const data: unknown = JSON.parse(text)
|
||||
if (isJsonObject(data)) {
|
||||
const message = readString(data, "message") ?? readString(data, "error")
|
||||
if (message) return message
|
||||
}
|
||||
} catch {
|
||||
return `Request failed: ${response.status} ${response.statusText}: ${text}`
|
||||
}
|
||||
|
||||
return `Request failed: ${response.status} ${response.statusText}: ${text}`
|
||||
}
|
||||
|
||||
function isAuthSession(value: unknown): value is AuthSession {
|
||||
if (!isJsonObject(value)) return false
|
||||
const user = value.user
|
||||
const session = value.session
|
||||
|
||||
return (
|
||||
isJsonObject(user) &&
|
||||
isJsonObject(session) &&
|
||||
typeof user.id === "string" &&
|
||||
typeof user.name === "string" &&
|
||||
typeof user.email === "string" &&
|
||||
(user.image === null || typeof user.image === "string") &&
|
||||
typeof session.id === "string" &&
|
||||
typeof session.token === "string"
|
||||
)
|
||||
}
|
||||
|
||||
function isQueryResponse(value: unknown): value is QueryResponse {
|
||||
if (!isJsonObject(value)) return false
|
||||
return typeof value.message === "string"
|
||||
}
|
||||
|
||||
function isQueryToolsResponse(value: unknown): value is QueryToolsResponse {
|
||||
if (!isJsonObject(value) || !Array.isArray(value.tools)) return false
|
||||
return value.tools.every(isQueryToolDefinition)
|
||||
}
|
||||
|
||||
function isQueryToolDefinition(value: unknown): value is QueryToolDefinition {
|
||||
return (
|
||||
isJsonObject(value) &&
|
||||
typeof value.name === "string" &&
|
||||
typeof value.label === "string" &&
|
||||
typeof value.description === "string" &&
|
||||
"parameters" in value
|
||||
)
|
||||
}
|
||||
|
||||
function isResultResponse(value: unknown): value is ResultResponse {
|
||||
return isJsonObject(value) && "result" in value
|
||||
}
|
||||
|
||||
function isSourceActionsResponse(value: unknown): value is SourceActionsResponse {
|
||||
if (!isJsonObject(value) || !isJsonObject(value.actions)) return false
|
||||
return Object.values(value.actions).every(isSourceActionDefinition)
|
||||
}
|
||||
|
||||
function isSourceActionDefinition(value: unknown): value is { id: string; description?: string } {
|
||||
return (
|
||||
isJsonObject(value) &&
|
||||
typeof value.id === "string" &&
|
||||
(value.description === undefined || typeof value.description === "string")
|
||||
)
|
||||
}
|
||||
|
||||
function isJsonObject(value: unknown): value is JsonObject {
|
||||
return typeof value === "object" && value !== null && !Array.isArray(value)
|
||||
}
|
||||
|
||||
function readString(object: JsonObject, key: string): string | undefined {
|
||||
const value = object[key]
|
||||
return typeof value === "string" ? value : undefined
|
||||
}
|
||||
|
||||
function formatError(error: unknown): string {
|
||||
return error instanceof Error ? error.message : String(error)
|
||||
}
|
||||
|
||||
await main()
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"extends": "../../tsconfig.json",
|
||||
"include": ["src/**/*.ts"]
|
||||
}
|
||||
@@ -12,6 +12,8 @@ BETTER_AUTH_URL=http://localhost:3000
|
||||
|
||||
# OpenRouter (LLM feed enhancement)
|
||||
OPENROUTER_API_KEY=
|
||||
# Optional: override the default model (default: openai/gpt-4.1-mini)
|
||||
# OPENROUTER_MODEL=openai/gpt-4.1-mini
|
||||
|
||||
# Apple WeatherKit credentials
|
||||
WEATHERKIT_PRIVATE_KEY=
|
||||
|
||||
@@ -1,49 +1 @@
|
||||
CREATE INDEX "user_sources_user_id_enabled_idx" ON "user_sources" USING btree ("user_id","enabled");--> statement-breakpoint
|
||||
CREATE TABLE "conversation_entries" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||
"conversation_id" uuid NOT NULL,
|
||||
"sequence" integer NOT NULL,
|
||||
"kind" text NOT NULL,
|
||||
"visibility" text DEFAULT 'internal' NOT NULL,
|
||||
"file_id" uuid,
|
||||
"payload" jsonb NOT NULL,
|
||||
"metadata" jsonb DEFAULT '{}'::jsonb NOT NULL,
|
||||
"created_at" timestamp DEFAULT now() NOT NULL,
|
||||
CONSTRAINT "conversation_entries_conversation_id_sequence_unique" UNIQUE("conversation_id","sequence")
|
||||
);
|
||||
--> statement-breakpoint
|
||||
CREATE TABLE "conversations" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||
"user_id" text NOT NULL,
|
||||
"created_at" timestamp DEFAULT now() NOT NULL,
|
||||
"updated_at" timestamp DEFAULT now() NOT NULL
|
||||
);
|
||||
--> statement-breakpoint
|
||||
CREATE TABLE "files" (
|
||||
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||
"user_id" text NOT NULL,
|
||||
"storage_key" text NOT NULL,
|
||||
"original_name" text,
|
||||
"mime_type" text NOT NULL,
|
||||
"size_bytes" integer NOT NULL,
|
||||
"metadata" jsonb DEFAULT '{}'::jsonb NOT NULL,
|
||||
"created_at" timestamp DEFAULT now() NOT NULL,
|
||||
CONSTRAINT "files_storage_key_unique" UNIQUE("storage_key")
|
||||
);
|
||||
--> statement-breakpoint
|
||||
ALTER TABLE "session" ADD COLUMN "impersonated_by" text;--> statement-breakpoint
|
||||
ALTER TABLE "user" ADD COLUMN "role" text;--> statement-breakpoint
|
||||
ALTER TABLE "user" ADD COLUMN "banned" boolean DEFAULT false;--> statement-breakpoint
|
||||
ALTER TABLE "user" ADD COLUMN "ban_reason" text;--> statement-breakpoint
|
||||
ALTER TABLE "user" ADD COLUMN "ban_expires" timestamp;--> statement-breakpoint
|
||||
ALTER TABLE "conversation_entries" ADD CONSTRAINT "conversation_entries_conversation_id_conversations_id_fk" FOREIGN KEY ("conversation_id") REFERENCES "public"."conversations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
ALTER TABLE "conversation_entries" ADD CONSTRAINT "conversation_entries_file_id_files_id_fk" FOREIGN KEY ("file_id") REFERENCES "public"."files"("id") ON DELETE restrict ON UPDATE no action;--> statement-breakpoint
|
||||
ALTER TABLE "conversation_entries" ADD CONSTRAINT "conversation_entries_attachment_file_id_check" CHECK (("conversation_entries"."kind" = 'attachment' and "conversation_entries"."file_id" is not null) or ("conversation_entries"."kind" <> 'attachment' and "conversation_entries"."file_id" is null));--> statement-breakpoint
|
||||
ALTER TABLE "conversations" ADD CONSTRAINT "conversations_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
ALTER TABLE "files" ADD CONSTRAINT "files_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
|
||||
CREATE INDEX "conversation_entries_conversation_id_sequence_idx" ON "conversation_entries" USING btree ("conversation_id","sequence");--> statement-breakpoint
|
||||
CREATE INDEX "conversation_entries_conversation_id_visibility_sequence_idx" ON "conversation_entries" USING btree ("conversation_id","visibility","sequence");--> statement-breakpoint
|
||||
CREATE INDEX "conversation_entries_kind_idx" ON "conversation_entries" USING btree ("kind");--> statement-breakpoint
|
||||
CREATE INDEX "conversation_entries_file_id_idx" ON "conversation_entries" USING btree ("file_id");--> statement-breakpoint
|
||||
CREATE INDEX "conversations_user_id_updated_at_idx" ON "conversations" USING btree ("user_id","updated_at");--> statement-breakpoint
|
||||
CREATE INDEX "files_user_id_created_at_idx" ON "files" USING btree ("user_id","created_at");
|
||||
CREATE INDEX "user_sources_user_id_enabled_idx" ON "user_sources" USING btree ("user_id","enabled");
|
||||
File diff suppressed because it is too large
Load Diff
@@ -44,20 +44,6 @@ mock.module("../sources/user-sources.ts", () => ({
|
||||
}),
|
||||
}))
|
||||
|
||||
mock.module("../conversations/storage.ts", () => ({
|
||||
conversations: (_db: Database, userId: string) => ({
|
||||
async getOrCreateConversation() {
|
||||
return { id: `conversation-${userId}` }
|
||||
},
|
||||
async listEntries() {
|
||||
return []
|
||||
},
|
||||
async appendEntry() {
|
||||
return { id: "entry-1", sequence: 1 }
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
function createStubSource(id: string): FeedSource {
|
||||
return {
|
||||
id,
|
||||
|
||||
@@ -1,347 +0,0 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import type { AppendConversationEntryInput } from "../conversations/storage.ts"
|
||||
import type {
|
||||
ConversationStorage,
|
||||
ConversationStorageEntry,
|
||||
} from "./conversation-recording-query-agent.ts"
|
||||
|
||||
import { ConversationEntryKind } from "../conversations/types.ts"
|
||||
import { ConversationRecordingQueryAgent } from "./conversation-recording-query-agent.ts"
|
||||
import {
|
||||
createQueryAgentEventListeners,
|
||||
QueryAgentEvent,
|
||||
type QueryAgent,
|
||||
type QueryAgentAsk,
|
||||
type QueryAgentCompactionEvent,
|
||||
type QueryAgentEventListeners,
|
||||
type QueryAgentEventListener,
|
||||
type QueryAgentEventMap,
|
||||
type QueryAgentStreamEvent,
|
||||
} from "./query-agent.ts"
|
||||
|
||||
interface RecordedEntry {
|
||||
conversationId: string
|
||||
input: AppendConversationEntryInput
|
||||
}
|
||||
|
||||
class FakeQueryAgent implements QueryAgent {
|
||||
readonly inputs: QueryAgentAsk[] = []
|
||||
private readonly events: QueryAgentStreamEvent[]
|
||||
private readonly eventListeners = createQueryAgentEventListeners()
|
||||
|
||||
constructor(events: QueryAgentStreamEvent[]) {
|
||||
this.events = events
|
||||
}
|
||||
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentStreamEvent> {
|
||||
this.inputs.push(input)
|
||||
for (const event of this.events) {
|
||||
yield event
|
||||
}
|
||||
}
|
||||
|
||||
addEventListener<T extends QueryAgentEvent>(
|
||||
type: T,
|
||||
listener: QueryAgentEventListener<T>,
|
||||
): () => void {
|
||||
const listeners = this.listenersFor(type)
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
async emitCompaction(event: QueryAgentCompactionEvent): Promise<void> {
|
||||
await this.emitEvent(event)
|
||||
}
|
||||
|
||||
private async emitEvent<T extends QueryAgentEvent>(event: QueryAgentEventMap[T]): Promise<void> {
|
||||
const listeners = this.listenersFor(event.type)
|
||||
for (const listener of listeners) {
|
||||
await listener(event)
|
||||
}
|
||||
}
|
||||
|
||||
private listenersFor<T extends QueryAgentEvent>(type: T): QueryAgentEventListeners[T] {
|
||||
return this.eventListeners[type]
|
||||
}
|
||||
|
||||
dispose(): void {}
|
||||
}
|
||||
|
||||
class FakeConversationStorage implements ConversationStorage {
|
||||
getOrCreateCount = 0
|
||||
readonly entries: RecordedEntry[] = []
|
||||
conversationId = "conversation-1"
|
||||
|
||||
async getOrCreateConversation(): Promise<{ id: string }> {
|
||||
this.getOrCreateCount += 1
|
||||
return { id: this.conversationId }
|
||||
}
|
||||
|
||||
async appendEntry(
|
||||
conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationStorageEntry> {
|
||||
this.entries.push({ conversationId, input })
|
||||
return {
|
||||
id: `entry-${this.entries.length}`,
|
||||
sequence: this.entries.length,
|
||||
kind: input.kind,
|
||||
payload: input.payload,
|
||||
metadata: input.metadata ?? {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
}
|
||||
}
|
||||
|
||||
async listEntries(_conversationId: string): Promise<ConversationStorageEntry[]> {
|
||||
return this.entries.map((entry, index) => ({
|
||||
id: `entry-${index + 1}`,
|
||||
sequence: index + 1,
|
||||
kind: entry.input.kind,
|
||||
payload: entry.input.payload,
|
||||
metadata: entry.input.metadata ?? {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
describe("ConversationRecordingQueryAgent", () => {
|
||||
test("records user and assistant messages in the conversation timeline", async () => {
|
||||
const queryAgent = new FakeQueryAgent([
|
||||
{ type: "text_delta", text: "Hello " },
|
||||
{ type: "text_delta", text: "there." },
|
||||
{ type: "done" },
|
||||
])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
|
||||
const events = await collectEvents(
|
||||
agent.ask({
|
||||
message: "hi",
|
||||
}),
|
||||
)
|
||||
|
||||
expect(events[0]).toEqual({ type: "conversation", conversationId: "conversation-1" })
|
||||
expect(queryAgent.inputs[0]?.conversationId).toBe("conversation-1")
|
||||
expect(storage.getOrCreateCount).toBe(1)
|
||||
expect(storage.entries).toHaveLength(2)
|
||||
|
||||
const userEntry = storage.entries[0]!.input
|
||||
if (userEntry.kind !== ConversationEntryKind.UserMessage) {
|
||||
throw new Error("Expected user message entry")
|
||||
}
|
||||
expect(userEntry.payload.parts).toEqual([{ type: "text", text: "hi" }])
|
||||
|
||||
const assistantEntry = storage.entries[1]!.input
|
||||
if (assistantEntry.kind !== ConversationEntryKind.AssistantMessage) {
|
||||
throw new Error("Expected assistant message entry")
|
||||
}
|
||||
expect(assistantEntry.payload.parts).toEqual([{ type: "text", text: "Hello there." }])
|
||||
expect(assistantEntry.metadata?.modelRun?.provider).toBe("openrouter")
|
||||
expect(assistantEntry.metadata?.modelRun?.model).toBe("test-model")
|
||||
})
|
||||
|
||||
test("uses a provided conversation id without creating a default conversation", async () => {
|
||||
const queryAgent = new FakeQueryAgent([{ type: "done" }])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
|
||||
const events = await collectEvents(
|
||||
agent.ask({
|
||||
conversationId: "conversation-existing",
|
||||
message: "continue",
|
||||
}),
|
||||
)
|
||||
|
||||
expect(events[0]).toEqual({
|
||||
type: "conversation",
|
||||
conversationId: "conversation-existing",
|
||||
})
|
||||
expect(storage.getOrCreateCount).toBe(0)
|
||||
expect(storage.entries[0]?.conversationId).toBe("conversation-existing")
|
||||
expect(queryAgent.inputs[0]?.conversationId).toBe("conversation-existing")
|
||||
})
|
||||
|
||||
test("uses the eager default conversation id without reading storage on ask", async () => {
|
||||
const queryAgent = new FakeQueryAgent([{ type: "done" }])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
defaultConversationId: "conversation-eager",
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
|
||||
const events = await collectEvents(
|
||||
agent.ask({
|
||||
message: "continue",
|
||||
}),
|
||||
)
|
||||
|
||||
expect(events[0]).toEqual({
|
||||
type: "conversation",
|
||||
conversationId: "conversation-eager",
|
||||
})
|
||||
expect(storage.getOrCreateCount).toBe(0)
|
||||
expect(storage.entries[0]?.conversationId).toBe("conversation-eager")
|
||||
expect(queryAgent.inputs[0]?.conversationId).toBe("conversation-eager")
|
||||
})
|
||||
|
||||
test("rejects switching away from the eager default conversation", async () => {
|
||||
const queryAgent = new FakeQueryAgent([{ type: "done" }])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
defaultConversationId: "conversation-eager",
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
|
||||
const events = await collectEvents(
|
||||
agent.ask({
|
||||
conversationId: "conversation-other",
|
||||
message: "continue",
|
||||
}),
|
||||
)
|
||||
|
||||
expect(events).toEqual([
|
||||
{
|
||||
type: "error",
|
||||
message: "Conversation switching is not supported for this session",
|
||||
},
|
||||
])
|
||||
expect(storage.entries).toHaveLength(0)
|
||||
expect(queryAgent.inputs).toHaveLength(0)
|
||||
})
|
||||
|
||||
test("records tool activity and agent errors as internal entries", async () => {
|
||||
const queryAgent = new FakeQueryAgent([
|
||||
{ type: "tool_start", toolName: "freya_get_feed" },
|
||||
{ type: "tool_end", toolName: "freya_get_feed", ok: true },
|
||||
{ type: "error", message: "model unavailable" },
|
||||
])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
|
||||
await collectEvents(
|
||||
agent.ask({
|
||||
message: "what now?",
|
||||
}),
|
||||
)
|
||||
|
||||
expect(storage.entries.map((entry) => entry.input.kind)).toEqual([
|
||||
ConversationEntryKind.UserMessage,
|
||||
ConversationEntryKind.ToolCall,
|
||||
ConversationEntryKind.ToolResult,
|
||||
ConversationEntryKind.SystemNote,
|
||||
])
|
||||
|
||||
const toolCall = storage.entries[1]!.input
|
||||
if (toolCall.kind !== ConversationEntryKind.ToolCall) {
|
||||
throw new Error("Expected tool call entry")
|
||||
}
|
||||
expect(toolCall.payload.toolName).toBe("freya_get_feed")
|
||||
|
||||
const toolResult = storage.entries[2]!.input
|
||||
if (toolResult.kind !== ConversationEntryKind.ToolResult) {
|
||||
throw new Error("Expected tool result entry")
|
||||
}
|
||||
expect(toolResult.payload.ok).toBe(true)
|
||||
|
||||
const systemNote = storage.entries[3]!.input
|
||||
if (systemNote.kind !== ConversationEntryKind.SystemNote) {
|
||||
throw new Error("Expected system note entry")
|
||||
}
|
||||
expect(systemNote.payload).toMatchObject({
|
||||
type: "agent_error",
|
||||
message: "model unavailable",
|
||||
})
|
||||
})
|
||||
|
||||
test("records compaction events as context summaries", async () => {
|
||||
const queryAgent = new FakeQueryAgent([
|
||||
{ type: "text_delta", text: "Kept answer." },
|
||||
{ type: "done" },
|
||||
])
|
||||
const storage = new FakeConversationStorage()
|
||||
const agent = new ConversationRecordingQueryAgent({
|
||||
agent: queryAgent,
|
||||
storage,
|
||||
defaultConversationId: "conversation-1",
|
||||
modelProvider: "openrouter",
|
||||
modelId: "test-model",
|
||||
})
|
||||
const forwardedCompactions: QueryAgentCompactionEvent[] = []
|
||||
agent.addEventListener(QueryAgentEvent.Compaction, (event) => {
|
||||
forwardedCompactions.push(event)
|
||||
})
|
||||
|
||||
await collectEvents(
|
||||
agent.ask({
|
||||
message: "remember this",
|
||||
}),
|
||||
)
|
||||
|
||||
await queryAgent.emitCompaction({
|
||||
type: QueryAgentEvent.Compaction,
|
||||
conversationId: "conversation-1",
|
||||
summary: "The user prefers compact summaries.",
|
||||
firstKeptEntryId: "pi-entry-7",
|
||||
compactedEntryRange: {
|
||||
startSequence: 1,
|
||||
endSequence: 1,
|
||||
},
|
||||
tokensBefore: 1234,
|
||||
details: { reason: "threshold" },
|
||||
fromExtension: false,
|
||||
})
|
||||
|
||||
const summaryEntry = storage.entries.at(-1)?.input
|
||||
if (summaryEntry?.kind !== ConversationEntryKind.ContextSummary) {
|
||||
throw new Error("Expected context summary entry")
|
||||
}
|
||||
expect(summaryEntry.payload.covers).toEqual({
|
||||
startSequence: 1,
|
||||
endSequence: 1,
|
||||
})
|
||||
expect(summaryEntry.payload.summary.importantDetails).toEqual([
|
||||
"The user prefers compact summaries.",
|
||||
])
|
||||
expect(summaryEntry.metadata?.piCompaction).toMatchObject({
|
||||
firstKeptEntryId: "pi-entry-7",
|
||||
tokensBefore: 1234,
|
||||
fromExtension: false,
|
||||
details: { reason: "threshold" },
|
||||
})
|
||||
expect(forwardedCompactions).toHaveLength(1)
|
||||
})
|
||||
})
|
||||
|
||||
async function collectEvents(
|
||||
events: AsyncIterable<QueryAgentStreamEvent>,
|
||||
): Promise<QueryAgentStreamEvent[]> {
|
||||
const result: QueryAgentStreamEvent[] = []
|
||||
for await (const event of events) {
|
||||
result.push(event)
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -1,252 +0,0 @@
|
||||
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,
|
||||
type QueryAgent,
|
||||
type QueryAgentAsk,
|
||||
type QueryAgentCompactionEvent,
|
||||
type QueryAgentEventListeners,
|
||||
type QueryAgentEventListener,
|
||||
type QueryAgentEventMap,
|
||||
type QueryAgentStreamEvent,
|
||||
} from "./query-agent.ts"
|
||||
|
||||
export interface ConversationStorage {
|
||||
getOrCreateConversation(): Promise<{ id: string }>
|
||||
appendEntry(
|
||||
conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationStorageEntry>
|
||||
listEntries(conversationId: string): Promise<ConversationStorageEntry[]>
|
||||
}
|
||||
|
||||
export type ConversationStorageEntry = Pick<
|
||||
ConversationEntryRow,
|
||||
"id" | "sequence" | "kind" | "payload" | "metadata" | "createdAt"
|
||||
>
|
||||
|
||||
export interface ConversationRecordingQueryAgentConfig {
|
||||
agent: QueryAgent
|
||||
storage: ConversationStorage
|
||||
defaultConversationId?: string
|
||||
route?: string
|
||||
modelProvider: string
|
||||
modelId: string
|
||||
}
|
||||
|
||||
const DefaultRoute = "agent_query"
|
||||
|
||||
export class ConversationRecordingQueryAgent implements QueryAgent {
|
||||
private readonly agent: QueryAgent
|
||||
private readonly storage: ConversationStorage
|
||||
private readonly defaultConversationId: string | undefined
|
||||
private readonly route: string
|
||||
private readonly modelProvider: string
|
||||
private readonly modelId: string
|
||||
private readonly eventListeners = createQueryAgentEventListeners()
|
||||
private readonly removeAgentCompactionListener: () => void
|
||||
|
||||
constructor(config: ConversationRecordingQueryAgentConfig) {
|
||||
this.agent = config.agent
|
||||
this.storage = config.storage
|
||||
this.defaultConversationId = config.defaultConversationId
|
||||
this.route = config.route ?? DefaultRoute
|
||||
this.modelProvider = config.modelProvider
|
||||
this.modelId = config.modelId
|
||||
this.removeAgentCompactionListener = this.agent.addEventListener(
|
||||
QueryAgentEvent.Compaction,
|
||||
async (event) => {
|
||||
await this.appendCompactionSummary(event)
|
||||
await this.emitEvent(event)
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentStreamEvent> {
|
||||
if (
|
||||
this.defaultConversationId &&
|
||||
input.conversationId &&
|
||||
input.conversationId !== this.defaultConversationId
|
||||
) {
|
||||
yield {
|
||||
type: "error",
|
||||
message: "Conversation switching is not supported for this session",
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
const conversationId =
|
||||
input.conversationId ??
|
||||
this.defaultConversationId ??
|
||||
(await this.storage.getOrCreateConversation()).id
|
||||
const runId = randomUUID()
|
||||
|
||||
const userEntry = await this.storage.appendEntry(conversationId, {
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: input.message }],
|
||||
},
|
||||
metadata: { runId },
|
||||
})
|
||||
|
||||
yield { type: "conversation", conversationId }
|
||||
|
||||
const assistantText: string[] = []
|
||||
for await (const event of this.agent.ask({
|
||||
...input,
|
||||
conversationId,
|
||||
userMessageEntry: {
|
||||
id: userEntry.id,
|
||||
sequence: userEntry.sequence,
|
||||
},
|
||||
})) {
|
||||
switch (event.type) {
|
||||
case "conversation":
|
||||
break
|
||||
case "text_delta":
|
||||
assistantText.push(event.text)
|
||||
yield event
|
||||
break
|
||||
case "tool_start":
|
||||
await this.storage.appendEntry(conversationId, {
|
||||
kind: ConversationEntryKind.ToolCall,
|
||||
payload: {
|
||||
toolName: event.toolName,
|
||||
runId,
|
||||
},
|
||||
metadata: { runId },
|
||||
})
|
||||
yield event
|
||||
break
|
||||
case "tool_end":
|
||||
await this.storage.appendEntry(conversationId, {
|
||||
kind: ConversationEntryKind.ToolResult,
|
||||
payload: {
|
||||
toolName: event.toolName,
|
||||
ok: event.ok,
|
||||
runId,
|
||||
},
|
||||
metadata: { runId },
|
||||
})
|
||||
yield event
|
||||
break
|
||||
case "error":
|
||||
await this.storage.appendEntry(conversationId, {
|
||||
kind: ConversationEntryKind.SystemNote,
|
||||
payload: {
|
||||
type: "agent_error",
|
||||
message: event.message,
|
||||
runId,
|
||||
},
|
||||
metadata: { runId },
|
||||
})
|
||||
yield event
|
||||
return
|
||||
case "done":
|
||||
await this.appendAssistantMessage(conversationId, assistantText, runId)
|
||||
yield event
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
await this.appendAssistantMessage(conversationId, assistantText, runId)
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
this.removeAgentCompactionListener()
|
||||
this.clearEventListeners()
|
||||
this.agent.dispose()
|
||||
}
|
||||
|
||||
addEventListener<T extends QueryAgentEvent>(
|
||||
type: T,
|
||||
listener: QueryAgentEventListener<T>,
|
||||
): () => void {
|
||||
const listeners = this.listenersFor(type)
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
|
||||
private async appendAssistantMessage(
|
||||
conversationId: string,
|
||||
assistantText: string[],
|
||||
runId: string,
|
||||
): Promise<void> {
|
||||
const text = assistantText.join("")
|
||||
if (text.length === 0) return
|
||||
|
||||
await this.storage.appendEntry(conversationId, {
|
||||
kind: ConversationEntryKind.AssistantMessage,
|
||||
payload: {
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text }],
|
||||
},
|
||||
metadata: this.modelRunMetadata(runId),
|
||||
})
|
||||
}
|
||||
|
||||
private modelRunMetadata(runId: string): ConversationEntryMetadata {
|
||||
const metadata: ConversationEntryMetadata = { runId }
|
||||
metadata.modelRun = {
|
||||
route: this.route,
|
||||
provider: this.modelProvider,
|
||||
model: this.modelId,
|
||||
}
|
||||
return metadata
|
||||
}
|
||||
|
||||
private async appendCompactionSummary(event: QueryAgentCompactionEvent): Promise<void> {
|
||||
if (event.compactedEntryRange === null) return
|
||||
|
||||
await this.storage.appendEntry(event.conversationId, {
|
||||
kind: ConversationEntryKind.ContextSummary,
|
||||
payload: {
|
||||
covers: event.compactedEntryRange,
|
||||
summary: {
|
||||
durableFacts: [],
|
||||
preferences: [],
|
||||
decisions: [],
|
||||
openTasks: [],
|
||||
importantDetails: [event.summary],
|
||||
},
|
||||
promptVersion: "pi-sdk-compaction-v1",
|
||||
},
|
||||
metadata: {
|
||||
piCompaction: {
|
||||
firstKeptEntryId: event.firstKeptEntryId,
|
||||
tokensBefore: event.tokensBefore,
|
||||
fromExtension: event.fromExtension,
|
||||
details: event.details,
|
||||
},
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
private async emitEvent<T extends QueryAgentEvent>(event: QueryAgentEventMap[T]): Promise<void> {
|
||||
const listeners = this.listenersFor(event.type)
|
||||
for (const listener of listeners) {
|
||||
await listener(event)
|
||||
}
|
||||
}
|
||||
|
||||
private listenersFor<T extends QueryAgentEvent>(type: T): QueryAgentEventListeners[T] {
|
||||
return this.eventListeners[type]
|
||||
}
|
||||
|
||||
private clearEventListeners(): void {
|
||||
for (const listeners of Object.values(this.eventListeners)) {
|
||||
listeners.clear()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,28 +57,6 @@ describe("query debug tools", () => {
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
test("executes source action directly", async () => {
|
||||
const tools = createTestDebugTools()
|
||||
const params = { title: "Buy tea" }
|
||||
|
||||
const result = await tools.execute("user-1", "freya_execute_action", {
|
||||
sourceId: "freya.reminders",
|
||||
actionId: "create-reminder",
|
||||
params,
|
||||
})
|
||||
|
||||
expect(result).toEqual({
|
||||
ok: true,
|
||||
sourceId: "freya.reminders",
|
||||
actionId: "create-reminder",
|
||||
result: {
|
||||
sourceId: "freya.reminders",
|
||||
actionId: "create-reminder",
|
||||
params,
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
function createTestDebugTools() {
|
||||
@@ -131,16 +109,6 @@ function createTestDebugTools() {
|
||||
async listActions(sourceId: string) {
|
||||
return actions[sourceId] ?? {}
|
||||
},
|
||||
async executeAction(sourceId: string, actionId: string, params: unknown) {
|
||||
const sourceActions = actions[sourceId]
|
||||
if (!sourceActions) {
|
||||
throw new Error(`Source not found: ${sourceId}`)
|
||||
}
|
||||
if (!(actionId in sourceActions)) {
|
||||
throw new Error(`Action "${actionId}" not found on source "${sourceId}"`)
|
||||
}
|
||||
return { sourceId, actionId, params }
|
||||
},
|
||||
},
|
||||
hasSource(sourceId: string) {
|
||||
return sourceId in actions
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { contextKey, type ContextKeyPart } from "@freya/core"
|
||||
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { ProposedAction } from "./query-agent.ts"
|
||||
|
||||
type ToolParams = Record<string, unknown>
|
||||
|
||||
@@ -22,7 +23,7 @@ const FreyaGetContextTool = "freya_get_context"
|
||||
const FreyaListContextTool = "freya_list_context"
|
||||
const FreyaGetSourceDataTool = "freya_get_source_data"
|
||||
const FreyaGetFeedItemTool = "freya_get_feed_item"
|
||||
const FreyaExecuteActionTool = "freya_execute_action"
|
||||
const FreyaProposeActionTool = "freya_propose_action"
|
||||
|
||||
export function createQueryDebugTools(sessionManager: UserSessionManager): QueryDebugTools {
|
||||
return new DefaultQueryDebugTools(sessionManager)
|
||||
@@ -85,12 +86,14 @@ class DefaultQueryDebugTools implements QueryDebugTools {
|
||||
},
|
||||
},
|
||||
{
|
||||
name: FreyaExecuteActionTool,
|
||||
label: "Execute FREYA Action",
|
||||
description: "Execute an available source action immediately.",
|
||||
name: FreyaProposeActionTool,
|
||||
label: "Propose FREYA Action",
|
||||
description: "Create a proposed action object without executing it.",
|
||||
parameters: {
|
||||
sourceId: "string",
|
||||
actionId: "string",
|
||||
title: "string",
|
||||
description: "string",
|
||||
sourceId: "string?",
|
||||
actionId: "string?",
|
||||
params: "unknown?",
|
||||
},
|
||||
},
|
||||
@@ -111,8 +114,8 @@ class DefaultQueryDebugTools implements QueryDebugTools {
|
||||
return this.listContext(userId)
|
||||
case FreyaGetSourceDataTool:
|
||||
return this.getSourceData(userId, expectToolParams(params, ["sourceId"]))
|
||||
case FreyaExecuteActionTool:
|
||||
return this.executeAction(userId, expectToolParams(params, ["sourceId", "actionId"]))
|
||||
case FreyaProposeActionTool:
|
||||
return proposeAction(expectToolParams(params, ["title", "description"]))
|
||||
default:
|
||||
throw new Error(`Unknown debug tool: ${toolName}`)
|
||||
}
|
||||
@@ -319,20 +322,27 @@ class DefaultQueryDebugTools implements QueryDebugTools {
|
||||
errors,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private async executeAction(userId: string, params: ToolParams): Promise<unknown> {
|
||||
const sourceId = expectString(params, "sourceId")
|
||||
const actionId = expectString(params, "actionId")
|
||||
const actionParams = "params" in params ? params.params : undefined
|
||||
const userSession = await this.sessionManager.getOrCreate(userId)
|
||||
const result = await userSession.engine.executeAction(sourceId, actionId, actionParams)
|
||||
function proposeAction(params: ToolParams): unknown {
|
||||
const sourceId = optionalString(params, "sourceId")
|
||||
const actionId = optionalString(params, "actionId")
|
||||
const action: ProposedAction = {
|
||||
id: crypto.randomUUID(),
|
||||
title: expectString(params, "title"),
|
||||
description: expectString(params, "description"),
|
||||
requiresConfirmation: true,
|
||||
createdAt: new Date().toISOString(),
|
||||
...(sourceId ? { sourceId } : {}),
|
||||
...(actionId ? { actionId } : {}),
|
||||
...("params" in params ? { params: params.params } : {}),
|
||||
}
|
||||
|
||||
return {
|
||||
ok: true,
|
||||
sourceId,
|
||||
actionId,
|
||||
result: result ?? null,
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
proposedActionId: action.id,
|
||||
requiresConfirmation: true,
|
||||
proposedAction: action,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,8 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import { Hono } from "hono"
|
||||
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { QueryDebugTools, QueryDebugToolDefinition } from "./debug-tools.ts"
|
||||
import type {
|
||||
QueryAgent,
|
||||
QueryAgentAsk,
|
||||
QueryAgentEventListener,
|
||||
QueryAgentStreamEvent,
|
||||
QueryAgentEvent,
|
||||
} from "./query-agent.ts"
|
||||
import type { ProposedAction, QueryAgent, QueryAgentAsk, QueryAgentEvent } from "./query-agent.ts"
|
||||
|
||||
import { mockAuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||
import { registerAgentHttpHandlers, registerDebugAgentHttpHandlers } from "./http.ts"
|
||||
@@ -18,25 +11,20 @@ const MockUserId = "k7Gx2mPqRvNwYs9TdLfA4bHcJeUo1iZn"
|
||||
|
||||
class FakeQueryAgent implements QueryAgent {
|
||||
readonly inputs: QueryAgentAsk[] = []
|
||||
private readonly events: QueryAgentStreamEvent[]
|
||||
private readonly events: QueryAgentEvent[]
|
||||
|
||||
constructor(events: QueryAgentStreamEvent[]) {
|
||||
constructor(events: QueryAgentEvent[]) {
|
||||
this.events = events
|
||||
}
|
||||
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentStreamEvent> {
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentEvent> {
|
||||
this.inputs.push(input)
|
||||
for (const event of this.events) {
|
||||
yield event
|
||||
}
|
||||
}
|
||||
|
||||
addEventListener<T extends QueryAgentEvent>(
|
||||
_type: T,
|
||||
_listener: QueryAgentEventListener<T>,
|
||||
): () => void {
|
||||
return () => {}
|
||||
}
|
||||
disposeUser(): void {}
|
||||
|
||||
dispose(): void {}
|
||||
}
|
||||
@@ -64,14 +52,8 @@ class FakeDebugTools implements QueryDebugTools {
|
||||
|
||||
function buildTestApp(queryAgent: QueryAgent, userId?: string) {
|
||||
const app = new Hono()
|
||||
const sessionManager = {
|
||||
async getOrCreate() {
|
||||
return { agent: queryAgent }
|
||||
},
|
||||
} as unknown as UserSessionManager
|
||||
|
||||
registerAgentHttpHandlers(app, {
|
||||
sessionManager,
|
||||
queryAgent,
|
||||
authSessionMiddleware: mockAuthSessionMiddleware(userId),
|
||||
})
|
||||
return app
|
||||
@@ -98,10 +80,21 @@ describe("POST /api/agent", () => {
|
||||
expect(res.status).toBe(401)
|
||||
})
|
||||
|
||||
test("collects text deltas", async () => {
|
||||
test("collects text deltas and proposed actions", async () => {
|
||||
const action: ProposedAction = {
|
||||
id: "proposal-1",
|
||||
title: "Update commute line",
|
||||
description: "Set the user's commute line to Victoria.",
|
||||
sourceId: "freya.tfl",
|
||||
actionId: "set-lines-of-interest",
|
||||
params: ["victoria"],
|
||||
requiresConfirmation: true,
|
||||
createdAt: "2026-06-12T12:00:00.000Z",
|
||||
}
|
||||
const agent = new FakeQueryAgent([
|
||||
{ type: "text_delta", text: "You should " },
|
||||
{ type: "text_delta", text: "leave at 8:30." },
|
||||
{ type: "action_proposed", action },
|
||||
{ type: "done" },
|
||||
])
|
||||
const app = buildTestApp(agent, "user-1")
|
||||
@@ -119,29 +112,10 @@ describe("POST /api/agent", () => {
|
||||
|
||||
const body = (await res.json()) as {
|
||||
message: string
|
||||
proposedActions: ProposedAction[]
|
||||
}
|
||||
expect(body.message).toBe("You should leave at 8:30.")
|
||||
})
|
||||
|
||||
test("passes conversation id to the query agent", async () => {
|
||||
const agent = new FakeQueryAgent([
|
||||
{ type: "conversation", conversationId: "conversation-1" },
|
||||
{ type: "done" },
|
||||
])
|
||||
const app = buildTestApp(agent, "user-1")
|
||||
|
||||
const res = await app.request("/api/agent", {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
message: "Continue this chat.",
|
||||
conversationId: "conversation-1",
|
||||
}),
|
||||
})
|
||||
|
||||
expect(res.status).toBe(200)
|
||||
expect(agent.inputs[0]?.conversationId).toBe("conversation-1")
|
||||
const body = (await res.json()) as { conversationId?: string }
|
||||
expect(body.conversationId).toBe("conversation-1")
|
||||
expect(body.proposedActions).toEqual([action])
|
||||
})
|
||||
|
||||
test("returns 400 for invalid body", async () => {
|
||||
|
||||
@@ -4,14 +4,14 @@ import { type } from "arktype"
|
||||
import { createMiddleware } from "hono/factory"
|
||||
|
||||
import type { AuthSessionMiddleware } from "../auth/session-middleware.ts"
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { QueryDebugTools } from "./debug-tools.ts"
|
||||
import type { QueryAgent } from "./query-agent.ts"
|
||||
|
||||
import { collectQueryAgentResponse, QueryAgentError } from "./query-agent.ts"
|
||||
|
||||
type Env = {
|
||||
Variables: {
|
||||
sessionManager: UserSessionManager
|
||||
queryAgent: QueryAgent
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ type DebugEnv = {
|
||||
}
|
||||
|
||||
interface AgentHttpHandlersDeps {
|
||||
sessionManager: UserSessionManager
|
||||
queryAgent: QueryAgent
|
||||
authSessionMiddleware: AuthSessionMiddleware
|
||||
}
|
||||
|
||||
@@ -35,15 +35,14 @@ interface AgentDebugHttpHandlersDeps {
|
||||
const AgentAskRequestBody = type({
|
||||
"+": "reject",
|
||||
message: "string",
|
||||
"conversationId?": "string",
|
||||
})
|
||||
|
||||
export function registerAgentHttpHandlers(
|
||||
app: Hono,
|
||||
{ sessionManager, authSessionMiddleware }: AgentHttpHandlersDeps,
|
||||
{ queryAgent, authSessionMiddleware }: AgentHttpHandlersDeps,
|
||||
) {
|
||||
const inject = createMiddleware<Env>(async (c, next) => {
|
||||
c.set("sessionManager", sessionManager)
|
||||
c.set("queryAgent", queryAgent)
|
||||
await next()
|
||||
})
|
||||
|
||||
@@ -77,13 +76,12 @@ async function handleAgentAsk(c: Context<Env>) {
|
||||
}
|
||||
|
||||
const user = c.get("user")!
|
||||
const sessionManager = c.get("sessionManager")
|
||||
const queryAgent = c.get("queryAgent")
|
||||
|
||||
try {
|
||||
const session = await sessionManager.getOrCreate(user.id)
|
||||
const response = await collectQueryAgentResponse(session.agent, {
|
||||
const response = await collectQueryAgentResponse(queryAgent, {
|
||||
userId: user.id,
|
||||
message: parsed.message,
|
||||
conversationId: parsed.conversationId,
|
||||
})
|
||||
return c.json(response)
|
||||
} catch (err) {
|
||||
|
||||
43
apps/freya-backend/src/agent/in-memory-resource-loader.ts
Normal file
43
apps/freya-backend/src/agent/in-memory-resource-loader.ts
Normal file
@@ -0,0 +1,43 @@
|
||||
import { createExtensionRuntime, type ResourceLoader } from "@earendil-works/pi-coding-agent"
|
||||
|
||||
export class InMemoryResourceLoader implements ResourceLoader {
|
||||
private readonly extensions: ReturnType<ResourceLoader["getExtensions"]> = {
|
||||
extensions: [],
|
||||
errors: [],
|
||||
runtime: createExtensionRuntime(),
|
||||
}
|
||||
|
||||
constructor(private readonly systemPrompt: string) {}
|
||||
|
||||
getExtensions(): ReturnType<ResourceLoader["getExtensions"]> {
|
||||
return this.extensions
|
||||
}
|
||||
|
||||
getSkills(): ReturnType<ResourceLoader["getSkills"]> {
|
||||
return { skills: [], diagnostics: [] }
|
||||
}
|
||||
|
||||
getPrompts(): ReturnType<ResourceLoader["getPrompts"]> {
|
||||
return { prompts: [], diagnostics: [] }
|
||||
}
|
||||
|
||||
getThemes(): ReturnType<ResourceLoader["getThemes"]> {
|
||||
return { themes: [], diagnostics: [] }
|
||||
}
|
||||
|
||||
getAgentsFiles(): ReturnType<ResourceLoader["getAgentsFiles"]> {
|
||||
return { agentsFiles: [] }
|
||||
}
|
||||
|
||||
getSystemPrompt(): string {
|
||||
return this.systemPrompt
|
||||
}
|
||||
|
||||
getAppendSystemPrompt(): string[] {
|
||||
return []
|
||||
}
|
||||
|
||||
extendResources(_paths: Parameters<ResourceLoader["extendResources"]>[0]): void {}
|
||||
|
||||
async reload(_options?: Parameters<ResourceLoader["reload"]>[0]): Promise<void> {}
|
||||
}
|
||||
@@ -1,10 +1,7 @@
|
||||
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"
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { QueryAgentEvent } from "./query-agent.ts"
|
||||
|
||||
interface FakePiSession {
|
||||
subscribe(listener: (event: unknown) => void): () => void
|
||||
@@ -12,65 +9,8 @@ interface FakePiSession {
|
||||
dispose(): void
|
||||
}
|
||||
|
||||
type CapturedExtensionHandler = (event: unknown) => Promise<unknown> | unknown
|
||||
|
||||
interface CapturedExtensionApi {
|
||||
on(event: string, handler: CapturedExtensionHandler): void
|
||||
}
|
||||
|
||||
type CapturedExtensionFactory = (pi: CapturedExtensionApi) => Promise<void> | void
|
||||
|
||||
interface CapturedExtension {
|
||||
handlers: Map<string, CapturedExtensionHandler[]>
|
||||
}
|
||||
|
||||
interface CapturedResourceLoader {
|
||||
getExtensions(): unknown
|
||||
}
|
||||
|
||||
interface CapturedDefaultResourceLoaderOptions {
|
||||
extensionFactories?: CapturedExtensionFactory[]
|
||||
}
|
||||
|
||||
class FakeDefaultResourceLoader implements CapturedResourceLoader {
|
||||
private readonly extensionFactories: CapturedExtensionFactory[]
|
||||
private extensionsResult: { extensions: CapturedExtension[] }
|
||||
|
||||
constructor(options: unknown) {
|
||||
this.extensionFactories = isDefaultResourceLoaderOptions(options)
|
||||
? (options.extensionFactories ?? [])
|
||||
: []
|
||||
this.extensionsResult = { extensions: [] }
|
||||
}
|
||||
|
||||
async reload(): Promise<void> {
|
||||
const handlers: CapturedExtension["handlers"] = new Map()
|
||||
const api: CapturedExtensionApi = {
|
||||
on(event: string, handler: CapturedExtensionHandler): void {
|
||||
const existing = handlers.get(event) ?? []
|
||||
existing.push(handler)
|
||||
handlers.set(event, existing)
|
||||
},
|
||||
}
|
||||
|
||||
for (const factory of this.extensionFactories) {
|
||||
await factory(api)
|
||||
}
|
||||
|
||||
this.extensionsResult = {
|
||||
extensions: [{ handlers }],
|
||||
}
|
||||
}
|
||||
|
||||
getExtensions(): unknown {
|
||||
return this.extensionsResult
|
||||
}
|
||||
}
|
||||
|
||||
let createAgentSessionCalls = 0
|
||||
let createAgentSessionOptions: unknown
|
||||
let runtimeApiKeyCalls: Array<{ provider: string; apiKey: string }> = []
|
||||
let modelFindCalls: Array<{ provider: string; modelId: string }> = []
|
||||
let promptCalls = 0
|
||||
let unsubscribeCalls = 0
|
||||
let sessionListeners: Array<(event: unknown) => void> = []
|
||||
@@ -109,51 +49,11 @@ const fakeSession: FakePiSession = {
|
||||
dispose(): void {},
|
||||
}
|
||||
|
||||
class FakeSessionManager {
|
||||
private messages: unknown[] = []
|
||||
private compaction: { summary: string; tokensBefore: number; timestamp: number } | null = null
|
||||
|
||||
appendMessage(message: unknown): string {
|
||||
this.messages.push(message)
|
||||
return `message-${this.messages.length}`
|
||||
}
|
||||
|
||||
appendCompaction(summary: string, _firstKeptEntryId: string, tokensBefore: number): string {
|
||||
this.compaction = {
|
||||
summary,
|
||||
tokensBefore,
|
||||
timestamp: Date.now(),
|
||||
}
|
||||
this.messages = []
|
||||
return "compaction-1"
|
||||
}
|
||||
|
||||
buildSessionContext(): unknown {
|
||||
const messages = [...this.messages]
|
||||
if (this.compaction) {
|
||||
messages.unshift({
|
||||
role: "compactionSummary",
|
||||
summary: this.compaction.summary,
|
||||
tokensBefore: this.compaction.tokensBefore,
|
||||
timestamp: this.compaction.timestamp,
|
||||
})
|
||||
}
|
||||
|
||||
return {
|
||||
messages,
|
||||
thinkingLevel: "off",
|
||||
model: modelFromMessages(messages),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mock.module("@earendil-works/pi-coding-agent", () => ({
|
||||
AuthStorage: {
|
||||
inMemory() {
|
||||
return {
|
||||
setRuntimeApiKey(provider: string, apiKey: string): void {
|
||||
runtimeApiKeyCalls.push({ provider, apiKey })
|
||||
},
|
||||
setRuntimeApiKey(_provider: string, _apiKey: string): void {},
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -167,15 +67,13 @@ mock.module("@earendil-works/pi-coding-agent", () => ({
|
||||
createExtensionRuntime() {
|
||||
return {}
|
||||
},
|
||||
DefaultResourceLoader: FakeDefaultResourceLoader,
|
||||
defineTool(tool: unknown): unknown {
|
||||
return tool
|
||||
},
|
||||
ModelRegistry: {
|
||||
inMemory(_authStorage: unknown) {
|
||||
return {
|
||||
find(provider: string, modelId: string): unknown {
|
||||
modelFindCalls.push({ provider, modelId })
|
||||
find(_provider: string, _modelId: string): unknown {
|
||||
return { id: "mock-model" }
|
||||
},
|
||||
}
|
||||
@@ -183,7 +81,7 @@ mock.module("@earendil-works/pi-coding-agent", () => ({
|
||||
},
|
||||
SessionManager: {
|
||||
inMemory(_cwd: string): unknown {
|
||||
return new FakeSessionManager()
|
||||
return {}
|
||||
},
|
||||
},
|
||||
SettingsManager: {
|
||||
@@ -196,8 +94,6 @@ mock.module("@earendil-works/pi-coding-agent", () => ({
|
||||
beforeEach(() => {
|
||||
createAgentSessionCalls = 0
|
||||
createAgentSessionOptions = undefined
|
||||
runtimeApiKeyCalls = []
|
||||
modelFindCalls = []
|
||||
promptCalls = 0
|
||||
unsubscribeCalls = 0
|
||||
sessionListeners = []
|
||||
@@ -228,14 +124,16 @@ describe("PiQueryAgent", () => {
|
||||
test("rejects a concurrent first query while the Pi session is being created", async () => {
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
apiKey: "test-api-key",
|
||||
sessionManager: createStubSessionManager(),
|
||||
modelProvider: "mock",
|
||||
modelId: "mock-model",
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
})
|
||||
|
||||
const firstEvents = collectEvents(
|
||||
agent.ask({
|
||||
userId: "user-1",
|
||||
message: "first",
|
||||
}),
|
||||
)
|
||||
@@ -244,6 +142,7 @@ describe("PiQueryAgent", () => {
|
||||
|
||||
const secondEvents = await collectEvents(
|
||||
agent.ask({
|
||||
userId: "user-1",
|
||||
message: "second",
|
||||
}),
|
||||
)
|
||||
@@ -251,12 +150,10 @@ describe("PiQueryAgent", () => {
|
||||
expect(secondEvents).toEqual([
|
||||
{
|
||||
type: "error",
|
||||
message: "A query is already running",
|
||||
message: "A query is already running for this user",
|
||||
},
|
||||
])
|
||||
expect(createAgentSessionCalls).toBe(1)
|
||||
expect(runtimeApiKeyCalls).toEqual([{ provider: "openrouter", apiKey: "test-api-key" }])
|
||||
expect(modelFindCalls).toEqual([{ provider: "openrouter", modelId: "z-ai/glm-4.7-flash" }])
|
||||
expect(promptCalls).toBe(0)
|
||||
|
||||
releaseSessionCreation()
|
||||
@@ -271,228 +168,6 @@ describe("PiQueryAgent", () => {
|
||||
}
|
||||
expect("agentDir" in createAgentSessionOptions).toBe(false)
|
||||
expect(createAgentSessionOptions.resourceLoader).toBeDefined()
|
||||
expect(typeof sessionCompactHandlerFromCapturedOptions()).toBe("function")
|
||||
|
||||
agent.dispose()
|
||||
})
|
||||
|
||||
test("hydrates initial entries into the Pi session manager", async () => {
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
initialEntries: [
|
||||
{
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "stored hello" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
},
|
||||
{
|
||||
id: "entry-2",
|
||||
sequence: 2,
|
||||
kind: ConversationEntryKind.AssistantMessage,
|
||||
payload: {
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text: "stored reply" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:01.000Z"),
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
const events = collectEvents(
|
||||
agent.ask({
|
||||
message: "hello",
|
||||
}),
|
||||
)
|
||||
|
||||
await sessionCreationStarted
|
||||
if (!isRecord(createAgentSessionOptions)) {
|
||||
throw new Error("createAgentSession options were not captured")
|
||||
}
|
||||
const sessionManager = createAgentSessionOptions.sessionManager
|
||||
if (!(sessionManager instanceof FakeSessionManager)) {
|
||||
throw new Error("session manager was not hydrated by PiQueryAgent")
|
||||
}
|
||||
const context = sessionManager.buildSessionContext()
|
||||
if (!isRecord(context) || !Array.isArray(context.messages)) {
|
||||
throw new Error("session context messages were not captured")
|
||||
}
|
||||
expect(context.messages[0]).toEqual({
|
||||
role: "user",
|
||||
content: "stored hello",
|
||||
timestamp: new Date("2026-06-15T00:00:00.000Z").getTime(),
|
||||
})
|
||||
expect(context.messages[1]).toMatchObject({
|
||||
role: "assistant",
|
||||
provider: "openrouter",
|
||||
model: "z-ai/glm-4.7-flash",
|
||||
stopReason: "stop",
|
||||
timestamp: new Date("2026-06-15T00:00:01.000Z").getTime(),
|
||||
})
|
||||
|
||||
releaseSessionCreation()
|
||||
await promptStarted
|
||||
releasePrompt()
|
||||
|
||||
expect(await events).toEqual([{ type: "done" }])
|
||||
|
||||
agent.dispose()
|
||||
})
|
||||
|
||||
test("emits Pi compaction events for the active conversation", async () => {
|
||||
const recordedCompactions: unknown[] = []
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
})
|
||||
agent.addEventListener(QueryAgentEvent.Compaction, (event) => {
|
||||
recordedCompactions.push(event)
|
||||
})
|
||||
|
||||
const events = collectEvents(
|
||||
agent.ask({
|
||||
conversationId: "conversation-1",
|
||||
message: "hello",
|
||||
}),
|
||||
)
|
||||
|
||||
await sessionCreationStarted
|
||||
releaseSessionCreation()
|
||||
await promptStarted
|
||||
|
||||
const handler = sessionCompactHandlerFromCapturedOptions()
|
||||
await handler({
|
||||
type: "session_compact",
|
||||
fromExtension: false,
|
||||
compactionEntry: {
|
||||
type: "compaction",
|
||||
id: "pi-compaction-1",
|
||||
timestamp: "2026-06-15T00:00:00.000Z",
|
||||
summary: "The user prefers concise updates.",
|
||||
firstKeptEntryId: "pi-entry-7",
|
||||
tokensBefore: 1234,
|
||||
details: { reason: "threshold" },
|
||||
},
|
||||
})
|
||||
|
||||
expect(recordedCompactions).toEqual([
|
||||
{
|
||||
type: QueryAgentEvent.Compaction,
|
||||
conversationId: "conversation-1",
|
||||
summary: "The user prefers concise updates.",
|
||||
firstKeptEntryId: "pi-entry-7",
|
||||
compactedEntryRange: null,
|
||||
tokensBefore: 1234,
|
||||
details: { reason: "threshold" },
|
||||
fromExtension: false,
|
||||
},
|
||||
])
|
||||
|
||||
releasePrompt()
|
||||
|
||||
expect(await events).toEqual([{ type: "done" }])
|
||||
expect(unsubscribeCalls).toBe(1)
|
||||
|
||||
agent.dispose()
|
||||
})
|
||||
|
||||
test("emits Freya coverage through the entry before Pi's kept boundary", async () => {
|
||||
const recordedCompactions: unknown[] = []
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
initialEntries: [
|
||||
{
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "old hello" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
},
|
||||
{
|
||||
id: "entry-2",
|
||||
sequence: 2,
|
||||
kind: ConversationEntryKind.AssistantMessage,
|
||||
payload: {
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text: "kept reply" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:01.000Z"),
|
||||
},
|
||||
],
|
||||
})
|
||||
agent.addEventListener(QueryAgentEvent.Compaction, (event) => {
|
||||
recordedCompactions.push(event)
|
||||
})
|
||||
|
||||
const events = collectEvents(
|
||||
agent.ask({
|
||||
conversationId: "conversation-1",
|
||||
message: "hello",
|
||||
}),
|
||||
)
|
||||
|
||||
await sessionCreationStarted
|
||||
|
||||
await extensionHandlerFromCapturedOptions("session_before_compact")({
|
||||
type: "session_before_compact",
|
||||
preparation: {
|
||||
firstKeptEntryId: "message-2",
|
||||
},
|
||||
branchEntries: [{ id: "message-1" }, { id: "message-2" }],
|
||||
})
|
||||
await extensionHandlerFromCapturedOptions("session_compact")({
|
||||
type: "session_compact",
|
||||
fromExtension: false,
|
||||
compactionEntry: {
|
||||
type: "compaction",
|
||||
id: "pi-compaction-1",
|
||||
timestamp: "2026-06-15T00:00:00.000Z",
|
||||
summary: "Old hello was discussed.",
|
||||
firstKeptEntryId: "message-2",
|
||||
tokensBefore: 1234,
|
||||
},
|
||||
})
|
||||
|
||||
expect(recordedCompactions).toEqual([
|
||||
{
|
||||
type: QueryAgentEvent.Compaction,
|
||||
conversationId: "conversation-1",
|
||||
summary: "Old hello was discussed.",
|
||||
firstKeptEntryId: "message-2",
|
||||
compactedEntryRange: {
|
||||
startSequence: 1,
|
||||
endSequence: 1,
|
||||
},
|
||||
tokensBefore: 1234,
|
||||
details: undefined,
|
||||
fromExtension: false,
|
||||
},
|
||||
])
|
||||
|
||||
releaseSessionCreation()
|
||||
await promptStarted
|
||||
releasePrompt()
|
||||
|
||||
expect(await events).toEqual([{ type: "done" }])
|
||||
|
||||
agent.dispose()
|
||||
})
|
||||
@@ -500,7 +175,9 @@ describe("PiQueryAgent", () => {
|
||||
test("surfaces Pi message_end provider errors instead of done", async () => {
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
sessionManager: createStubSessionManager(),
|
||||
modelProvider: "mock",
|
||||
modelId: "mock-model",
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
})
|
||||
@@ -518,6 +195,7 @@ describe("PiQueryAgent", () => {
|
||||
|
||||
const events = collectEvents(
|
||||
agent.ask({
|
||||
userId: "user-1",
|
||||
message: "hello",
|
||||
}),
|
||||
)
|
||||
@@ -536,7 +214,9 @@ describe("PiQueryAgent", () => {
|
||||
test("surfaces Pi agent_end provider errors instead of done", async () => {
|
||||
const { PiQueryAgent } = await import("./pi-query-agent.ts")
|
||||
const agent = new PiQueryAgent({
|
||||
toolbox: createStubToolbox(),
|
||||
sessionManager: createStubSessionManager(),
|
||||
modelProvider: "mock",
|
||||
modelId: "mock-model",
|
||||
cwd: "/tmp/freya-pi-query-agent-test",
|
||||
systemPrompt: "test",
|
||||
})
|
||||
@@ -556,6 +236,7 @@ describe("PiQueryAgent", () => {
|
||||
|
||||
const events = collectEvents(
|
||||
agent.ask({
|
||||
userId: "user-1",
|
||||
message: "hello",
|
||||
}),
|
||||
)
|
||||
@@ -572,113 +253,20 @@ describe("PiQueryAgent", () => {
|
||||
})
|
||||
})
|
||||
|
||||
async function collectEvents(
|
||||
events: AsyncIterable<QueryAgentStreamEvent>,
|
||||
): Promise<QueryAgentStreamEvent[]> {
|
||||
const result: QueryAgentStreamEvent[] = []
|
||||
async function collectEvents(events: AsyncIterable<QueryAgentEvent>): Promise<QueryAgentEvent[]> {
|
||||
const result: QueryAgentEvent[] = []
|
||||
for await (const event of events) {
|
||||
result.push(event)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
function createStubToolbox(): QueryAgentToolbox {
|
||||
function createStubSessionManager(): UserSessionManager {
|
||||
return {
|
||||
async listSources(): Promise<never> {
|
||||
async getOrCreate(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async getContext(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async getFeedItem(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async queryContext(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async listContext(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async getSourceData(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
async executeAction(): Promise<never> {
|
||||
throw new Error("not used")
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
function sessionCompactHandlerFromCapturedOptions(): CapturedExtensionHandler {
|
||||
return extensionHandlerFromCapturedOptions("session_compact")
|
||||
}
|
||||
|
||||
function extensionHandlerFromCapturedOptions(eventName: string): CapturedExtensionHandler {
|
||||
if (!isRecord(createAgentSessionOptions)) {
|
||||
throw new Error("createAgentSession options were not captured")
|
||||
}
|
||||
|
||||
const resourceLoader = createAgentSessionOptions.resourceLoader
|
||||
if (!isCapturedResourceLoader(resourceLoader)) {
|
||||
throw new Error("resourceLoader was not captured")
|
||||
}
|
||||
|
||||
const extensionsResult = resourceLoader.getExtensions()
|
||||
if (!isRecord(extensionsResult) || !Array.isArray(extensionsResult.extensions)) {
|
||||
throw new Error("extensions were not captured")
|
||||
}
|
||||
|
||||
const extension = extensionsResult.extensions[0]
|
||||
if (!isCapturedExtension(extension)) {
|
||||
throw new Error("compaction extension was not captured")
|
||||
}
|
||||
|
||||
const handlers = extension.handlers.get(eventName)
|
||||
const handler = handlers?.[0]
|
||||
if (!handler) {
|
||||
throw new Error(`${eventName} handler was not captured`)
|
||||
}
|
||||
|
||||
return handler
|
||||
}
|
||||
|
||||
function isCapturedResourceLoader(value: unknown): value is CapturedResourceLoader {
|
||||
return isRecord(value) && typeof value.getExtensions === "function"
|
||||
}
|
||||
|
||||
function isCapturedExtension(value: unknown): value is CapturedExtension {
|
||||
return isRecord(value) && value.handlers instanceof Map
|
||||
}
|
||||
|
||||
function isDefaultResourceLoaderOptions(
|
||||
value: unknown,
|
||||
): value is CapturedDefaultResourceLoaderOptions {
|
||||
return (
|
||||
isRecord(value) &&
|
||||
(value.extensionFactories === undefined ||
|
||||
(Array.isArray(value.extensionFactories) &&
|
||||
value.extensionFactories.every(isCapturedExtensionFactory)))
|
||||
)
|
||||
}
|
||||
|
||||
function isCapturedExtensionFactory(value: unknown): value is CapturedExtensionFactory {
|
||||
return typeof value === "function"
|
||||
}
|
||||
|
||||
function modelFromMessages(messages: unknown[]): { provider: string; modelId: string } | null {
|
||||
let model: { provider: string; modelId: string } | null = null
|
||||
|
||||
for (const message of messages) {
|
||||
if (!isRecord(message)) continue
|
||||
if (message.role !== "assistant") continue
|
||||
if (typeof message.provider !== "string" || typeof message.model !== "string") continue
|
||||
|
||||
model = {
|
||||
provider: message.provider,
|
||||
modelId: message.model,
|
||||
}
|
||||
}
|
||||
|
||||
return model
|
||||
} as unknown as UserSessionManager
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
|
||||
@@ -1,119 +1,79 @@
|
||||
import type {
|
||||
AgentSessionEvent,
|
||||
ExtensionFactory,
|
||||
SessionEntry,
|
||||
} from "@earendil-works/pi-coding-agent"
|
||||
import type { AgentSessionEvent } from "@earendil-works/pi-coding-agent"
|
||||
|
||||
import {
|
||||
AuthStorage,
|
||||
createAgentSession,
|
||||
DefaultResourceLoader,
|
||||
ModelRegistry,
|
||||
SessionManager,
|
||||
SettingsManager,
|
||||
} from "@earendil-works/pi-coding-agent"
|
||||
import { tmpdir } from "node:os"
|
||||
|
||||
import type { ConversationStorageEntry } from "./conversation-recording-query-agent.ts"
|
||||
import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { ProposedAction, QueryAgent, QueryAgentAsk, QueryAgentEvent } from "./query-agent.ts"
|
||||
|
||||
import { InMemoryResourceLoader } from "./in-memory-resource-loader.ts"
|
||||
import defaultSystemPrompt from "./prompts/system.txt"
|
||||
import {
|
||||
createQueryAgentEventListeners,
|
||||
QueryAgentEvent,
|
||||
type QueryAgent,
|
||||
type QueryAgentAsk,
|
||||
type QueryAgentCompactedEntryRange,
|
||||
type QueryAgentCompactionEvent,
|
||||
type QueryAgentConversationEntryRef,
|
||||
type QueryAgentEventListeners,
|
||||
type QueryAgentEventListener,
|
||||
type QueryAgentEventMap,
|
||||
type QueryAgentStreamEvent,
|
||||
} from "./query-agent.ts"
|
||||
import { createSessionManager } from "./session-manager.ts"
|
||||
import { createFreyaAgentTools, FREYA_AGENT_TOOL_NAMES } from "./tools.ts"
|
||||
|
||||
type PiSession = Awaited<ReturnType<typeof createAgentSession>>["session"]
|
||||
type PiMessageEndEvent = Extract<AgentSessionEvent, { type: "message_end" }>
|
||||
type PiAgentMessage = PiMessageEndEvent["message"]
|
||||
type PiAgentEndEvent = Extract<AgentSessionEvent, { type: "agent_end" }>
|
||||
type PiSessionManager = ReturnType<typeof createSessionManager>
|
||||
type PiSessionMessage = Parameters<PiSessionManager["appendMessage"]>[0]
|
||||
|
||||
export interface PiQueryAgentConfig {
|
||||
toolbox: QueryAgentToolbox
|
||||
sessionManager: UserSessionManager
|
||||
modelProvider: string
|
||||
modelId: string
|
||||
apiKey?: string
|
||||
cwd?: string
|
||||
systemPrompt?: string
|
||||
initialEntries?: ConversationStorageEntry[]
|
||||
clock?: () => Date
|
||||
}
|
||||
|
||||
export const PI_MODEL_PROVIDER = "openrouter"
|
||||
export const PI_MODEL_ID = "z-ai/glm-4.7-flash"
|
||||
interface ActiveRun {
|
||||
proposedActions: ProposedAction[]
|
||||
}
|
||||
|
||||
export class PiQueryAgent implements QueryAgent {
|
||||
private readonly toolbox: QueryAgentToolbox
|
||||
private readonly sessionManager: UserSessionManager
|
||||
private readonly cwd: string
|
||||
private readonly systemPrompt: string
|
||||
private readonly clock: () => Date
|
||||
private readonly modelProvider: string
|
||||
private readonly modelId: string
|
||||
private readonly apiKey: string | undefined
|
||||
private readonly initialEntries: ConversationStorageEntry[]
|
||||
private readonly eventListeners = createQueryAgentEventListeners()
|
||||
private session: PiSession | null = null
|
||||
private pendingSession: Promise<PiSession> | null = null
|
||||
/**
|
||||
* Conversation currently receiving Pi events for an active ask().
|
||||
*
|
||||
* Pi's compaction hook fires from the SDK session rather than from our
|
||||
* QueryAgent call stack, so the hook reads this value to attach the
|
||||
* compaction summary to the right Freya conversation. null means no active
|
||||
* run; "" means a run is active but no Freya conversation id was supplied.
|
||||
*/
|
||||
private activeConversationId: string | null = null
|
||||
/**
|
||||
* Freya entry for the user message currently being handed to Pi.
|
||||
*
|
||||
* ConversationRecordingQueryAgent appends the user message before calling
|
||||
* PiQueryAgent. Pi later persists its own copy of that user message into its
|
||||
* SessionManager, and this one-shot reference lets us map Pi's generated
|
||||
* session entry id back to the Freya sequence.
|
||||
*/
|
||||
private activeUserMessageEntry: QueryAgentConversationEntryRef | null = null
|
||||
/**
|
||||
* Maps Pi SessionManager entry ids to Freya conversation sequences.
|
||||
*
|
||||
* Pi compaction reports boundaries with Pi entry ids, while our DB replay
|
||||
* logic uses monotonically increasing Freya sequences. This map is the bridge
|
||||
* that lets us translate Pi's firstKeptEntryId into a compacted entry range.
|
||||
*/
|
||||
private readonly piEntryConversationSequences = new Map<string, number>()
|
||||
private disposed = false
|
||||
private readonly sessions = new Map<string, PiSession>()
|
||||
private readonly pendingSessions = new Map<string, Promise<PiSession>>()
|
||||
private readonly activeRuns = new Map<string, ActiveRun>()
|
||||
|
||||
constructor(config: PiQueryAgentConfig) {
|
||||
this.toolbox = config.toolbox
|
||||
this.sessionManager = config.sessionManager
|
||||
this.modelProvider = config.modelProvider
|
||||
this.modelId = config.modelId
|
||||
this.apiKey = config.apiKey
|
||||
this.cwd = config.cwd ?? tmpdir()
|
||||
this.systemPrompt = config.systemPrompt ?? defaultSystemPrompt
|
||||
this.initialEntries = config.initialEntries ?? []
|
||||
this.clock = config.clock ?? (() => new Date())
|
||||
}
|
||||
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentStreamEvent> {
|
||||
if (this.activeConversationId !== null) {
|
||||
async *ask(input: QueryAgentAsk): AsyncIterable<QueryAgentEvent> {
|
||||
if (this.activeRuns.has(input.userId)) {
|
||||
yield {
|
||||
type: "error",
|
||||
message: "A query is already running",
|
||||
message: "A query is already running for this user",
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
this.activeConversationId = input.conversationId ?? ""
|
||||
this.activeUserMessageEntry = input.userMessageEntry ?? null
|
||||
const run: ActiveRun = { proposedActions: [] }
|
||||
this.activeRuns.set(input.userId, run)
|
||||
|
||||
let session: PiSession
|
||||
try {
|
||||
session = await this.getOrCreateSession()
|
||||
session = await this.getOrCreateSession(input.userId)
|
||||
} catch (err) {
|
||||
this.activeConversationId = null
|
||||
this.activeUserMessageEntry = null
|
||||
this.clearActiveRun(input.userId, run)
|
||||
yield {
|
||||
type: "error",
|
||||
message: `Failed to create query session: ${errorMessage(err)}`,
|
||||
@@ -121,11 +81,11 @@ export class PiQueryAgent implements QueryAgent {
|
||||
return
|
||||
}
|
||||
|
||||
const events: QueryAgentStreamEvent[] = []
|
||||
const events: QueryAgentEvent[] = []
|
||||
let closed = false
|
||||
let wake: (() => void) | null = null
|
||||
|
||||
function push(event: QueryAgentStreamEvent): void {
|
||||
function push(event: QueryAgentEvent): void {
|
||||
events.push(event)
|
||||
if (wake) {
|
||||
wake()
|
||||
@@ -134,7 +94,7 @@ export class PiQueryAgent implements QueryAgent {
|
||||
}
|
||||
|
||||
let runFailed = false
|
||||
function pushRunEvent(event: QueryAgentStreamEvent): void {
|
||||
function pushRunEvent(event: QueryAgentEvent): void {
|
||||
if (event.type === "error") {
|
||||
if (runFailed) return
|
||||
runFailed = true
|
||||
@@ -154,10 +114,12 @@ export class PiQueryAgent implements QueryAgent {
|
||||
this.handlePiEvent(event, pushRunEvent)
|
||||
})
|
||||
|
||||
session
|
||||
.prompt(input.message)
|
||||
void this.runPrompt(session, input)
|
||||
.then(() => {
|
||||
if (runFailed) return
|
||||
for (const action of run.proposedActions) {
|
||||
pushRunEvent({ type: "action_proposed", action })
|
||||
}
|
||||
pushRunEvent({ type: "done" })
|
||||
})
|
||||
.catch((err: unknown) => {
|
||||
@@ -165,8 +127,7 @@ export class PiQueryAgent implements QueryAgent {
|
||||
})
|
||||
.finally(() => {
|
||||
unsubscribe()
|
||||
this.activeConversationId = null
|
||||
this.activeUserMessageEntry = null
|
||||
this.clearActiveRun(input.userId, run)
|
||||
close()
|
||||
})
|
||||
|
||||
@@ -183,256 +144,92 @@ export class PiQueryAgent implements QueryAgent {
|
||||
}
|
||||
}
|
||||
|
||||
disposeUser(userId: string): void {
|
||||
const session = this.sessions.get(userId)
|
||||
session?.dispose()
|
||||
this.sessions.delete(userId)
|
||||
this.pendingSessions.delete(userId)
|
||||
this.activeRuns.delete(userId)
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
this.disposed = true
|
||||
this.session?.dispose()
|
||||
this.session = null
|
||||
this.pendingSession = null
|
||||
this.activeConversationId = null
|
||||
this.activeUserMessageEntry = null
|
||||
this.clearEventListeners()
|
||||
for (const session of this.sessions.values()) {
|
||||
session.dispose()
|
||||
}
|
||||
this.sessions.clear()
|
||||
this.pendingSessions.clear()
|
||||
this.activeRuns.clear()
|
||||
}
|
||||
|
||||
addEventListener<T extends QueryAgentEvent>(
|
||||
type: T,
|
||||
listener: QueryAgentEventListener<T>,
|
||||
): () => void {
|
||||
const listeners = this.listenersFor(type)
|
||||
listeners.add(listener)
|
||||
return () => {
|
||||
listeners.delete(listener)
|
||||
private clearActiveRun(userId: string, run: ActiveRun): void {
|
||||
if (this.activeRuns.get(userId) === run) {
|
||||
this.activeRuns.delete(userId)
|
||||
}
|
||||
}
|
||||
|
||||
private async getOrCreateSession(): Promise<PiSession> {
|
||||
if (this.disposed) {
|
||||
throw new Error("Query agent is disposed")
|
||||
}
|
||||
private async getOrCreateSession(userId: string): Promise<PiSession> {
|
||||
const existing = this.sessions.get(userId)
|
||||
if (existing) return existing
|
||||
|
||||
if (this.session) return this.session
|
||||
|
||||
const pending = this.pendingSession
|
||||
const pending = this.pendingSessions.get(userId)
|
||||
if (pending) return pending
|
||||
|
||||
const promise = this.createSession()
|
||||
this.pendingSession = promise
|
||||
const promise = this.createSession(userId)
|
||||
this.pendingSessions.set(userId, promise)
|
||||
|
||||
try {
|
||||
const session = await promise
|
||||
if (this.disposed) {
|
||||
session.dispose()
|
||||
throw new Error("Query agent is disposed")
|
||||
}
|
||||
this.session = session
|
||||
this.sessions.set(userId, session)
|
||||
return session
|
||||
} finally {
|
||||
if (this.pendingSession === promise) {
|
||||
this.pendingSession = null
|
||||
}
|
||||
this.pendingSessions.delete(userId)
|
||||
}
|
||||
}
|
||||
|
||||
private async createSession(): Promise<PiSession> {
|
||||
private async createSession(userId: string): Promise<PiSession> {
|
||||
const settingsManager = SettingsManager.inMemory({
|
||||
compaction: { enabled: true },
|
||||
retry: { enabled: true, maxRetries: 2 },
|
||||
})
|
||||
const authStorage = AuthStorage.inMemory()
|
||||
if (this.apiKey) {
|
||||
authStorage.setRuntimeApiKey(PI_MODEL_PROVIDER, this.apiKey)
|
||||
authStorage.setRuntimeApiKey(this.modelProvider, this.apiKey)
|
||||
}
|
||||
|
||||
const modelRegistry = ModelRegistry.inMemory(authStorage)
|
||||
const model = modelRegistry.find(PI_MODEL_PROVIDER, PI_MODEL_ID)
|
||||
const model = modelRegistry.find(this.modelProvider, this.modelId)
|
||||
if (!model) {
|
||||
throw new Error(`Pi model not found: ${PI_MODEL_PROVIDER}/${PI_MODEL_ID}`)
|
||||
throw new Error(`Pi model not found: ${this.modelProvider}/${this.modelId}`)
|
||||
}
|
||||
|
||||
const resourceLoader = new DefaultResourceLoader({
|
||||
cwd: this.cwd,
|
||||
agentDir: this.cwd,
|
||||
settingsManager,
|
||||
systemPrompt: this.systemPrompt,
|
||||
extensionFactories: [this.createCompactionExtension()],
|
||||
noExtensions: true,
|
||||
noSkills: true,
|
||||
noPromptTemplates: true,
|
||||
noThemes: true,
|
||||
noContextFiles: true,
|
||||
})
|
||||
await resourceLoader.reload()
|
||||
|
||||
const sessionManager = this.createMappedSessionManager()
|
||||
|
||||
const { session } = await createAgentSession({
|
||||
cwd: this.cwd,
|
||||
authStorage,
|
||||
modelRegistry,
|
||||
model,
|
||||
resourceLoader,
|
||||
resourceLoader: new InMemoryResourceLoader(this.systemPrompt),
|
||||
settingsManager,
|
||||
sessionManager,
|
||||
sessionManager: SessionManager.inMemory(this.cwd),
|
||||
noTools: "builtin",
|
||||
customTools: createFreyaAgentTools({
|
||||
toolbox: this.toolbox,
|
||||
userId,
|
||||
sessionManager: this.sessionManager,
|
||||
clock: this.clock,
|
||||
proposeAction: (action) => {
|
||||
this.activeRuns.get(userId)?.proposedActions.push(action)
|
||||
},
|
||||
}),
|
||||
tools: FREYA_AGENT_TOOL_NAMES,
|
||||
tools: [...FREYA_AGENT_TOOL_NAMES],
|
||||
})
|
||||
|
||||
return session
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates Pi's SessionManager and records Pi-id -> Freya-sequence mappings.
|
||||
*
|
||||
* Hydrated DB messages are mapped through createSessionManager's callback.
|
||||
* Live user messages are mapped by wrapping appendMessage(), because Pi owns
|
||||
* the generated session entry id for messages written during prompt handling.
|
||||
*/
|
||||
private createMappedSessionManager(): PiSessionManager {
|
||||
this.piEntryConversationSequences.clear()
|
||||
const sessionManager = createSessionManager({
|
||||
cwd: this.cwd,
|
||||
entries: this.initialEntries,
|
||||
modelProvider: PI_MODEL_PROVIDER,
|
||||
modelId: PI_MODEL_ID,
|
||||
onMessageEntryAppended: (piEntryId, entry) => {
|
||||
this.piEntryConversationSequences.set(piEntryId, entry.sequence)
|
||||
},
|
||||
})
|
||||
const appendMessage = sessionManager.appendMessage.bind(sessionManager)
|
||||
|
||||
sessionManager.appendMessage = (message: PiSessionMessage): string => {
|
||||
const piEntryId = appendMessage(message)
|
||||
const sequence = this.liveConversationSequenceForMessage(message)
|
||||
if (sequence !== null) {
|
||||
this.piEntryConversationSequences.set(piEntryId, sequence)
|
||||
}
|
||||
return piEntryId
|
||||
}
|
||||
|
||||
return sessionManager
|
||||
private async runPrompt(session: PiSession, input: QueryAgentAsk): Promise<void> {
|
||||
await session.prompt(input.message)
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Freya sequence for Pi's persisted live user message.
|
||||
*
|
||||
* We only map user messages here because they are the messages Freya writes
|
||||
* before invoking Pi. Assistant/tool entries are recorded from the stream
|
||||
* outside Pi's SessionManager and do not have a stable live Pi id available
|
||||
* at the storage boundary.
|
||||
*/
|
||||
private liveConversationSequenceForMessage(message: PiSessionMessage): number | null {
|
||||
if (message.role !== "user") return null
|
||||
|
||||
const entry = this.activeUserMessageEntry
|
||||
this.activeUserMessageEntry = null
|
||||
if (!entry) return null
|
||||
|
||||
return entry.sequence
|
||||
}
|
||||
|
||||
/**
|
||||
* Installs the minimal Pi extension used to observe compaction.
|
||||
*
|
||||
* session_before_compact gives us the full branch plus firstKeptEntryId, so
|
||||
* we translate that boundary before Pi writes the compaction entry. The later
|
||||
* session_compact event carries the saved summary, which we forward with the
|
||||
* cached Freya compacted entry range.
|
||||
*/
|
||||
private createCompactionExtension(): ExtensionFactory {
|
||||
return (pi) => {
|
||||
/**
|
||||
* Temporary handoff between Pi's before/after compaction hooks.
|
||||
*
|
||||
* session_compact receives the saved compaction entry, not the original
|
||||
* branch entries needed for boundary translation.
|
||||
*/
|
||||
let pendingCompactedEntryRange: QueryAgentCompactedEntryRange | null = null
|
||||
|
||||
pi.on("session_before_compact", async (event) => {
|
||||
pendingCompactedEntryRange = this.compactedEntryRangeBeforePiEntry(
|
||||
event.branchEntries,
|
||||
event.preparation.firstKeptEntryId,
|
||||
)
|
||||
})
|
||||
|
||||
pi.on("session_compact", async (event) => {
|
||||
const conversationId = this.activeConversationId
|
||||
if (!conversationId) return
|
||||
|
||||
const entry = event.compactionEntry
|
||||
const compactedEntryRange = pendingCompactedEntryRange
|
||||
pendingCompactedEntryRange = null
|
||||
const compactionEvent: QueryAgentCompactionEvent = {
|
||||
type: QueryAgentEvent.Compaction,
|
||||
conversationId,
|
||||
summary: entry.summary,
|
||||
firstKeptEntryId: entry.firstKeptEntryId,
|
||||
compactedEntryRange,
|
||||
tokensBefore: entry.tokensBefore,
|
||||
details: entry.details,
|
||||
fromExtension: event.fromExtension,
|
||||
}
|
||||
|
||||
await this.emitEvent(compactionEvent)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Freya entry range compacted before a Pi session entry.
|
||||
*
|
||||
* Pi keeps firstKeptEntryId and everything after it as raw context. Therefore
|
||||
* the summary covers only mapped entries before that Pi entry. If none of
|
||||
* those entries map back to Freya, we return null so storage can avoid
|
||||
* recording a summary with an unsafe coverage range.
|
||||
*/
|
||||
private compactedEntryRangeBeforePiEntry(
|
||||
branchEntries: SessionEntry[],
|
||||
piEntryId: string,
|
||||
): QueryAgentCompactedEntryRange | null {
|
||||
let endSequence: number | null = null
|
||||
for (const entry of branchEntries) {
|
||||
if (entry.id === piEntryId) {
|
||||
if (endSequence === null) return null
|
||||
|
||||
return {
|
||||
startSequence: 1,
|
||||
endSequence,
|
||||
}
|
||||
}
|
||||
|
||||
const sequence = this.piEntryConversationSequences.get(entry.id)
|
||||
if (typeof sequence === "number") {
|
||||
endSequence = sequence
|
||||
}
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
private async emitEvent<T extends QueryAgentEvent>(event: QueryAgentEventMap[T]): Promise<void> {
|
||||
const listeners = this.listenersFor(event.type)
|
||||
for (const listener of listeners) {
|
||||
await listener(event)
|
||||
}
|
||||
}
|
||||
|
||||
private listenersFor<T extends QueryAgentEvent>(type: T): QueryAgentEventListeners[T] {
|
||||
return this.eventListeners[type]
|
||||
}
|
||||
|
||||
private clearEventListeners(): void {
|
||||
for (const listeners of Object.values(this.eventListeners)) {
|
||||
listeners.clear()
|
||||
}
|
||||
}
|
||||
|
||||
private handlePiEvent(
|
||||
event: AgentSessionEvent,
|
||||
push: (event: QueryAgentStreamEvent) => void,
|
||||
): void {
|
||||
private handlePiEvent(event: AgentSessionEvent, push: (event: QueryAgentEvent) => void): void {
|
||||
switch (event.type) {
|
||||
case "message_end": {
|
||||
const message = piAssistantMessageError(event.message)
|
||||
@@ -500,6 +297,7 @@ function piAssistantMessageError(message: PiAgentMessage): string | null {
|
||||
case "toolUse":
|
||||
return null
|
||||
}
|
||||
return null
|
||||
default:
|
||||
return null
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
<identity>
|
||||
You are Freya. You are a digital companion created by Kenneth. His twitter is @kennethnym.
|
||||
You have access to user data via the context graph. It stores the latest snapshot of all user data and context.
|
||||
It reactively updates based on external events, such as, but not exclusively, when the user moves, when a new email arrives, when weather updates are available, and when transit alerts are issued.
|
||||
</identity>
|
||||
|
||||
<action>
|
||||
@@ -17,9 +15,9 @@ freya_list_context: when you need to inspect all current context graph entries.
|
||||
|
||||
freya_get_source_data: when you need current feed items, context entries, actions, or errors for a specific source ID.
|
||||
|
||||
freya_execute_action: when the user asks you to perform an available source action, or when the source action is non-mutating and tool-like. This executes immediately.
|
||||
freya_propose_action: when the user asks to change state or when you recommend a concrete action that should be confirmed first. This tool only proposes an action. It does not execute the action.
|
||||
|
||||
If you need more information to answer user's query, call freya_execute_action with sourceId "freya.web-search", actionId "search", and params containing query and numResults, for example {"query":"latest relevant information","numResults":5}.
|
||||
if you need more information to answer user's query, call freya_propose_action with freya.web-search source id.
|
||||
</action>
|
||||
|
||||
<behavior>
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
import type { ContextKeyPart } from "@freya/core"
|
||||
|
||||
export interface QueryAgentToolResult {
|
||||
content: Array<{ type: "text"; text: string }>
|
||||
details: Record<string, unknown>
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation boundary for FREYA query-agent tools.
|
||||
*
|
||||
* The Pi-facing tool definitions in `tools.ts` should stay thin: they declare
|
||||
* schemas, validate and narrow raw model-provided parameters, then delegate to
|
||||
* this toolbox. Concrete implementations own the actual data gathering,
|
||||
* source/action lookups, result shaping, and any session-specific behavior.
|
||||
*/
|
||||
export interface QueryAgentToolbox {
|
||||
/**
|
||||
* Summarizes every source currently visible to the user's session.
|
||||
*
|
||||
* Implementations should refresh or read the current feed as needed, then
|
||||
* return a compact source inventory including feed item counts, context
|
||||
* entry counts, available action IDs/descriptions, and source errors. This
|
||||
* is the broad discovery tool an agent can use before deciding which more
|
||||
* targeted tool call to make.
|
||||
*/
|
||||
listSources(): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Reads context entries from the current FREYA context graph.
|
||||
*
|
||||
* `key` is a tuple-style context key. With `match: "exact"`, the implementation
|
||||
* should return only the value at that exact key and indicate whether it was
|
||||
* found. With `match: "prefix"`, it should return all entries whose keys
|
||||
* begin with the provided key parts, plus a count. Implementations may refresh
|
||||
* the feed first so the context reflects the latest source data.
|
||||
*/
|
||||
getContext(key: ContextKeyPart[], match: "exact" | "prefix"): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Reads one feed item by ID and includes source-local diagnostics.
|
||||
*
|
||||
* Implementations should search the current feed for `feedItemId`. When found,
|
||||
* the result should include the item plus related context entries, source
|
||||
* action summaries, and source errors. When missing, the result should clearly
|
||||
* report `found: false` and return `item: null`.
|
||||
*/
|
||||
getFeedItem(feedItemId: string): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Returns the broad context bundle needed to answer a natural-language query.
|
||||
*
|
||||
* `question` is included in the result for traceability. If `feedItemId` is
|
||||
* provided, implementations should also include the matching selected item
|
||||
* when present. The result should expose the current feed items, context graph
|
||||
* entries, available source actions, and source errors so the agent can
|
||||
* synthesize an answer from the user's personal data.
|
||||
*/
|
||||
queryContext(question: string, feedItemId?: string): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Lists every current context graph entry.
|
||||
*
|
||||
* This is a lower-level inspection tool than `queryContext`: it should return
|
||||
* all context entries and a count, without feed items or action summaries.
|
||||
* Implementations may refresh the feed first to ensure source-provided
|
||||
* context has been materialized.
|
||||
*/
|
||||
listContext(): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Returns all currently available data for one source.
|
||||
*
|
||||
* Implementations should include whether the source is enabled, all feed
|
||||
* items from `sourceId`, context entries owned by that source, available
|
||||
* action summaries, and errors from that source. If `feedItemId` is provided,
|
||||
* the result should also include the matching selected item from that source
|
||||
* when present.
|
||||
*/
|
||||
getSourceData(sourceId: string, feedItemId?: string): Promise<QueryAgentToolResult>
|
||||
|
||||
/**
|
||||
* Executes a source action and returns a serializable execution result.
|
||||
*
|
||||
* `sourceId` identifies the source, `actionId` identifies the action within
|
||||
* that source, and `params` is the source-specific action payload. Tool
|
||||
* wrappers validate the action envelope, while the source action schema owns
|
||||
* payload validation. Implementations should let source/action validation
|
||||
* errors propagate, and on success should return an `ok: true` result plus
|
||||
* `details.actionExecution` for callers that need a structured record of
|
||||
* what ran.
|
||||
*/
|
||||
executeAction(sourceId: string, actionId: string, params?: unknown): Promise<QueryAgentToolResult>
|
||||
}
|
||||
@@ -1,74 +1,36 @@
|
||||
export interface QueryAgentAsk {
|
||||
userId: string
|
||||
message: string
|
||||
conversationId?: string
|
||||
userMessageEntry?: QueryAgentConversationEntryRef
|
||||
}
|
||||
|
||||
export type QueryAgentStreamEvent =
|
||||
| { type: "conversation"; conversationId: string }
|
||||
export interface ProposedAction {
|
||||
id: string
|
||||
title: string
|
||||
description: string
|
||||
sourceId?: string
|
||||
actionId?: string
|
||||
params?: unknown
|
||||
requiresConfirmation: true
|
||||
createdAt: string
|
||||
}
|
||||
|
||||
export type QueryAgentEvent =
|
||||
| { type: "text_delta"; text: string }
|
||||
| { type: "tool_start"; toolName: string }
|
||||
| { type: "tool_end"; toolName: string; ok: boolean }
|
||||
| { type: "action_proposed"; action: ProposedAction }
|
||||
| { type: "done" }
|
||||
| { type: "error"; message: string }
|
||||
|
||||
export const QueryAgentEvent = {
|
||||
Compaction: "compaction",
|
||||
} as const
|
||||
|
||||
export type QueryAgentEvent = (typeof QueryAgentEvent)[keyof typeof QueryAgentEvent]
|
||||
|
||||
export interface QueryAgentConversationEntryRef {
|
||||
id: string
|
||||
sequence: number
|
||||
}
|
||||
|
||||
export interface QueryAgentCompactedEntryRange {
|
||||
startSequence: number
|
||||
endSequence: number
|
||||
}
|
||||
|
||||
export interface QueryAgentCompactionEvent {
|
||||
type: typeof QueryAgentEvent.Compaction
|
||||
conversationId: string
|
||||
summary: string
|
||||
firstKeptEntryId: string
|
||||
compactedEntryRange: QueryAgentCompactedEntryRange | null
|
||||
tokensBefore: number
|
||||
details?: unknown
|
||||
fromExtension: boolean
|
||||
}
|
||||
|
||||
export interface QueryAgentEventMap {
|
||||
[QueryAgentEvent.Compaction]: QueryAgentCompactionEvent
|
||||
}
|
||||
|
||||
export type QueryAgentEventListener<T extends QueryAgentEvent> = (
|
||||
event: QueryAgentEventMap[T],
|
||||
) => void | Promise<void>
|
||||
|
||||
export type QueryAgentEventListeners = {
|
||||
[T in QueryAgentEvent]: Set<QueryAgentEventListener<T>>
|
||||
}
|
||||
|
||||
export function createQueryAgentEventListeners(): QueryAgentEventListeners {
|
||||
return {
|
||||
[QueryAgentEvent.Compaction]: new Set(),
|
||||
}
|
||||
}
|
||||
|
||||
export interface QueryAgent {
|
||||
ask(input: QueryAgentAsk): AsyncIterable<QueryAgentStreamEvent>
|
||||
addEventListener<T extends QueryAgentEvent>(
|
||||
type: T,
|
||||
listener: QueryAgentEventListener<T>,
|
||||
): () => void
|
||||
ask(input: QueryAgentAsk): AsyncIterable<QueryAgentEvent>
|
||||
disposeUser(userId: string): void
|
||||
dispose(): void
|
||||
}
|
||||
|
||||
export interface QueryAgentResponse {
|
||||
message: string
|
||||
conversationId?: string
|
||||
proposedActions: ProposedAction[]
|
||||
}
|
||||
|
||||
export class QueryAgentError extends Error {
|
||||
@@ -83,16 +45,16 @@ export async function collectQueryAgentResponse(
|
||||
input: QueryAgentAsk,
|
||||
): Promise<QueryAgentResponse> {
|
||||
let message = ""
|
||||
let conversationId: string | undefined
|
||||
const proposedActions: ProposedAction[] = []
|
||||
|
||||
for await (const event of agent.ask(input)) {
|
||||
switch (event.type) {
|
||||
case "conversation":
|
||||
conversationId = event.conversationId
|
||||
break
|
||||
case "text_delta":
|
||||
message += event.text
|
||||
break
|
||||
case "action_proposed":
|
||||
proposedActions.push(event.action)
|
||||
break
|
||||
case "error":
|
||||
throw new QueryAgentError(event.message)
|
||||
case "tool_start":
|
||||
@@ -102,5 +64,5 @@ export async function collectQueryAgentResponse(
|
||||
}
|
||||
}
|
||||
|
||||
return { message, conversationId }
|
||||
return { message, proposedActions }
|
||||
}
|
||||
|
||||
@@ -1,156 +0,0 @@
|
||||
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", () => {
|
||||
test("hydrates user and assistant entries into Pi session context", () => {
|
||||
const sessionManager = createSessionManager({
|
||||
entries: [
|
||||
entry({
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "hello" }],
|
||||
},
|
||||
}),
|
||||
entry({
|
||||
id: "entry-2",
|
||||
sequence: 2,
|
||||
kind: ConversationEntryKind.AssistantMessage,
|
||||
payload: {
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text: "hi there" }],
|
||||
},
|
||||
metadata: {
|
||||
modelRun: {
|
||||
route: "agent_query",
|
||||
provider: "openrouter",
|
||||
model: "stored-model",
|
||||
},
|
||||
},
|
||||
}),
|
||||
],
|
||||
modelProvider: "openrouter",
|
||||
modelId: "fallback-model",
|
||||
})
|
||||
|
||||
const context = sessionManager.buildSessionContext()
|
||||
|
||||
expect(context.messages.map(roleOf)).toEqual(["user", "assistant"])
|
||||
expect(textFromMessage(context.messages[0])).toBe("hello")
|
||||
expect(textFromMessage(context.messages[1])).toBe("hi there")
|
||||
expect(context.model).toEqual({
|
||||
provider: "openrouter",
|
||||
modelId: "stored-model",
|
||||
})
|
||||
})
|
||||
|
||||
test("uses the latest context summary and replays only uncovered raw entries", () => {
|
||||
const sessionManager = createSessionManager({
|
||||
entries: [
|
||||
entry({
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "old question" }],
|
||||
},
|
||||
}),
|
||||
entry({
|
||||
id: "entry-2",
|
||||
sequence: 2,
|
||||
kind: ConversationEntryKind.AssistantMessage,
|
||||
payload: {
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text: "old answer" }],
|
||||
},
|
||||
}),
|
||||
entry({
|
||||
id: "entry-3",
|
||||
sequence: 3,
|
||||
kind: ConversationEntryKind.ContextSummary,
|
||||
payload: {
|
||||
covers: {
|
||||
startSequence: 1,
|
||||
endSequence: 2,
|
||||
},
|
||||
summary: {
|
||||
durableFacts: ["The user is designing conversation storage."],
|
||||
preferences: [],
|
||||
decisions: ["Context compaction is stored as a conversation entry."],
|
||||
openTasks: [],
|
||||
importantDetails: [],
|
||||
},
|
||||
promptVersion: "test-v1",
|
||||
},
|
||||
}),
|
||||
entry({
|
||||
id: "entry-4",
|
||||
sequence: 4,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "new question" }],
|
||||
},
|
||||
}),
|
||||
],
|
||||
modelProvider: "openrouter",
|
||||
modelId: "fallback-model",
|
||||
})
|
||||
|
||||
const context = sessionManager.buildSessionContext()
|
||||
|
||||
expect(context.messages.map(roleOf)).toEqual(["compactionSummary", "user"])
|
||||
expect(textFromMessage(context.messages[0])).toContain(
|
||||
"The user is designing conversation storage.",
|
||||
)
|
||||
expect(textFromMessage(context.messages[0])).toContain(
|
||||
"Context compaction is stored as a conversation entry.",
|
||||
)
|
||||
expect(textFromMessage(context.messages[1])).toBe("new question")
|
||||
})
|
||||
})
|
||||
|
||||
function entry(
|
||||
input: Omit<ConversationStorageEntry, "createdAt" | "metadata"> & {
|
||||
createdAt?: Date
|
||||
metadata?: ConversationStorageEntry["metadata"]
|
||||
},
|
||||
): ConversationStorageEntry {
|
||||
return {
|
||||
...input,
|
||||
metadata: input.metadata ?? {},
|
||||
createdAt: input.createdAt ?? new Date("2026-06-15T00:00:00.000Z"),
|
||||
}
|
||||
}
|
||||
|
||||
function roleOf(message: unknown): string | undefined {
|
||||
if (!isRecord(message)) return undefined
|
||||
return typeof message.role === "string" ? message.role : undefined
|
||||
}
|
||||
|
||||
function textFromMessage(message: unknown): string {
|
||||
if (!isRecord(message)) return ""
|
||||
if (typeof message.summary === "string") return message.summary
|
||||
|
||||
const content = message.content
|
||||
if (typeof content === "string") return content
|
||||
if (!Array.isArray(content)) return ""
|
||||
|
||||
return content.map(textFromContentPart).join("")
|
||||
}
|
||||
|
||||
function textFromContentPart(part: unknown): string {
|
||||
if (!isRecord(part)) return ""
|
||||
return typeof part.text === "string" ? part.text : ""
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === "object" && value !== null
|
||||
}
|
||||
@@ -1,188 +0,0 @@
|
||||
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 "../conversations/types.ts"
|
||||
|
||||
type PiMessage = Parameters<SessionManager["appendMessage"]>[0]
|
||||
type PiAssistantMessage = Extract<PiMessage, { role: "assistant" }>
|
||||
|
||||
export interface CreateSessionManagerInput {
|
||||
cwd?: string
|
||||
entries: ConversationStorageEntry[]
|
||||
modelProvider: string
|
||||
modelId: string
|
||||
onMessageEntryAppended?: (piEntryId: string, entry: ConversationStorageEntry) => void
|
||||
}
|
||||
|
||||
export function createSessionManager(input: CreateSessionManagerInput): SessionManager {
|
||||
const sessionManager = SessionManager.inMemory(input.cwd ?? tmpdir())
|
||||
const context = buildContextFromEntries(input.entries)
|
||||
|
||||
if (context.summary) {
|
||||
sessionManager.appendCompaction(
|
||||
context.summary.text,
|
||||
"freya-db-context-start",
|
||||
0,
|
||||
{
|
||||
conversationEntryId: context.summary.entry.id,
|
||||
covers: context.summary.covers,
|
||||
},
|
||||
true,
|
||||
)
|
||||
}
|
||||
|
||||
for (const entry of context.entries) {
|
||||
const message = messageForEntry(entry, input.modelProvider, input.modelId)
|
||||
if (message) {
|
||||
const piEntryId = sessionManager.appendMessage(message)
|
||||
input.onMessageEntryAppended?.(piEntryId, entry)
|
||||
}
|
||||
}
|
||||
|
||||
return sessionManager
|
||||
}
|
||||
|
||||
function buildContextFromEntries(entries: ConversationStorageEntry[]): {
|
||||
summary?: { entry: ConversationStorageEntry; text: string; covers: unknown }
|
||||
entries: ConversationStorageEntry[]
|
||||
} {
|
||||
const orderedEntries = [...entries].sort((left, right) => left.sequence - right.sequence)
|
||||
const summaryEntry = latestContextSummaryEntry(orderedEntries)
|
||||
if (!summaryEntry || summaryEntry.kind !== ConversationEntryKind.ContextSummary) {
|
||||
return { entries: orderedEntries }
|
||||
}
|
||||
|
||||
const payload = ContextSummaryPayload.assert(summaryEntry.payload)
|
||||
const text = contextSummaryText(payload.summary)
|
||||
const rawStartSequence = payload.covers.endSequence + 1
|
||||
|
||||
return {
|
||||
summary: {
|
||||
entry: summaryEntry,
|
||||
text,
|
||||
covers: payload.covers,
|
||||
},
|
||||
entries: orderedEntries.filter((entry) => entry.sequence >= rawStartSequence),
|
||||
}
|
||||
}
|
||||
|
||||
function latestContextSummaryEntry(
|
||||
entries: ConversationStorageEntry[],
|
||||
): ConversationStorageEntry | undefined {
|
||||
let latest: ConversationStorageEntry | undefined
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.kind !== ConversationEntryKind.ContextSummary) continue
|
||||
if (!latest || entry.sequence > latest.sequence) {
|
||||
latest = entry
|
||||
}
|
||||
}
|
||||
|
||||
return latest
|
||||
}
|
||||
|
||||
function messageForEntry(
|
||||
entry: ConversationStorageEntry,
|
||||
modelProvider: string,
|
||||
modelId: string,
|
||||
): PiMessage | null {
|
||||
switch (entry.kind) {
|
||||
case ConversationEntryKind.UserMessage: {
|
||||
const payload = UserMessagePayload.assert(entry.payload)
|
||||
return {
|
||||
role: "user",
|
||||
content: messagePartsText(payload.parts),
|
||||
timestamp: entry.createdAt.getTime(),
|
||||
}
|
||||
}
|
||||
case ConversationEntryKind.AssistantMessage: {
|
||||
const payload = AssistantMessagePayload.assert(entry.payload)
|
||||
return {
|
||||
role: "assistant",
|
||||
content: [{ type: "text", text: messagePartsText(payload.parts) }],
|
||||
api: "anthropic-messages",
|
||||
provider: entry.metadata.modelRun?.provider ?? modelProvider,
|
||||
model: entry.metadata.modelRun?.model ?? modelId,
|
||||
usage: zeroUsage(),
|
||||
stopReason: "stop",
|
||||
timestamp: entry.createdAt.getTime(),
|
||||
} satisfies PiAssistantMessage
|
||||
}
|
||||
case ConversationEntryKind.Attachment:
|
||||
case ConversationEntryKind.ContextSummary:
|
||||
case ConversationEntryKind.SystemNote:
|
||||
case ConversationEntryKind.ToolCall:
|
||||
case ConversationEntryKind.ToolResult:
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
function messagePartsText(
|
||||
parts: Array<{ type: "text"; text: string } | { type: "json"; value: unknown }>,
|
||||
): string {
|
||||
return parts.map(messagePartText).join("\n")
|
||||
}
|
||||
|
||||
function messagePartText(
|
||||
part: { type: "text"; text: string } | { type: "json"; value: unknown },
|
||||
): string {
|
||||
switch (part.type) {
|
||||
case "text":
|
||||
return part.text
|
||||
case "json":
|
||||
return stringifyJson(part.value)
|
||||
}
|
||||
}
|
||||
|
||||
function contextSummaryText(summary: {
|
||||
userIntent?: string
|
||||
durableFacts: string[]
|
||||
preferences: string[]
|
||||
decisions: string[]
|
||||
openTasks: string[]
|
||||
importantDetails: string[]
|
||||
}): string {
|
||||
const sections: string[] = []
|
||||
pushSection(sections, "User intent", summary.userIntent ? [summary.userIntent] : [])
|
||||
pushSection(sections, "Durable facts", summary.durableFacts)
|
||||
pushSection(sections, "Preferences", summary.preferences)
|
||||
pushSection(sections, "Decisions", summary.decisions)
|
||||
pushSection(sections, "Open tasks", summary.openTasks)
|
||||
pushSection(sections, "Important details", summary.importantDetails)
|
||||
return sections.join("\n\n")
|
||||
}
|
||||
|
||||
function pushSection(sections: string[], title: string, values: string[]): void {
|
||||
const trimmedValues = values.map((value) => value.trim()).filter(Boolean)
|
||||
if (trimmedValues.length === 0) return
|
||||
|
||||
sections.push(`${title}:\n${trimmedValues.map((value) => `- ${value}`).join("\n")}`)
|
||||
}
|
||||
|
||||
function stringifyJson(value: unknown): string {
|
||||
return JSON.stringify(value, null, 2) ?? String(value)
|
||||
}
|
||||
|
||||
function zeroUsage(): PiAssistantMessage["usage"] {
|
||||
return {
|
||||
input: 0,
|
||||
output: 0,
|
||||
cacheRead: 0,
|
||||
cacheWrite: 0,
|
||||
totalTokens: 0,
|
||||
cost: {
|
||||
input: 0,
|
||||
output: 0,
|
||||
cacheRead: 0,
|
||||
cacheWrite: 0,
|
||||
total: 0,
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -1,116 +0,0 @@
|
||||
import { describe, expect, mock, test } from "bun:test"
|
||||
|
||||
import type { QueryAgentToolResult, QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||
|
||||
mock.module("@earendil-works/pi-coding-agent", () => ({
|
||||
defineTool(tool: unknown): unknown {
|
||||
return tool
|
||||
},
|
||||
}))
|
||||
|
||||
interface TestTool {
|
||||
name: string
|
||||
parameters: unknown
|
||||
execute(toolCallId: string, params: unknown): Promise<unknown>
|
||||
}
|
||||
|
||||
describe("FREYA agent tools", () => {
|
||||
test("rejects unknown top-level params", async () => {
|
||||
const { createFreyaAgentTools, FREYA_GET_CONTEXT_TOOL } = await import("./tools.ts")
|
||||
const tool = expectTool(
|
||||
createFreyaAgentTools({ toolbox: createStubToolbox() }),
|
||||
FREYA_GET_CONTEXT_TOOL,
|
||||
)
|
||||
|
||||
await expect(
|
||||
tool.execute("tool-call-1", {
|
||||
key: ["freya.location"],
|
||||
extra: true,
|
||||
}),
|
||||
).rejects.toThrow("extra")
|
||||
})
|
||||
|
||||
test("rejects invalid context keys", async () => {
|
||||
const { createFreyaAgentTools, FREYA_GET_CONTEXT_TOOL } = await import("./tools.ts")
|
||||
const tool = expectTool(
|
||||
createFreyaAgentTools({ toolbox: createStubToolbox() }),
|
||||
FREYA_GET_CONTEXT_TOOL,
|
||||
)
|
||||
|
||||
await expect(tool.execute("tool-call-1", { key: [] })).rejects.toThrow("key")
|
||||
await expect(tool.execute("tool-call-1", { key: [["freya.location"]] })).rejects.toThrow("key")
|
||||
await expect(
|
||||
tool.execute("tool-call-1", { key: [{ nested: { invalid: true } }] }),
|
||||
).rejects.toThrow("nested")
|
||||
})
|
||||
|
||||
test("marks tool schemas as closed objects", async () => {
|
||||
const { createFreyaAgentTools } = await import("./tools.ts")
|
||||
const tools = createFreyaAgentTools({ toolbox: createStubToolbox() })
|
||||
|
||||
for (const tool of tools.map(expectTestTool)) {
|
||||
expect(expectRecord(tool.parameters).additionalProperties).toBe(false)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
function createStubToolbox(): QueryAgentToolbox {
|
||||
return {
|
||||
async listSources() {
|
||||
return toolResult({ sources: [] })
|
||||
},
|
||||
async getContext(key, match) {
|
||||
return toolResult({ key, match })
|
||||
},
|
||||
async getFeedItem(feedItemId) {
|
||||
return toolResult({ feedItemId })
|
||||
},
|
||||
async queryContext(question, feedItemId) {
|
||||
return toolResult({ question, feedItemId })
|
||||
},
|
||||
async listContext() {
|
||||
return toolResult({ entries: [] })
|
||||
},
|
||||
async getSourceData(sourceId, feedItemId) {
|
||||
return toolResult({ sourceId, feedItemId })
|
||||
},
|
||||
async executeAction(sourceId, actionId, params) {
|
||||
return toolResult({ sourceId, actionId, params })
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
function toolResult(result: unknown): QueryAgentToolResult {
|
||||
return {
|
||||
content: [{ type: "text", text: JSON.stringify(result) }],
|
||||
details: {},
|
||||
}
|
||||
}
|
||||
|
||||
function expectTool(tools: unknown[], name: string): TestTool {
|
||||
const tool = tools.map(expectTestTool).find((candidate) => candidate.name === name)
|
||||
if (!tool) {
|
||||
throw new Error(`Missing test tool: ${name}`)
|
||||
}
|
||||
return tool
|
||||
}
|
||||
|
||||
function expectTestTool(value: unknown): TestTool {
|
||||
const record = expectRecord(value)
|
||||
const execute = record.execute
|
||||
if (typeof record.name !== "string" || typeof execute !== "function") {
|
||||
throw new Error("Expected test tool")
|
||||
}
|
||||
return {
|
||||
name: record.name,
|
||||
parameters: record.parameters,
|
||||
execute: execute as TestTool["execute"],
|
||||
}
|
||||
}
|
||||
|
||||
function expectRecord(value: unknown): Record<string, unknown> {
|
||||
expect(typeof value).toBe("object")
|
||||
expect(value).not.toBeNull()
|
||||
expect(Array.isArray(value)).toBe(false)
|
||||
return value as Record<string, unknown>
|
||||
}
|
||||
@@ -1,11 +1,17 @@
|
||||
import { defineTool } from "@earendil-works/pi-coding-agent"
|
||||
import { type } from "arktype"
|
||||
import { Type } from "typebox"
|
||||
|
||||
import type { QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||
import type { UserSessionManager } from "../session/index.ts"
|
||||
import type { QueryDebugTools } from "./debug-tools.ts"
|
||||
import type { ProposedAction } from "./query-agent.ts"
|
||||
|
||||
import { createQueryDebugTools } from "./debug-tools.ts"
|
||||
|
||||
interface CreateFreyaAgentToolsConfig {
|
||||
toolbox: QueryAgentToolbox
|
||||
userId: string
|
||||
sessionManager: UserSessionManager
|
||||
clock: () => Date
|
||||
proposeAction(action: ProposedAction): void
|
||||
}
|
||||
|
||||
export const FREYA_QUERY_CONTEXT_TOOL = "freya_query_context"
|
||||
@@ -14,42 +20,7 @@ export const FREYA_GET_CONTEXT_TOOL = "freya_get_context"
|
||||
export const FREYA_LIST_CONTEXT_TOOL = "freya_list_context"
|
||||
export const FREYA_GET_SOURCE_DATA_TOOL = "freya_get_source_data"
|
||||
export const FREYA_GET_FEED_ITEM_TOOL = "freya_get_feed_item"
|
||||
export const FREYA_EXECUTE_ACTION_TOOL = "freya_execute_action"
|
||||
|
||||
const ContextKeyObjectPart = type("Record<string, string | number | boolean>").narrow(
|
||||
(value) => !Array.isArray(value),
|
||||
)
|
||||
const ContextKeyPart = type("string | number").or(ContextKeyObjectPart)
|
||||
|
||||
const GetContextToolParams = type({
|
||||
"+": "reject",
|
||||
key: ContextKeyPart.array().atLeastLength(1),
|
||||
"match?": "'exact' | 'prefix'",
|
||||
})
|
||||
|
||||
const GetFeedItemToolParams = type({
|
||||
"+": "reject",
|
||||
feedItemId: type.string.atLeastLength(1),
|
||||
})
|
||||
|
||||
const QueryContextToolParams = type({
|
||||
"+": "reject",
|
||||
question: type.string.atLeastLength(1),
|
||||
"feedItemId?": "string",
|
||||
})
|
||||
|
||||
const GetSourceDataToolParams = type({
|
||||
"+": "reject",
|
||||
sourceId: type.string.atLeastLength(1),
|
||||
"feedItemId?": "string",
|
||||
})
|
||||
|
||||
const ExecuteActionToolParams = type({
|
||||
"+": "reject",
|
||||
sourceId: type.string.atLeastLength(1),
|
||||
actionId: type.string.atLeastLength(1),
|
||||
"params?": "unknown",
|
||||
})
|
||||
export const FREYA_PROPOSE_ACTION_TOOL = "freya_propose_action"
|
||||
|
||||
export const FREYA_AGENT_TOOL_NAMES = [
|
||||
FREYA_LIST_SOURCES_TOOL,
|
||||
@@ -58,17 +29,20 @@ export const FREYA_AGENT_TOOL_NAMES = [
|
||||
FREYA_QUERY_CONTEXT_TOOL,
|
||||
FREYA_LIST_CONTEXT_TOOL,
|
||||
FREYA_GET_SOURCE_DATA_TOOL,
|
||||
FREYA_EXECUTE_ACTION_TOOL,
|
||||
FREYA_PROPOSE_ACTION_TOOL,
|
||||
]
|
||||
|
||||
export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
const { userId } = config
|
||||
const debugTools = createQueryDebugTools(config.sessionManager)
|
||||
|
||||
const listSourcesTool = defineTool({
|
||||
name: FREYA_LIST_SOURCES_TOOL,
|
||||
label: "List FREYA Sources",
|
||||
description:
|
||||
"List enabled FREYA source IDs and summarize available feed items, context entries, actions, and errors.",
|
||||
parameters: Type.Object({}, { additionalProperties: false }),
|
||||
execute: async () => executeListSourcesTool(config.toolbox),
|
||||
parameters: Type.Object({}),
|
||||
execute: async () => executeDebugTool(debugTools, userId, FREYA_LIST_SOURCES_TOOL, {}),
|
||||
})
|
||||
|
||||
const getContextTool = defineTool({
|
||||
@@ -76,34 +50,30 @@ export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
label: "Get FREYA Context",
|
||||
description:
|
||||
"Read specific FREYA context entries by key. Use prefix matching to discover entries under a source ID, or exact matching when you know the full key.",
|
||||
parameters: Type.Object(
|
||||
{
|
||||
key: Type.Array(Type.Unknown(), {
|
||||
description:
|
||||
'Context key array, for example ["freya.location"] or ["freya.location", "location"].',
|
||||
parameters: Type.Object({
|
||||
key: Type.Array(Type.Unknown(), {
|
||||
description:
|
||||
'Context key array, for example ["freya.location"] or ["freya.location", "location"].',
|
||||
}),
|
||||
match: Type.Optional(
|
||||
Type.Union([Type.Literal("exact"), Type.Literal("prefix")], {
|
||||
description: "Match mode. Defaults to prefix.",
|
||||
}),
|
||||
match: Type.Optional(
|
||||
Type.Union([Type.Literal("exact"), Type.Literal("prefix")], {
|
||||
description: "Match mode. Defaults to prefix.",
|
||||
}),
|
||||
),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
execute: async (_toolCallId, params) => executeGetContextTool(config.toolbox, params),
|
||||
),
|
||||
}),
|
||||
execute: async (_toolCallId, params) =>
|
||||
executeDebugTool(debugTools, userId, FREYA_GET_CONTEXT_TOOL, params),
|
||||
})
|
||||
|
||||
const getFeedItemTool = defineTool({
|
||||
name: FREYA_GET_FEED_ITEM_TOOL,
|
||||
label: "Get FREYA Feed Item",
|
||||
description: "Read one feed item by ID, including related source context, actions, and errors.",
|
||||
parameters: Type.Object(
|
||||
{
|
||||
feedItemId: Type.String({ description: "Feed item ID to inspect." }),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
execute: async (_toolCallId, params) => executeGetFeedItemTool(config.toolbox, params),
|
||||
parameters: Type.Object({
|
||||
feedItemId: Type.String({ description: "Feed item ID to inspect." }),
|
||||
}),
|
||||
execute: async (_toolCallId, params) =>
|
||||
executeDebugTool(debugTools, userId, FREYA_GET_FEED_ITEM_TOOL, params),
|
||||
})
|
||||
|
||||
const queryContextTool = defineTool({
|
||||
@@ -111,20 +81,17 @@ export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
label: "Query FREYA Context",
|
||||
description:
|
||||
"Read the user's current FREYA feed, source graph context, source errors, and available actions.",
|
||||
parameters: Type.Object(
|
||||
{
|
||||
question: Type.String({
|
||||
description: "The specific personal-context question to answer.",
|
||||
parameters: Type.Object({
|
||||
question: Type.String({
|
||||
description: "The specific personal-context question to answer.",
|
||||
}),
|
||||
feedItemId: Type.Optional(
|
||||
Type.String({
|
||||
description: "Optional feed item ID when the user is asking about a specific card.",
|
||||
}),
|
||||
feedItemId: Type.Optional(
|
||||
Type.String({
|
||||
description: "Optional feed item ID when the user is asking about a specific card.",
|
||||
}),
|
||||
),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
execute: async (_toolCallId, params) => executeQueryContextTool(config.toolbox, params),
|
||||
),
|
||||
}),
|
||||
execute: async (_toolCallId, params) => executeQueryContextTool(config, params),
|
||||
})
|
||||
|
||||
const listContextTool = defineTool({
|
||||
@@ -132,8 +99,8 @@ export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
label: "List FREYA Context",
|
||||
description:
|
||||
"List all current FREYA context graph entries for the user. Use this to inspect what personal context is available.",
|
||||
parameters: Type.Object({}, { additionalProperties: false }),
|
||||
execute: async () => executeListContextTool(config.toolbox),
|
||||
parameters: Type.Object({}),
|
||||
execute: async () => executeListContextTool(config),
|
||||
})
|
||||
|
||||
const getSourceDataTool = defineTool({
|
||||
@@ -141,40 +108,41 @@ export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
label: "Get FREYA Source Data",
|
||||
description:
|
||||
"Get current feed items, context entries, actions, and errors for a specific FREYA source ID.",
|
||||
parameters: Type.Object(
|
||||
{
|
||||
sourceId: Type.String({
|
||||
description: "Source ID, for example freya.location, freya.tfl, or freya.weather.",
|
||||
parameters: Type.Object({
|
||||
sourceId: Type.String({
|
||||
description: "Source ID, for example freya.location, freya.tfl, or freya.weather.",
|
||||
}),
|
||||
feedItemId: Type.Optional(
|
||||
Type.String({
|
||||
description: "Optional feed item ID to select one item from the source.",
|
||||
}),
|
||||
feedItemId: Type.Optional(
|
||||
Type.String({
|
||||
description: "Optional feed item ID to select one item from the source.",
|
||||
}),
|
||||
),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
execute: async (_toolCallId, params) => executeGetSourceDataTool(config.toolbox, params),
|
||||
),
|
||||
}),
|
||||
execute: async (_toolCallId, params) => executeGetSourceDataTool(config, params),
|
||||
})
|
||||
|
||||
const executeActionTool = defineTool({
|
||||
name: FREYA_EXECUTE_ACTION_TOOL,
|
||||
label: "Execute FREYA Action",
|
||||
description:
|
||||
"Execute an available FREYA source action immediately without creating a proposal.",
|
||||
parameters: Type.Object(
|
||||
{
|
||||
sourceId: Type.String({ description: "Source ID that should execute the action." }),
|
||||
actionId: Type.String({ description: "Source action ID to execute." }),
|
||||
params: Type.Optional(
|
||||
Type.Unknown({
|
||||
description: "Parameters to pass to the source action.",
|
||||
}),
|
||||
),
|
||||
},
|
||||
{ additionalProperties: false },
|
||||
),
|
||||
execute: async (_toolCallId, params) => executeActionToolCall(config.toolbox, params),
|
||||
const proposeActionTool = defineTool({
|
||||
name: FREYA_PROPOSE_ACTION_TOOL,
|
||||
label: "Propose FREYA Action",
|
||||
description: "Create a proposed action for the user to review. This never executes the action.",
|
||||
parameters: Type.Object({
|
||||
title: Type.String({ description: "Short user-facing action title." }),
|
||||
description: Type.String({
|
||||
description: "What will happen if the user confirms this action.",
|
||||
}),
|
||||
sourceId: Type.Optional(
|
||||
Type.String({ description: "Source ID that should execute the action, if known." }),
|
||||
),
|
||||
actionId: Type.Optional(
|
||||
Type.String({ description: "Source action ID to execute after confirmation, if known." }),
|
||||
),
|
||||
params: Type.Optional(
|
||||
Type.Unknown({
|
||||
description: "Parameters to pass to the source action after confirmation.",
|
||||
}),
|
||||
),
|
||||
}),
|
||||
execute: async (_toolCallId, params) => executeProposeActionTool(config, params),
|
||||
})
|
||||
|
||||
return [
|
||||
@@ -184,61 +152,173 @@ export function createFreyaAgentTools(config: CreateFreyaAgentToolsConfig) {
|
||||
queryContextTool,
|
||||
listContextTool,
|
||||
getSourceDataTool,
|
||||
executeActionTool,
|
||||
proposeActionTool,
|
||||
]
|
||||
}
|
||||
|
||||
async function executeListSourcesTool(toolbox: QueryAgentToolbox) {
|
||||
return toolbox.listSources()
|
||||
async function executeDebugTool(
|
||||
debugTools: QueryDebugTools,
|
||||
userId: string,
|
||||
toolName: string,
|
||||
params: unknown,
|
||||
) {
|
||||
const result = await debugTools.execute(userId, toolName, params)
|
||||
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify(result),
|
||||
},
|
||||
],
|
||||
details: {},
|
||||
}
|
||||
}
|
||||
|
||||
async function executeGetContextTool(toolbox: QueryAgentToolbox, rawParams: unknown) {
|
||||
const params = GetContextToolParams(rawParams)
|
||||
if (params instanceof type.errors) {
|
||||
throw new Error(params.summary)
|
||||
async function executeQueryContextTool(
|
||||
config: CreateFreyaAgentToolsConfig,
|
||||
params: { question: string; feedItemId?: string },
|
||||
) {
|
||||
const userSession = await config.sessionManager.getOrCreate(config.userId)
|
||||
const feed = await userSession.feed()
|
||||
const context = userSession.engine.currentContext()
|
||||
const feedItemId = params.feedItemId
|
||||
const selectedItem =
|
||||
typeof feedItemId === "string" ? feed.items.find((item) => item.id === feedItemId) : undefined
|
||||
const actions = await userSession.listActions()
|
||||
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify({
|
||||
time: context.time.toISOString(),
|
||||
question: params.question,
|
||||
feedItemId: feedItemId ?? null,
|
||||
selectedItem: selectedItem ?? null,
|
||||
items: feed.items,
|
||||
context: context.entries(),
|
||||
availableActions: actions.map((entry) => ({
|
||||
sourceId: entry.sourceId,
|
||||
actions: Object.values(entry.actions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
})),
|
||||
errors: feed.errors.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
})),
|
||||
}),
|
||||
},
|
||||
],
|
||||
details: {},
|
||||
}
|
||||
}
|
||||
|
||||
async function executeListContextTool(config: CreateFreyaAgentToolsConfig) {
|
||||
const userSession = await config.sessionManager.getOrCreate(config.userId)
|
||||
await userSession.feed()
|
||||
const context = userSession.engine.currentContext()
|
||||
const entries = context.entries()
|
||||
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify({
|
||||
time: context.time.toISOString(),
|
||||
count: entries.length,
|
||||
entries,
|
||||
}),
|
||||
},
|
||||
],
|
||||
details: {},
|
||||
}
|
||||
}
|
||||
|
||||
async function executeGetSourceDataTool(
|
||||
config: CreateFreyaAgentToolsConfig,
|
||||
params: { sourceId: string; feedItemId?: string },
|
||||
) {
|
||||
const userSession = await config.sessionManager.getOrCreate(config.userId)
|
||||
const feed = await userSession.feed()
|
||||
const context = userSession.engine.currentContext()
|
||||
const sourceActions = userSession.hasSource(params.sourceId)
|
||||
? await userSession.engine.listActions(params.sourceId)
|
||||
: {}
|
||||
|
||||
const items = feed.items.filter((item) => item.sourceId === params.sourceId)
|
||||
const selectedItem =
|
||||
params.feedItemId !== undefined
|
||||
? items.find((item) => item.id === params.feedItemId)
|
||||
: undefined
|
||||
const contextEntries = context.entries().filter((entry) => entry.key[0] === params.sourceId)
|
||||
const errors = feed.errors
|
||||
.filter((error) => error.sourceId === params.sourceId)
|
||||
.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
}))
|
||||
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify({
|
||||
time: context.time.toISOString(),
|
||||
sourceId: params.sourceId,
|
||||
hasSource: userSession.hasSource(params.sourceId),
|
||||
feedItemId: params.feedItemId ?? null,
|
||||
selectedItem: selectedItem ?? null,
|
||||
items,
|
||||
context: contextEntries,
|
||||
actions: Object.values(sourceActions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
errors,
|
||||
}),
|
||||
},
|
||||
],
|
||||
details: {},
|
||||
}
|
||||
}
|
||||
|
||||
function executeProposeActionTool(
|
||||
config: CreateFreyaAgentToolsConfig,
|
||||
params: {
|
||||
title: string
|
||||
description: string
|
||||
sourceId?: string
|
||||
actionId?: string
|
||||
params?: unknown
|
||||
},
|
||||
) {
|
||||
const action: ProposedAction = {
|
||||
id: crypto.randomUUID(),
|
||||
title: params.title,
|
||||
description: params.description,
|
||||
requiresConfirmation: true,
|
||||
createdAt: config.clock().toISOString(),
|
||||
...(params.sourceId ? { sourceId: params.sourceId } : {}),
|
||||
...(params.actionId ? { actionId: params.actionId } : {}),
|
||||
...(params.params !== undefined ? { params: params.params } : {}),
|
||||
}
|
||||
|
||||
const match = params.match ?? "prefix"
|
||||
config.proposeAction(action)
|
||||
|
||||
return toolbox.getContext(params.key, match)
|
||||
}
|
||||
|
||||
async function executeGetFeedItemTool(toolbox: QueryAgentToolbox, rawParams: unknown) {
|
||||
const params = GetFeedItemToolParams(rawParams)
|
||||
if (params instanceof type.errors) {
|
||||
throw new Error(params.summary)
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify({
|
||||
ok: true,
|
||||
proposedActionId: action.id,
|
||||
requiresConfirmation: true,
|
||||
}),
|
||||
},
|
||||
],
|
||||
details: { proposedAction: action },
|
||||
}
|
||||
|
||||
return toolbox.getFeedItem(params.feedItemId)
|
||||
}
|
||||
|
||||
async function executeQueryContextTool(toolbox: QueryAgentToolbox, rawParams: unknown) {
|
||||
const params = QueryContextToolParams(rawParams)
|
||||
if (params instanceof type.errors) {
|
||||
throw new Error(params.summary)
|
||||
}
|
||||
|
||||
return toolbox.queryContext(params.question, params.feedItemId)
|
||||
}
|
||||
|
||||
async function executeListContextTool(toolbox: QueryAgentToolbox) {
|
||||
return toolbox.listContext()
|
||||
}
|
||||
|
||||
async function executeGetSourceDataTool(toolbox: QueryAgentToolbox, rawParams: unknown) {
|
||||
const params = GetSourceDataToolParams(rawParams)
|
||||
if (params instanceof type.errors) {
|
||||
throw new Error(params.summary)
|
||||
}
|
||||
|
||||
return toolbox.getSourceData(params.sourceId, params.feedItemId)
|
||||
}
|
||||
|
||||
async function executeActionToolCall(toolbox: QueryAgentToolbox, rawParams: unknown) {
|
||||
const params = ExecuteActionToolParams(rawParams)
|
||||
if (params instanceof type.errors) {
|
||||
throw new Error(params.summary)
|
||||
}
|
||||
|
||||
return toolbox.executeAction(params.sourceId, params.actionId, params.params)
|
||||
}
|
||||
|
||||
@@ -1,253 +0,0 @@
|
||||
import { contextKey, type ContextKeyPart } from "@freya/core"
|
||||
|
||||
import type { UserSession } from "../session/user-session.ts"
|
||||
import type { QueryAgentToolResult, QueryAgentToolbox } from "./query-agent-toolbox.ts"
|
||||
|
||||
export class UserSessionQueryAgentToolbox implements QueryAgentToolbox {
|
||||
constructor(private readonly session: UserSession) {}
|
||||
|
||||
async listSources(): Promise<QueryAgentToolResult> {
|
||||
const feed = await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const contextEntries = context.entries()
|
||||
const actions = await this.session.listActions()
|
||||
|
||||
const feedCounts = countBy(feed.items.map((item) => item.sourceId))
|
||||
const contextCounts = countBy(
|
||||
contextEntries
|
||||
.map((entry) => entry.key[0])
|
||||
.filter((part): part is string => typeof part === "string"),
|
||||
)
|
||||
const errors = groupErrorsBySource(
|
||||
feed.errors.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
})),
|
||||
)
|
||||
const actionEntries = new Map(actions.map((entry) => [entry.sourceId, entry.actions]))
|
||||
const sourceIds = new Set<string>([
|
||||
...actionEntries.keys(),
|
||||
...feedCounts.keys(),
|
||||
...contextCounts.keys(),
|
||||
...errors.keys(),
|
||||
])
|
||||
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
sources: [...sourceIds].sort().map((sourceId) => {
|
||||
const sourceActions = actionEntries.get(sourceId) ?? {}
|
||||
const feedItemCount = feedCounts.get(sourceId) ?? 0
|
||||
const contextEntryCount = contextCounts.get(sourceId) ?? 0
|
||||
|
||||
return {
|
||||
sourceId,
|
||||
hasFeedItems: feedItemCount > 0,
|
||||
feedItemCount,
|
||||
hasContext: contextEntryCount > 0,
|
||||
contextEntryCount,
|
||||
actions: Object.values(sourceActions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
errors: errors.get(sourceId) ?? [],
|
||||
}
|
||||
}),
|
||||
})
|
||||
}
|
||||
|
||||
async getContext(
|
||||
key: ContextKeyPart[],
|
||||
match: "exact" | "prefix",
|
||||
): Promise<QueryAgentToolResult> {
|
||||
await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const keyObject = contextKey(...key)
|
||||
|
||||
if (match === "exact") {
|
||||
const value = context.get(keyObject)
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
match,
|
||||
key,
|
||||
found: value !== undefined,
|
||||
value: value ?? null,
|
||||
})
|
||||
}
|
||||
|
||||
const entries = context.find(keyObject)
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
match,
|
||||
key,
|
||||
count: entries.length,
|
||||
entries,
|
||||
})
|
||||
}
|
||||
|
||||
async getFeedItem(feedItemId: string): Promise<QueryAgentToolResult> {
|
||||
const feed = await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const item = feed.items.find((candidate) => candidate.id === feedItemId)
|
||||
|
||||
if (!item) {
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
feedItemId,
|
||||
found: false,
|
||||
item: null,
|
||||
})
|
||||
}
|
||||
|
||||
const sourceActions = this.session.hasSource(item.sourceId)
|
||||
? await this.session.engine.listActions(item.sourceId)
|
||||
: {}
|
||||
const errors = feed.errors
|
||||
.filter((error) => error.sourceId === item.sourceId)
|
||||
.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
}))
|
||||
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
feedItemId,
|
||||
found: true,
|
||||
item,
|
||||
source: {
|
||||
sourceId: item.sourceId,
|
||||
hasSource: this.session.hasSource(item.sourceId),
|
||||
context: context.entries().filter((entry) => entry.key[0] === item.sourceId),
|
||||
actions: Object.values(sourceActions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
errors,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
async queryContext(question: string, feedItemId?: string): Promise<QueryAgentToolResult> {
|
||||
const feed = await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const selectedItem = feedItemId ? feed.items.find((item) => item.id === feedItemId) : undefined
|
||||
const actions = await this.session.listActions()
|
||||
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
question,
|
||||
feedItemId: feedItemId ?? null,
|
||||
selectedItem: selectedItem ?? null,
|
||||
items: feed.items,
|
||||
context: context.entries(),
|
||||
availableActions: actions.map((entry) => ({
|
||||
sourceId: entry.sourceId,
|
||||
actions: Object.values(entry.actions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
})),
|
||||
errors: feed.errors.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
})),
|
||||
})
|
||||
}
|
||||
|
||||
async listContext(): Promise<QueryAgentToolResult> {
|
||||
await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const entries = context.entries()
|
||||
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
count: entries.length,
|
||||
entries,
|
||||
})
|
||||
}
|
||||
|
||||
async getSourceData(sourceId: string, feedItemId?: string): Promise<QueryAgentToolResult> {
|
||||
const feed = await this.session.feed()
|
||||
const context = this.session.engine.currentContext()
|
||||
const sourceActions = this.session.hasSource(sourceId)
|
||||
? await this.session.engine.listActions(sourceId)
|
||||
: {}
|
||||
|
||||
const items = feed.items.filter((item) => item.sourceId === sourceId)
|
||||
const selectedItem = feedItemId ? items.find((item) => item.id === feedItemId) : undefined
|
||||
const contextEntries = context.entries().filter((entry) => entry.key[0] === sourceId)
|
||||
const errors = feed.errors
|
||||
.filter((error) => error.sourceId === sourceId)
|
||||
.map((error) => ({
|
||||
sourceId: error.sourceId,
|
||||
message: error.error.message,
|
||||
}))
|
||||
|
||||
return toolResult({
|
||||
time: context.time.toISOString(),
|
||||
sourceId,
|
||||
hasSource: this.session.hasSource(sourceId),
|
||||
feedItemId: feedItemId ?? null,
|
||||
selectedItem: selectedItem ?? null,
|
||||
items,
|
||||
context: contextEntries,
|
||||
actions: Object.values(sourceActions).map((action) => ({
|
||||
id: action.id,
|
||||
description: action.description ?? null,
|
||||
})),
|
||||
errors,
|
||||
})
|
||||
}
|
||||
|
||||
async executeAction(
|
||||
sourceId: string,
|
||||
actionId: string,
|
||||
params?: unknown,
|
||||
): Promise<QueryAgentToolResult> {
|
||||
const result = await this.session.engine.executeAction(sourceId, actionId, params)
|
||||
const actionExecution = {
|
||||
sourceId,
|
||||
actionId,
|
||||
result: result ?? null,
|
||||
}
|
||||
|
||||
return toolResult(
|
||||
{
|
||||
ok: true,
|
||||
...actionExecution,
|
||||
},
|
||||
{ actionExecution },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
function toolResult(result: unknown, details: Record<string, unknown> = {}): QueryAgentToolResult {
|
||||
return {
|
||||
content: [
|
||||
{
|
||||
type: "text" as const,
|
||||
text: JSON.stringify(result),
|
||||
},
|
||||
],
|
||||
details,
|
||||
}
|
||||
}
|
||||
|
||||
function countBy(values: string[]): Map<string, number> {
|
||||
const result = new Map<string, number>()
|
||||
for (const value of values) {
|
||||
result.set(value, (result.get(value) ?? 0) + 1)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
function groupErrorsBySource(
|
||||
errors: Array<{ sourceId: string; message: string }>,
|
||||
): Map<string, Array<{ sourceId: string; message: string }>> {
|
||||
const result = new Map<string, Array<{ sourceId: string; message: string }>>()
|
||||
for (const error of errors) {
|
||||
const group = result.get(error.sourceId) ?? []
|
||||
group.push(error)
|
||||
result.set(error.sourceId, group)
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -1,373 +0,0 @@
|
||||
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,
|
||||
conversations as conversationsTable,
|
||||
files,
|
||||
user,
|
||||
} from "../db/schema.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"
|
||||
|
||||
export type ConversationRow = typeof conversationsTable.$inferSelect
|
||||
export type ConversationEntryRow = typeof conversationEntries.$inferSelect
|
||||
export type FileRow = typeof files.$inferSelect
|
||||
|
||||
export interface CreateFileInput {
|
||||
storageKey: string
|
||||
originalName?: string
|
||||
mimeType: string
|
||||
sizeBytes: number
|
||||
metadata?: Record<string, unknown>
|
||||
}
|
||||
|
||||
export interface AppendAttachmentEntryInput {
|
||||
file: CreateFileInput
|
||||
payload: AttachmentPayload
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
metadata?: ConversationEntryMetadata
|
||||
}
|
||||
|
||||
export interface AppendAttachmentEntryResult {
|
||||
file: FileRow
|
||||
entry: ConversationEntryRow
|
||||
}
|
||||
|
||||
interface AppendConversationEntryBase {
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
metadata?: ConversationEntryMetadata
|
||||
}
|
||||
|
||||
export type AppendConversationEntryInput =
|
||||
| (AppendConversationEntryBase & {
|
||||
kind: typeof ConversationEntryKind.UserMessage
|
||||
payload: UserMessagePayload
|
||||
fileId?: never
|
||||
})
|
||||
| (AppendConversationEntryBase & {
|
||||
kind: typeof ConversationEntryKind.AssistantMessage
|
||||
payload: AssistantMessagePayload
|
||||
fileId?: never
|
||||
})
|
||||
| (AppendConversationEntryBase & {
|
||||
kind: typeof ConversationEntryKind.Attachment
|
||||
payload: AttachmentPayload
|
||||
fileId: string
|
||||
})
|
||||
| (AppendConversationEntryBase & {
|
||||
kind: typeof ConversationEntryKind.ContextSummary
|
||||
payload: ContextSummaryPayload
|
||||
fileId?: never
|
||||
})
|
||||
| (AppendConversationEntryBase & {
|
||||
kind:
|
||||
| typeof ConversationEntryKind.ToolCall
|
||||
| typeof ConversationEntryKind.ToolResult
|
||||
| typeof ConversationEntryKind.SystemNote
|
||||
payload: GenericObjectPayload
|
||||
fileId?: never
|
||||
})
|
||||
|
||||
export interface ListConversationEntriesParams {
|
||||
visibility?: ConversationEntryVisibilityType
|
||||
}
|
||||
|
||||
export function conversations(db: Database, userId: string) {
|
||||
return {
|
||||
async createConversation(): Promise<ConversationRow> {
|
||||
return insertConversation(db, userId)
|
||||
},
|
||||
|
||||
async getOrCreateConversation(): Promise<ConversationRow> {
|
||||
return db.transaction(async (tx) => {
|
||||
await requireUserForUpdate(tx, userId)
|
||||
const existing = await latestConversation(tx, userId)
|
||||
if (existing) return existing
|
||||
|
||||
return insertConversation(tx, userId)
|
||||
})
|
||||
},
|
||||
|
||||
async createFile(input: CreateFileInput): Promise<FileRow> {
|
||||
return insertFile(db, userId, input)
|
||||
},
|
||||
|
||||
async appendEntry(
|
||||
conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationEntryRow> {
|
||||
const kind = ConversationEntryKindInput.assert(input.kind)
|
||||
const visibility = ConversationEntryVisibilityInput.assert(
|
||||
input.visibility ?? defaultVisibilityForKind(kind),
|
||||
)
|
||||
const payload = payloadForKind(kind, input.payload)
|
||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
||||
let fileId: string | null = null
|
||||
|
||||
if (input.kind === ConversationEntryKind.Attachment) {
|
||||
fileId = input.fileId
|
||||
await requireFile(db, userId, fileId)
|
||||
}
|
||||
|
||||
const rows = await db.transaction(async (tx) => {
|
||||
await requireConversationForUpdate(tx, userId, conversationId)
|
||||
const sequence = await nextSequence(tx, conversationId)
|
||||
|
||||
const rows = await tx
|
||||
.insert(conversationEntries)
|
||||
.values({
|
||||
conversationId,
|
||||
sequence,
|
||||
kind,
|
||||
visibility,
|
||||
fileId,
|
||||
payload,
|
||||
metadata,
|
||||
})
|
||||
.returning()
|
||||
|
||||
await touchConversation(tx, userId, conversationId)
|
||||
return rows
|
||||
})
|
||||
|
||||
return requireRow(rows)
|
||||
},
|
||||
|
||||
async appendAttachmentEntry(
|
||||
conversationId: string,
|
||||
input: AppendAttachmentEntryInput,
|
||||
): Promise<AppendAttachmentEntryResult> {
|
||||
const payload = AttachmentPayloadSchema.assert(input.payload)
|
||||
const visibility = ConversationEntryVisibilityInput.assert(
|
||||
input.visibility ?? defaultVisibilityForKind(ConversationEntryKind.Attachment),
|
||||
)
|
||||
const metadata = ConversationEntryMetadataSchema.assert(input.metadata ?? {})
|
||||
|
||||
return db.transaction(async (tx) => {
|
||||
await requireConversationForUpdate(tx, userId, conversationId)
|
||||
|
||||
const file = await insertFile(tx, userId, input.file)
|
||||
const sequence = await nextSequence(tx, conversationId)
|
||||
const rows = await tx
|
||||
.insert(conversationEntries)
|
||||
.values({
|
||||
conversationId,
|
||||
sequence,
|
||||
kind: ConversationEntryKind.Attachment,
|
||||
visibility,
|
||||
fileId: file.id,
|
||||
payload,
|
||||
metadata,
|
||||
})
|
||||
.returning()
|
||||
|
||||
await touchConversation(tx, userId, conversationId)
|
||||
return {
|
||||
file,
|
||||
entry: requireRow(rows),
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
async listEntries(
|
||||
conversationId: string,
|
||||
params: ListConversationEntriesParams = {},
|
||||
): Promise<ConversationEntryRow[]> {
|
||||
await requireConversation(db, userId, conversationId)
|
||||
|
||||
if (params.visibility) {
|
||||
return db
|
||||
.select()
|
||||
.from(conversationEntries)
|
||||
.where(
|
||||
and(
|
||||
eq(conversationEntries.conversationId, conversationId),
|
||||
eq(conversationEntries.visibility, params.visibility),
|
||||
),
|
||||
)
|
||||
.orderBy(asc(conversationEntries.sequence))
|
||||
}
|
||||
|
||||
return db
|
||||
.select()
|
||||
.from(conversationEntries)
|
||||
.where(eq(conversationEntries.conversationId, conversationId))
|
||||
.orderBy(asc(conversationEntries.sequence))
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
function payloadForKind(
|
||||
kind: ConversationEntryKindType,
|
||||
payload: AppendConversationEntryInput["payload"],
|
||||
): ConversationEntryPayload {
|
||||
switch (kind) {
|
||||
case ConversationEntryKind.UserMessage:
|
||||
return UserMessagePayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.AssistantMessage:
|
||||
return AssistantMessagePayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.Attachment:
|
||||
return AttachmentPayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.ContextSummary:
|
||||
return ContextSummaryPayloadSchema.assert(payload)
|
||||
case ConversationEntryKind.ToolCall:
|
||||
case ConversationEntryKind.ToolResult:
|
||||
case ConversationEntryKind.SystemNote:
|
||||
return GenericObjectPayloadSchema.assert(payload)
|
||||
}
|
||||
}
|
||||
|
||||
async function requireUserForUpdate(db: Database, userId: string): Promise<void> {
|
||||
const rows = await db
|
||||
.select({ id: user.id })
|
||||
.from(user)
|
||||
.where(eq(user.id, userId))
|
||||
.limit(1)
|
||||
.for("update")
|
||||
|
||||
requireRow(rows, `User not found: ${userId}`)
|
||||
}
|
||||
|
||||
async function requireConversation(
|
||||
db: Database,
|
||||
userId: string,
|
||||
conversationId: string,
|
||||
): 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)
|
||||
.where(and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)))
|
||||
.limit(1)
|
||||
.for("update")
|
||||
|
||||
return requireRow(rows, `Conversation not found: ${conversationId}`)
|
||||
}
|
||||
|
||||
async function latestConversation(db: Database, userId: string): Promise<ConversationRow | null> {
|
||||
const rows = await db
|
||||
.select()
|
||||
.from(conversationsTable)
|
||||
.where(eq(conversationsTable.userId, userId))
|
||||
.orderBy(desc(conversationsTable.updatedAt), desc(conversationsTable.createdAt))
|
||||
.limit(1)
|
||||
|
||||
return rows[0] ?? null
|
||||
}
|
||||
|
||||
async function insertConversation(db: Database, userId: string): Promise<ConversationRow> {
|
||||
const rows = await db
|
||||
.insert(conversationsTable)
|
||||
.values({
|
||||
userId,
|
||||
})
|
||||
.returning()
|
||||
|
||||
return requireRow(rows)
|
||||
}
|
||||
|
||||
async function requireFile(db: Database, userId: string, fileId: string): Promise<FileRow> {
|
||||
const rows = await db
|
||||
.select()
|
||||
.from(files)
|
||||
.where(and(eq(files.id, fileId), eq(files.userId, userId)))
|
||||
.limit(1)
|
||||
|
||||
return requireRow(rows, `File not found: ${fileId}`)
|
||||
}
|
||||
|
||||
async function insertFile(db: Database, userId: string, input: CreateFileInput): Promise<FileRow> {
|
||||
const rows = await db
|
||||
.insert(files)
|
||||
.values({
|
||||
userId,
|
||||
storageKey: input.storageKey,
|
||||
originalName: input.originalName ?? null,
|
||||
mimeType: input.mimeType,
|
||||
sizeBytes: input.sizeBytes,
|
||||
metadata: input.metadata ?? {},
|
||||
})
|
||||
.returning()
|
||||
|
||||
return requireRow(rows)
|
||||
}
|
||||
|
||||
async function touchConversation(
|
||||
db: Database,
|
||||
userId: string,
|
||||
conversationId: string,
|
||||
): Promise<void> {
|
||||
await db
|
||||
.update(conversationsTable)
|
||||
.set({ updatedAt: new Date() })
|
||||
.where(and(eq(conversationsTable.id, conversationId), eq(conversationsTable.userId, userId)))
|
||||
}
|
||||
|
||||
async function nextSequence(db: Database, conversationId: string): Promise<number> {
|
||||
const rows = await db
|
||||
.select({ sequence: conversationEntries.sequence })
|
||||
.from(conversationEntries)
|
||||
.where(eq(conversationEntries.conversationId, conversationId))
|
||||
.orderBy(desc(conversationEntries.sequence))
|
||||
.limit(1)
|
||||
|
||||
return (rows[0]?.sequence ?? 0) + 1
|
||||
}
|
||||
|
||||
function requireRow<T>(rows: T[], message = "Expected database row"): T {
|
||||
const row = rows[0]
|
||||
if (!row) throw new Error(message)
|
||||
return row
|
||||
}
|
||||
|
||||
function defaultVisibilityForKind(
|
||||
kind: ConversationEntryKindType,
|
||||
): ConversationEntryVisibilityType {
|
||||
switch (kind) {
|
||||
case ConversationEntryKind.UserMessage:
|
||||
case ConversationEntryKind.AssistantMessage:
|
||||
case ConversationEntryKind.Attachment:
|
||||
return ConversationEntryVisibility.UserVisible
|
||||
case ConversationEntryKind.ToolCall:
|
||||
case ConversationEntryKind.ToolResult:
|
||||
case ConversationEntryKind.ContextSummary:
|
||||
case ConversationEntryKind.SystemNote:
|
||||
return ConversationEntryVisibility.Internal
|
||||
}
|
||||
}
|
||||
@@ -1,146 +0,0 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
import {
|
||||
AttachmentType,
|
||||
AttachmentPayload,
|
||||
ContextSummaryPayload,
|
||||
ConversationEntryMetadata,
|
||||
GenericObjectPayload,
|
||||
UserMessagePayload,
|
||||
} from "./types.ts"
|
||||
|
||||
describe("conversation entry schemas", () => {
|
||||
test("parses valid user message payloads", () => {
|
||||
const payload = UserMessagePayload.assert({
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "hello" }],
|
||||
})
|
||||
|
||||
expect(payload).toEqual({
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "hello" }],
|
||||
})
|
||||
})
|
||||
|
||||
test("rejects user message payloads with the wrong role", () => {
|
||||
expect(() =>
|
||||
UserMessagePayload.assert({
|
||||
role: "assistant",
|
||||
parts: [{ type: "text", text: "hello" }],
|
||||
}),
|
||||
).toThrow()
|
||||
})
|
||||
|
||||
test("rejects user message payloads with no parts", () => {
|
||||
expect(() =>
|
||||
UserMessagePayload.assert({
|
||||
role: "user",
|
||||
parts: [],
|
||||
}),
|
||||
).toThrow()
|
||||
})
|
||||
|
||||
test("parses valid attachment payloads", () => {
|
||||
const payload = AttachmentPayload.assert({
|
||||
role: "user",
|
||||
name: "whiteboard.png",
|
||||
mimeType: "image/png",
|
||||
attachmentType: AttachmentType.Image,
|
||||
caption: "whiteboard sketch",
|
||||
})
|
||||
|
||||
expect(payload).toEqual({
|
||||
role: "user",
|
||||
name: "whiteboard.png",
|
||||
mimeType: "image/png",
|
||||
attachmentType: AttachmentType.Image,
|
||||
caption: "whiteboard sketch",
|
||||
})
|
||||
})
|
||||
|
||||
test("rejects extra fields on structured payloads", () => {
|
||||
expect(() =>
|
||||
AttachmentPayload.assert({
|
||||
role: "user",
|
||||
name: "whiteboard.png",
|
||||
mimeType: "image/png",
|
||||
attachmentType: AttachmentType.Image,
|
||||
fileId: "file-1",
|
||||
}),
|
||||
).toThrow()
|
||||
})
|
||||
|
||||
test("parses context summary payloads", () => {
|
||||
const payload = ContextSummaryPayload.assert({
|
||||
covers: {
|
||||
startSequence: 1,
|
||||
endSequence: 12,
|
||||
},
|
||||
summary: {
|
||||
userIntent: "Design message storage.",
|
||||
durableFacts: [],
|
||||
preferences: ["Keep the schema simple."],
|
||||
decisions: ["Use conversation_entries as the timeline."],
|
||||
openTasks: [],
|
||||
importantDetails: [],
|
||||
},
|
||||
promptVersion: "conversation-summary-v1",
|
||||
sourceEntryIds: ["entry-1", "entry-2"],
|
||||
})
|
||||
|
||||
expect(payload).toMatchObject({
|
||||
covers: {
|
||||
startSequence: 1,
|
||||
endSequence: 12,
|
||||
},
|
||||
promptVersion: "conversation-summary-v1",
|
||||
})
|
||||
})
|
||||
|
||||
test("allows generic object payloads for tool entries", () => {
|
||||
const payload = GenericObjectPayload.assert({
|
||||
toolCallId: "call-1",
|
||||
toolName: "calendar.search",
|
||||
input: { date: "2026-06-15" },
|
||||
})
|
||||
|
||||
expect(payload).toEqual({
|
||||
toolCallId: "call-1",
|
||||
toolName: "calendar.search",
|
||||
input: { date: "2026-06-15" },
|
||||
})
|
||||
})
|
||||
|
||||
test("rejects non-object generic payloads", () => {
|
||||
expect(() => GenericObjectPayload.assert("done")).toThrow()
|
||||
})
|
||||
|
||||
test("parses model run metadata and allows extra top-level metadata", () => {
|
||||
const metadata = ConversationEntryMetadata.assert({
|
||||
modelRun: {
|
||||
route: "default-chat",
|
||||
provider: "pi",
|
||||
model: "pi-model",
|
||||
inputTokens: 120,
|
||||
outputTokens: 24,
|
||||
},
|
||||
traceId: "trace-1",
|
||||
})
|
||||
|
||||
expect(metadata.modelRun?.model).toBe("pi-model")
|
||||
expect(metadata.traceId).toBe("trace-1")
|
||||
})
|
||||
|
||||
test("rejects invalid model run metadata", () => {
|
||||
expect(() =>
|
||||
ConversationEntryMetadata.assert({
|
||||
modelRun: {
|
||||
route: "default-chat",
|
||||
provider: "pi",
|
||||
model: "pi-model",
|
||||
inputTokens: -1,
|
||||
},
|
||||
}),
|
||||
).toThrow()
|
||||
})
|
||||
})
|
||||
@@ -1,136 +0,0 @@
|
||||
import { type } from "arktype"
|
||||
|
||||
export const ConversationEntryKind = {
|
||||
UserMessage: "user_message",
|
||||
AssistantMessage: "assistant_message",
|
||||
Attachment: "attachment",
|
||||
ToolCall: "tool_call",
|
||||
ToolResult: "tool_result",
|
||||
ContextSummary: "context_summary",
|
||||
SystemNote: "system_note",
|
||||
} as const
|
||||
|
||||
export type ConversationEntryKind =
|
||||
(typeof ConversationEntryKind)[keyof typeof ConversationEntryKind]
|
||||
|
||||
export const ConversationEntryVisibility = {
|
||||
UserVisible: "user_visible",
|
||||
Internal: "internal",
|
||||
} as const
|
||||
|
||||
export type ConversationEntryVisibility =
|
||||
(typeof ConversationEntryVisibility)[keyof typeof ConversationEntryVisibility]
|
||||
|
||||
export const AttachmentType = {
|
||||
Image: "image",
|
||||
Audio: "audio",
|
||||
Video: "video",
|
||||
Document: "document",
|
||||
Other: "other",
|
||||
} as const
|
||||
|
||||
export type AttachmentType = (typeof AttachmentType)[keyof typeof AttachmentType]
|
||||
|
||||
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",
|
||||
})
|
||||
|
||||
const JsonMessagePart = type({
|
||||
"+": "reject",
|
||||
type: "'json'",
|
||||
value: "unknown",
|
||||
})
|
||||
|
||||
export const MessagePart = type.or(TextMessagePart, JsonMessagePart)
|
||||
export type MessagePart = typeof MessagePart.infer
|
||||
|
||||
export const UserMessagePayload = type({
|
||||
"+": "reject",
|
||||
role: "'user'",
|
||||
parts: MessagePart.array().atLeastLength(1),
|
||||
})
|
||||
|
||||
export type UserMessagePayload = typeof UserMessagePayload.infer
|
||||
|
||||
export const AssistantMessagePayload = type({
|
||||
"+": "reject",
|
||||
role: "'assistant'",
|
||||
parts: MessagePart.array().atLeastLength(1),
|
||||
})
|
||||
|
||||
export type AssistantMessagePayload = typeof AssistantMessagePayload.infer
|
||||
|
||||
export const AttachmentPayload = type({
|
||||
"+": "reject",
|
||||
role: type.enumerated("user", "assistant"),
|
||||
name: "string",
|
||||
mimeType: "string",
|
||||
attachmentType: AttachmentTypeInput,
|
||||
"caption?": "string",
|
||||
})
|
||||
|
||||
export type AttachmentPayload = typeof AttachmentPayload.infer
|
||||
|
||||
const ContextSummary = type({
|
||||
"+": "reject",
|
||||
"userIntent?": "string",
|
||||
durableFacts: type.string.array(),
|
||||
preferences: type.string.array(),
|
||||
decisions: type.string.array(),
|
||||
openTasks: type.string.array(),
|
||||
importantDetails: type.string.array(),
|
||||
})
|
||||
|
||||
export const ContextSummaryPayload = type({
|
||||
"+": "reject",
|
||||
covers: type({
|
||||
"+": "reject",
|
||||
startSequence: "number.integer >= 1",
|
||||
endSequence: "number.integer >= 1",
|
||||
}),
|
||||
summary: ContextSummary,
|
||||
promptVersion: "string",
|
||||
"sourceEntryIds?": type.string.array(),
|
||||
})
|
||||
|
||||
export type ContextSummaryPayload = typeof ContextSummaryPayload.infer
|
||||
|
||||
export const ModelRunMetadata = type({
|
||||
"+": "reject",
|
||||
route: "string",
|
||||
provider: "string",
|
||||
model: "string",
|
||||
"contextSummaryEntryId?": "string",
|
||||
"rawEntriesStartSequence?": "number.integer >= 1",
|
||||
"rawEntriesEndSequence?": "number.integer >= 1",
|
||||
"inputTokens?": "number.integer >= 0",
|
||||
"outputTokens?": "number.integer >= 0",
|
||||
"providerRequestId?": "string",
|
||||
})
|
||||
|
||||
export type ModelRunMetadata = typeof ModelRunMetadata.infer
|
||||
|
||||
export const ConversationEntryMetadata = type({
|
||||
"modelRun?": ModelRunMetadata,
|
||||
"[string]": "unknown",
|
||||
})
|
||||
|
||||
export type ConversationEntryMetadata = typeof ConversationEntryMetadata.infer
|
||||
|
||||
export const GenericObjectPayload = type("Record<string, unknown>")
|
||||
export type GenericObjectPayload = typeof GenericObjectPayload.infer
|
||||
|
||||
export type ConversationEntryPayload =
|
||||
| UserMessagePayload
|
||||
| AssistantMessagePayload
|
||||
| AttachmentPayload
|
||||
| ContextSummaryPayload
|
||||
| GenericObjectPayload
|
||||
@@ -1,9 +1,6 @@
|
||||
import { sql } from "drizzle-orm"
|
||||
import {
|
||||
boolean,
|
||||
check,
|
||||
customType,
|
||||
integer,
|
||||
index,
|
||||
jsonb,
|
||||
pgTable,
|
||||
@@ -13,14 +10,6 @@ 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.
|
||||
@@ -72,81 +61,6 @@ export const userSources = pgTable(
|
||||
],
|
||||
)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// FREYA — conversations
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
export const conversations = pgTable(
|
||||
"conversations",
|
||||
{
|
||||
id: uuid("id").primaryKey().defaultRandom(),
|
||||
userId: text("user_id")
|
||||
.notNull()
|
||||
.references(() => user.id, { onDelete: "cascade" }),
|
||||
createdAt: timestamp("created_at").notNull().defaultNow(),
|
||||
updatedAt: timestamp("updated_at")
|
||||
.notNull()
|
||||
.defaultNow()
|
||||
.$onUpdate(() => new Date()),
|
||||
},
|
||||
(t) => [index("conversations_user_id_updated_at_idx").on(t.userId, t.updatedAt)],
|
||||
)
|
||||
|
||||
export const files = pgTable(
|
||||
"files",
|
||||
{
|
||||
id: uuid("id").primaryKey().defaultRandom(),
|
||||
userId: text("user_id")
|
||||
.notNull()
|
||||
.references(() => user.id, { onDelete: "cascade" }),
|
||||
storageKey: text("storage_key").notNull(),
|
||||
originalName: text("original_name"),
|
||||
mimeType: text("mime_type").notNull(),
|
||||
sizeBytes: integer("size_bytes").notNull(),
|
||||
metadata: jsonb("metadata").$type<Record<string, unknown>>().notNull().default({}),
|
||||
createdAt: timestamp("created_at").notNull().defaultNow(),
|
||||
},
|
||||
(t) => [
|
||||
unique("files_storage_key_unique").on(t.storageKey),
|
||||
index("files_user_id_created_at_idx").on(t.userId, t.createdAt),
|
||||
],
|
||||
)
|
||||
|
||||
export const conversationEntries = pgTable(
|
||||
"conversation_entries",
|
||||
{
|
||||
id: uuid("id").primaryKey().defaultRandom(),
|
||||
conversationId: uuid("conversation_id")
|
||||
.notNull()
|
||||
.references(() => conversations.id, { onDelete: "cascade" }),
|
||||
sequence: integer("sequence").notNull(),
|
||||
kind: text("kind").$type<ConversationEntryKind>().notNull(),
|
||||
visibility: text("visibility")
|
||||
.$type<ConversationEntryVisibilityType>()
|
||||
.notNull()
|
||||
.default(ConversationEntryVisibility.Internal),
|
||||
fileId: uuid("file_id").references(() => files.id, { onDelete: "restrict" }),
|
||||
payload: jsonb("payload").$type<ConversationEntryPayload>().notNull(),
|
||||
metadata: jsonb("metadata").$type<ConversationEntryMetadata>().notNull().default({}),
|
||||
createdAt: timestamp("created_at").notNull().defaultNow(),
|
||||
},
|
||||
(t) => [
|
||||
unique("conversation_entries_conversation_id_sequence_unique").on(t.conversationId, t.sequence),
|
||||
index("conversation_entries_conversation_id_sequence_idx").on(t.conversationId, t.sequence),
|
||||
index("conversation_entries_conversation_id_visibility_sequence_idx").on(
|
||||
t.conversationId,
|
||||
t.visibility,
|
||||
t.sequence,
|
||||
),
|
||||
index("conversation_entries_kind_idx").on(t.kind),
|
||||
index("conversation_entries_file_id_idx").on(t.fileId),
|
||||
check(
|
||||
"conversation_entries_attachment_file_id_check",
|
||||
sql`(${t.kind} = 'attachment' and ${t.fileId} is not null) or (${t.kind} <> 'attachment' and ${t.fileId} is null)`,
|
||||
),
|
||||
],
|
||||
)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// FREYA — reminders source storage
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
@@ -85,20 +85,6 @@ mock.module("../sources/user-sources.ts", () => ({
|
||||
}),
|
||||
}))
|
||||
|
||||
mock.module("../conversations/storage.ts", () => ({
|
||||
conversations: (_db: Database, userId: string) => ({
|
||||
async getOrCreateConversation() {
|
||||
return { id: `conversation-${userId}` }
|
||||
},
|
||||
async listEntries() {
|
||||
return []
|
||||
},
|
||||
async appendEntry() {
|
||||
return { id: "entry-1", sequence: 1 }
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
const fakeDb = {} as Database
|
||||
|
||||
describe("GET /api/feed", () => {
|
||||
|
||||
@@ -11,6 +11,7 @@ describe("ensureEnv", () => {
|
||||
EXA_API_KEY: " exa-key ",
|
||||
GOOGLE_MAPS_API_KEY: " google-maps-key ",
|
||||
OPENROUTER_API_KEY: " openrouter-key ",
|
||||
OPENROUTER_MODEL: " model-name ",
|
||||
TFL_API_KEY: " tfl-key ",
|
||||
WEATHERKIT_KEY_ID: " weather-key-id ",
|
||||
WEATHERKIT_PRIVATE_KEY: " weather-private-key ",
|
||||
@@ -25,6 +26,7 @@ describe("ensureEnv", () => {
|
||||
exaApiKey: "exa-key",
|
||||
googleMapsApiKey: "google-maps-key",
|
||||
openrouterApiKey: "openrouter-key",
|
||||
openrouterModel: "model-name",
|
||||
tflApiKey: "tfl-key",
|
||||
weatherkitKeyId: "weather-key-id",
|
||||
weatherkitPrivateKey: "weather-private-key",
|
||||
@@ -51,6 +53,25 @@ describe("ensureEnv", () => {
|
||||
).toThrow("Missing required environment variables: GOOGLE_MAPS_API_KEY")
|
||||
})
|
||||
|
||||
test("allows openrouter model to be omitted", () => {
|
||||
const env = ensureEnv({
|
||||
BETTER_AUTH_SECRET: "auth-secret",
|
||||
CREDENTIAL_ENCRYPTION_KEY: "credential-key",
|
||||
DATABASE_URL: "postgres://example",
|
||||
EXA_API_KEY: "exa-key",
|
||||
GOOGLE_MAPS_API_KEY: "google-maps-key",
|
||||
OPENROUTER_API_KEY: "openrouter-key",
|
||||
TFL_API_KEY: "tfl-key",
|
||||
WEATHERKIT_KEY_ID: "weather-key-id",
|
||||
WEATHERKIT_PRIVATE_KEY: "weather-private-key",
|
||||
WEATHERKIT_SERVICE_ID: "weather-service-id",
|
||||
WEATHERKIT_TEAM_ID: "weather-team-id",
|
||||
})
|
||||
|
||||
expect(env.googleMapsApiKey).toBe("google-maps-key")
|
||||
expect(env.openrouterModel).toBeUndefined()
|
||||
})
|
||||
|
||||
test("throws with all missing required env names", () => {
|
||||
expect(() => ensureEnv({})).toThrow(
|
||||
"Missing required environment variables: BETTER_AUTH_SECRET, CREDENTIAL_ENCRYPTION_KEY, DATABASE_URL, EXA_API_KEY, OPENROUTER_API_KEY, TFL_API_KEY, WEATHERKIT_PRIVATE_KEY, WEATHERKIT_KEY_ID, WEATHERKIT_TEAM_ID, WEATHERKIT_SERVICE_ID, GOOGLE_MAPS_API_KEY",
|
||||
|
||||
@@ -5,6 +5,7 @@ export interface ServerEnv {
|
||||
exaApiKey: string
|
||||
googleMapsApiKey: string
|
||||
openrouterApiKey: string
|
||||
openrouterModel: string | undefined
|
||||
tflApiKey: string
|
||||
weatherkitKeyId: string
|
||||
weatherkitPrivateKey: string
|
||||
@@ -38,6 +39,7 @@ export function ensureEnv(env: Record<string, string | undefined>): ServerEnv {
|
||||
exaApiKey,
|
||||
googleMapsApiKey,
|
||||
openrouterApiKey,
|
||||
openrouterModel: readOptionalEnv(env, "OPENROUTER_MODEL"),
|
||||
tflApiKey,
|
||||
weatherkitKeyId,
|
||||
weatherkitPrivateKey,
|
||||
|
||||
@@ -4,6 +4,7 @@ import { cors } from "hono/cors"
|
||||
import { registerAdminHttpHandlers } from "./admin/http.ts"
|
||||
import { createQueryDebugTools } from "./agent/debug-tools.ts"
|
||||
import { registerAgentHttpHandlers, registerDebugAgentHttpHandlers } from "./agent/http.ts"
|
||||
import { PiQueryAgent } from "./agent/pi-query-agent.ts"
|
||||
import { createRequireAdmin } from "./auth/admin-middleware.ts"
|
||||
import { registerAuthHandlers } from "./auth/http.ts"
|
||||
import { createAuth } from "./auth/index.ts"
|
||||
@@ -34,11 +35,11 @@ function main() {
|
||||
const feedEnhancer = createFeedEnhancer({
|
||||
client: createLlmClient({
|
||||
apiKey: env.openrouterApiKey,
|
||||
model: env.openrouterModel,
|
||||
}),
|
||||
})
|
||||
|
||||
const credentialEncryptor = new CredentialEncryptor(env.credentialEncryptionKey)
|
||||
const piApiKey = process.env.PI_API_KEY ?? env.openrouterApiKey
|
||||
|
||||
const sessionManager = new UserSessionManager({
|
||||
db,
|
||||
@@ -62,9 +63,13 @@ function main() {
|
||||
],
|
||||
feedEnhancer,
|
||||
credentialEncryptor,
|
||||
queryAgent: {
|
||||
apiKey: piApiKey,
|
||||
},
|
||||
})
|
||||
const piApiKey = process.env.PI_API_KEY ?? env.openrouterApiKey
|
||||
const queryAgent = new PiQueryAgent({
|
||||
sessionManager,
|
||||
modelProvider: process.env.PI_MODEL_PROVIDER ?? "openrouter",
|
||||
modelId: process.env.PI_MODEL ?? env.openrouterModel ?? "z-ai/glm-4.7-flash",
|
||||
apiKey: piApiKey,
|
||||
})
|
||||
if (!piApiKey) {
|
||||
console.warn("[query] PI_API_KEY or OPENROUTER_API_KEY not set — query agent unavailable")
|
||||
@@ -115,7 +120,7 @@ function main() {
|
||||
registerLocationHttpHandlers(app, { sessionManager, authSessionMiddleware })
|
||||
registerSourcesHttpHandlers(app, { sessionManager, authSessionMiddleware })
|
||||
registerAgentHttpHandlers(app, {
|
||||
sessionManager,
|
||||
queryAgent,
|
||||
authSessionMiddleware,
|
||||
})
|
||||
if (isDebugMode) {
|
||||
@@ -128,7 +133,7 @@ function main() {
|
||||
registerAdminHttpHandlers(app, { sessionManager, adminMiddleware, db })
|
||||
|
||||
process.on("SIGTERM", async () => {
|
||||
sessionManager.dispose()
|
||||
queryAgent.dispose()
|
||||
await closeDb()
|
||||
process.exit(0)
|
||||
})
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { FeedSource } from "@freya/core"
|
||||
import type { type } from "arktype"
|
||||
|
||||
export type ConfigSchema = (value: unknown) => unknown
|
||||
export type ConfigSchema = ReturnType<typeof type>
|
||||
|
||||
export interface FeedSourceProvider {
|
||||
/** The source ID this provider is responsible for (e.g., "freya.location"). */
|
||||
|
||||
@@ -4,12 +4,9 @@ import { LocationSource } from "@freya/source-location"
|
||||
import { WeatherSource } from "@freya/source-weatherkit"
|
||||
import { beforeEach, describe, expect, mock, spyOn, test } from "bun:test"
|
||||
|
||||
import type { ConversationStorageEntry } from "../agent/conversation-recording-query-agent.ts"
|
||||
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,
|
||||
@@ -24,8 +21,6 @@ import { UserSessionManager } from "./user-session-manager.ts"
|
||||
* Key = userId (or "*" for a default), value = array of enabled sourceIds.
|
||||
*/
|
||||
const enabledByUser = new Map<string, string[]>()
|
||||
const conversationEntriesByUser = new Map<string, ConversationStorageEntry[]>()
|
||||
const mockConversationCalls: Array<{ type: "getOrCreate" | "listEntries"; userId: string }> = []
|
||||
|
||||
/** Set which sourceIds are enabled for all users. */
|
||||
function setEnabledSources(sourceIds: string[]) {
|
||||
@@ -42,10 +37,6 @@ function getEnabledSourceIds(userId: string): string[] {
|
||||
return enabledByUser.get(userId) ?? enabledByUser.get("*") ?? []
|
||||
}
|
||||
|
||||
function setConversationEntriesForUser(userId: string, entries: ConversationStorageEntry[]) {
|
||||
conversationEntriesByUser.set(userId, entries)
|
||||
}
|
||||
|
||||
/**
|
||||
* Controls what `find()` returns in the mock. When `undefined` (the default),
|
||||
* `find()` returns a standard enabled row. Set to a specific value (including
|
||||
@@ -120,35 +111,6 @@ mock.module("../sources/user-sources.ts", () => ({
|
||||
}),
|
||||
}))
|
||||
|
||||
mock.module("../conversations/storage.ts", () => ({
|
||||
conversations: (_db: Database, userId: string) => ({
|
||||
async getOrCreateConversation(): Promise<{ id: string }> {
|
||||
mockConversationCalls.push({ type: "getOrCreate", userId })
|
||||
return { id: `conversation-${userId}` }
|
||||
},
|
||||
async listEntries(_conversationId: string): Promise<ConversationStorageEntry[]> {
|
||||
mockConversationCalls.push({ type: "listEntries", userId })
|
||||
return conversationEntriesByUser.get(userId) ?? []
|
||||
},
|
||||
async appendEntry(
|
||||
_conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationStorageEntry> {
|
||||
const entries = conversationEntriesByUser.get(userId) ?? []
|
||||
const row: ConversationStorageEntry = {
|
||||
id: `entry-${entries.length + 1}`,
|
||||
sequence: entries.length + 1,
|
||||
kind: input.kind,
|
||||
payload: input.payload,
|
||||
metadata: input.metadata ?? {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
}
|
||||
conversationEntriesByUser.set(userId, [...entries, row])
|
||||
return row
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
const fakeDb = {
|
||||
transaction: <T>(fn: (tx: unknown) => Promise<T>) => fn(fakeDb),
|
||||
} as unknown as Database
|
||||
@@ -198,8 +160,6 @@ const weatherProvider: FeedSourceProvider = {
|
||||
|
||||
beforeEach(() => {
|
||||
enabledByUser.clear()
|
||||
conversationEntriesByUser.clear()
|
||||
mockConversationCalls.length = 0
|
||||
mockFindResult = undefined
|
||||
mockUpdateCredentialsCalls.length = 0
|
||||
mockUpdateCredentialsError = null
|
||||
@@ -216,31 +176,6 @@ describe("UserSessionManager", () => {
|
||||
expect(session.engine).toBeDefined()
|
||||
})
|
||||
|
||||
test("getOrCreate eagerly loads conversation entries for the user session", async () => {
|
||||
setEnabledSources([])
|
||||
setConversationEntriesForUser("user-1", [
|
||||
{
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "stored hello" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
},
|
||||
])
|
||||
const manager = new UserSessionManager({ db: fakeDb, providers: [] })
|
||||
|
||||
await manager.getOrCreate("user-1")
|
||||
|
||||
expect(mockConversationCalls).toEqual([
|
||||
{ type: "getOrCreate", userId: "user-1" },
|
||||
{ type: "listEntries", userId: "user-1" },
|
||||
])
|
||||
})
|
||||
|
||||
test("getOrCreate returns same session for same user", async () => {
|
||||
setEnabledSources(["freya.location"])
|
||||
const manager = new UserSessionManager({ db: fakeDb, providers: [locationProvider] })
|
||||
|
||||
@@ -8,21 +8,19 @@ import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||
import type { CredentialEncryptor } from "../lib/crypto.ts"
|
||||
import type { FeedSourceProvider } from "./feed-source-provider.ts"
|
||||
|
||||
import { conversations } from "../conversations/storage.ts"
|
||||
import {
|
||||
CredentialStorageUnavailableError,
|
||||
InvalidSourceConfigError,
|
||||
SourceNotFoundError,
|
||||
} from "../sources/errors.ts"
|
||||
import { sources } from "../sources/user-sources.ts"
|
||||
import { UserSession, type UserSessionAgentConfig } from "./user-session.ts"
|
||||
import { UserSession } from "./user-session.ts"
|
||||
|
||||
export interface UserSessionManagerConfig {
|
||||
db: Database
|
||||
providers: FeedSourceProvider[]
|
||||
feedEnhancer?: FeedEnhancer | null
|
||||
credentialEncryptor?: CredentialEncryptor | null
|
||||
queryAgent?: UserSessionAgentConfig
|
||||
}
|
||||
|
||||
export class UserSessionManager {
|
||||
@@ -32,7 +30,6 @@ export class UserSessionManager {
|
||||
private readonly providers = new Map<string, FeedSourceProvider>()
|
||||
private readonly feedEnhancer: FeedEnhancer | null
|
||||
private readonly encryptor: CredentialEncryptor | null
|
||||
private readonly queryAgentConfig: UserSessionAgentConfig | undefined
|
||||
|
||||
constructor(config: UserSessionManagerConfig) {
|
||||
this.db = config.db
|
||||
@@ -41,7 +38,6 @@ export class UserSessionManager {
|
||||
}
|
||||
this.feedEnhancer = config.feedEnhancer ?? null
|
||||
this.encryptor = config.credentialEncryptor ?? null
|
||||
this.queryAgentConfig = config.queryAgent
|
||||
}
|
||||
|
||||
getProvider(sourceId: string): FeedSourceProvider | undefined {
|
||||
@@ -103,14 +99,6 @@ export class UserSessionManager {
|
||||
this.pending.delete(userId)
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
for (const session of this.sessions.values()) {
|
||||
session.destroy()
|
||||
}
|
||||
this.sessions.clear()
|
||||
this.pending.clear()
|
||||
}
|
||||
|
||||
/**
|
||||
* Merges, validates, and persists a user's source config and/or enabled
|
||||
* state, then invalidates the cached session.
|
||||
@@ -363,7 +351,6 @@ export class UserSessionManager {
|
||||
|
||||
private async createSession(userId: string): Promise<UserSession> {
|
||||
const enabledRows = await sources(this.db, userId).enabled()
|
||||
const agentConfig = this.queryAgentConfigForUser(userId)
|
||||
|
||||
const promises: Promise<FeedSource>[] = []
|
||||
for (const row of enabledRows) {
|
||||
@@ -375,7 +362,7 @@ export class UserSessionManager {
|
||||
}
|
||||
|
||||
if (promises.length === 0) {
|
||||
return this.initializedSession(userId, [], agentConfig)
|
||||
return new UserSession(userId, [], this.feedEnhancer)
|
||||
}
|
||||
|
||||
const results = await Promise.allSettled(promises)
|
||||
@@ -399,29 +386,7 @@ export class UserSessionManager {
|
||||
console.error("[UserSessionManager] Feed source provider failed:", error)
|
||||
}
|
||||
|
||||
return this.initializedSession(userId, feedSources, agentConfig)
|
||||
}
|
||||
|
||||
private queryAgentConfigForUser(userId: string): UserSessionAgentConfig {
|
||||
return {
|
||||
...(this.queryAgentConfig ?? {}),
|
||||
conversationStorage: conversations(this.db, userId),
|
||||
}
|
||||
}
|
||||
|
||||
private async initializedSession(
|
||||
userId: string,
|
||||
sources: FeedSource[],
|
||||
agentConfig: UserSessionAgentConfig,
|
||||
): Promise<UserSession> {
|
||||
const session = new UserSession(userId, sources, this.feedEnhancer, agentConfig)
|
||||
try {
|
||||
await session.initialize()
|
||||
return session
|
||||
} catch (err) {
|
||||
session.destroy()
|
||||
throw err
|
||||
}
|
||||
return new UserSession(userId, feedSources, this.feedEnhancer)
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -3,13 +3,6 @@ import type { ActionDefinition, ContextEntry, FeedItem, FeedSource } from "@frey
|
||||
import { LocationSource } from "@freya/source-location"
|
||||
import { describe, expect, spyOn, test } from "bun:test"
|
||||
|
||||
import type {
|
||||
ConversationStorage,
|
||||
ConversationStorageEntry,
|
||||
} 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 {
|
||||
@@ -30,40 +23,6 @@ function createStubSource(id: string, items: FeedItem[] = []): FeedSource {
|
||||
}
|
||||
}
|
||||
|
||||
class FakeConversationStorage implements ConversationStorage {
|
||||
readonly calls: string[] = []
|
||||
private readonly entries: ConversationStorageEntry[]
|
||||
|
||||
constructor(entries: ConversationStorageEntry[] = []) {
|
||||
this.entries = entries
|
||||
}
|
||||
|
||||
async getOrCreateConversation(): Promise<{ id: string }> {
|
||||
this.calls.push("getOrCreateConversation")
|
||||
return { id: "conversation-1" }
|
||||
}
|
||||
|
||||
async appendEntry(
|
||||
_conversationId: string,
|
||||
input: AppendConversationEntryInput,
|
||||
): Promise<ConversationStorageEntry> {
|
||||
this.calls.push("appendEntry")
|
||||
return {
|
||||
id: "entry-appended",
|
||||
sequence: 1,
|
||||
kind: input.kind,
|
||||
payload: input.payload,
|
||||
metadata: input.metadata ?? {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
}
|
||||
}
|
||||
|
||||
async listEntries(_conversationId: string): Promise<ConversationStorageEntry[]> {
|
||||
this.calls.push("listEntries")
|
||||
return this.entries
|
||||
}
|
||||
}
|
||||
|
||||
describe("UserSession", () => {
|
||||
test("registers sources and starts engine", async () => {
|
||||
const session = new UserSession("test-user", [
|
||||
@@ -99,41 +58,6 @@ describe("UserSession", () => {
|
||||
expect(session.getSource("test")).toBeUndefined()
|
||||
})
|
||||
|
||||
test("destroy disposes query agent", () => {
|
||||
const session = new UserSession("test-user", [createStubSource("test")])
|
||||
const disposeSpy = spyOn(session.agent, "dispose")
|
||||
|
||||
session.destroy()
|
||||
|
||||
expect(disposeSpy).toHaveBeenCalled()
|
||||
})
|
||||
|
||||
test("initialize loads conversation entries before exposing stored agent", async () => {
|
||||
const storage = new FakeConversationStorage([
|
||||
{
|
||||
id: "entry-1",
|
||||
sequence: 1,
|
||||
kind: ConversationEntryKind.UserMessage,
|
||||
payload: {
|
||||
role: "user",
|
||||
parts: [{ type: "text", text: "stored hello" }],
|
||||
},
|
||||
metadata: {},
|
||||
createdAt: new Date("2026-06-15T00:00:00.000Z"),
|
||||
},
|
||||
])
|
||||
const session = new UserSession("test-user", [createStubSource("test")], null, {
|
||||
conversationStorage: storage,
|
||||
})
|
||||
|
||||
expect(() => session.agent).toThrow("UserSession has not been initialized")
|
||||
|
||||
await session.initialize()
|
||||
|
||||
expect(storage.calls).toEqual(["getOrCreateConversation", "listEntries"])
|
||||
expect(session.agent).toBeDefined()
|
||||
})
|
||||
|
||||
test("engine.executeAction routes to correct source", async () => {
|
||||
const location = new LocationSource()
|
||||
const session = new UserSession("test-user", [location])
|
||||
|
||||
@@ -6,50 +6,23 @@ import {
|
||||
type FeedSource,
|
||||
} from "@freya/core"
|
||||
|
||||
import type { QueryAgentToolbox } from "../agent/query-agent-toolbox.ts"
|
||||
import type { QueryAgent } from "../agent/query-agent.ts"
|
||||
import type { FeedEnhancer } from "../enhancement/enhance-feed.ts"
|
||||
|
||||
import {
|
||||
ConversationRecordingQueryAgent,
|
||||
type ConversationStorage,
|
||||
} from "../agent/conversation-recording-query-agent.ts"
|
||||
import { PiQueryAgent, PI_MODEL_ID, PI_MODEL_PROVIDER } from "../agent/pi-query-agent.ts"
|
||||
import { UserSessionQueryAgentToolbox } from "../agent/user-session-query-agent-toolbox.ts"
|
||||
|
||||
export interface UserSessionAgentConfig {
|
||||
apiKey?: string
|
||||
cwd?: string
|
||||
systemPrompt?: string
|
||||
conversationStorage?: ConversationStorage
|
||||
}
|
||||
|
||||
export class UserSession {
|
||||
readonly userId: string
|
||||
readonly engine: FeedEngine
|
||||
readonly toolbox: QueryAgentToolbox
|
||||
private sources = new Map<string, FeedSource>()
|
||||
private readonly enhancer: FeedEnhancer | null
|
||||
private readonly agentConfig: UserSessionAgentConfig | undefined
|
||||
private queryAgent: QueryAgent | null = null
|
||||
private initializePromise: Promise<void> | null = null
|
||||
private initialized = false
|
||||
private enhancedItems: FeedItem[] | null = null
|
||||
/** The FeedResult that enhancedItems was derived from. */
|
||||
private enhancedSource: FeedResult | null = null
|
||||
private enhancingPromise: Promise<void> | null = null
|
||||
private unsubscribe: (() => void) | null = null
|
||||
|
||||
constructor(
|
||||
userId: string,
|
||||
sources: FeedSource[],
|
||||
enhancer?: FeedEnhancer | null,
|
||||
agentConfig?: UserSessionAgentConfig,
|
||||
) {
|
||||
constructor(userId: string, sources: FeedSource[], enhancer?: FeedEnhancer | null) {
|
||||
this.userId = userId
|
||||
this.engine = new FeedEngine()
|
||||
this.enhancer = enhancer ?? null
|
||||
this.agentConfig = agentConfig
|
||||
for (const source of sources) {
|
||||
this.sources.set(source.id, source)
|
||||
this.engine.register(source)
|
||||
@@ -62,44 +35,9 @@ export class UserSession {
|
||||
})
|
||||
}
|
||||
|
||||
this.toolbox = new UserSessionQueryAgentToolbox(this)
|
||||
if (!agentConfig?.conversationStorage) {
|
||||
this.queryAgent = new PiQueryAgent({
|
||||
toolbox: this.toolbox,
|
||||
apiKey: this.agentConfig?.apiKey,
|
||||
cwd: this.agentConfig?.cwd,
|
||||
systemPrompt: this.agentConfig?.systemPrompt,
|
||||
})
|
||||
this.initialized = true
|
||||
}
|
||||
|
||||
this.engine.start()
|
||||
}
|
||||
|
||||
get agent(): QueryAgent {
|
||||
if (!this.queryAgent) {
|
||||
throw new Error("UserSession has not been initialized")
|
||||
}
|
||||
return this.queryAgent
|
||||
}
|
||||
|
||||
async initialize(): Promise<void> {
|
||||
if (this.initialized) return
|
||||
if (this.initializePromise) return this.initializePromise
|
||||
|
||||
const promise = this.initializeAgent()
|
||||
this.initializePromise = promise
|
||||
|
||||
try {
|
||||
await promise
|
||||
this.initialized = true
|
||||
} finally {
|
||||
if (this.initializePromise === promise) {
|
||||
this.initializePromise = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current feed, refreshing if the engine cache expired.
|
||||
* Enhancement runs eagerly on engine updates; this method awaits
|
||||
@@ -236,8 +174,6 @@ export class UserSession {
|
||||
}
|
||||
|
||||
destroy(): void {
|
||||
this.queryAgent?.dispose()
|
||||
this.queryAgent = null
|
||||
this.unsubscribe?.()
|
||||
this.unsubscribe = null
|
||||
this.engine.stop()
|
||||
@@ -246,38 +182,6 @@ export class UserSession {
|
||||
this.enhancingPromise = null
|
||||
}
|
||||
|
||||
private async initializeAgent(): Promise<void> {
|
||||
if (this.queryAgent) return
|
||||
|
||||
const conversationStorage = this.agentConfig?.conversationStorage
|
||||
if (!conversationStorage) {
|
||||
this.queryAgent = new PiQueryAgent({
|
||||
toolbox: this.toolbox,
|
||||
apiKey: this.agentConfig?.apiKey,
|
||||
cwd: this.agentConfig?.cwd,
|
||||
systemPrompt: this.agentConfig?.systemPrompt,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
const conversation = await conversationStorage.getOrCreateConversation()
|
||||
const entries = await conversationStorage.listEntries(conversation.id)
|
||||
|
||||
this.queryAgent = new ConversationRecordingQueryAgent({
|
||||
agent: new PiQueryAgent({
|
||||
toolbox: this.toolbox,
|
||||
apiKey: this.agentConfig?.apiKey,
|
||||
cwd: this.agentConfig?.cwd,
|
||||
systemPrompt: this.agentConfig?.systemPrompt,
|
||||
initialEntries: entries,
|
||||
}),
|
||||
storage: conversationStorage,
|
||||
defaultConversationId: conversation.id,
|
||||
modelProvider: PI_MODEL_PROVIDER,
|
||||
modelId: PI_MODEL_ID,
|
||||
})
|
||||
}
|
||||
|
||||
private invalidateEnhancement(): void {
|
||||
this.enhancedItems = null
|
||||
this.enhancedSource = null
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import { LocationSource } from "@freya/source-location"
|
||||
import { ReminderSource } from "@freya/source-reminders"
|
||||
import { WebSearchSource } from "@freya/source-web-search"
|
||||
import { describe, expect, test } from "bun:test"
|
||||
|
||||
@@ -56,12 +55,8 @@ function createRecordingDb(): RecordingDb {
|
||||
}
|
||||
|
||||
describe("default user sources", () => {
|
||||
test("defines default enabled sources", () => {
|
||||
expect(DEFAULT_ENABLED_SOURCE_IDS).toEqual([
|
||||
LocationSource.id,
|
||||
ReminderSource.id,
|
||||
WebSearchSource.id,
|
||||
])
|
||||
test("defines location and web search as default enabled sources", () => {
|
||||
expect(DEFAULT_ENABLED_SOURCE_IDS).toEqual([LocationSource.id, WebSearchSource.id])
|
||||
})
|
||||
|
||||
test("inserts default enabled source rows for a user", async () => {
|
||||
@@ -75,7 +70,7 @@ describe("default user sources", () => {
|
||||
}
|
||||
|
||||
expect(recording.table()).toBe(userSources)
|
||||
expect(rows).toHaveLength(3)
|
||||
expect(rows).toHaveLength(2)
|
||||
expect(rows.map((row) => row.sourceId)).toEqual([...DEFAULT_ENABLED_SOURCE_IDS])
|
||||
expect(recording.conflictTarget()).toEqual([userSources.userId, userSources.sourceId])
|
||||
|
||||
|
||||
@@ -1,16 +1,11 @@
|
||||
import { LocationSource } from "@freya/source-location"
|
||||
import { ReminderSource } from "@freya/source-reminders"
|
||||
import { WebSearchSource } from "@freya/source-web-search"
|
||||
|
||||
import type { Database } from "../db/index.ts"
|
||||
|
||||
import { userSources } from "../db/schema.ts"
|
||||
|
||||
export const DEFAULT_ENABLED_SOURCE_IDS = [
|
||||
LocationSource.id,
|
||||
ReminderSource.id,
|
||||
WebSearchSource.id,
|
||||
] as const
|
||||
export const DEFAULT_ENABLED_SOURCE_IDS = [LocationSource.id, WebSearchSource.id] as const
|
||||
|
||||
export type DefaultEnabledSourceId = (typeof DEFAULT_ENABLED_SOURCE_IDS)[number]
|
||||
|
||||
|
||||
@@ -128,20 +128,6 @@ mock.module("../sources/user-sources.ts", () => ({
|
||||
},
|
||||
}))
|
||||
|
||||
mock.module("../conversations/storage.ts", () => ({
|
||||
conversations: (_db: Database, userId: string) => ({
|
||||
async getOrCreateConversation() {
|
||||
return { id: `conversation-${userId}` }
|
||||
},
|
||||
async listEntries() {
|
||||
return []
|
||||
},
|
||||
async appendEntry() {
|
||||
return { id: "entry-1", sequence: 1 }
|
||||
},
|
||||
}),
|
||||
}))
|
||||
|
||||
const fakeDb = {
|
||||
transaction: <T>(fn: (tx: unknown) => Promise<T>) => fn(fakeDb),
|
||||
} as unknown as Database
|
||||
|
||||
@@ -37,13 +37,13 @@ export function meta({}: Route.MetaArgs) {
|
||||
},
|
||||
{ property: "og:title", content: PAGE_TITLE },
|
||||
{ property: "og:description", content: PAGE_DESCRIPTION },
|
||||
{ property: "og:image", content: "https://freya.chat/social-media-preview.jpg" },
|
||||
{ property: "og:url", content: "https://freya.chat" },
|
||||
{ property: "og:image", content: "https://ael.is/social-media-preview.png" },
|
||||
{ property: "og:url", content: "https://ael.is" },
|
||||
{ property: "og:type", content: "website" },
|
||||
{ name: "twitter:card", content: "summary_large_image" },
|
||||
{ name: "twitter:title", content: PAGE_TITLE },
|
||||
{ name: "twitter:description", content: PAGE_DESCRIPTION },
|
||||
{ name: "twitter:image", content: "https://freya.chat/social-media-preview.jpg" },
|
||||
{ name: "twitter:image", content: "https://ael.is/social-media-preview.png" },
|
||||
]
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ export async function action({ request }: Route.ActionArgs) {
|
||||
await new Promise((resolve) => setTimeout(resolve, 1000))
|
||||
|
||||
const emailRes = await resend.emails.send({
|
||||
from: "Freya <no-reply@freya.chat>",
|
||||
from: "Freya <no-reply@ael.is>",
|
||||
to: email,
|
||||
template: {
|
||||
id: "waitlist-confirmation",
|
||||
@@ -380,6 +380,7 @@ function SystemMessageBubble({
|
||||
isAnimating={isStreaming}
|
||||
linkSafety={{ enabled: false }}
|
||||
components={{
|
||||
// @ts-expect-error
|
||||
a: ({ className, ...props }) => <a className={`underline ${className}`} {...props} />,
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -40,7 +40,7 @@ const POLICY = `# Privacy Policy
|
||||
|
||||
**Last updated:** March 5, 2026
|
||||
|
||||
This Privacy Policy describes how **Freya** ("we", "us", or "our") collects, uses, and protects your personal information when you visit **https://freya.chat** or interact with our services.
|
||||
This Privacy Policy describes how **Freya** ("we", "us", or "our") collects, uses, and protects your personal information when you visit **https://ael.is** or interact with our services.
|
||||
|
||||
If you do not agree with this Privacy Policy, please do not use the website.
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
User-agent: *
|
||||
Allow: /
|
||||
|
||||
Sitemap: https://freya.chat/sitemap.xml
|
||||
Sitemap: https://ael.is/sitemap.xml
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://freya.chat/</loc>
|
||||
<loc>https://ael.is/</loc>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://freya.chat/privacy</loc>
|
||||
<loc>https://ael.is/privacy</loc>
|
||||
</url>
|
||||
</urlset>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 45 KiB |
BIN
apps/waitlist-website/public/social-media-preview.png
Normal file
BIN
apps/waitlist-website/public/social-media-preview.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 68 KiB |
198
bun.lock
198
bun.lock
@@ -46,10 +46,6 @@
|
||||
"vite": "^7.2.4",
|
||||
},
|
||||
},
|
||||
"apps/agent-test-cli": {
|
||||
"name": "@freya/agent-test-cli",
|
||||
"version": "0.0.0",
|
||||
},
|
||||
"apps/freya-backend": {
|
||||
"name": "@freya/backend",
|
||||
"version": "0.0.0",
|
||||
@@ -749,8 +745,6 @@
|
||||
|
||||
"@formatjs/intl-localematcher": ["@formatjs/intl-localematcher@0.6.2", "", { "dependencies": { "tslib": "^2.8.0" } }, "sha512-XOMO2Hupl0wdd172Y06h6kLpBz6Dv+J4okPLl4LPtzbr8f66WbIoy4ev98EBuZ6ZK4h5ydTN6XneT4QVpD7cdA=="],
|
||||
|
||||
"@freya/agent-test-cli": ["@freya/agent-test-cli@workspace:apps/agent-test-cli"],
|
||||
|
||||
"@freya/backend": ["@freya/backend@workspace:apps/freya-backend"],
|
||||
|
||||
"@freya/components": ["@freya/components@workspace:packages/freya-components"],
|
||||
@@ -767,8 +761,6 @@
|
||||
|
||||
"@freya/source-location": ["@freya/source-location@workspace:packages/freya-source-location"],
|
||||
|
||||
"@freya/source-mcp": ["@freya/source-mcp@workspace:packages/freya-source-mcp"],
|
||||
|
||||
"@freya/source-reminders": ["@freya/source-reminders@workspace:packages/freya-source-reminders"],
|
||||
|
||||
"@freya/source-tfl": ["@freya/source-tfl@workspace:packages/freya-source-tfl"],
|
||||
@@ -1703,7 +1695,7 @@
|
||||
|
||||
"abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],
|
||||
|
||||
"accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
|
||||
"accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
|
||||
|
||||
"acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
|
||||
|
||||
@@ -1715,9 +1707,9 @@
|
||||
|
||||
"agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
|
||||
|
||||
"ajv": ["ajv@8.18.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A=="],
|
||||
"ajv": ["ajv@8.11.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" } }, "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="],
|
||||
|
||||
"ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="],
|
||||
"ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="],
|
||||
|
||||
"anser": ["anser@1.4.10", "", {}, "sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww=="],
|
||||
|
||||
@@ -1845,7 +1837,7 @@
|
||||
|
||||
"binary-extensions": ["binary-extensions@2.3.0", "", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
|
||||
|
||||
"body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="],
|
||||
"body-parser": ["body-parser@1.20.4", "", { "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "~1.2.0", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", "qs": "~6.14.0", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" } }, "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA=="],
|
||||
|
||||
"boolbase": ["boolbase@1.0.0", "", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
|
||||
|
||||
@@ -1977,7 +1969,7 @@
|
||||
|
||||
"consola": ["consola@3.4.2", "", {}, "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA=="],
|
||||
|
||||
"content-disposition": ["content-disposition@1.0.1", "", {}, "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q=="],
|
||||
"content-disposition": ["content-disposition@0.5.4", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="],
|
||||
|
||||
"content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="],
|
||||
|
||||
@@ -1987,7 +1979,7 @@
|
||||
|
||||
"cookie-es": ["cookie-es@2.0.0", "", {}, "sha512-RAj4E421UYRgqokKUmotqAwuplYw15qtdXfY+hGzgCJ/MBjCVZcSoHK/kH9kocfjRjcDME7IiDWR/1WX1TM2Pg=="],
|
||||
|
||||
"cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
|
||||
"cookie-signature": ["cookie-signature@1.0.7", "", {}, "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="],
|
||||
|
||||
"core-js-compat": ["core-js-compat@3.48.0", "", { "dependencies": { "browserslist": "^4.28.1" } }, "sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q=="],
|
||||
|
||||
@@ -2283,7 +2275,7 @@
|
||||
|
||||
"exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="],
|
||||
|
||||
"express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
|
||||
"express": ["express@4.22.1", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.3", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g=="],
|
||||
|
||||
"express-rate-limit": ["express-rate-limit@8.3.1", "", { "dependencies": { "ip-address": "10.1.0" }, "peerDependencies": { "express": ">= 4.11" } }, "sha512-D1dKN+cmyPWuvB+G2SREQDzPY1agpBIcTa9sJxOPMCNeH3gwzhqJRDWCXW3gg0y//+LQ/8j52JbMROWyrKdMdw=="],
|
||||
|
||||
@@ -2335,7 +2327,7 @@
|
||||
|
||||
"filter-obj": ["filter-obj@1.1.0", "", {}, "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="],
|
||||
|
||||
"finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="],
|
||||
"finalhandler": ["finalhandler@1.3.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "statuses": "~2.0.2", "unpipe": "~1.0.0" } }, "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg=="],
|
||||
|
||||
"find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="],
|
||||
|
||||
@@ -2361,7 +2353,7 @@
|
||||
|
||||
"freeport-async": ["freeport-async@2.0.0", "", {}, "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ=="],
|
||||
|
||||
"fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
|
||||
"fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
|
||||
|
||||
"freya-client": ["freya-client@workspace:apps/freya-client"],
|
||||
|
||||
@@ -2851,13 +2843,13 @@
|
||||
|
||||
"mdn-data": ["mdn-data@2.0.14", "", {}, "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="],
|
||||
|
||||
"media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
|
||||
"media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="],
|
||||
|
||||
"memoize-one": ["memoize-one@5.2.1", "", {}, "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="],
|
||||
|
||||
"memory-pager": ["memory-pager@1.5.0", "", {}, "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="],
|
||||
|
||||
"merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],
|
||||
"merge-descriptors": ["merge-descriptors@1.0.3", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="],
|
||||
|
||||
"merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
|
||||
|
||||
@@ -2953,9 +2945,9 @@
|
||||
|
||||
"mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
|
||||
|
||||
"mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
|
||||
"mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],
|
||||
"mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
|
||||
"mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
|
||||
|
||||
@@ -3421,7 +3413,7 @@
|
||||
|
||||
"semver": ["semver@7.5.4", "", { "dependencies": { "lru-cache": "^6.0.0" }, "bin": { "semver": "bin/semver.js" } }, "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="],
|
||||
|
||||
"send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="],
|
||||
"send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],
|
||||
|
||||
"seq-queue": ["seq-queue@0.0.5", "", {}, "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="],
|
||||
|
||||
@@ -3431,7 +3423,7 @@
|
||||
|
||||
"seroval-plugins": ["seroval-plugins@1.5.1", "", { "peerDependencies": { "seroval": "^1.0" } }, "sha512-4FbuZ/TMl02sqv0RTFexu0SP6V+ywaIe5bAWCCEik0fk17BhALgwvUDVF7e3Uvf9pxmwCEJsRPmlkUE6HdzLAw=="],
|
||||
|
||||
"serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="],
|
||||
"serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="],
|
||||
|
||||
"server-only": ["server-only@0.0.1", "", {}, "sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA=="],
|
||||
|
||||
@@ -3667,7 +3659,7 @@
|
||||
|
||||
"type-fest": ["type-fest@5.5.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-PlBfpQwiUvGViBNX84Yxwjsdhd1TUlXr6zjX7eoirtCPIr08NAmxwa+fcYBTeRQxHo9YC9wwF3m9i700sHma8g=="],
|
||||
|
||||
"type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],
|
||||
"type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="],
|
||||
|
||||
"typebox": ["typebox@1.2.8", "", {}, "sha512-rlsKhsd7L3082m9nxhFIB4Gl8jizLd/6YlFAWaz96hdV8+VJRjwYaYmDlT0jlTRwkb48SxCSSirqUtrg/HilNw=="],
|
||||
|
||||
@@ -3989,8 +3981,6 @@
|
||||
|
||||
"@expo/cli/@urql/exchange-retry": ["@urql/exchange-retry@1.3.2", "", { "dependencies": { "@urql/core": "^5.1.2", "wonka": "^6.3.2" } }, "sha512-TQMCz2pFJMfpNxmSfX1VSfTjwUIFx/mL+p1bnfM1xjjdla7Z+KnGMW/EhFbpckp3LyWAH4PgOsMwOMnIN+MBFg=="],
|
||||
|
||||
"@expo/cli/accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
|
||||
|
||||
"@expo/cli/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
|
||||
|
||||
"@expo/cli/getenv": ["getenv@2.0.0", "", {}, "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ=="],
|
||||
@@ -4009,8 +3999,6 @@
|
||||
|
||||
"@expo/cli/semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],
|
||||
|
||||
"@expo/cli/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],
|
||||
|
||||
"@expo/cli/undici": ["undici@6.23.0", "", {}, "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g=="],
|
||||
|
||||
"@expo/cli/ws": ["ws@8.19.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg=="],
|
||||
@@ -4177,6 +4165,12 @@
|
||||
|
||||
"@mistralai/mistralai/ws": ["ws@8.19.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/ajv": ["ajv@8.18.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express": ["express@5.2.1", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.1", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "depd": "^2.0.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw=="],
|
||||
|
||||
"@mrleebo/prisma-ast/lilconfig": ["lilconfig@2.1.0", "", {}, "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="],
|
||||
|
||||
"@noble/curves/@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="],
|
||||
@@ -4205,8 +4199,6 @@
|
||||
|
||||
"@react-native/dev-middleware/open": ["open@7.4.2", "", { "dependencies": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" } }, "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="],
|
||||
|
||||
"@react-navigation/core/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
|
||||
|
||||
"@react-navigation/native/nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
|
||||
@@ -4217,8 +4209,6 @@
|
||||
|
||||
"@react-router/dev/semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],
|
||||
|
||||
"@react-router/serve/express": ["express@4.22.1", "", { "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "~1.20.3", "content-disposition": "~0.5.4", "content-type": "~1.0.4", "cookie": "~0.7.1", "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "~1.3.1", "fresh": "~0.5.2", "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", "send": "~0.19.0", "serve-static": "~1.16.2", "setprototypeof": "1.2.0", "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" } }, "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g=="],
|
||||
|
||||
"@smithy/core/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||
|
||||
"@smithy/credential-provider-imds/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||
@@ -4271,7 +4261,7 @@
|
||||
|
||||
"@typescript-eslint/visitor-keys/eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="],
|
||||
|
||||
"accepts/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
|
||||
"accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
|
||||
|
||||
"ansi-escapes/type-fest": ["type-fest@0.21.3", "", {}, "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="],
|
||||
|
||||
@@ -4289,6 +4279,12 @@
|
||||
|
||||
"better-opn/open": ["open@8.4.2", "", { "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", "is-wsl": "^2.2.0" } }, "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="],
|
||||
|
||||
"body-parser/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
|
||||
|
||||
"body-parser/raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="],
|
||||
|
||||
"bun-types/@types/node": ["@types/node@22.19.15", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg=="],
|
||||
|
||||
"c12/dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="],
|
||||
@@ -4313,8 +4309,6 @@
|
||||
|
||||
"cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
|
||||
|
||||
"compressible/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"compression/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"connect/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
@@ -4327,10 +4321,6 @@
|
||||
|
||||
"dotenv-expand/dotenv": ["dotenv@16.4.7", "", {}, "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ=="],
|
||||
|
||||
"eas-cli/ajv": ["ajv@8.11.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" } }, "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="],
|
||||
|
||||
"eas-cli/ajv-formats": ["ajv-formats@2.1.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="],
|
||||
|
||||
"eas-cli/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
|
||||
|
||||
"eas-cli/diff": ["diff@7.0.0", "", {}, "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw=="],
|
||||
@@ -4397,8 +4387,6 @@
|
||||
|
||||
"expo-constants/@expo/env": ["@expo/env@2.0.11", "", { "dependencies": { "chalk": "^4.0.0", "debug": "^4.3.4", "dotenv": "~16.4.5", "dotenv-expand": "~11.0.6", "getenv": "^2.0.0" } }, "sha512-xV+ps6YCW7XIPVUwFVCRN2nox09dnRwy8uIjwHWTODu0zFw4kp4omnVkl0OOjuu2XOe7tdgAHxikrkJt9xB/7Q=="],
|
||||
|
||||
"expo-dev-launcher/ajv": ["ajv@8.11.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" } }, "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="],
|
||||
|
||||
"expo-manifests/@expo/config": ["@expo/config@12.0.13", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "@expo/config-plugins": "~54.0.4", "@expo/config-types": "^54.0.10", "@expo/json-file": "^10.0.8", "deepmerge": "^4.3.1", "getenv": "^2.0.0", "glob": "^13.0.0", "require-from-string": "^2.0.2", "resolve-from": "^5.0.0", "resolve-workspace-root": "^2.0.0", "semver": "^7.6.0", "slugify": "^1.3.4", "sucrase": "~3.35.1" } }, "sha512-Cu52arBa4vSaupIWsF0h7F/Cg//N374nYb7HAxV0I4KceKA7x2UXpYaHOL7EEYYvp7tZdThBjvGpVmr8ScIvaQ=="],
|
||||
|
||||
"expo-modules-autolinking/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
|
||||
@@ -4415,6 +4403,10 @@
|
||||
|
||||
"express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
|
||||
|
||||
"express/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"express/path-to-regexp": ["path-to-regexp@0.1.12", "", {}, "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="],
|
||||
|
||||
"fast-glob/glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
|
||||
|
||||
"fbjs/cross-fetch": ["cross-fetch@3.2.0", "", { "dependencies": { "node-fetch": "^2.7.0" } }, "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q=="],
|
||||
@@ -4425,9 +4417,9 @@
|
||||
|
||||
"filelist/minimatch": ["minimatch@5.1.2", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="],
|
||||
|
||||
"foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
|
||||
"finalhandler/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
"foreground-child/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
|
||||
|
||||
"framer-motion/tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||
|
||||
@@ -4487,8 +4479,6 @@
|
||||
|
||||
"mdast-util-find-and-replace/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
|
||||
|
||||
"metro/accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
|
||||
|
||||
"metro/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
|
||||
|
||||
"metro/ci-info": ["ci-info@2.0.0", "", {}, "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="],
|
||||
@@ -4499,8 +4489,6 @@
|
||||
|
||||
"metro/metro-source-map": ["metro-source-map@0.83.3", "", { "dependencies": { "@babel/traverse": "^7.25.3", "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3", "@babel/types": "^7.25.2", "flow-enums-runtime": "^0.0.6", "invariant": "^2.2.4", "metro-symbolicate": "0.83.3", "nullthrows": "^1.1.1", "ob1": "0.83.3", "source-map": "^0.5.6", "vlq": "^1.0.0" } }, "sha512-xkC3qwUBh2psVZgVavo8+r2C9Igkk3DibiOXSAht1aYRRcztEZNFtAMtfSB7sdO2iFMx2Mlyu++cBxz/fhdzQg=="],
|
||||
|
||||
"metro/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
|
||||
"metro/source-map": ["source-map@0.5.7", "", {}, "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="],
|
||||
|
||||
"metro/ws": ["ws@7.5.10", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="],
|
||||
@@ -4617,6 +4605,10 @@
|
||||
|
||||
"semver/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],
|
||||
|
||||
"send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
|
||||
|
||||
"shadcn/diff": ["diff@8.0.3", "", {}, "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ=="],
|
||||
|
||||
"shadcn/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
|
||||
@@ -4773,10 +4765,6 @@
|
||||
|
||||
"@expo/cli/@expo/prebuild-config/@expo/config-types": ["@expo/config-types@54.0.10", "", {}, "sha512-/J16SC2an1LdtCZ67xhSkGXpALYUVUNyZws7v+PVsFZxClYehDSoKLqyRaGkpHlYrCc08bS0RF5E0JV6g50psA=="],
|
||||
|
||||
"@expo/cli/accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
|
||||
"@expo/cli/accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
|
||||
|
||||
"@expo/cli/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
|
||||
|
||||
"@expo/cli/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],
|
||||
@@ -4789,12 +4777,6 @@
|
||||
|
||||
"@expo/cli/ora/strip-ansi": ["strip-ansi@5.2.0", "", { "dependencies": { "ansi-regex": "^4.1.0" } }, "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="],
|
||||
|
||||
"@expo/cli/send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"@expo/cli/send/fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
|
||||
|
||||
"@expo/cli/send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
|
||||
|
||||
"@expo/config-plugins/@expo/json-file/@babel/code-frame": ["@babel/code-frame@7.10.4", "", { "dependencies": { "@babel/highlight": "^7.10.4" } }, "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="],
|
||||
|
||||
"@expo/config-plugins/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
|
||||
@@ -4903,6 +4885,30 @@
|
||||
|
||||
"@jest/types/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/body-parser": ["body-parser@2.2.2", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.3", "http-errors": "^2.0.0", "iconv-lite": "^0.7.0", "on-finished": "^2.4.1", "qs": "^6.14.1", "raw-body": "^3.0.1", "type-is": "^2.0.1" } }, "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/content-disposition": ["content-disposition@1.0.1", "", {}, "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/finalhandler": ["finalhandler@2.1.1", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/send": ["send@1.2.1", "", { "dependencies": { "debug": "^4.4.3", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.1", "mime-types": "^3.0.2", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.2" } }, "sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/serve-static": ["serve-static@2.2.1", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],
|
||||
|
||||
"@oclif/core/minimatch/brace-expansion": ["brace-expansion@5.0.4", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg=="],
|
||||
|
||||
"@oclif/core/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
|
||||
@@ -4913,34 +4919,6 @@
|
||||
|
||||
"@react-native/dev-middleware/open/is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],
|
||||
|
||||
"@react-router/serve/express/accepts": ["accepts@1.3.8", "", { "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" } }, "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="],
|
||||
|
||||
"@react-router/serve/express/body-parser": ["body-parser@1.20.4", "", { "dependencies": { "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "~1.2.0", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "on-finished": "~2.4.1", "qs": "~6.14.0", "raw-body": "~2.5.3", "type-is": "~1.6.18", "unpipe": "~1.0.0" } }, "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA=="],
|
||||
|
||||
"@react-router/serve/express/content-disposition": ["content-disposition@0.5.4", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="],
|
||||
|
||||
"@react-router/serve/express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
|
||||
|
||||
"@react-router/serve/express/cookie-signature": ["cookie-signature@1.0.7", "", {}, "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA=="],
|
||||
|
||||
"@react-router/serve/express/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"@react-router/serve/express/finalhandler": ["finalhandler@1.3.2", "", { "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "~2.4.1", "parseurl": "~1.3.3", "statuses": "~2.0.2", "unpipe": "~1.0.0" } }, "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg=="],
|
||||
|
||||
"@react-router/serve/express/fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
|
||||
|
||||
"@react-router/serve/express/merge-descriptors": ["merge-descriptors@1.0.3", "", {}, "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="],
|
||||
|
||||
"@react-router/serve/express/path-to-regexp": ["path-to-regexp@0.1.12", "", {}, "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="],
|
||||
|
||||
"@react-router/serve/express/send": ["send@0.19.2", "", { "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "~0.5.2", "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", "on-finished": "~2.4.1", "range-parser": "~1.2.1", "statuses": "~2.0.2" } }, "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg=="],
|
||||
|
||||
"@react-router/serve/express/serve-static": ["serve-static@1.16.3", "", { "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", "send": "~0.19.1" } }, "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA=="],
|
||||
|
||||
"@react-router/serve/express/type-is": ["type-is@1.6.18", "", { "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" } }, "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="],
|
||||
|
||||
"@tailwindcss/node/lightningcss/lightningcss-android-arm64": ["lightningcss-android-arm64@1.31.1", "", { "os": "android", "cpu": "arm64" }, "sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg=="],
|
||||
|
||||
"@tailwindcss/node/lightningcss/lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.31.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg=="],
|
||||
@@ -4989,6 +4967,8 @@
|
||||
|
||||
"better-opn/open/is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
|
||||
|
||||
"body-parser/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"bun-types/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
|
||||
|
||||
"chrome-launcher/@types/node/undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
|
||||
@@ -5117,11 +5097,13 @@
|
||||
|
||||
"expo/@expo/config-plugins/semver": ["semver@7.7.4", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],
|
||||
|
||||
"express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"fbjs/cross-fetch/node-fetch": ["node-fetch@2.7.0", "", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
|
||||
|
||||
"filelist/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],
|
||||
|
||||
"form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
"finalhandler/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"freya-client/react-dom/scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="],
|
||||
|
||||
@@ -5157,16 +5139,12 @@
|
||||
|
||||
"metro-transform-worker/metro-source-map/source-map": ["source-map@0.5.7", "", {}, "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="],
|
||||
|
||||
"metro/accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
|
||||
|
||||
"metro/chalk/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
|
||||
|
||||
"metro/hermes-parser/hermes-estree": ["hermes-estree@0.32.0", "", {}, "sha512-KWn3BqnlDOl97Xe1Yviur6NbgIZ+IP+UVSpshlZWkq+EtoHg6/cwiDj/osP9PCEgFE15KBm1O55JRwbMEm5ejQ=="],
|
||||
|
||||
"metro/metro-source-map/ob1": ["ob1@0.83.3", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-egUxXCDwoWG06NGCS5s5AdcpnumHKJlfd3HH06P3m9TEMwwScfcY35wpQxbm9oHof+dM/lVH9Rfyu1elTVelSA=="],
|
||||
|
||||
"metro/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"mongodb-connection-string-url/whatwg-url/tr46": ["tr46@5.1.1", "", { "dependencies": { "punycode": "^2.3.1" } }, "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw=="],
|
||||
|
||||
"mongodb-connection-string-url/whatwg-url/webidl-conversions": ["webidl-conversions@7.0.0", "", {}, "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="],
|
||||
@@ -5189,6 +5167,8 @@
|
||||
|
||||
"semver/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
|
||||
|
||||
"send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"sucrase/glob/minimatch": ["minimatch@9.0.9", "", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
|
||||
|
||||
"sucrase/glob/path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="],
|
||||
@@ -5287,8 +5267,6 @@
|
||||
|
||||
"@expo/cli/@expo/json-file/@babel/code-frame/chalk": ["chalk@2.4.2", "", { "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } }, "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="],
|
||||
|
||||
"@expo/cli/accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"@expo/cli/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||
|
||||
"@expo/cli/ora/chalk/ansi-styles": ["ansi-styles@3.2.1", "", { "dependencies": { "color-convert": "^1.9.0" } }, "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="],
|
||||
@@ -5301,8 +5279,6 @@
|
||||
|
||||
"@expo/cli/ora/strip-ansi/ansi-regex": ["ansi-regex@4.1.1", "", {}, "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="],
|
||||
|
||||
"@expo/cli/send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"@expo/config-plugins/glob/minimatch/brace-expansion": ["brace-expansion@2.0.2", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ=="],
|
||||
|
||||
"@expo/config-plugins/glob/path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
|
||||
@@ -5365,30 +5341,14 @@
|
||||
|
||||
"@istanbuljs/load-nyc-config/find-up/locate-path/p-locate": ["p-locate@4.1.0", "", { "dependencies": { "p-limit": "^2.2.0" } }, "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/accepts/negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/mime-types/mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
|
||||
|
||||
"@modelcontextprotocol/sdk/express/type-is/media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
|
||||
|
||||
"@react-native/codegen/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static/send/debug": ["debug@2.6.9", "", { "dependencies": { "ms": "2.0.0" } }, "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static/send/fresh": ["fresh@0.5.2", "", {}, "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static/send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
|
||||
|
||||
"@react-router/serve/express/accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
|
||||
"@react-router/serve/express/accepts/negotiator": ["negotiator@0.6.3", "", {}, "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="],
|
||||
|
||||
"@react-router/serve/express/body-parser/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
|
||||
|
||||
"@react-router/serve/express/body-parser/raw-body": ["raw-body@2.5.3", "", { "dependencies": { "bytes": "~3.1.2", "http-errors": "~2.0.1", "iconv-lite": "~0.4.24", "unpipe": "~1.0.0" } }, "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA=="],
|
||||
|
||||
"@react-router/serve/express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"@react-router/serve/express/send/mime": ["mime@1.6.0", "", { "bin": { "mime": "cli.js" } }, "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="],
|
||||
|
||||
"@react-router/serve/express/type-is/media-typer": ["media-typer@0.3.0", "", {}, "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="],
|
||||
|
||||
"@react-router/serve/express/type-is/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
|
||||
|
||||
"chromium-edge-launcher/rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="],
|
||||
|
||||
"eas-cli/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||
@@ -5529,12 +5489,6 @@
|
||||
|
||||
"@react-native/codegen/glob/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||
|
||||
"@react-native/dev-middleware/serve-static/send/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
|
||||
|
||||
"@react-router/serve/express/accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"@react-router/serve/express/type-is/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
|
||||
|
||||
"chromium-edge-launcher/rimraf/glob/minimatch/brace-expansion": ["brace-expansion@1.1.12", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
|
||||
|
||||
"expo-constants/@expo/config/@expo/config-plugins/@expo/plist/@xmldom/xmldom": ["@xmldom/xmldom@0.8.11", "", {}, "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw=="],
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
"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",
|
||||
"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",
|
||||
"test": "bun run --filter '*' test",
|
||||
"lint": "oxlint .",
|
||||
"lint:fix": "oxlint --fix .",
|
||||
|
||||
@@ -84,9 +84,7 @@ const ONE_DAY_MS = 24 * 60 * 60 * 1000
|
||||
* It owns recurrence expansion, edit-scope semantics, and feed item signals.
|
||||
*/
|
||||
export class ReminderSource implements FeedSource<ReminderFeedItem> {
|
||||
static readonly id = "freya.reminders"
|
||||
|
||||
readonly id = ReminderSource.id
|
||||
readonly id = "freya.reminders"
|
||||
|
||||
private readonly storage: ReminderStorage
|
||||
private readonly lookAheadMs: number
|
||||
|
||||
Reference in New Issue
Block a user