diff --git a/apps/server/src/kin/mcp/ScheduledTaskFence.ts b/apps/server/src/kin/mcp/ScheduledTaskFence.ts index e1679dc683348..2ae968f430832 100644 --- a/apps/server/src/kin/mcp/ScheduledTaskFence.ts +++ b/apps/server/src/kin/mcp/ScheduledTaskFence.ts @@ -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( diff --git a/apps/server/src/kin/triggers/KinTriggerStore.ts b/apps/server/src/kin/triggers/KinTriggerStore.ts index 8cde3c021b3b2..87e11cf076114 100644 --- a/apps/server/src/kin/triggers/KinTriggerStore.ts +++ b/apps/server/src/kin/triggers/KinTriggerStore.ts @@ -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", @@ -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 }; diff --git a/apps/server/src/kin/triggers/taskIds.ts b/apps/server/src/kin/triggers/taskIds.ts new file mode 100644 index 0000000000000..b6be68bea4847 --- /dev/null +++ b/apps/server/src/kin/triggers/taskIds.ts @@ -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}`;