@ikie-dev/cli 9.8.7 → 9.9.0

package/.ikie/ferments/019f2b8e-9974-700e-b045-cc2244e4d691/reviews/phase-phase-1-1.json

@@ -0,0 +1,62 @@
+{
+  "schemaVersion": 1,
+  "fermentId": "019f2b8e-9974-700e-b045-cc2244e4d691",
+  "phaseId": "phase-1",
+  "phaseName": "Phase 1",
+  "attempt": 1,
+  "timestamp": "2026-07-04T05:16:33.545Z",
+  "goal": "Build 1",
+  "summary": "phase done",
+  "stepSummaries": "  1. Step 1 [done]",
+  "diffAvailable": false,
+  "flags": [],
+  "derivedGrade": "A",
+  "reviewerRationale": "All gates pass; project checks validate.",
+  "gateVerdicts": [
+    {
+      "id": "F1",
+      "verdict": "pass",
+      "rationale": "All step verifications were real.",
+      "evidence": "step-1 used smoke"
+    },
+    {
+      "id": "F2",
+      "verdict": "pass",
+      "rationale": "Phase goal delivered.",
+      "evidence": "feature.ts:1-40"
+    },
+    {
+      "id": "F3",
+      "verdict": "pass",
+      "rationale": "Nothing deferred.",
+      "evidence": "n/a"
+    }
+  ],
+  "projectChecks": {
+    "discovered": true,
+    "anyFailed": false,
+    "commands": [
+      {
+        "kind": "test",
+        "command": "npm test",
+        "exitCode": 0,
+        "durationMs": 0,
+        "timedOut": false
+      },
+      {
+        "kind": "lint",
+        "command": "npm run lint",
+        "exitCode": 0,
+        "durationMs": 0,
+        "timedOut": false
+      },
+      {
+        "kind": "typecheck",
+        "command": "npm run typecheck",
+        "exitCode": 0,
+        "durationMs": 0,
+        "timedOut": false
+      }
+    ]
+  }
+}

package/.ikie/ferments/019f2b8e-9974-700e-b045-cc2244e4d691/runtime.json

@@ -0,0 +1,9 @@
+{
+  "schemaVersion": 1,
+  "stepStartCounts": {},
+  "blockRetries": {},
+  "lastBlockHashes": {},
+  "stepCompleteAttempts": {},
+  "phaseStartRefs": {},
+  "stepStartRefs": {}
+}

package/package.json

