From e9e9f1b6916c1d2619c51794d84a30d086732e43 Mon Sep 17 00:00:00 2001
From: David Soria Parra <davidsp@anthropic.com>
Date: Thu, 10 Sep 2026 09:00:59 +0900
Subject: [PATCH] Unblock deploys: follow ext-skills repo rename and fix #168
 fallout

Deploys have failed since #178 because experimental-ext-skills was renamed
to ext-skills on GitHub and the stale RepositoryCollaborators state 404s on
update. Point config at the new name and drop the old resource from state
before 'make up' (same approach as #126; remove after one green deploy).

#168 also referenced SKILLS_OVER_MCP_IG, which #170 had renamed to
SKILLS_OVER_MCP_WG, and left tobi-oye out of sort order, breaking tsc and
'npm run check'.
---
 .github/workflows/deploy.yml |  3 +++
 src/config/repoAccess.ts     |  2 +-
 src/config/users.ts          | 11 +++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e93fe79..2234331 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -70,6 +70,9 @@ jobs:
           echo "$PULUMI_PASSPHRASE" > passphrase.prod.txt
           export PULUMI_CONFIG_PASSPHRASE_FILE=passphrase.prod.txt
           pulumi login gs://mcp-access-prod-pulumi-state
+          # TEMP: drop stale state for renamed repo (experimental-ext-skills -> ext-skills).
+          # Delete-on-up 404s because the old repo name is gone. Remove after one successful deploy.
+          pulumi state delete 'urn:pulumi:prod::mcp-access::github:index/repositoryCollaborators:RepositoryCollaborators::repo-experimental-ext-skills' --stack prod --yes || true
           pulumi config set discord:guildId "$DISCORD_GUILD_ID" --stack prod
           pulumi config set discord:botToken "$DISCORD_BOT_TOKEN" --secret --stack prod
           pulumi config set githubBillingEmail "$ORG_BILLING_EMAIL" --secret --stack prod
diff --git a/src/config/repoAccess.ts b/src/config/repoAccess.ts
index 3fe85b4..cf9e3bb 100644
--- a/src/config/repoAccess.ts
+++ b/src/config/repoAccess.ts
@@ -340,7 +340,7 @@ export const REPOSITORY_ACCESS: RepositoryAccess[] = [
     ],
   },
   {
-    repository: 'experimental-ext-skills',
+    repository: 'ext-skills',
     teams: [
       { team: 'core-maintainers', permission: 'admin' },
       { team: 'moderators', permission: 'maintain' },
diff --git a/src/config/users.ts b/src/config/users.ts
index 0e5a92c..2ad49a6 100644
--- a/src/config/users.ts
+++ b/src/config/users.ts
@@ -863,16 +863,15 @@ export const MEMBERS: readonly Member[] = [
     github: 'tiginamaria',
     memberOf: [ROLE_IDS.KOTLIN_SDK],
   },
-  {
-
-    github: 'tobi-oye',
-    discord: '791307404293177354',
-    memberOf: [ROLE_IDS.SKILLS_OVER_MCP_IG],
-  },
   {
     github: 'tnorimat',
     memberOf: [ROLE_IDS.CONFORMANCE_AUTH],
   },
+  {
+    github: 'tobi-oye',
+    discord: '791307404293177354',
+    memberOf: [ROLE_IDS.SKILLS_OVER_MCP_WG],
+  },
   {
     github: 'tobinsouth',
     discord: '865072069779521556',