fix: flatten skill symlinks, add SSLMODE, remove agent tool restrictions

viragtripathi · viragtripathi · commit a6aceb4e6ee6 · 2026-03-23T20:09:13.000-04:00
- Replace single deep skills/ symlink with 22 individual flat symlinks
  (Claude Code expects skills/&lt;name&gt;/SKILL.md, not 2-level nesting)
- Add COCKROACHDB_SSLMODE to .mcp.json env block
- Remove tools: allowlist from all 3 agents so they can call MCP tools
- Add sensible defaults to tools.yaml env vars for local development
- Remove mcpServers from plugin.json (auto-discovered from .mcp.json)
- Update submodule pointer
diff --git a/.mcp.json b/.mcp.json
@@ -8,7 +8,8 @@
         "COCKROACHDB_PORT": "${COCKROACHDB_PORT}",
         "COCKROACHDB_USER": "${COCKROACHDB_USER}",
         "COCKROACHDB_PASSWORD": "${COCKROACHDB_PASSWORD}",
-        "COCKROACHDB_DATABASE": "${COCKROACHDB_DATABASE}"
+        "COCKROACHDB_DATABASE": "${COCKROACHDB_DATABASE}",
+        "COCKROACHDB_SSLMODE": "${COCKROACHDB_SSLMODE}"
       }
     }
   }
diff --git a/agents/cockroachdb-dba.md b/agents/cockroachdb-dba.md
@@ -1,7 +1,6 @@
 ---
 name: cockroachdb-dba
 description: CockroachDB database administration agent. Use when diagnosing performance issues, reviewing schema designs, analyzing query plans, troubleshooting cluster problems, or planning multi-region deployments. This agent has deep knowledge of CockroachDB distributed SQL internals.
-tools: Read, Grep, Glob, LS, Bash, WebFetch, TodoWrite
 model: sonnet
 color: green
 ---
diff --git a/agents/cockroachdb-developer.md b/agents/cockroachdb-developer.md
@@ -1,7 +1,6 @@
 ---
 name: cockroachdb-developer
 description: CockroachDB application developer agent. Use when building applications on CockroachDB, configuring ORMs/drivers, implementing transaction retry logic, optimizing queries, designing schemas for distributed SQL, or migrating from PostgreSQL/Oracle. Deep knowledge of JPA/Hibernate, Spring, JDBC, and multi-language driver patterns.
-tools: Read, Grep, Glob, LS, Bash, WebFetch, TodoWrite
 model: sonnet
 color: blue
 ---
diff --git a/agents/cockroachdb-operator.md b/agents/cockroachdb-operator.md
@@ -1,7 +1,6 @@
 ---
 name: cockroachdb-operator
 description: CockroachDB operator and SRE agent. Use when managing cluster operations, monitoring, alerting, incident response, backup/restore, scaling, version upgrades, node maintenance, changefeed management, or troubleshooting performance and availability issues. Based on the official CockroachDB runbook template.
-tools: Read, Grep, Glob, LS, Bash, WebFetch, TodoWrite
 model: sonnet
 color: red
 ---
