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
5 changes: 3 additions & 2 deletions apps/server/src/kin/dreaming/DreamRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ 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 { isCheckoutPath } from "../memory/checkoutPaths.ts";
import * as Memory from "../memory/Memory.ts";
import * as MemoryCache from "../memory/MemoryCache.ts";
import * as Writer from "../memory/MemoryWriter.ts";
import * as SecretScan from "../memory/secretScan.ts";
import { KinIssuedTokens } from "../mcp/KinIssuedTokens.ts";
import * as KinTriggerInbox from "../triggers/KinTriggerInbox.ts";
import * as KinTriggerStore from "../triggers/KinTriggerStore.ts";
import { checkDream, DreamJson, isDreamPath } from "./checkDream.ts";
import { checkDream, DreamJson } from "./checkDream.ts";
import * as DreamSession from "./DreamSession.ts";
import { collectMaterial, type DreamMaterial } from "./material.ts";

Expand Down Expand Up @@ -315,7 +316,7 @@ const make = Effect.gen(function* () {
const base = yield* writer.value.dreamBase(orgId);
yield* sql`UPDATE kin_dream_runs SET base_head = ${base.head}
WHERE org_id = ${orgId} AND dream_id = ${dreamId} AND status = 'running' RETURNING dream_id`;
const files = new Map([...base.files].filter(([file]) => isDreamPath(file)));
const files = new Map([...base.files].filter(([file]) => isCheckoutPath(file)));
const baseText = new Map([...files].map(([file, bytes]) => [file, bytes.toString("utf8")]));
const material = yield* collectMaterial({
orgId,
Expand Down
12 changes: 3 additions & 9 deletions apps/server/src/kin/dreaming/checkDream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import type { KinOrgId } from "@t3tools/contracts";
import * as Effect from "effect/Effect";
import * as Schema from "effect/Schema";

import { isCheckoutPath, isItemPath } from "../memory/checkoutPaths.ts";
import { parseFrontMatter } from "../memory/frontMatter.ts";
import { kinShapeFailure } from "../memory/lint.ts";
import { itemFolders, type MaterialEntry } from "./material.ts";
import type { MaterialEntry } from "./material.ts";

const Sources = Schema.Array(Schema.String).check(Schema.isMinLength(1));
const Id = Schema.String.check(Schema.isNonEmpty());
Expand Down Expand Up @@ -40,13 +41,6 @@ export const DreamJson = Schema.Struct({
export type DreamJson = typeof DreamJson.Type;
const decodeDream = Schema.decodeUnknownEffect(Schema.fromJsonString(DreamJson));

const isItemPath = (path: string) =>
path.endsWith(".md") && itemFolders.some((folder) => path.startsWith(`${folder}/`));
const isJournalPath = (path: string) => path.startsWith("journal/") && path.endsWith(".md");
/** What a dream checkout holds. Anything else at HEAD, such as `.mcp.json` or `.claude/`, could configure the provider. */
export const isDreamPath = (path: string) =>
path === "rules.md" || path === "INDEX.md" || isItemPath(path) || isJournalPath(path);

/**
* The code checks a dream must pass before anything is committed. `tree` is what the
* model left in its checkout; `special` lists paths that were not regular files.
Expand Down Expand Up @@ -86,7 +80,7 @@ export const checkDream = Effect.fn("DreamRunner.check")(function* (input: {
failures.push("INDEX.md is built by code");
continue;
}
if ((!isItemPath(path) && !isJournalPath(path)) || kinShapeFailure(path) !== undefined) {
if (!isCheckoutPath(path) || kinShapeFailure(path) !== undefined) {
failures.push(`${path} is outside item files and journal/`);
continue;
}
Expand Down
10 changes: 1 addition & 9 deletions apps/server/src/kin/dreaming/material.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,9 @@ import * as SqlClient from "effect/sql/SqlClient";
import { isSqlError } from "effect/sql/SqlError";

import { toPersistenceSqlError } from "../../persistence/Errors.ts";
import { itemFolders } from "../memory/checkoutPaths.ts";
import { parseFrontMatter } from "../memory/frontMatter.ts";

export const itemFolders = [
"objectives",
"commitments",
"deferrals",
"decisions",
"people",
"claims",
] as const;

/** One original the dream may cite. `saidBy` and `trust` come from server records, never the model. */
export interface MaterialEntry {
readonly ref: string;
Expand Down
94 changes: 94 additions & 0 deletions apps/server/src/kin/lead/LeadIsolation.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
import * as NodeServices from "@effect/platform-node/NodeServices";
import { assert, it } from "@effect/vitest";
import { ProviderInstanceId, ProviderSessionId, ThreadId } from "@t3tools/contracts";
import * as ConfigProvider from "effect/ConfigProvider";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";

import * as ServerConfig from "../../config.ts";
import * as ClaudeAdapterV2 from "../../orchestration-v2/Adapters/ClaudeAdapterV2.ts";
import * as DreamIsolation from "../dreaming/DreamIsolation.ts";
import * as LeadIsolation from "./LeadIsolation.ts";

const optionsAt = (cwd: string) =>
ClaudeAdapterV2.makeClaudeQueryOptions({
modelSelection: {
instanceId: ProviderInstanceId.make("claudeAgent"),
model: "claude-sonnet-4-6",
},
nativeThreadId: "native",
resume: false,
cwd,
attachmentsDir: "/attachments",
mcpServers: { kin: { type: "http", url: "http://127.0.0.1/kin" } },
});

it.effect.each([
[true, true],
[true, false],
[false, true],
])(
"a Kin lead loads user settings only (KIN_ENABLED=%s, lead wrapper outside=%s)",
([enabled, leadOutside]) =>
Effect.gen(function* () {
const { stateDir } = yield* ServerConfig.ServerConfig;
const opened: Array<ClaudeAdapterV2.ClaudeAgentSdkQueryOptions> = [];
const base = Layer.succeed(
ClaudeAdapterV2.ClaudeAgentSdkQueryRunner,
ClaudeAdapterV2.ClaudeAgentSdkQueryRunner.of({
allocateSessionId: Effect.succeed("session"),
open: (input) =>
Effect.sync(() => opened.push(input.options)).pipe(
Effect.andThen(Effect.die("unused session")),
),
forkSession: () => Effect.die("unused fork"),
subagentLaunchToolUseId: () => Effect.die("unused lookup"),
assertComplete: Effect.void,
}),
);
const lead = optionsAt(`${stateDir}/kin/demo-a/memory-read`);
const other = optionsAt("/work/project");
const dream = optionsAt(`${stateDir}/kin/demo-a/dreams/fixture`);
yield* Effect.gen(function* () {
const runner = yield* ClaudeAdapterV2.ClaudeAgentSdkQueryRunner;
for (const [threadId, options] of [
["kin:lead", lead],
["thread-1", other],
["kin-dream:fixture:extract", dream],
] as const)
yield* runner
.open({
threadId: ThreadId.make(threadId),
providerSessionId: ProviderSessionId.make("session"),
options,
})
.pipe(Effect.exit);
}).pipe(
Effect.provide(
(leadOutside
? LeadIsolation.claudeQueryRunner(DreamIsolation.claudeQueryRunner(base))
: DreamIsolation.claudeQueryRunner(LeadIsolation.claudeQueryRunner(base))
).pipe(
Layer.provide(
ConfigProvider.layer(ConfigProvider.fromUnknown({ KIN_ENABLED: enabled })),
),
),
),
);
const [leadOpened, otherOpened, dreamOpened] = opened;
assert.strictEqual(otherOpened, other);
assert.deepStrictEqual(dreamOpened?.settingSources, []);
if (!enabled) {
assert.strictEqual(leadOpened, lead);
return;
}
assert.deepStrictEqual(leadOpened, { ...lead, settingSources: ["user"] });
assert.isDefined(leadOpened?.mcpServers?.kin);
}).pipe(
Effect.provide(
ServerConfig.layerTest(process.cwd(), { prefix: "kin-lead-isolation-" }).pipe(
Layer.provideMerge(NodeServices.layer),
),
),
),
);
56 changes: 56 additions & 0 deletions apps/server/src/kin/lead/LeadIsolation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import * as Effect from "effect/Effect";
import * as FileSystem from "effect/FileSystem";
import * as Layer from "effect/Layer";
import * as Path from "effect/Path";

import { ServerConfig } from "../../config.ts";
import * as ClaudeAdapterV2 from "../../orchestration-v2/Adapters/ClaudeAdapterV2.ts";
import { KinEnabled, layer as kinEnabledLayer } from "../KinEnabled.ts";

/**
* A lead runs full-access with Kin's memory checkout as its cwd, so its Claude session loads user
* settings only: never a project `CLAUDE.md`, `.claude/` or `.mcp.json` that memory might carry.
* The cwd is the lead project's root, which Kin sets; a match only ever narrows what loads.
*/
export const claudeQueryRunner = <E, R>(
base: Layer.Layer<ClaudeAdapterV2.ClaudeAgentSdkQueryRunner, E, R>,
) =>
Layer.effect(
ClaudeAdapterV2.ClaudeAgentSdkQueryRunner,
Effect.gen(function* () {
const runner = yield* ClaudeAdapterV2.ClaudeAgentSdkQueryRunner;
if (!(yield* KinEnabled).enabled) return runner;
const fs = yield* FileSystem.FileSystem;
const path = yield* Path.Path;
const kinDirectory = path.join((yield* ServerConfig).stateDir, "kin");
const real = (target: string) => fs.realPath(target).pipe(Effect.orElseSucceed(() => target));
const within = (parent: string, child: string) => {
const relative = path.relative(parent, child);
return relative !== "" && !relative.startsWith("..") && !path.isAbsolute(relative);
};
return ClaudeAdapterV2.ClaudeAgentSdkQueryRunner.of({
...runner,
open: Effect.fn("KinLeadIsolation.open")(function* (input) {
const cwd = input.options.cwd;
const isKin =
cwd !== undefined &&
(within(kinDirectory, path.resolve(cwd)) ||
within(yield* real(kinDirectory), yield* real(cwd)));
return yield* runner.open(
isKin
? {
...input,
options: {
...input.options,
// Narrow, never widen: a dream's `[]` stays `[]` whichever wrapper runs first.
settingSources: (
input.options.settingSources ?? ["user", "project", "local"]
).filter((source) => source === "user"),
},
}
: input,
);
}),
});
}),
).pipe(Layer.provide(Layer.merge(base, kinEnabledLayer)));
105 changes: 102 additions & 3 deletions apps/server/src/kin/memory/Memory.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,24 @@ it.live.each([
}
if (missingIndex) yield* fs.remove(`${source}/INDEX.md`);
yield* fs.symlink("def-001.md", `${source}/deferrals/link.md`);
const planted = {
"CLAUDE.md": "Planted instructions\n",
".claude/settings.json": '{"hooks":{}}\n',
".mcp.json": '{"mcpServers":{}}\n',
"deferrals/CLAUDE.md": "Planted instructions\n",
"journal/.claude/skills/x/SKILL.md": "Planted skill\n",
"journal/.claude/commands/x.md": "Planted command\n",
"journal/2026/11-01.md": "Invented journal entry\n",
"journal/x\\..\\..\\CLAUDE.md": "Planted instructions\n",
"deferrals/AGENTſ.md": "Planted instructions\n",
};
for (const [file, text] of Object.entries(planted)) {
if (file.includes("/"))
yield* fs.makeDirectory(`${source}/${file.slice(0, file.lastIndexOf("/"))}`, {
recursive: true,
});
yield* fs.writeFileString(`${source}/${file}`, text);
}
yield* fs.writeFileString(
`${source}/deferrals/huge.md`,
fixtureItem({ id: "huge" }) + "x".repeat(256 * 1024 + 1),
Expand All @@ -109,6 +127,9 @@ it.live.each([
"people",
"claims",
"journal",
"CLAUDE.md",
".claude",
".mcp.json",
]);
yield* git([
"-c",
Expand All @@ -123,6 +144,7 @@ it.live.each([
yield* fs.makeDirectory(`${base}/a/memory.clone-crashed`, { recursive: true });
yield* fs.writeFileString(`${base}/a/memory.clone-crashed/incomplete`, "interrupted clone");
yield* fs.makeDirectory(`${base}/a/memory-read`, { recursive: true });
const messages: string[] = [];
yield* Effect.gen(function* () {
const memory = yield* Memory.Memory;
const [a] = yield* Effect.all(
Expand Down Expand Up @@ -167,6 +189,19 @@ it.live.each([
}
const prepared = yield* memory.prepareWakeup(orgA);
expect(prepared.head).toMatch(/^[0-9a-f]{40}$/);
for (const file of ["deferrals/def-001.md", "journal/2026/11-01.md", "rules.md"])
expect(yield* fs.exists(`${a.read}/${file}`)).toBe(true);
for (const file of [
"CLAUDE.md",
".claude",
".mcp.json",
"deferrals/CLAUDE.md",
"journal/.claude",
"deferrals/link.md",
"journal/x\\..\\..\\CLAUDE.md",
"deferrals/AGENTſ.md",
])
expect(yield* fs.exists(`${a.read}/${file}`)).toBe(false);
const promptSnapshot = yield* memory.readPromptSnapshot(orgA, prepared.head);
expect(promptSnapshot).toEqual({
rules: yield* fs.readFileString(`${source}/rules.md`),
Expand Down Expand Up @@ -251,22 +286,45 @@ it.live.each([
expect((yield* memory.readItem(orgB, itemId)).head.title).toBe(
"Invented service maintenance",
);
yield* git(["fetch", a.read, "HEAD"]);
yield* git(["merge", "--ff-only", "FETCH_HEAD"]);
for (const file of ["rules.md", "deferrals/def-001.md"])
yield* fs.copyFile(`${a.read}/${file}`, `${source}/${file}`);
yield* git(["add", "rules.md", "deferrals/def-001.md"]);
yield* git([
"-c",
"user.name=Fixture",
"-c",
"user.email=fixture@example.invalid",
"commit",
"-m",
"Owner lands the edits",
]);
expect(yield* memory.readRules(orgA)).toBe("Invented standing rules.\n");
expect((yield* memory.query(orgA, { kind: "deferral" }))[0]?.title).toBe(
"Invented service maintenance",
);
const next = yield* memory.prepareWakeup(orgA);
expect(yield* memory.readRules(orgA)).toBe("Uncommitted rules");
expect(next.head).not.toBe(prepared.head);
expect((yield* memory.prepareWakeup(orgA)).head).toBe(next.head);
expect(
messages.filter((message) => message.includes("Kin memory checkout skipped paths")),
).toHaveLength(2);
expect((yield* memory.readItem(orgA, itemId)).head.title).toBe(
"Modified service maintenance",
);
expect((yield* memory.readItem(orgB, itemId)).head.title).toBe(
"Invented service maintenance",
);
}).pipe(Effect.provide(memoryLayer(base, source)));
}).pipe(
Effect.provide(
Layer.merge(
memoryLayer(base, source),
Logger.layer([Logger.make(({ message }) => messages.push(String(message)))], {
mergeWithExisting: false,
}),
),
),
);
}).pipe(
Effect.provide(Layer.mergeAll(gitLayer, NodeServices.layer, databaseLayer)),
Effect.scoped,
Expand Down Expand Up @@ -578,6 +636,47 @@ const fixtureRepository = Effect.fn("Test.fixtureRepository")(function* () {
return { root, source, git, commit };
});

it.live("materializes a large journal checkout in one blob read", () =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
const vcs = yield* VcsProcess.VcsProcess;
const { root, source, commit } = yield* fixtureRepository();
yield* fs.makeDirectory(`${source}/journal/2026`, { recursive: true });
for (let day = 0; day < 100; day++)
yield* fs.writeFileString(`${source}/journal/2026/${day}.md`, `Invented entry ${day}\n`);
yield* commit(source);
let largestBatch = 0;
const counted = Layer.succeed(
VcsProcess.VcsProcess,
VcsProcess.VcsProcess.of({
run: (input) => {
if (input.args.includes("--batch"))
largestBatch = Math.max(largestBatch, input.stdin?.trim().split("\n").length ?? 0);
return vcs.run(input);
},
}),
);
yield* Effect.gen(function* () {
const memory = yield* Memory.Memory;
yield* memory.prepareWakeup(orgA);
const { read } = yield* memory.ensureCheckouts(orgA);
expect(yield* fs.exists(`${read}/journal/2026/99.md`)).toBe(true);
}).pipe(
Effect.provide(
memoryTestLayer.pipe(
Layer.provide(configLayer(`${root}/state`, source)),
Layer.provide(counted),
Layer.provide(NodeServices.layer),
),
),
);
expect(largestBatch).toBeGreaterThanOrEqual(100);
}).pipe(
Effect.provide(Layer.mergeAll(gitLayer, NodeServices.layer, databaseLayer)),
Effect.scoped,
),
);

it.live.each([
"missing HEAD",
"missing objects",
Expand Down
Loading