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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/server/src/kin/KinServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { KinChatService } from "./chat/KinChatService.ts";
import { KinChatHub } from "./chat/KinChatHub.ts";
import { KinBudget } from "./lead/KinBudget.ts";
import { KinEventQueue } from "./lead/KinEventQueue.ts";
import { KinStop } from "./lead/KinStop.ts";
import type { KinGithubWebhookLock } from "./triggers/githubWebhooks.ts";

export type Services =
Expand All @@ -15,6 +16,7 @@ export type Services =
| KinBudget
| KinEventQueue
| KinChatHub
| KinStop
| KinGithubWebhookLock;

export class KinServer extends Context.Service<
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/kin/chat/layer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as NoopJudge from "../floor/NoopJudge.ts";
import * as Layer from "effect/Layer";
import * as Budget from "../lead/KinBudget.ts";
import * as Queue from "../lead/KinEventQueue.ts";
import * as Stop from "../lead/KinStop.ts";
import * as Cache from "../memory/MemoryCache.ts";
import * as KinPersistence from "../persistence/KinPersistence.ts";
import * as Repository from "./KinChatRepository.ts";
Expand All @@ -12,7 +13,9 @@ import { KinIdentity, KinIdentityConfig } from "./KinIdentity.ts";

export const layer = Layer.mergeAll(
Service.layer,
Budget.layer.pipe(Layer.provideMerge(Queue.layer), Layer.provide(Cache.layer)),
Layer.mergeAll(Budget.layer.pipe(Layer.provide(Cache.layer)), Stop.layer).pipe(
Layer.provideMerge(Queue.layer),
),
KinIdentity.layer.pipe(Layer.provide(KinIdentityConfig.layer)),
).pipe(
Layer.provide(JudgeShadow.layer.pipe(Layer.provide(NoopJudge.layer))),
Expand Down
74 changes: 74 additions & 0 deletions apps/server/src/kin/chat/rpcHandlers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,80 @@ it.effect(
}).pipe(Effect.provide(root.pipe(Layer.provideMerge(Sqlite.layerMemory)))),
);

it.effect("lets only the owner stop and resume Kin over RPC; members may read the state", () =>
Effect.gen(function* () {
const { person, repo } = yield* seed;
const clientFor = (
handlers: Effect.Success<ReturnType<typeof makeKinHandlers>>,
scopes: ReadonlyArray<(typeof AuthStandardClientScopes)[number]> = AuthStandardClientScopes,
) =>
RpcTest.makeClient(group).pipe(
Effect.provide(
Layer.merge(
group.toLayer({ ...handlers, "server.probe": () => Effect.succeed({}) }),
RpcAuthorization.layer(scopes),
),
),
);
const handlers = yield* makeKinHandlers(session);
const client = yield* clientFor(handlers);
const input = { orgId: person.orgId };
const paused = yield* client["kin.org.pause"]({ ...input, reason: "Going offline" });
assert.include(paused, { paused: true, pausedBy: person.personId, reason: "Going offline" });
assert.deepStrictEqual(yield* client["kin.org.pause"](input), paused);
assert.deepStrictEqual(yield* client["kin.org.get"](input), paused);
assert.include(
yield* client["kin.org.pause"]({ orgId: KinOrgId.make("foreign") }).pipe(Effect.flip),
{ reason: "not_found" },
);

const memberId = KinPersonId.make("stop-member");
yield* repo.insertPerson({
orgId: person.orgId,
personId: memberId,
handle: "stop-member",
displayName: "Member",
githubLogin: null,
createdAt: "1970-01-01T00:00:00.000Z",
});
const kin = yield* Kin.KinServer;
const services = Option.getOrThrow(kin.services);
const identity = Context.get(services, KinIdentity);
const member = yield* clientFor(
yield* makeKinHandlers(session).pipe(
Effect.provideService(Kin.KinServer, {
...kin,
services: Option.some(
Context.add(services, KinIdentity, {
...identity,
resolve: () =>
Effect.succeed([{ _tag: "person", orgId: person.orgId, personId: memberId }]),
}),
),
}),
),
);
assert.deepStrictEqual(yield* member["kin.org.get"](input), paused);
assert.include(yield* member["kin.org.resume"](input).pipe(Effect.flip), {
reason: "not_allowed",
});
assert.include(yield* member["kin.org.pause"](input).pipe(Effect.flip), {
reason: "not_allowed",
});
const readOnly = yield* clientFor(handlers, [AuthOrchestrationReadScope]);
for (const method of ["kin.org.pause", "kin.org.resume"] as const)
assert.strictEqual(
(yield* readOnly[method](input).pipe(Effect.flip))._tag,
"EnvironmentAuthorizationError",
);
assert.isTrue((yield* readOnly["kin.org.get"](input)).paused);

const resumed = yield* client["kin.org.resume"](input);
assert.isFalse(resumed.paused);
assert.deepStrictEqual(yield* client["kin.org.resume"](input), resumed);
}).pipe(Effect.provide(root.pipe(Layer.provideMerge(Sqlite.layerMemory)))),
);

