coji · coji · Mar 19, 2026 · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026
diff --git a/app/routes/$orgSlug/settings/_index/+forms/organization-settings.tsx b/app/routes/$orgSlug/settings/_index/+forms/organization-settings.tsx
@@ -40,7 +40,6 @@ export const OrganizationSettings = ({
     releaseDetectionMethod: string
     releaseDetectionKey: string
     isActive: number
-    excludedUsers: string
     timezone: string
     language: string
   }
@@ -60,7 +59,6 @@ export const OrganizationSettings = ({
       releaseDetectionMethod: organizationSetting?.releaseDetectionMethod,
       releaseDetectionKey: organizationSetting?.releaseDetectionKey,
       isActive: organizationSetting?.isActive ? '1' : undefined,
-      excludedUsers: organizationSetting?.excludedUsers,
       timezone: organizationSetting?.timezone ?? DEFAULT_TIMEZONE,
       language: organizationSetting?.language,
     },
@@ -173,21 +171,6 @@ export const OrganizationSettings = ({
           <div className="text-destructive">{fields.isActive.errors}</div>
         </fieldset>
 
-        <fieldset className="space-y-1">
-          <Label htmlFor={fields.excludedUsers.id}>
-            Excluded Users (comma separated)
-          </Label>
-          <Input
-            {...getInputProps(fields.excludedUsers, { type: 'text' })}
-            placeholder="e.g. my-org-bot, some-other-bot"
-          />
-          <p className="text-muted-foreground text-sm">
-            Copilot is excluded by default. Add additional usernames to exclude
-            from cycle time calculations.
-          </p>
-          <div className="text-destructive">{fields.excludedUsers.errors}</div>
-        </fieldset>
-
         {form.errors && (
           <Alert variant="destructive">
             <AlertTitle>System Error</AlertTitle>

diff --git a/app/routes/$orgSlug/settings/_index/+functions/mutations.server.ts b/app/routes/$orgSlug/settings/_index/+functions/mutations.server.ts
@@ -26,7 +26,6 @@ export const updateOrganizationSetting = async (
     | 'releaseDetectionMethod'
     | 'releaseDetectionKey'
     | 'isActive'
-    | 'excludedUsers'
     | 'timezone'
     | 'language'
   >,

diff --git a/app/routes/$orgSlug/settings/_index/+schema.ts b/app/routes/$orgSlug/settings/_index/+schema.ts
@@ -11,7 +11,6 @@ export const organizationSettingsSchema = z.object({
     .literal('on')
     .optional()
     .transform((val) => (val === 'on' ? 1 : 0)),
-  excludedUsers: z.string().max(2000).default(''),
   timezone: z.string().refine((v) => VALID_TIMEZONES.has(v), {
     message: 'Invalid timezone',
   }),

diff --git a/app/routes/$orgSlug/settings/_index/index.tsx b/app/routes/$orgSlug/settings/_index/index.tsx
@@ -44,7 +44,6 @@ export const action = async ({ request, context }: Route.ActionArgs) => {
     releaseDetectionMethod,
     releaseDetectionKey,
     isActive,
-    excludedUsers,
     timezone,
     language,
   } = submission.value
@@ -55,7 +54,6 @@ export const action = async ({ request, context }: Route.ActionArgs) => {
       releaseDetectionMethod,
       releaseDetectionKey,
       isActive,
-      excludedUsers,
       timezone,
       language,
     })

diff --git a/app/routes/$orgSlug/settings/repositories/$repository/$pull/index.tsx b/app/routes/$orgSlug/settings/repositories/$repository/$pull/index.tsx
@@ -11,6 +11,7 @@ import {
   upsertPullRequestReview,
   upsertPullRequestReviewers,
 } from '~/batch/db/mutations'
+import { getBotLogins } from '~/batch/db/queries'
 import { createFetcher } from '~/batch/github/fetcher'
 import type { ShapedGitHubPullRequest } from '~/batch/github/model'
 import { buildPullRequests } from '~/batch/github/pullrequest'
@@ -161,15 +162,18 @@ export const action = async ({
         timelineItems,
       })
 
-      // 4. Get organization settings for build config
-      const settings = await getOrganizationSettings(organization.id)
+      // 4. Get organization settings and bot logins for build config
+      const [settings, botLogins] = await Promise.all([
+        getOrganizationSettings(organization.id),
+        getBotLogins(organization.id),
+      ])
 
       // 5. Build pull request data (analyze)
       const result = await buildPullRequests(
         {
           organizationId: organization.id,
           repositoryId,
-          excludedUsers: settings?.excludedUsers ?? '',
+          botLogins,
           releaseDetectionMethod: settings?.releaseDetectionMethod ?? 'branch',
           releaseDetectionKey: settings?.releaseDetectionKey ?? '',
         },

diff --git a/app/routes/$orgSlug/settings/repositories/$repository/$pull/queries.server.ts b/app/routes/$orgSlug/settings/repositories/$repository/$pull/queries.server.ts
@@ -59,7 +59,7 @@ export const getOrganizationSettings = async (
   const tenantDb = getTenantDb(organizationId)
   return await tenantDb
     .selectFrom('organizationSettings')
-    .select(['releaseDetectionMethod', 'releaseDetectionKey', 'excludedUsers'])
+    .select(['releaseDetectionMethod', 'releaseDetectionKey'])
     .executeTakeFirst()
 }
 

diff --git a/app/services/jobs/analyze-worker.ts b/app/services/jobs/analyze-worker.ts
@@ -17,7 +17,7 @@ interface WorkerInput {
   repositoryId: string
   releaseDetectionMethod: string
   releaseDetectionKey: string
-  excludedUsers: string
+  botLogins: string[]
   filterPrNumbers?: number[]
 }
 
@@ -47,7 +47,7 @@ const result: Awaited<ReturnType<typeof buildPullRequests>> =
       repositoryId: input.repositoryId,
       releaseDetectionMethod: input.releaseDetectionMethod,
       releaseDetectionKey: input.releaseDetectionKey,
-      excludedUsers: input.excludedUsers,
+      botLogins: new Set(input.botLogins),
     },
     await store.loader.pullrequests(),
     store.loader,

diff --git a/app/services/jobs/crawl.server.ts b/app/services/jobs/crawl.server.ts
@@ -34,6 +34,7 @@ export const crawlJob = defineJob({
       }
       return {
         organizationSetting: org.organizationSetting,
+        botLogins: org.botLogins,
         repositories: org.repositories,
         exportSetting: org.exportSetting,
       }

diff --git a/app/services/jobs/recalculate.server.ts b/app/services/jobs/recalculate.server.ts
@@ -31,6 +31,7 @@ export const recalculateJob = defineJob({
       }
       return {
         organizationSetting: org.organizationSetting,
+        botLogins: org.botLogins,
         repositories: org.repositories,
         exportSetting: org.exportSetting,
       }

diff --git a/app/services/jobs/run-in-worker.ts b/app/services/jobs/run-in-worker.ts
@@ -7,7 +7,7 @@ interface AnalyzeWorkerInput {
   repositoryId: string
   releaseDetectionMethod: string
   releaseDetectionKey: string
-  excludedUsers: string
+  botLogins: string[]
   filterPrNumbers?: number[]
 }
 

diff --git a/app/services/jobs/shared-steps.server.ts b/app/services/jobs/shared-steps.server.ts
@@ -30,8 +30,9 @@ interface AnalyzeResult {
 interface OrganizationData {
   organizationSetting: Pick<
     Selectable<TenantDB.OrganizationSettings>,
-    'releaseDetectionMethod' | 'releaseDetectionKey' | 'excludedUsers'
+    'releaseDetectionMethod' | 'releaseDetectionKey'
   >
+  botLogins: string[]
   repositories: Selectable<TenantDB.Repositories>[]
   exportSetting?: Selectable<TenantDB.ExportSettings> | null
 }
@@ -127,7 +128,7 @@ export async function analyzeAndFinalizeSteps(
               repo.releaseDetectionMethod ?? orgSetting.releaseDetectionMethod,
             releaseDetectionKey:
               repo.releaseDetectionKey ?? orgSetting.releaseDetectionKey,
-            excludedUsers: orgSetting.excludedUsers,
+            botLogins: organization.botLogins,
             filterPrNumbers: prNumbers ? [...prNumbers] : undefined,
           },
           {

diff --git a/app/services/tenant-type.ts b/app/services/tenant-type.ts
@@ -70,7 +70,6 @@ export interface Integrations {
 
 export interface OrganizationSettings {
   createdAt: Generated<string>;
-  excludedUsers: Generated<string>;
   id: string;
   isActive: Generated<0 | 1>;
   language: Generated<"en" | "ja">;

diff --git a/batch/db/mutations.ts b/batch/db/mutations.ts
@@ -5,6 +5,18 @@ import type { OrganizationId } from '~/app/types/organization'
 import type { AnalyzedReview, AnalyzedReviewer } from '../github/types'
 import { logger } from '../helper/logger'
 
+/** GitHub API で [bot] 接尾辞なしで記録される well-known bot (lowercase) */
+const KNOWN_BOTS = new Set([
+  'copilot',
+  'copilot-pull-request-reviewer',
+  'copilot-swe-agent',
+  'github-actions',
+  'dependabot',
+  'renovate',
+  'coderabbitai',
+  'devin-ai-integration',
+])
+
 export function upsertPullRequest(
   organizationId: OrganizationId,
   data: Insertable<TenantDB.PullRequests>,
@@ -240,6 +252,7 @@ export async function upsertCompanyGithubUsers(
       uniqueLogins.map((login) => ({
         login,
         displayName: login,
+        type: KNOWN_BOTS.has(login) ? 'Bot' : null,
         isActive: 0,
         updatedAt: now,
       })),

diff --git a/batch/db/queries.ts b/batch/db/queries.ts
@@ -14,56 +14,74 @@ export const getPullRequestReport = async (organizationId: OrganizationId) => {
 
 async function getTenantData(organizationId: OrganizationId) {
   const tenantDb = getTenantDb(organizationId)
-  const [organizationSetting, integration, repositories, exportSetting] =
-    await Promise.all([
-      tenantDb
-        .selectFrom('organizationSettings')
-        .select([
-          'releaseDetectionMethod',
-          'releaseDetectionKey',
-          'isActive',
-          'excludedUsers',
-        ])
-        .executeTakeFirst(),
-      tenantDb
-        .selectFrom('integrations')
-        .select(['id', 'method', 'provider', 'privateToken'])
-        .executeTakeFirst(),
-      tenantDb
-        .selectFrom('repositories')
-        .select([
-          'id',
-          'repo',
-          'owner',
-          'integrationId',
-          'provider',
-          'releaseDetectionKey',
-          'releaseDetectionMethod',
-          'teamId',
-          'updatedAt',
-          'createdAt',
-        ])
-        .execute(),
-      tenantDb
-        .selectFrom('exportSettings')
-        .select([
-          'id',
-          'sheetId',
-          'clientEmail',
-          'privateKey',
-          'updatedAt',
-          'createdAt',
-        ])
-        .executeTakeFirst(),
-    ])
+  const [
+    organizationSetting,
+    integration,
+    repositories,
+    exportSetting,
+    botLoginRows,
+  ] = await Promise.all([
+    tenantDb
+      .selectFrom('organizationSettings')
+      .select(['releaseDetectionMethod', 'releaseDetectionKey', 'isActive'])
+      .executeTakeFirst(),
+    tenantDb
+      .selectFrom('integrations')
+      .select(['id', 'method', 'provider', 'privateToken'])
+      .executeTakeFirst(),
+    tenantDb
+      .selectFrom('repositories')
+      .select([
+        'id',
+        'repo',
+        'owner',
+        'integrationId',
+        'provider',
+        'releaseDetectionKey',
+        'releaseDetectionMethod',
+        'teamId',
+        'updatedAt',
+        'createdAt',
+      ])
+      .execute(),
+    tenantDb
+      .selectFrom('exportSettings')
+      .select([
+        'id',
+        'sheetId',
+        'clientEmail',
+        'privateKey',
+        'updatedAt',
+        'createdAt',
+      ])
+      .executeTakeFirst(),
+    tenantDb
+      .selectFrom('companyGithubUsers')
+      .select('login')
+      .where('type', '=', 'Bot')
+      .execute(),
+  ])
   return {
     organizationSetting: organizationSetting ?? null,
     integration: integration ?? null,
     repositories,
     exportSetting: exportSetting ?? null,
+    botLogins: botLoginRows.map((r) => r.login),
   }
 }
 
+export async function getBotLogins(
+  organizationId: OrganizationId,
+): Promise<Set<string>> {
+  const tenantDb = getTenantDb(organizationId)
+  const rows = await tenantDb
+    .selectFrom('companyGithubUsers')
+    .select('login')
+    .where('type', '=', 'Bot')
+    .execute()
+  return new Set(rows.map((r) => r.login))
+}
+
 export const listAllOrganizations = async () => {
   const orgs = await db
     .selectFrom('organizations')

diff --git a/batch/github/__tests__/buildPullRequests-filter.test.ts b/batch/github/__tests__/buildPullRequests-filter.test.ts
@@ -206,7 +206,7 @@ const config = {
   repositoryId: 'repo-1',
   releaseDetectionMethod: 'branch',
   releaseDetectionKey: 'main',
-  excludedUsers: '',
+  botLogins: new Set<string>(),
 }
 
 // --- テスト ---

diff --git a/batch/github/pullrequest.ts b/batch/github/pullrequest.ts
@@ -31,9 +31,6 @@ import type {
   PullRequestLoaders,
 } from './types'
 
-// デフォルトで除外するユーザー (GitHub API で [bot] 接尾辞なしで記録されるbot)
-const DEFAULT_EXCLUDED_USERS = ['Copilot']
-
 /** PR に関連するアーティファクトの型 */
 interface PrArtifacts {
   commits: ShapedGitHubCommit[]
@@ -55,7 +52,7 @@ interface BuildConfig {
   repositoryId: string
   releaseDetectionMethod: string
   releaseDetectionKey: string
-  excludedUsers: string
+  botLogins: Set<string>
 }
 
 const nullOrDate = (dateStr?: Date | string | null) => {
@@ -82,21 +79,21 @@ async function loadPrArtifacts(
 function filterActors(
   artifacts: PrArtifacts,
   pr: ShapedGitHubPullRequest,
-  excludedUsers: string[],
+  botLogins: Set<string>,
 ): PrArtifacts {
   return {
     commits: artifacts.commits,
     reviews: artifacts.reviews.filter(
       (r) =>
         !r.isBot &&
         r.user !== pr.author &&
-        !excludedUsers.includes(r.user ?? ''),
+        !botLogins.has((r.user ?? '').toLowerCase()),
     ),
     discussions: artifacts.discussions.filter(
       (d) =>
         !d.isBot &&
         d.user !== pr.author &&
-        !excludedUsers.includes(d.user ?? ''),
+        !botLogins.has((d.user ?? '').toLowerCase()),
     ),
   }
 }
@@ -188,13 +185,6 @@ export const buildPullRequests = async (
   loaders: PullRequestLoaders,
   filterPrNumbers?: Set<number>,
 ) => {
-  // カンマ区切りの除外ユーザーリストをパース
-  const customExcludedUsers = config.excludedUsers
-    .split(',')
-    .map((u) => u.trim())
-    .filter((u) => u.length > 0)
-  const excludedUsers = [...DEFAULT_EXCLUDED_USERS, ...customExcludedUsers]
-
   // リリース日ルックアップを事前構築
   // 注: filterPrNumbers に関係なく全 PR から構築する（リリースPR自体がフィルタ外でも必要）
   let branchReleaseLookup: Map<number, string> | null = null
@@ -234,7 +224,7 @@ export const buildPullRequests = async (
       const rawArtifacts = await loadPrArtifacts(pr, loaders)
 
       // 2. アクター除外フィルタ（純粋関数）
-      const artifacts = filterActors(rawArtifacts, pr, excludedUsers)
+      const artifacts = filterActors(rawArtifacts, pr, config.botLogins)
 
       // 3. レビューレスポンス解析
       reviewResponses.push(