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: 2 additions & 4 deletions apps/server/src/kin/mcp/ScheduledTaskFence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ import * as Layer from "effect/Layer";

import * as ScheduledTasks from "../../scheduledTasks/ScheduledTaskService.ts";
import * as KinEnabled from "../KinEnabled.ts";
import { KIN_TASK_PREFIX } from "../triggers/taskIds.ts";

// Upstream names a task created with a commandId `scheduled-task:${commandId}`.
const kinTaskPrefix = "scheduled-task:kin:";

const isKinTask = (id: string) => id.startsWith(kinTaskPrefix);
const isKinTask = (id: string) => id.startsWith(KIN_TASK_PREFIX);

const refuse = (taskId: ScheduledTaskId) =>
Effect.fail(
Expand Down
5 changes: 3 additions & 2 deletions apps/server/src/kin/triggers/KinTriggerStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
PersistenceSqlError,
toPersistenceSqlError,
} from "../../persistence/Errors.ts";
import { KIN_COMMAND_PREFIX, KIN_TASK_PREFIX } from "./taskIds.ts";

export class KinTriggerFireConflict extends Schema.TaggedError<KinTriggerFireConflict>()(
"KinTriggerFireConflict",
Expand Down Expand Up @@ -93,11 +94,11 @@ const decodeInboxRow = Schema.decodeUnknownEffect(
const Scope = Schema.Struct({ orgId: KinOrgId, id: KinTriggerId });

export const githubAppCommandId = (orgId: KinOrgId) =>
CommandId.make(`kin:webhook:${orgId}:${KIN_GITHUB_APP_SOURCE}`);
CommandId.make(`${KIN_COMMAND_PREFIX}webhook:${orgId}:${KIN_GITHUB_APP_SOURCE}`);
// Upstream names a task created by commandId `scheduled-task:${commandId}`.
export const githubAppTaskId = (orgId: KinOrgId) =>
ScheduledTaskId.make(`scheduled-task:${githubAppCommandId(orgId)}`);
export const KIN_WEBHOOK_TASK_PREFIX = "scheduled-task:kin:webhook:";
export const KIN_WEBHOOK_TASK_PREFIX = `${KIN_TASK_PREFIX}webhook:`;
export const GITHUB_REPLAY_KEY = "{{headers.x-github-delivery}}";
// Exactly this, no coalesce window: a held delivery would outlive a re-key.
export const GITHUB_DEDUPE = { replayKey: GITHUB_REPLAY_KEY };
Expand Down
3 changes: 3 additions & 0 deletions apps/server/src/kin/triggers/taskIds.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const KIN_COMMAND_PREFIX = "kin:";
// Upstream names a task created with a commandId `scheduled-task:${commandId}`.
export const KIN_TASK_PREFIX = `scheduled-task:${KIN_COMMAND_PREFIX}`;