Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/server/src/kin/chat/KinChatHub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Stream from "effect/Stream";
import { messageForViewer } from "./messageView.ts";
import * as Repository from "./KinChatRepository.ts";
import type { AgentIdentity, PersonIdentity } from "./KinIdentity.ts";
import * as PubSub from "effect/PubSub";
Expand Down Expand Up @@ -128,6 +129,11 @@ const make = Effect.gen(function* () {
);
}),
),
Stream.map((event) =>
event.type === "message.posted"
? { ...event, message: messageForViewer(event.message, identity) }
: event,
),
);
}),
});
Expand Down
7 changes: 5 additions & 2 deletions apps/server/src/kin/chat/KinChatRepository.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const message = (id: string, overrides: Partial<Omit<KinMessage, "seq">> = {}) =
editedAt: null,
...overrides,
clientMessageId: { kind: "send", id },
}) satisfies Omit<KinMessage, "seq"> & {
}) satisfies Omit<KinMessage, "seq" | "clientMessageId"> & {
caller: McpThreadCaller;
clientMessageId: { kind: "send" | "act"; id: string };
};
Expand Down Expand Up @@ -355,7 +355,10 @@ describe("KinChatRepository", () => {
);
}
const first = yield* repo.insertMessage(message("first"));
assert.deepStrictEqual(first, decodeMessage({ ...message("first"), seq: 1 }));
assert.deepStrictEqual(
first,
decodeMessage({ ...message("first"), clientMessageId: "first", seq: 1, changeSeq: 1 }),
);
const repeated = yield* Effect.all(
Array.from({ length: 5 }, (_, i) =>
repo.insertMessage({
Expand Down
77 changes: 68 additions & 9 deletions apps/server/src/kin/chat/KinChatRepository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Option from "effect/Option";
import * as Schema from "effect/Schema";
import * as SchemaTransformation from "effect/SchemaTransformation";
import { messageForViewer } from "./messageView.ts";
import * as SqlClient from "effect/sql/SqlClient";
import * as SqlSchema from "effect/sql/SqlSchema";
import {
Expand Down Expand Up @@ -59,7 +61,7 @@ export type RepositoryError = PersistenceSqlError | PersistenceDecodeError | Kin
type Scope = { readonly orgId: KinOrgId };
type ChatScope = Scope & { readonly chatId: KinChatId };
type MemberScope = ChatScope & { readonly memberId: KinMemberId };
type InsertMessage = Omit<KinMessage, "seq" | "authorRole"> & {
type InsertMessage = Omit<KinMessage, "seq" | "authorRole" | "clientMessageId"> & {
readonly caller?: McpThreadCaller | undefined;
// Only the server-only task card creator may attribute a message outside an agent wake-up.
readonly serverTaskCard?: true;
Expand Down Expand Up @@ -119,10 +121,28 @@ const memberColumns = `org_id AS "orgId", chat_id AS "chatId", member_id AS "mem
ELSE json_object('_tag', principal_kind, 'agentId', agent_id) END AS principal`;
const MessageRow = Schema.Struct({
...KinMessage.fields,
storedClientMessageId: Schema.NullOr(Schema.String),
author: Schema.fromJsonString(KinMessage.fields.author),
mentions: Schema.fromJsonString(KinMessage.fields.mentions),
});
const messageColumns = `org_id AS "orgId", chat_id AS "chatId", message_id AS "messageId", seq AS "seq", author_role AS "authorRole", kind AS "kind", body AS "body", intent AS "intent", mentions_json AS "mentions", reply_to AS "replyTo", widget_id AS "widgetId", floor_run_id AS "floorRunId", status AS "status", sent_by AS "sentBy", created_at AS "createdAt", edited_at AS "editedAt", CASE author_kind WHEN 'human' THEN json_object('_tag', 'human', 'personId', author_person_id, 'memberId', author_member_id)
}).pipe(
Schema.decodeTo(
Schema.toType(KinMessage),
SchemaTransformation.transform({
decode: ({ storedClientMessageId, ...message }) => ({
...message,
...(storedClientMessageId?.startsWith("send:")
? { clientMessageId: storedClientMessageId.slice(5) }
: {}),
}),
encode: (message) => ({
...message,
storedClientMessageId:
message.clientMessageId === undefined ? null : `send:${message.clientMessageId}`,
}),
}),
),
);
const messageColumns = `org_id AS "orgId", chat_id AS "chatId", message_id AS "messageId", seq AS "seq", change_seq AS "changeSeq", client_message_id AS "storedClientMessageId", author_role AS "authorRole", kind AS "kind", body AS "body", intent AS "intent", mentions_json AS "mentions", reply_to AS "replyTo", widget_id AS "widgetId", floor_run_id AS "floorRunId", status AS "status", sent_by AS "sentBy", created_at AS "createdAt", edited_at AS "editedAt", CASE author_kind WHEN 'human' THEN json_object('_tag', 'human', 'personId', author_person_id, 'memberId', author_member_id)
WHEN 'agent' THEN json_object('_tag', 'agent', 'agentId', author_agent_id, 'memberId', author_member_id,
'ownerPersonId', author_owner_person_id, 'threadId', author_thread_id)
ELSE json_object('_tag', author_kind) END AS author`;
Expand Down Expand Up @@ -231,11 +251,16 @@ export class KinChatRepository extends Context.Service<
input: ChatScope & { readonly messageId: KinMessageId },
) => Effect.Effect<boolean, RepositoryError>;
readonly resume: (
input: ChatScope & { readonly memberId: KinMemberId; readonly afterSeq: number },
input: ChatScope & {
readonly memberId: KinMemberId;
readonly afterSeq: number;
readonly afterChangeSeq?: number | undefined;
},
) => Effect.Effect<
{
readonly reset: boolean;
readonly lastSeq: number;
readonly lastChangeSeq: number;
readonly messages: ReadonlyArray<KinMessage>;
readonly widgets: ReadonlyArray<KinWidget>;
},
Expand Down Expand Up @@ -788,14 +813,30 @@ const make = Effect.gen(function* () {
if (member.chatId !== input.chatId || member.leftAt !== null)
return yield* new KinChatError({ reason: "not_found", message: "Kin record not found." });
const chat = yield* requireRecord(chatOne(input));
const counters = yield* sql<{
change_seq: number;
}>`SELECT change_seq FROM kin_chats WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId}`;
const lastChangeSeq = counters[0]!.change_seq;
// Without a change cursor, replay only new messages; change_seq runs ahead of seq.
const afterChangeSeq = input.afterChangeSeq ?? lastChangeSeq;
const visible = sql`(${member.role === "owner" ? 1 : 0} = 1 OR status NOT IN ('suggested', 'dismissed') OR author_member_id = ${member.memberId})`;
const messages = yield* SqlSchema.findAll({
Request: Schema.Unknown,
Result: MessageRow,
execute: () =>
sql`SELECT ${sql.literal(messageColumns)} FROM kin_messages WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND seq > ${input.afterSeq} AND seq <= ${chat.lastSeq} AND (${member.role === "owner" ? 1 : 0} = 1 OR status NOT IN ('suggested', 'dismissed') OR author_member_id = ${member.memberId}) ORDER BY seq LIMIT 201`,
sql`SELECT ${sql.literal(messageColumns)} FROM kin_messages
WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND message_id IN (
SELECT message_id FROM (SELECT message_id FROM kin_messages
WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND seq > ${input.afterSeq} AND ${visible}
ORDER BY seq LIMIT 201)
UNION
SELECT message_id FROM (SELECT message_id FROM kin_messages
WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND change_seq > ${afterChangeSeq} AND ${visible}
ORDER BY change_seq, seq LIMIT 201)
) ORDER BY seq LIMIT 201`,
})(input);
if (messages.length > 200)
return { reset: true, lastSeq: chat.lastSeq, messages: [], widgets: [] };
return { reset: true, lastSeq: chat.lastSeq, lastChangeSeq, messages: [], widgets: [] };
const widgets =
messages.length === 0
? []
Expand All @@ -805,7 +846,13 @@ const make = Effect.gen(function* () {
execute: () =>
sql`SELECT ${sql.literal(widgetColumns)} FROM kin_widgets WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND (message_id IN ${sql.in(messages.map((m) => m.messageId))} OR widget_id IN ${sql.in(messages.flatMap((m) => (m.widgetId === null ? [] : [m.widgetId])))}) ORDER BY message_id, widget_id`,
})(input);
return { reset: false, messages, widgets, lastSeq: chat.lastSeq };
return {
reset: false,
messages: messages.map((m) => messageForViewer(m, member.principal)),
widgets,
lastSeq: chat.lastSeq,
lastChangeSeq,
};
},
(effect) => sql.withTransaction(effect).pipe(NodeSqliteClient.readOnly),
Effect.mapError(toRepositoryError("KinChatRepository.resume")),
Expand Down Expand Up @@ -1256,7 +1303,10 @@ const make = Effect.gen(function* () {
AND (${viewer === null || viewer.role === "owner" ? 1 : 0} = 1 OR status NOT IN ('suggested', 'dismissed') OR author_member_id = ${viewer?.memberId ?? null})
ORDER BY seq DESC LIMIT ${request.limit + 1}`,
})(input);
const messages = rows.slice(0, request.limit).reverse();
const messages = rows
.slice(0, request.limit)
.reverse()
.map((m) => messageForViewer(m, viewer?.principal));
const widgets =
messages.length === 0
? []
Expand All @@ -1277,14 +1327,23 @@ const make = Effect.gen(function* () {
messagesAfter: Effect.fn("KinChatRepository.messagesAfter")(
function* (input) {
const request = yield* decodeResume(input);
const viewer =
input.viewerMemberId === undefined
? undefined
: yield* requireRecord(
memberOne({ orgId: input.orgId, memberId: input.viewerMemberId }),
);
return yield* SqlSchema.findAll({
Request: Schema.Unknown,
Result: MessageRow,
execute:
() => sql`SELECT ${sql.literal(messageColumns)} FROM kin_messages WHERE org_id = ${input.orgId}
AND chat_id = ${input.chatId} AND seq > ${request.afterSeq}
AND (${input.viewerMemberId ?? null} IS NULL OR status NOT IN ('suggested', 'dismissed') OR author_member_id = ${input.viewerMemberId ?? null} OR EXISTS (SELECT 1 FROM kin_chat_members WHERE org_id = ${input.orgId} AND chat_id = ${input.chatId} AND member_id = ${input.viewerMemberId ?? null} AND role = 'owner')) ORDER BY seq LIMIT ${request.limit}`,
})(input).pipe(NodeSqliteClient.readOnly);
})(input).pipe(
NodeSqliteClient.readOnly,
Effect.map((messages) => messages.map((m) => messageForViewer(m, viewer?.principal))),
);
},
Effect.mapError(toRepositoryError("KinChatRepository.messagesAfter")),
),
Expand Down
9 changes: 7 additions & 2 deletions apps/server/src/kin/chat/KinChatService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,11 @@ describe("KinChatService", () => {
service.send(person, { chatId: chat.chatId, clientMessageId: "blank", body: " " }),
])
assert.include(yield* Effect.flip(operation), { reason: "invalid_state" });
const { clientMessageId: _postedId, ...postedForPerson } = posted;
assert.deepStrictEqual(
(yield* service.history(person, { chatId: chat.chatId, beforeSeq: 4, limit: 1 }))
.messages,
[posted],
[postedForPerson],
);
const widget = yield* service.createTaskCard({
orgId: person.orgId,
Expand Down Expand Up @@ -877,7 +878,11 @@ describe("KinChatService", () => {
for (const event of events) yield* hub.publish(event);
assert.deepStrictEqual(
yield* Stream.runCollect(viewer.pipe(Stream.take(events.length))),
events,
events.map((event) => {
if (event.type !== "message.posted") return event;
const { clientMessageId: _id, ...visible } = event.message;
return { ...event, message: visible };
}),
);
const agentViewer = yield* hub.subscribeForViewer(agent);
const suggestion: Hub.KinChatHubEvent = {
Expand Down
16 changes: 12 additions & 4 deletions apps/server/src/kin/chat/KinChatService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,16 +564,21 @@ const make = Effect.gen(function* () {
const identity = yield* personFor(caller, input);
const live = yield* hub.subscribeForViewer(identity);
const member = yield* memberFor(identity, input.chatId);
const resumed = yield* repo.resume({ ...member, afterSeq: input.afterSeq ?? 0 });
const resumed = yield* repo.resume({
...member,
afterSeq: input.afterSeq ?? 0,
afterChangeSeq: input.afterChangeSeq,
});
const backlog: KinChatStreamEvent = resumed.reset
? { _tag: "reset", lastSeq: resumed.lastSeq }
? { _tag: "reset", lastSeq: resumed.lastSeq, lastChangeSeq: resumed.lastChangeSeq }
: {
_tag: "backlog",
lastSeq: resumed.lastSeq,
lastChangeSeq: resumed.lastChangeSeq,
messages: resumed.messages,
widgets: resumed.widgets,
};
const lastHistorySeq = backlog.lastSeq;
const messageChanges = new Map<string, number>();
const revisions = new Map(
backlog._tag === "backlog" ? backlog.widgets.map((w) => [w.widgetId, w.revision]) : [],
);
Expand All @@ -583,11 +588,14 @@ const make = Effect.gen(function* () {
Stream.map((event) => {
switch (event.type) {
case "message.posted": {
const change = event.message.changeSeq ?? event.message.seq;
if (
event.message.chatId !== input.chatId ||
event.message.seq <= lastHistorySeq
change <= resumed.lastChangeSeq ||
change <= (messageChanges.get(event.message.messageId) ?? 0)
)
return Option.none();
messageChanges.set(event.message.messageId, change);
return Option.some<KinChatStreamEvent>({
_tag: "message",
message: event.message,
Expand Down
18 changes: 18 additions & 0 deletions apps/server/src/kin/chat/messageView.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { KinChatMember, KinMessage } from "@t3tools/contracts";

export function messageForViewer(
message: KinMessage,
viewer: KinChatMember["principal"] | undefined,
): KinMessage {
if (
(viewer?._tag === "person" &&
message.author._tag === "human" &&
viewer.personId === message.author.personId) ||
(viewer?._tag === "agent" &&
message.author._tag === "agent" &&
viewer.agentId === message.author.agentId)
)
return message;
const { clientMessageId: _, ...visible } = message;
return visible;
}
Loading