From 32dbd4a47820885b2a1f2c721474c9606861b017 Mon Sep 17 00:00:00 2001 From: GLDRoger <130458023+GLDRoger@users.noreply.github.com> Date: Mon, 9 Nov 2026 00:30:20 +0530 Subject: [PATCH 1/2] refactor(kin): share the kin: task prefix between the fence and webhook tasks Co-Authored-By: Claude Opus 5.5 --- apps/server/src/kin/mcp/ScheduledTaskFence.ts | 5 +++-- apps/server/src/kin/triggers/KinTriggerStore.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/server/src/kin/mcp/ScheduledTaskFence.ts b/apps/server/src/kin/mcp/ScheduledTaskFence.ts index e1679dc683348..fd4feb340af79 100644 --- a/apps/server/src/kin/mcp/ScheduledTaskFence.ts +++ b/apps/server/src/kin/mcp/ScheduledTaskFence.ts @@ -5,10 +5,11 @@ import * as Layer from "effect/Layer"; import * as ScheduledTasks from "../../scheduledTasks/ScheduledTaskService.ts"; import * as KinEnabled from "../KinEnabled.ts"; +export const KIN_COMMAND_PREFIX = "kin:"; // Upstream names a task created with a commandId `scheduled-task:${commandId}`. -const kinTaskPrefix = "scheduled-task:kin:"; +export const KIN_TASK_PREFIX = `scheduled-task:${KIN_COMMAND_PREFIX}`; -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..12f6830374ab1 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 "../mcp/ScheduledTaskFence.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 }; From 911fd30792eac8b5444499a34fe65866c2cab3f2 Mon Sep 17 00:00:00 2001 From: GLDRoger <130458023+GLDRoger@users.noreply.github.com> Date: Mon, 9 Nov 2026 00:38:36 +0530 Subject: [PATCH 2/2] refactor(kin): keep the kin: task prefixes in their own module Co-Authored-By: Claude Opus 5.5 --- apps/server/src/kin/mcp/ScheduledTaskFence.ts | 5 +---- apps/server/src/kin/triggers/KinTriggerStore.ts | 2 +- apps/server/src/kin/triggers/taskIds.ts | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 apps/server/src/kin/triggers/taskIds.ts diff --git a/apps/server/src/kin/mcp/ScheduledTaskFence.ts b/apps/server/src/kin/mcp/ScheduledTaskFence.ts index fd4feb340af79..2ae968f430832 100644 --- a/apps/server/src/kin/mcp/ScheduledTaskFence.ts +++ b/apps/server/src/kin/mcp/ScheduledTaskFence.ts @@ -4,10 +4,7 @@ import * as Layer from "effect/Layer"; import * as ScheduledTasks from "../../scheduledTasks/ScheduledTaskService.ts"; import * as KinEnabled from "../KinEnabled.ts"; - -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}`; +import { KIN_TASK_PREFIX } from "../triggers/taskIds.ts"; const isKinTask = (id: string) => id.startsWith(KIN_TASK_PREFIX); diff --git a/apps/server/src/kin/triggers/KinTriggerStore.ts b/apps/server/src/kin/triggers/KinTriggerStore.ts index 12f6830374ab1..87e11cf076114 100644 --- a/apps/server/src/kin/triggers/KinTriggerStore.ts +++ b/apps/server/src/kin/triggers/KinTriggerStore.ts @@ -35,7 +35,7 @@ import { PersistenceSqlError, toPersistenceSqlError, } from "../../persistence/Errors.ts"; -import { KIN_COMMAND_PREFIX, KIN_TASK_PREFIX } from "../mcp/ScheduledTaskFence.ts"; +import { KIN_COMMAND_PREFIX, KIN_TASK_PREFIX } from "./taskIds.ts"; export class KinTriggerFireConflict extends Schema.TaggedError()( "KinTriggerFireConflict", 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}`;