diff --git a/skills b/skills
diff --git a/skills/analyzing-range-distribution b/skills/analyzing-range-distribution
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/analyzing-range-distribution/
diff --git a/skills/analyzing-schema-change-storage-risk b/skills/analyzing-schema-change-storage-risk
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/analyzing-schema-change-storage-risk/
diff --git a/skills/auditing-cloud-cluster-security b/skills/auditing-cloud-cluster-security
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/auditing-cloud-cluster-security/
diff --git a/skills/auditing-table-statistics b/skills/auditing-table-statistics
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/auditing-table-statistics/
diff --git a/skills/cockroachdb-sql b/skills/cockroachdb-sql
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/query-and-schema-design/cockroachdb-sql/
diff --git a/skills/configuring-audit-logging b/skills/configuring-audit-logging
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/configuring-audit-logging/
diff --git a/skills/configuring-ip-allowlists b/skills/configuring-ip-allowlists
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/configuring-ip-allowlists/
diff --git a/skills/configuring-log-export b/skills/configuring-log-export
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/configuring-log-export/
diff --git a/skills/configuring-private-connectivity b/skills/configuring-private-connectivity
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/configuring-private-connectivity/
diff --git a/skills/configuring-sso-and-scim b/skills/configuring-sso-and-scim
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/configuring-sso-and-scim/
diff --git a/skills/enabling-cmek-encryption b/skills/enabling-cmek-encryption
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/enabling-cmek-encryption/
diff --git a/skills/enforcing-password-policies b/skills/enforcing-password-policies
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/enforcing-password-policies/
diff --git a/skills/hardening-user-privileges b/skills/hardening-user-privileges
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/hardening-user-privileges/
diff --git a/skills/managing-tls-certificates b/skills/managing-tls-certificates
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/managing-tls-certificates/
diff --git a/skills/molt-fetch b/skills/molt-fetch
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/onboarding-and-migrations/molt-fetch/
diff --git a/skills/molt-replicator b/skills/molt-replicator
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/onboarding-and-migrations/molt-replicator/
diff --git a/skills/molt-verify b/skills/molt-verify
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/onboarding-and-migrations/molt-verify/
diff --git a/skills/monitoring-background-jobs b/skills/monitoring-background-jobs
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/monitoring-background-jobs/
diff --git a/skills/preparing-compliance-documentation b/skills/preparing-compliance-documentation
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/security-and-governance/preparing-compliance-documentation/
diff --git a/skills/profiling-statement-fingerprints b/skills/profiling-statement-fingerprints
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/profiling-statement-fingerprints/
diff --git a/skills/profiling-transaction-fingerprints b/skills/profiling-transaction-fingerprints
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/profiling-transaction-fingerprints/
diff --git a/skills/triaging-live-sql-activity b/skills/triaging-live-sql-activity
@@ -0,0 +1 @@
+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/triaging-live-sql-activity/
diff --git a/submodules/cockroachdb-skills b/submodules/cockroachdb-skills
@@ -1 +1 @@
-Subproject commit 713be3f6921bcd35d243286c1a10f85cce95997b
+Subproject commit 57ea9b41ebf5f3f8287696f179dd4ed5027398d1
diff --git a/tools.yaml b/tools.yaml
@@ -1,19 +1,19 @@
 kind: sources
 name: crdb-source
 type: cockroachdb
-host: ${COCKROACHDB_HOST}
+host: "${COCKROACHDB_HOST:localhost}"
 port: "${COCKROACHDB_PORT:26257}"
-database: ${COCKROACHDB_DATABASE}
-user: ${COCKROACHDB_USER}
-password: ${COCKROACHDB_PASSWORD}
+database: "${COCKROACHDB_DATABASE:defaultdb}"
+user: "${COCKROACHDB_USER:root}"
+password: "${COCKROACHDB_PASSWORD:}"
 maxRetries: 5
 retryBaseDelay: 500ms
 readOnlyMode: true
 enableWriteMode: false
 maxRowLimit: 1000
 queryTimeoutSec: 30
 queryParams:
-  sslmode: ${COCKROACHDB_SSLMODE:require}
+  sslmode: "${COCKROACHDB_SSLMODE:require}"
   application_name: cockroachdb-claude-plugin
 
 ---

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`"COCKROACHDB_PORT": "${COCKROACHDB_PORT}",`
`9`	`9`	`"COCKROACHDB_USER": "${COCKROACHDB_USER}",`
`10`	`10`	`"COCKROACHDB_PASSWORD": "${COCKROACHDB_PASSWORD}",`
`11`		`- "COCKROACHDB_DATABASE": "${COCKROACHDB_DATABASE}"`
	`11`	`+ "COCKROACHDB_DATABASE": "${COCKROACHDB_DATABASE}",`
	`12`	`+ "COCKROACHDB_SSLMODE": "${COCKROACHDB_SSLMODE}"`
`12`	`13`	`}`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../submodules/cockroachdb-skills/skills/observability-and-diagnostics/analyzing-range-distribution/`