Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7aeaf02
Merge kin prerequisites into TRIG-9 stack
GLDRoger Nov 8, 2026
768c397
feat(kin): block secrets in memory writes (TRIG-16)
GLDRoger Nov 8, 2026
e7aba15
test(kin): harden scanner bounds and wrapped-token coverage
GLDRoger Nov 8, 2026
3954bbd
feat(kin): schedule brief, summary and owner-check routines
GLDRoger Nov 8, 2026
52d873e
Merge updated LEAD-3 writer prerequisite
GLDRoger Nov 8, 2026
ae165f4
test(kin): retain writer base pinned-read assertion
GLDRoger Nov 8, 2026
493c228
test(kin): compose dormant routine dependencies in one layer
GLDRoger Nov 8, 2026
9c7fa43
Merge remote-tracking branch 'origin/kin-lead-3-writer' into HEAD
GLDRoger Nov 8, 2026
cb8f2ff
fix(kin): bound secret scanning and scan only merged changes
GLDRoger Nov 8, 2026
db4e149
Merge remote-tracking branch 'origin/kin-lead-3-writer' into HEAD
GLDRoger Nov 8, 2026
47f2625
fix(kin): gate owner review and harden routine delivery
GLDRoger Nov 8, 2026
c1d35aa
Merge remote-tracking branch 'origin/kin-lead-3-writer' into HEAD
GLDRoger Nov 8, 2026
0a5f36d
fix(kin): bound secret scan work and preserve token boundaries
GLDRoger Nov 8, 2026
1e11dc3
fix(kin): avoid routine deadlocks and retain transient fires
GLDRoger Nov 8, 2026
ec5bf6d
fix(kin): scan realistic journals and wrapped secret prefixes
GLDRoger Nov 8, 2026
195491d
fix(kin): treat nested decode errors as permanent; warn once per retr…
GLDRoger Nov 8, 2026
3039381
fix(kin): skip short anchorless wrapped runs; yield in the line loop
GLDRoger Nov 8, 2026
a8b5dff
fix(kin): bounded decode-cause walk; retries log at debug, drops warn
GLDRoger Nov 8, 2026
7df9d3f
docs(kin): correct JWT header limit; note path-list work limit
GLDRoger Nov 8, 2026
30c2c6d
chore(kin): merge kin-lead-3-writer into kin-trig-16-secret-scan
GLDRoger Nov 8, 2026
a42eee2
chore(kin): merge kin-lead-3-writer into kin-trig-9-routines
GLDRoger Nov 8, 2026
78b6dc1
chore(kin): merge kin-trig-16-secret-scan into kin-trig-9-routines
GLDRoger Nov 8, 2026
a993df1
test(kin): provide JudgeShadow.layerOff in routines testkit
GLDRoger Nov 8, 2026
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: 1 addition & 1 deletion apps/server/src/kin/KinServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { KinChatHub } from "./chat/KinChatHub.ts";
import { KinBudget } from "./lead/KinBudget.ts";
import { KinEventQueue } from "./lead/KinEventQueue.ts";

export type Services = KinIdentity | KinChatService | KinBudget | KinEventQueue;
export type Services = KinIdentity | KinChatService | KinBudget | KinEventQueue | KinChatHub;