it.effect("replays offline edits, deletions and widget revisions once with afterChangeSeq", () =>
Effect.gen(function* () {
const { chat, repo, person, direct } = yield* seed;
Expand Down
33 changes: 32 additions & 1 deletion apps/server/src/kin/chat/rpcHandlers.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { KinChatError, KinChatAndBudgetRpcs } from "@t3tools/contracts";
import { KinChatAndBudgetRpcs, KinChatError } from "@t3tools/contracts";
import * as Context from "effect/Context";
import * as Effect from "effect/Effect";
import * as Schema from "effect/Schema";
Expand All @@ -8,6 +8,7 @@ import * as RpcGroup from "effect/rpc/RpcGroup";
import type { AuthenticatedSession } from "../../auth/EnvironmentAuth.ts";
import { KinServer } from "../layer.ts";
import { KinBudget } from "../lead/KinBudget.ts";
import { KinStop } from "../lead/KinStop.ts";
import { KinIdentity } from "./KinIdentity.ts";
import { KinChatService } from "./KinChatService.ts";

Expand All @@ -33,6 +34,7 @@ export const makeKinChatHandlers = Effect.fn("makeKinChatHandlers")(function* (
return {
identity: Context.get(kin.value.services.value, KinIdentity),
budget: Context.get(kin.value.services.value, KinBudget),
stop: Context.get(kin.value.services.value, KinStop),
chat: Context.get(kin.value.services.value, KinChatService),
};
});
Expand Down Expand Up @@ -61,6 +63,35 @@ export const makeKinChatHandlers = Effect.fn("makeKinChatHandlers")(function* (
Effect.mapError(mapError),
Effect.catchDefect(defect),
),
"kin.org.get": (input) =>
services.pipe(
Effect.flatMap(({ identity, stop }) =>
identity
.resolve(session)
.pipe(Effect.flatMap((people) => stop.view(people, input.orgId))),
),
Effect.tapError(logInfra),
Effect.mapError(mapError),
Effect.catchDefect(defect),
),
"kin.org.pause": (input) =>
services.pipe(
Effect.flatMap(({ identity, stop }) =>
identity.resolve(session).pipe(Effect.flatMap((people) => stop.pause(people, input))),
),
Effect.tapError(logInfra),
Effect.mapError(mapError),
Effect.catchDefect(defect),
),
"kin.org.resume": (input) =>
services.pipe(
Effect.flatMap(({ identity, stop }) =>
identity.resolve(session).pipe(Effect.flatMap((people) => stop.resume(people, input))),
),
Effect.tapError(logInfra),
Effect.mapError(mapError),
Effect.catchDefect(defect),
),
"kin.orgs.list": () =>
services.pipe(
Effect.flatMap(({ identity, chat }) =>
Expand Down
20 changes: 19 additions & 1 deletion apps/server/src/kin/dreaming/DreamRunner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ type Behavior =
| "token"
| "failed-turn"
| "contradiction"
/** The owner presses stop while the extract turn runs; the turn itself completes. */
| "paused"
| { readonly hold: Deferred.Deferred<void> };

const newClaim = (body = "Invented report ships Friday.\n") =>
Expand Down Expand Up @@ -91,6 +93,8 @@ const fixture = <A, E>(
readonly root: string;
readonly behave: (behavior: Behavior) => void;
readonly turns: Array<DreamSession.DreamTurn>;
/** `kin_dream_runs.thread_id` as each turn saw it while running. */
readonly turnThreads: Array<string | null>;
readonly notices: Array<string>;
readonly refuseBudget: () => void;
readonly hooks: RunnerHooks;
Expand All @@ -107,6 +111,7 @@ const fixture = <A, E>(
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const vcs = yield* Vcs.VcsProcess;
const db = yield* SqlClient.SqlClient;
const root = yield* fs.realPath(yield* fs.makeTempDirectoryScoped());
const source = `${root}/seed`;
const remote = `${root}/remote.git`;
Expand Down Expand Up @@ -158,13 +163,20 @@ const fixture = <A, E>(
let budgetAllowed = true;
const hooks: RunnerHooks = { beforeDelete: Effect.void, removed: () => Effect.void };
const turns: Array<DreamSession.DreamTurn> = [];
const turnThreads: Array<string | null> = [];
const notices: Array<string> = [];
const session = Layer.succeed(DreamSession.DreamSession, {
run: (turn) =>
Effect.gen(function* () {
turns.push(turn);
const threadId = ThreadId.make(`kin-dream:${turn.dreamId}:${turn.turn}`);
const [recorded] = yield* db<{
threadId: string | null;
}>`SELECT thread_id AS "threadId" FROM kin_dream_runs WHERE org_id = ${orgId} AND dream_id = ${turn.dreamId} ORDER BY dream_id`;
turnThreads.push(recorded?.threadId ?? null);
const current = behavior;
if (current === "paused")
yield* db`INSERT INTO kin_org_state (org_id, paused, paused_at, paused_by) VALUES (${orgId}, 1, 0, 'owner')`;
if (typeof current === "object") {
yield* Deferred.succeed(current.hold, undefined);
return yield* Effect.never;
Expand Down Expand Up @@ -312,6 +324,7 @@ const fixture = <A, E>(
behavior = next;
},
turns,
turnThreads,
notices,
refuseBudget: () => {
budgetAllowed = false;
Expand Down Expand Up @@ -504,10 +517,11 @@ it.live.each([
{ behavior: "secret", failure: "The secret scan found" },
{ behavior: "token", failure: "a live T3 credential" },
{ behavior: "failed-turn", failure: "The dream session failed" },
{ behavior: "paused", failure: "Kin was paused during the dream" },
] as const)(
"a $behavior dream fails, pushes nothing and tells the owner",
({ behavior, failure }) =>
fixture(({ git, remote, root, main, behave, notices }) =>
fixture(({ git, remote, root, main, behave, notices, turns, turnThreads }) =>
Effect.gen(function* () {
behave(behavior);
const runner = yield* DreamRunner.DreamRunner;
Expand All @@ -523,6 +537,10 @@ it.live.each([
expect(notices).toHaveLength(1);
expect(notices[0]).toContain("merged nothing");
expect(notices[0]).not.toContain("ghp_");
// The stop switch's fan-out finds the running turn's thread.
expect(turnThreads).toEqual(
turns.map((turn) => DreamSession.dreamThreadId(turn.dreamId, turn.turn)),
);
}),
),
);
Expand Down
15 changes: 12 additions & 3 deletions apps/server/src/kin/dreaming/DreamRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import { nextScheduledRunAt } from "../../scheduledTasks/Schedule.ts";
import * as Scheduler from "../../scheduling/Scheduler.ts";
import { VcsProcess } from "../../vcs/VcsProcess.ts";
import * as KinBudget from "../lead/KinBudget.ts";
import { isOrgPaused } from "../lead/orgState.ts";
import * as Memory from "../memory/Memory.ts";
import * as MemoryCache from "../memory/MemoryCache.ts";
import * as Writer from "../memory/MemoryWriter.ts";
Expand Down Expand Up @@ -308,6 +309,8 @@ const make = Effect.gen(function* () {
branch,
failures,
});
const paused = isOrgPaused(orgId).pipe(Effect.provideService(SqlClient.SqlClient, sql));
const pausedFailure = "Kin was paused during the dream";
if (Option.isNone(writer)) return failed(["The memory writer is not available"]);
const base = yield* writer.value.dreamBase(orgId);
yield* sql`UPDATE kin_dream_runs SET base_head = ${base.head}
Expand All @@ -329,6 +332,10 @@ const make = Effect.gen(function* () {
model: ModelSelection,
text: string,
) {
if (yield* paused) return "paused";
// Recorded before the turn starts, so the stop switch's fan-out can interrupt it.
yield* sql`UPDATE kin_dream_runs SET thread_id = ${DreamSession.dreamThreadId(dreamId, name)}
WHERE org_id = ${orgId} AND dream_id = ${dreamId} AND status = 'running' RETURNING dream_id`;
const result = yield* session.run({
orgId,
dreamId,
Expand All @@ -337,15 +344,14 @@ const make = Effect.gen(function* () {
model,
text,
});
yield* sql`UPDATE kin_dream_runs SET thread_id = ${result.threadId}
WHERE org_id = ${orgId} AND dream_id = ${dreamId} AND status = 'running' RETURNING dream_id`;
return result.status;
return (yield* paused) ? "paused" : result.status;
});
const extracted = yield* turn(
"extract",
claimed.models.cheap,
extractPrompt({ orgId, head: base.head, full }),
);
if (extracted === "paused") return failed([pausedFailure]);
if (extracted !== "completed") return failed([`The dream session ${extracted}`]);
let checkout = yield* readCheckout(root);
const draft =
Expand All @@ -357,6 +363,7 @@ const make = Effect.gen(function* () {
draft.value.contradictions.some((entry) => !entry.resolution && !entry.question)
) {
const resolved = yield* turn("resolve", claimed.models.strong, resolvePrompt);
if (resolved === "paused") return failed([pausedFailure]);
if (resolved !== "completed") return failed([`The contradiction session ${resolved}`]);
checkout = yield* readCheckout(root);
}
Expand Down Expand Up @@ -401,6 +408,8 @@ const make = Effect.gen(function* () {
files: checked.changes,
message: `kin(dream): ${ownerDate}\n\nKin-Dream: ${dreamId}\nMaterial-Until: ${iso(claimed.until)}\n`,
});
// A pause during the checks or the push fails the dream, and settling deletes its branch.
if (yield* paused) return failed([pausedFailure]);
return {
_tag: "succeeded",
dreamId,
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/kin/dreaming/DreamSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ export class DreamSession extends Context.Service<
}
>()("t3/kin/dreaming/DreamSession") {}

export const dreamThreadId = (dreamId: string, turn: DreamTurn["turn"]) =>
ThreadId.make(`${threadPrefix}${dreamId}:${turn}`);

const timeoutMs = 900_000;
const isRefused = Schema.is(DreamRefused);

Expand Down Expand Up @@ -100,7 +103,7 @@ export const layer = Layer.effect(
title: `Kin dreams · ${turn.orgId}`,
});
const key = `${turn.dreamId}:${turn.turn}`;
const threadId = ThreadId.make(`${threadPrefix}${key}`);
const threadId = dreamThreadId(turn.dreamId, turn.turn);
const messageId = MessageId.make(`kin-dream-msg:${key}`);
const sent = yield* launch.launch({
commandId: CommandId.make(`kin-dream:${key}`),
Expand Down
13 changes: 5 additions & 8 deletions apps/server/src/kin/lead/KinBudget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import * as Chat from "../chat/KinChatRepository.ts";
import * as Hub from "../chat/KinChatHub.ts";
import * as MemoryCache from "../memory/MemoryCache.ts";
import * as Queue from "./KinEventQueue.ts";
import { isOrgOwner } from "./orgState.ts";

type Priority = "P0" | "P1" | "P2" | "P3" | "P4";
export type Usage = {
Expand Down Expand Up @@ -263,14 +264,10 @@ const make = Effect.gen(function* () {
yield* ensure(input.orgId, day);
const person = people.find((p) => p.orgId === input.orgId);
if (person === undefined) return yield* notFound;
// The reserved bootstrap owner is authoritative before a lead is configured.
const owner =
yield* sql`SELECT 1 FROM kin_people p WHERE p.org_id = ${input.orgId} AND p.person_id = ${person.personId}
AND ((p.org_id = 'kin-default' AND p.person_id = 'kin-default-owner'
AND NOT EXISTS (SELECT 1 FROM kin_leads WHERE org_id = p.org_id)) OR EXISTS (
SELECT 1 FROM kin_leads l JOIN kin_agents a ON a.org_id = l.org_id AND a.agent_id = l.agent_id
WHERE l.org_id = p.org_id AND a.owner_person_id = p.person_id))`;
if (owner.length === 0) return yield* notAllowed;
const owner = yield* isOrgOwner(input.orgId, person.personId).pipe(
Effect.provideService(SqlClient.SqlClient, sql),
);
if (!owner) return yield* notAllowed;
const json = yield* encodeJson(limits);
yield* sql`INSERT INTO kin_budget_limits (org_id, limits_json) VALUES (${input.orgId}, ${json}) ON CONFLICT DO NOTHING RETURNING org_id`;
yield* sql`UPDATE kin_budget_limits SET limits_json = ${json} WHERE org_id = ${input.orgId}`;
Expand Down
1 change: 1 addition & 0 deletions apps/server/src/kin/lead/KinEventQueue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const event = Effect.fn("test.event")(function* (
itemIds: [],
routine: "owner_check",
pausedAt: DateTime.formatIso(DateTime.makeUnsafe(now)),
expired: { count: 0, events: [] },
subject: { type: "reminder", itemId: "reminder" },
lateByMs: 0,
workerId: id,
Expand Down
Loading