@@ -1,126 +1,104 @@
 {
-	"name": "@ikie-dev/cli",
-	"version": "9.8.7",
-	"description": "ikie \u2014 a coding agent CLI powered by ikie AI",
-	"type": "module",
-	"license": "Apache-2.0",
-	"bin": {
-		"ikie-cli": "src/entry.ts"
-	},
-	"scripts": {
-		"clean": "rm -rf dist",
-		"build": "tsc --noEmit && node scripts/copy-resources.js --dev",
-		"build:proxy-helper": "node scripts/build-proxy-helper.js",
-		"build:binary": "node scripts/build-binary.js",
-		"install:local": "node scripts/install-local.js",
-		"build:binary-linux-arm64": "node scripts/build-binary.js --target linux-arm64",
-		"build:binary-linux-x64": "node scripts/build-binary.js --target linux-x64",
-		"build:binary-windows-x64": "node scripts/build-binary.js --target windows-x64",
-		"dev": "make -C tools/proxy-helper/ copy-for-dev && bun run --preload ./src/set-package-dir.ts src/entry.ts",
-		"dev:overlay": "scripts/dev-overlay.sh",
-		"dev:setup": "bun run --preload ./src/set-package-dir.ts src/entry.ts setup",
-		"lint": "biome check src/ scripts/",
-		"lint:fix": "biome check --write src/ scripts/",
-		"typecheck": "tsc --noEmit",
-		"check": "pnpm run lint && pnpm run typecheck",
-		"test": "vitest run --dir src",
-		"test:smoke": "vitest run --config tests/smoke/vitest.config.ts",
-		"test:e2e:tui": "pnpm run build:binary && node scripts/run-tui-e2e.js",
-		"test:e2e:tui:debug": "pnpm run build:binary && node scripts/run-tui-e2e.js --debug",
-		"test:e2e:tui:trace": "pnpm run build:binary && node scripts/run-tui-e2e.js --trace",
-		"test:e2e:tui:trace:replay": "node scripts/run-tui-e2e.js replay",
-		"test:e2e:acp": "pnpm run build:binary && vitest run --config tests/e2e/acp/vitest.config.ts",
-		"prepublishOnly": "node scripts/prepublish-npm.js",
-		"postinstall": "node scripts/patch-pi-ai-oauth.js",
-		"prepare": "husky",
-		"verify": "pnpm run check && pnpm run build:binary && pnpm run test && pnpm run test:smoke"
-	},
-	"piConfig": {
-		"name": "ikie",
-		"configDir": ".config/ikie/harness"
-	},
-	"dependencies": {
-		"@agentclientprotocol/sdk": "0.19.2",
-		"@clack/prompts": "^1.3.0",
-		"@earendil-works/pi-ai": "0.78.1",
-		"@earendil-works/pi-coding-agent": "0.78.1",
-		"@earendil-works/pi-tui": "0.78.1",
-		"@mixmark-io/domino": "^2.2.0",
-		"@modelcontextprotocol/ext-apps": "^1.7.1",
-		"@modelcontextprotocol/sdk": "^1.29.0",
-		"@shikijs/cli": "^4.0.2",
-		"@types/diff": "^8.0.0",
-		"@types/proper-lockfile": "^4.1.4",
-		"@types/ssh2": "^1.15.5",
-		"@xterm/headless": "^6.0.0",
-		"diff": "^9.0.0",
-		"micromatch": "^4.0.8",
-		"open": "^10.2.0",
-		"proper-lockfile": "^4.1.2",
-		"shell-quote": "^1.8.3",
-		"shiki": "^4.0.2",
-		"ssh2": "^1.17.0",
-		"tar": "^7.5.15",
-		"turndown": "^7.2.4",
-		"undici": "^8.2.0",
-		"uuid": "^14.0.0",
-		"wcwidth": "^1.0.1",
-		"ws": "^8.20.1",
-		"yaml": "^2.8.4",
-		"zod": "^4.4.3"
-	},
-	"peerDependencies": {
-		"typebox": "*"
-	},
-	"optionalDependencies": {
-		"@mariozechner/clipboard-darwin-arm64": "0.3.6",
-		"@mariozechner/clipboard-darwin-universal": "0.3.6",
-		"@mariozechner/clipboard-darwin-x64": "0.3.6",
-		"@mariozechner/clipboard-linux-arm64-gnu": "0.3.6",
-		"@mariozechner/clipboard-linux-arm64-musl": "0.3.6",
-		"@mariozechner/clipboard-linux-x64-gnu": "0.3.6",
-		"@mariozechner/clipboard-linux-x64-musl": "0.3.6",
-		"@mariozechner/clipboard-win32-arm64-msvc": "0.3.6",
-		"@mariozechner/clipboard-win32-x64-msvc": "0.3.6"
-	},
-	"devDependencies": {
-		"@biomejs/biome": "^1.9.4",
-		"@microsoft/tui-test": "0.0.4",
-		"@types/micromatch": "^4.0.10",
-		"@types/node": "^22.19.18",
-		"@types/shell-quote": "^1.7.5",
-		"@types/tar": "^7.0.87",
-		"@types/turndown": "^5.0.6",
-		"@types/ws": "^8.18.1",
-		"husky": "^9.1.7",
-		"node-pty": "^1.1.0",
-		"playwright": "^1.59.1",
-		"supports-color": "^10.2.2",
-		"tsx": "^4.21.0",
-		"typescript": "^5.9.3",
-		"vitest": "^3.2.4"
-	},
-	"engines": {
-		"node": ">=22.0.0"
-	},
-	"packageManager": "pnpm@10.8.1",
-	"pnpm": {
-		"onlyBuiltDependencies": [
-			"@biomejs/biome",
-			"esbuild",
-			"koffi",
-			"node-pty",
-			"protobufjs"
-		],
-		"ignoredOptionalDependencies": [
-			"cpu-features",
-			"nan"
-		],
-		"patchedDependencies": {
-			"@earendil-works/pi-tui": "patches/@earendil-works__pi-tui.patch",
-			"playwright-core@1.59.1": "patches/playwright-core@1.59.1.patch",
-			"@earendil-works/pi-ai@0.78.1": "patches/@earendil-works__pi-ai@0.78.1.patch",
-			"@earendil-works/pi-coding-agent@0.78.1": "patches/@earendil-works__pi-coding-agent@0.78.1.patch"
-		}
-	}
-}
+  "name": "@ikie-dev/cli",
+  "version": "9.9.0",
+  "description": "ikie — a coding agent CLI powered by ikie AI",
+  "type": "module",
+  "license": "Apache-2.0",
+  "bin": {
+    "ikie-cli": "src/entry.ts"
+  },
+  "piConfig": {
+    "name": "ikie",
+    "configDir": ".config/ikie/harness"
+  },
+  "dependencies": {
+    "@agentclientprotocol/sdk": "0.19.2",
+    "@clack/prompts": "^1.3.0",
+    "@earendil-works/pi-ai": "0.78.1",
+    "@earendil-works/pi-coding-agent": "0.78.1",
+    "@earendil-works/pi-tui": "0.78.1",
+    "@mixmark-io/domino": "^2.2.0",
+    "@modelcontextprotocol/ext-apps": "^1.7.1",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@shikijs/cli": "^4.0.2",
+    "@types/diff": "^8.0.0",
+    "@types/proper-lockfile": "^4.1.4",
+    "@types/ssh2": "^1.15.5",
+    "@xterm/headless": "^6.0.0",
+    "diff": "^9.0.0",
+    "micromatch": "^4.0.8",
+    "open": "^10.2.0",
+    "proper-lockfile": "^4.1.2",
+    "shell-quote": "^1.8.3",
+    "shiki": "^4.0.2",
+    "ssh2": "^1.17.0",
+    "tar": "^7.5.15",
+    "turndown": "^7.2.4",
+    "undici": "^8.2.0",
+    "uuid": "^14.0.0",
+    "wcwidth": "^1.0.1",
+    "ws": "^8.20.1",
+    "yaml": "^2.8.4",
+    "zod": "^4.4.3"
+  },
+  "peerDependencies": {
+    "typebox": "*"
+  },
+  "optionalDependencies": {
+    "@mariozechner/clipboard-darwin-arm64": "0.3.6",
+    "@mariozechner/clipboard-darwin-universal": "0.3.6",
+    "@mariozechner/clipboard-darwin-x64": "0.3.6",
+    "@mariozechner/clipboard-linux-arm64-gnu": "0.3.6",
+    "@mariozechner/clipboard-linux-arm64-musl": "0.3.6",
+    "@mariozechner/clipboard-linux-x64-gnu": "0.3.6",
+    "@mariozechner/clipboard-linux-x64-musl": "0.3.6",
+    "@mariozechner/clipboard-win32-arm64-msvc": "0.3.6",
+    "@mariozechner/clipboard-win32-x64-msvc": "0.3.6"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^1.9.4",
+    "@microsoft/tui-test": "0.0.4",
+    "@types/micromatch": "^4.0.10",
+    "@types/node": "^22.19.18",
+    "@types/shell-quote": "^1.7.5",
+    "@types/tar": "^7.0.87",
+    "@types/turndown": "^5.0.6",
+    "@types/ws": "^8.18.1",
+    "husky": "^9.1.7",
+    "node-pty": "^1.1.0",
+    "playwright": "^1.59.1",
+    "supports-color": "^10.2.2",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3",
+    "vitest": "^3.2.4"
+  },
+  "engines": {
+    "node": ">=22.0.0"
+  },
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build": "tsc --noEmit && node scripts/copy-resources.js --dev",
+    "build:proxy-helper": "node scripts/build-proxy-helper.js",
+    "build:binary": "node scripts/build-binary.js",
+    "install:local": "node scripts/install-local.js",
+    "build:binary-linux-arm64": "node scripts/build-binary.js --target linux-arm64",
+    "build:binary-linux-x64": "node scripts/build-binary.js --target linux-x64",
+    "build:binary-windows-x64": "node scripts/build-binary.js --target windows-x64",
+    "dev": "make -C tools/proxy-helper/ copy-for-dev && bun run --preload ./src/set-package-dir.ts src/entry.ts",
+    "dev:overlay": "scripts/dev-overlay.sh",
+    "dev:setup": "bun run --preload ./src/set-package-dir.ts src/entry.ts setup",
+    "lint": "biome check src/ scripts/",
+    "lint:fix": "biome check --write src/ scripts/",
+    "typecheck": "tsc --noEmit",
+    "check": "pnpm run lint && pnpm run typecheck",
+    "test": "vitest run --dir src",
+    "test:smoke": "vitest run --config tests/smoke/vitest.config.ts",
+    "test:e2e:tui": "pnpm run build:binary && node scripts/run-tui-e2e.js",
+    "test:e2e:tui:debug": "pnpm run build:binary && node scripts/run-tui-e2e.js --debug",
+    "test:e2e:tui:trace": "pnpm run build:binary && node scripts/run-tui-e2e.js --trace",
+    "test:e2e:tui:trace:replay": "node scripts/run-tui-e2e.js replay",
+    "test:e2e:acp": "pnpm run build:binary && vitest run --config tests/e2e/acp/vitest.config.ts",
+    "postinstall": "node scripts/patch-pi-ai-oauth.js",
+    "verify": "pnpm run check && pnpm run build:binary && pnpm run test && pnpm run test:smoke"
+  }
+}