export class KinServer extends Context.Service<
KinServer,
Expand Down
16 changes: 15 additions & 1 deletion apps/server/src/kin/chat/KinChatService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
KinMessageId,
KinWaitingId,
KinWidgetId,
KinOwnerCheckCard,
KinMessagesSendInput,
KinWidgetsActInput,
KinAgentIntent,
Expand Down Expand Up @@ -179,6 +180,7 @@ const decodeWidgetId = Schema.decodeEffect(KinWidgetId);
const decodeWaitingId = Schema.decodeEffect(KinWaitingId);
const decodeSend = Schema.decodeEffect(KinMessagesSendInput);
const decodeIntent = Schema.decodeEffect(KinAgentIntent);
const decodeOwnerCheckCard = Schema.decodeUnknownEffect(KinOwnerCheckCard);
const decodeAct = Schema.decodeEffect(KinWidgetsActInput);
const encodeAction = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
const invalidState = new KinChatError({ reason: "invalid_state", message: "Invalid chat input." });
Expand Down Expand Up @@ -947,7 +949,8 @@ const make = Effect.gen(function* () {
reason: "use_approvals",
message: "Use the signed approvals service.",
});
if (input.type === "task" && input.widgetId === undefined) return yield* notAllowed;
if (input.type === "owner_check" || (input.type === "task" && input.widgetId === undefined))
return yield* notAllowed;
let state = yield* validateState(input.type, input.state);
let widget: KinWidget;
if (input.widgetId === undefined) {
Expand Down Expand Up @@ -1074,6 +1077,17 @@ const make = Effect.gen(function* () {
reason: "use_approvals",
message: "Use the signed approvals service.",
});
if (widget.type === "owner_check") {
if (member.role !== "owner") return yield* notAllowed;
const card = yield* decodeOwnerCheckCard(widget.state).pipe(
Effect.mapError(() => invalidState),
);
if (
!["keep", "update", "drop"].includes(request.actionId) ||
!card.items.some((item) => item.itemId === request.value)
)
return yield* invalidState;
}
const body = yield* encodeAction({
widgetId: request.widgetId,
revision: request.revision,
Expand Down
3 changes: 2 additions & 1 deletion apps/server/src/kin/lead/KinEventQueue.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,12 @@ describe("KinEventQueue", () => {
"report",
"resolved",
"github",
"routine",
"noisy",
"routine",
"watch",
],
);
assert.equal(events.find((entry) => entry.eventId === "routine")?.priority, "P3");
yield* finish("priority");
yield* sql`UPDATE kin_chat_members SET role = 'member'`;
yield* queue.enqueue(yield* event("member", "chat.message"));
Expand Down
3 changes: 3 additions & 0 deletions apps/server/src/kin/lead/KinEventQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ const make = Effect.gen(function* () {
case "worker.report":
priority = "P1";
break;
case "routine":
if (event.routine === "owner_check") priority = "P3";
break;
case "watchdog":
priority = "P3";
break;
Expand Down
33 changes: 33 additions & 0 deletions apps/server/src/kin/lead/WakeupRunner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import {
ProjectId,
ProviderInstanceId,
} from "@t3tools/contracts";
import * as OwnerCheck from "../triggers/ownerCheck.ts";
import * as ChatService from "../chat/KinChatService.ts";
import * as ChatHub from "../chat/KinChatHub.ts";
import * as Context from "effect/Context";
import * as Deferred from "effect/Deferred";
import * as Effect from "effect/Effect";
Expand Down Expand Up @@ -86,6 +89,34 @@ const run = Effect.fn("test.run")(function* () {
});

describe("WakeupRunner", () => {
it.effect("handles the owner check in code without starting a provider turn", () =>
Effect.gen(function* () {
yield* seed;
const queue = yield* KinEventQueue.KinEventQueue;
const sql = yield* SqlClient.SqlClient;
yield* queue.enqueue(event("owner-check"));
yield* Fiber.join(yield* run());
assert.deepEqual(
yield* sql`SELECT state FROM kin_events WHERE org_id = ${orgId} ORDER BY event_id`,
[{ state: "done" }],
);
assert.deepEqual(
yield* sql`SELECT thread_id, status FROM kin_wakeups WHERE org_id = ${orgId} ORDER BY wakeup_id`,
[{ thread_id: null, status: "completed" }],
);
assert.lengthOf(
yield* sql`SELECT thread_id FROM kin_agent_threads WHERE org_id = ${orgId} ORDER BY thread_id`,
0,
);
}).pipe(
Effect.provide(
harness().pipe(
Layer.provide(Layer.mock(OwnerCheck.OwnerCheck)({ post: () => Effect.succeed([]) })),
),
),
provideDeterministicTestRuntime,
),
);
it.effect("uses the cheap model for exhausted P0 even when a routine is in the batch", () =>
Effect.gen(function* () {
yield* seed;
Expand Down Expand Up @@ -962,6 +993,8 @@ describe("WakeupRunner", () => {
Layer.provide(Layer.mock(KinIdentity.KinIdentity)({ isAgentThread: () => false })),
Layer.provide(
Layer.mergeAll(
Layer.mock(ChatService.KinChatService)({}),
Layer.mock(ChatHub.KinChatHub)({}),
Layer.mock(Budget.KinBudget)({}),
Layer.mock(KinEventQueue.KinEventQueue)({}),
Layer.mock(ThreadLaunch.ThreadLaunchService)({}),
Expand Down
32 changes: 31 additions & 1 deletion apps/server/src/kin/lead/WakeupRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ import { toPersistenceSqlError } from "../../persistence/Errors.ts";
import * as ProjectService from "../../project/ProjectService.ts";
import * as KinIdentity from "../chat/KinIdentity.ts";
import * as Memory from "../memory/Memory.ts";
import * as Routines from "../triggers/routines.ts";
import * as OwnerCheck from "../triggers/ownerCheck.ts";
import * as KinEventQueue from "./KinEventQueue.ts";
import * as KinBudget from "./KinBudget.ts";
import * as KinLeadRegistry from "./KinLeadRegistry.ts";
import { KinLeadPrompt } from "./LeadPrompt.ts";

const ownerCheckDispatcherReady = false;

export class KinWakeupError extends Schema.TaggedError<KinWakeupError>()("KinWakeupError", {
orgId: KinOrgId,
agentId: KinAgentId,
Expand Down Expand Up @@ -93,6 +97,7 @@ const ulid = Effect.gen(function* () {
});

const make = Effect.gen(function* () {
const ownerCheck = yield* Effect.serviceOption(OwnerCheck.OwnerCheck);
const sql = yield* SqlClient.SqlClient;
const queue = yield* KinEventQueue.KinEventQueue;
const budget = yield* KinBudget.KinBudget;
Expand Down Expand Up @@ -349,7 +354,17 @@ const make = Effect.gen(function* () {
events = events.filter((event) => !deferred.has(event.eventId));
}
}
if (events.length === 0) return;
const routines = yield* Effect.serviceOption(Routines.KinRoutines);
if (Option.isSome(routines))
events = yield* Effect.filter(events, (event) =>
event._tag === "routine"
? routines.value.isEnabled(orgId, event.routine)
: Effect.succeed(true),
);
if (events.length === 0) {
yield* queue.finish({ orgId, wakeupId, status: "completed" });
return;
}
const budgetContext = yield* budget.promptContext(orgId);
const pinned = yield* memory.prepareWakeup(orgId, wakeupId).pipe(
Effect.tapError((error) =>
Expand All @@ -365,6 +380,21 @@ const make = Effect.gen(function* () {
: Effect.void,
),
);
if (Option.isSome(ownerCheck)) {
for (const event of events) {
if (event._tag === "routine" && event.routine === "owner_check")
// Keep cards dark until the verified action dispatcher and clients land.
if (ownerCheckDispatcherReady)
yield* ownerCheck.value.post(orgId, event.eventId, event.ownerCheckItems ?? []);
}
events = events.filter(
(event) => event._tag !== "routine" || event.routine !== "owner_check",
);
if (events.length === 0) {
yield* queue.finish({ orgId, wakeupId, status: "completed" });
return;
}
}
const paths = yield* memory.ensureCheckouts(orgId);
const { project } = yield* projects.bootstrap({
commandId: CommandId.make(`kin-project:${orgId}`),
Expand Down
14 changes: 11 additions & 3 deletions apps/server/src/kin/lead/layer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@ import * as ServerConfig from "../../config.ts";
import * as EffectWorker from "../../orchestration-v2/EffectWorker.ts";
import * as ThreadManagement from "../../orchestration-v2/ThreadManagementService.ts";
import { provideDeterministicTestRuntime } from "../../orchestration-v2/testkit/DeterministicRuntime.ts";
import * as ChatService from "../chat/KinChatService.ts";
import * as ChatHub from "../chat/KinChatHub.ts";
import * as KinEventQueue from "./KinEventQueue.ts";
import * as KinLead from "./layer.ts";
import { event, harness, seed, orgId } from "./WakeupRunner.testkit.ts";

const external = Layer.mergeAll(
Layer.mock(ChatService.KinChatService)({}),
Layer.mock(ChatHub.KinChatHub)({}),
ServerConfig.layerTest(process.cwd(), { prefix: "kin-lead-layer-" }),
Layer.mock(VcsProcess.VcsProcess)({}),
).pipe(Layer.provideMerge(NodeServices.layer));
Expand Down Expand Up @@ -52,7 +56,7 @@ vi.mock("../memory/Memory.ts", async (importOriginal) => {
: Effect.die("Prompt and runner must share pinned memory"),
readIndex: () => Effect.die("unused"),
readRules: () => Effect.die("unused"),
query: () => Effect.die("unused"),
query: () => Effect.succeed([]),
readItem: () => Effect.die("unused"),
readItemQuietly: () => Effect.die("unused"),
rebuildIndex: () => Effect.die("unused"),
Expand All @@ -69,7 +73,11 @@ it.effect("starts configured Kin with the real prompt and the runner's pinned me
const hold = yield* Deferred.make<void>();
yield* Effect.gen(function* () {
yield* seed;
yield* (yield* KinEventQueue.KinEventQueue).enqueue(event("real-prompt"));
yield* (yield* KinEventQueue.KinEventQueue).enqueue({
...event("real-prompt"),
_tag: "routine",
routine: "morning_brief",
});
yield* Layer.build(
Layer.fresh(KinLead.layerServer).pipe(
Layer.provide(external),
Expand Down Expand Up @@ -114,5 +122,5 @@ it.effect("leaves unconfigured Kin silent and inert without building its depende
),
);
assert.deepStrictEqual(entries, []);
}).pipe(Effect.provide(harness()), provideDeterministicTestRuntime),
}).pipe(Effect.provide(Layer.mergeAll(harness(), external)), provideDeterministicTestRuntime),
);
19 changes: 18 additions & 1 deletion apps/server/src/kin/lead/layer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import { forkParked } from "../../serverActivation.ts";
import { KinOrgId } from "@t3tools/contracts";
import * as Scheduler from "../../scheduling/Scheduler.ts";
import * as Config from "effect/Config";
import * as Effect from "effect/Effect";
import * as Layer from "effect/Layer";
import * as Routines from "../triggers/routines.ts";
import * as OwnerCheck from "../triggers/ownerCheck.ts";
import * as TriggerScheduler from "../triggers/KinTriggerScheduler.ts";
import * as TriggerStore from "../triggers/KinTriggerStore.ts";
import * as TriggerInbox from "../triggers/KinTriggerInbox.ts";
import * as Schema from "effect/Schema";

import * as KinChatRepository from "../chat/KinChatRepository.ts";
Expand Down Expand Up @@ -35,13 +41,24 @@ export function containStartup<A, E, R>(layer: Layer.Layer<A, E, R>) {
);
}

const routineRuntime = Routines.layer.pipe(
Layer.provideMerge(TriggerScheduler.layer),
Layer.provide(Layer.mergeAll(TriggerStore.layer, TriggerInbox.layer)),
// Kin builds in its contained startup scope; orchestration runtime does not expose its scheduler.
Layer.provide(Scheduler.layer),
);

export const layer = Layer.effectDiscard(
Effect.gen(function* () {
const runner = yield* WakeupRunner.WakeupRunner;
yield* runner.start.pipe(forkParked);
yield* Effect.gen(function* () {
const context = yield* Layer.build(routineRuntime);
yield* runner.start.pipe(Effect.provideContext(context));
}).pipe(forkParked);
}),
).pipe(
Layer.provide(WakeupRunner.layer),
Layer.provide(OwnerCheck.layer),
Layer.provide(
Layer.mergeAll(KinLeadRegistry.layer, KinLeadPrompt.layer).pipe(
Layer.provideMerge(
Expand Down
45 changes: 42 additions & 3 deletions apps/server/src/kin/memory/Memory.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,10 @@ it.live("uses filesystem identity for a case-mismatched base without recloning",

it.live.each([
"diverged",
"secret merge",
"scan failure merge",
"remote secret merge",
"large remote merge",
"conflict",
"network down",
"dirty writer",
Expand Down Expand Up @@ -932,7 +936,11 @@ it.live.each([
} else
yield* fs.writeFileString(
`${writer}/rules.md`,
scenario === "H2-merge-swap" ? h2Local : "Local invented rules\n",
scenario === "H2-merge-swap"
? h2Local
: scenario === "secret merge"
? ["gh", "p_", "a".repeat(36)].join("")
: "Local invented rules\n",
);
let local = yield* commit(writer);
if (scenario === "push retry") {
Expand All @@ -952,13 +960,20 @@ it.live.each([
}
yield* memory.record(orgA, "main", initial.head, local);
yield* fs.writeFileString(
`${source}/${scenario === "push retry" || scenario === "diverged" || scenario === "network down" || scenario === "dirty writer" || scenario === "H2-merge-swap" ? "remote-only" : "rules.md"}`,
`${source}/${scenario === "push retry" || scenario === "diverged" || scenario === "scan failure merge" || scenario === "secret merge" || scenario === "remote secret merge" || scenario === "large remote merge" || scenario === "network down" || scenario === "dirty writer" || scenario === "H2-merge-swap" ? "remote-only" : "rules.md"}`,
"Remote invented edit\n",
);
if (scenario === "journal conflict" || scenario === "push retry") {
yield* fs.writeFileString(`${source}/journal/day.md`, "remote entry\n");
yield* fs.writeFileString(`${source}/INDEX.md`, "remote generated index\n");
}
if (scenario === "remote secret merge")
yield* fs.writeFileString(`${source}/remote-only`, ["gh", "p_", "a".repeat(36)].join(""));
if (scenario === "large remote merge") {
yield* fs.makeDirectory(`${source}/archive`);
for (let i = 0; i < 1030; i++)
yield* fs.writeFileString(`${source}/archive/${i}.txt`, "clean");
}
if (scenario === "H2-merge-swap")
yield* fs.writeFileString(`${source}/rules.md`, h2Base.replace("base tail", "remote tail"));
yield* commit(source);
Expand Down Expand Up @@ -1004,6 +1019,10 @@ it.live.each([
yield* memory.record(orgA, "main", local, replacement);
local = replacement;
}
if (scenario === "scan failure merge") {
const sql = yield* SqlClient.SqlClient;
yield* sql`DROP TABLE kin_secret_allow`;
}
const result = yield* memory.prepareWakeup(orgA, "fixture-wakeup").pipe(Effect.result);
if (scenario === "unrelated" || scenario === "criss-cross") {
expect(result._tag).toBe("Failure");
Expand Down Expand Up @@ -1038,6 +1057,22 @@ it.live.each([
expect(
(yield* memory.prepareWakeup(orgA, "fixture-wakeup-3").pipe(Effect.result))._tag,
).toBe("Success");
} else if (scenario === "scan failure merge") {
expect(result._tag).toBe("Failure");
expect(
messages.some((message) => message.includes("Secret scan failed: Allowlist unavailable")),
).toBe(true);
expect(yield* memory.anchor(orgA, "main")).toBe(local);
} else if (scenario === "secret merge") {
expect(result._tag).toBe("Failure");
if (result._tag === "Failure") {
expect(result.failure._tag).toBe("MemoryError");
expect(result.failure.operation).toBe("secretScan");
}
expect(yield* memory.anchor(orgA, "main")).toBe(local);
expect(yield* git(root, [`--git-dir=${remote}`, "rev-parse", "main"])).toBe(
yield* git(source, ["rev-parse", "HEAD"]),
);
} else if (scenario === "push retry") {
expect(result._tag).toBe("Success");
if (result._tag === "Success") {
Expand All @@ -1063,6 +1098,8 @@ it.live.each([
} else if (
scenario === "network down" ||
scenario === "diverged" ||
scenario === "remote secret merge" ||
scenario === "large remote merge" ||
scenario === "dirty writer"
) {
expect(result._tag).toBe("Success");
Expand All @@ -1072,7 +1109,9 @@ it.live.each([
expect(result.success.head).not.toBe(local);
expect(yield* memory.readRules(orgA)).toBe("Local invented rules\n");
expect(yield* git(writer, ["show", `${result.success.head}:remote-only`])).toBe(
"Remote invented edit",
scenario === "remote secret merge"
? ["gh", "p_", "a".repeat(36)].join("")
: "Remote invented edit",
);
}
}
Expand Down
Loading