package/scripts/prepublish-npm.js

@@ -6,7 +6,7 @@
 //   - src/core/export-html/<templates> (upstream pi-coding-agent looks there)
 //   - package.json at the package root
 
-import { cpSync, existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from "node:fs"
+import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs"
 import { dirname, join } from "node:path"
 import { fileURLToPath } from "node:url"
 

package/src/cli-auth/index.test.ts

@@ -7,14 +7,16 @@ const mockFetch = vi.fn()
 
 const DEFAULT_BASE = "https://ikie-cli.xyz"
 
-function deviceResponse(overrides: Partial<{
-	device_code: string
-	user_code: string
-	verification_uri: string
-	verification_uri_complete: string
-	expires_in: number
-	interval: number
-}> = {}) {
+function deviceResponse(
+	overrides: Partial<{
+		device_code: string
+		user_code: string
+		verification_uri: string
+		verification_uri_complete: string
+		expires_in: number
+		interval: number
+	}> = {},
+) {
 	return {
 		device_code: "dc-test-123",
 		user_code: "ABC-123",
@@ -91,8 +93,10 @@ describe("authenticateViaBrowser", () => {
 	})
 
 	it("throws when cancelled via signal", async () => {
-		mockFetch
-			.mockResolvedValueOnce({ ok: true, json: () => Promise.resolve(deviceResponse({ expires_in: 60000, interval: 0 })) })
+		mockFetch.mockResolvedValueOnce({
+			ok: true,
+			json: () => Promise.resolve(deviceResponse({ expires_in: 60000, interval: 0 })),
+		})
 
 		const ctrl = new AbortController()
 		const promise = authenticateViaBrowser({ quiet: true, signal: ctrl.signal })

package/src/extensions/agents/prompt/skill-loader.test.ts

@@ -38,4 +38,22 @@ describe("preloadSkills", () => {
 		expect(results[0].name).toBe("my-skill")
 		expect(results[0].content).toContain("This is the skill content.")
 	})
+
+	it("normalizes an invalid skill name before loading", () => {
+		const base = join(tmpdir(), `ikie-skill-test-${Date.now()}`)
+		const cwd = join(base, "project")
+
+		// Place skill at <cwd>/.pi/agent/skills (second entry in DEFAULT_SKILL_PATHS)
+		const skillDir = join(cwd, ".pi", "agent", "skills", "ckm:slides")
+		mkdirSync(skillDir, { recursive: true })
+		writeFileSync(
+			join(skillDir, "SKILL.md"),
+			"---\nname: ckm:slides\ndescription: slides skill\n---\nSlides skill body.",
+		)
+
+		const results = preloadSkills(["ckm-slides"], cwd)
+		expect(results).toHaveLength(1)
+		expect(results[0].name).toBe("ckm-slides")
+		expect(results[0].content).toContain("Slides skill body.")
+	})
 })

package/src/extensions/agents/prompt/skill-loader.ts

@@ -10,8 +10,11 @@ import { isAbsolute, join } from "node:path"
 import type { Skill } from "@earendil-works/pi-coding-agent"
 import { loadSkillsFromDir } from "@earendil-works/pi-coding-agent"
 import { DEFAULT_SKILL_PATHS } from "../../../config.js"
+import { createSkillSanitizer } from "../../skills-manager/skill-sanitizer.js"
 import { isUnsafeName } from "../memory/memory.js"
 
+const skillSanitizer = createSkillSanitizer()
+
 export interface PreloadedSkill {
 	name: string
 	content: string
@@ -44,7 +47,7 @@ export function preloadSkills(skillNames: string[], cwd: string): PreloadedSkill
 	const allSkills = new Map<string, Skill>()
 	for (const dir of resolvedPaths) {
 		try {
-			const { skills } = loadSkillsFromDir({ dir, source: dir })
+			const { skills } = loadSkillsFromDir({ dir: skillSanitizer.sanitizePath(dir), source: dir })
 			for (const skill of skills) {
 				// Later paths (higher priority) override earlier ones
 				allSkills.set(skill.name, skill)

package/src/extensions/prompt-construction/prompt-enrichment.test.ts

@@ -3,6 +3,7 @@ import { arch, version as osVersion, platform, release, tmpdir } from "node:os"
 import { join } from "node:path"
 import type { AssistantMessage, ToolResultMessage } from "@earendil-works/pi-ai"
 import type { ExtensionAPI, ToolInfo } from "@earendil-works/pi-coding-agent"
+import { loadSkillsFromDir } from "@earendil-works/pi-coding-agent"
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
 import * as config from "../../config.js"
 import type { ModelMetadata } from "../../models.js"
@@ -509,6 +510,46 @@ describe("prompt enrichment Claude Code skills", () => {
 
 		expect(result.systemPrompt).not.toContain("<name>typescript-safety</name>")
 	})
+
+	it("sanitizes project skill names and emits no name-validation diagnostics", async () => {
+		const cwd = join(dir, "project")
+		const skillDir = join(cwd, ".ikie", "skills", "ckm-slides")
+		writeRawSkill(
+			join(skillDir, "SKILL.md"),
+			`---
+name: ckm:slides
+description: Ikie project slides skill.
+---
+
+# Slides
+
+Slides skill body.
+`,
+		)
+
+		const { createSkillSanitizer } = await import("../skills-manager/skill-sanitizer.js")
+		const sanitizer = createSkillSanitizer()
+		const sanitizedDir = sanitizer.sanitizePath(skillDir)
+		const directLoad = loadSkillsFromDir({ dir: sanitizedDir, source: "project" })
+		const nameDiagnostics = directLoad.diagnostics.filter(
+			(d) => d.type === "warning" && typeof d.message === "string" && d.message.toLowerCase().includes("name"),
+		)
+		expect(nameDiagnostics).toEqual([])
+		expect(directLoad.skills.map((s) => s.name)).toContain("ckm-slides")
+		sanitizer.cleanup()
+
+		const { beforeAgentStart } = buildPromptExtensionWithHandlers([])
+		if (!beforeAgentStart) throw new Error("before_agent_start handler was not registered")
+
+		const result = (await beforeAgentStart(
+			{},
+			{ cwd, model: undefined, hasUI: false, sessionManager: { getSessionId: () => "session-1" } },
+		)) as { systemPrompt: string }
+
+		expect(result.systemPrompt).toContain("<available_skills>")
+		expect(result.systemPrompt).toContain("<name>ckm-slides</name>")
+		expect(result.systemPrompt).toContain("Ikie project slides skill.")
+	})
 })
 
 describe("append system prompt", () => {

package/src/extensions/prompt-construction/prompt-enrichment.ts

@@ -63,6 +63,7 @@ import {
 	splitModelRef,
 	validateModelRoles,
 } from "../orchestration/model-roles.js"
+import { createSkillSanitizer } from "../skills-manager/skill-sanitizer.js"
 import { getCurrentPhase } from "../tags.js"
 import { type ContextFile, loadGlobalContextFiles, loadProjectContextFiles } from "./context-files.js"
 import {
@@ -476,6 +477,8 @@ export default function (skillPaths: string[]) {
 		const cachedUsername = safeUsername()
 		const cachedHomeDir = homedir()
 
+		const skillSanitizer = createSkillSanitizer()
+
 		let cachedContextFiles: ContextFile[] | undefined
 		let cachedSkills: Skill[] | undefined
 		let cachedGitRemote: string | undefined | null = null
@@ -505,7 +508,7 @@ export default function (skillPaths: string[]) {
 				cachedSkills = loadSkills({
 					cwd: ctx.cwd,
 					agentDir: getAgentDir(),
-					skillPaths: allSkillPaths,
+					skillPaths: allSkillPaths.map((p) => skillSanitizer.sanitizePath(p)),
 					includeDefaults: false,
 				}).skills
 			}

package/src/extensions/skills-manager/skill-manager.test.ts

@@ -15,36 +15,53 @@ import {
 
 describe("validateName", () => {
 	const valid = (name: string) => expect(validateName(name)).toBeNull()
-	const invalid = (name: string, contains: string) => {
-		const result = validateName(name)
-		expect(result).not.toBeNull()
-		expect(result?.toLowerCase()).toContain(contains)
+	const invalid = (name: string) => {
+		expect(validateName(name)).not.toBeNull()
 	}
 
 	it("accepts valid names", () => {
+		valid("ckm-slides")
+		valid("ui-ux-pro-max")
 		valid("systematic-debugging")
-		valid("debug_v2")
-		valid("foo.bar")
 		valid("abc123")
 	})
 
-	it("rejects names starting with non-alphanumeric", () => {
-		invalid("-foo", "start")
-		invalid("_bar", "start")
+	it("rejects names with colons", () => {
+		invalid("ckm:slides")
+	})
+
+	it("rejects names with underscores", () => {
+		invalid("foo_bar")
+		invalid("debug_v2")
+	})
+
+	it("rejects names with dots", () => {
+		invalid("foo.bar")
+	})
+
+	it("rejects names with a leading hyphen", () => {
+		invalid("-bad")
+	})
+
+	it("rejects names with consecutive hyphens", () => {
+		invalid("bad--bad")
+	})
+
+	it("rejects names starting with an underscore", () => {
+		invalid("_bar")
 	})
 
 	it("rejects uppercase letters", () => {
-		invalid("Foo", "lowercase")
-		invalid("SYSTEM", "lowercase")
+		invalid("Foo")
+		invalid("SYSTEM")
 	})
 
 	it("rejects names longer than 64 chars", () => {
-		invalid("a".repeat(65), "64")
+		invalid("a".repeat(65))
 	})
 
 	it("rejects names with spaces", () => {
-		const result = validateName("foo bar")
-		expect(result).not.toBeNull()
+		invalid("foo bar")
 	})
 })
 

package/src/extensions/skills-manager/skill-manager.ts

@@ -44,23 +44,32 @@ export interface SkillManageResult {
 	path?: string
 }
 
-const NAME_RE = /^[a-z0-9][a-z0-9._-]*$/
+// Agent Skills spec: only lowercase a-z, 0-9, hyphens; no leading/trailing
+// hyphens; no consecutive hyphens; max 64 characters.
+const SKILL_NAME_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/
+// Category directory names are filesystem-side only, so they allow a broader
+// set of characters (dots, underscores) but still reject spaces and must
+// start with a lowercase letter or digit.
+const CATEGORY_RE = /^[a-z0-9][a-z0-9._-]*$/
 const MAX_NAME_LEN = 64
 const ALLOWED_SUBDIRS = new Set(["references", "templates", "scripts", "assets"])
 
 export function validateName(name: string): string | null {
 	if (name.length === 0) return "Name cannot be empty."
 	if (name.length > MAX_NAME_LEN) return `Name must be at most ${MAX_NAME_LEN} characters.`
-	if (!NAME_RE.test(name)) {
-		if (!/^[a-z0-9]/.test(name)) return "Name must start with a lowercase letter or digit."
-		return "Name must contain only lowercase letters, digits, dots, underscores, or hyphens."
+	if (!SKILL_NAME_RE.test(name)) {
+		return "Name must contain only lowercase letters, digits, and hyphens, with no leading or trailing hyphens or consecutive hyphens."
 	}
 	return null
 }
 
 export function validateCategory(category?: string): string | null {
 	if (!category) return null
-	return validateName(category)
+	if (category.length > MAX_NAME_LEN) return `Category must be at most ${MAX_NAME_LEN} characters.`
+	if (!CATEGORY_RE.test(category)) {
+		return "Category must start with a lowercase letter or digit and contain only lowercase letters, digits, dots, underscores, or hyphens."
+	}
+	return null
 }
 
 /**