Revert "skills(cutover): move the objectui skill bundle into the root skills/ catalog, and point its readers at it (decision C, objectstack#25803)"

This reverts commit 19c9bce.

Decision C stands, its timing moves: inside the root catalog the bundle
meets three ratchets the cutover cannot pay for tonight without touching
Tier H surfaces beyond the import itself -- the published-skills token
ratchet (27 unpriced authored files, SKILL.md ceiling count 10 vs 11),
the reserved-word "role" docs ratchet (38 occurrences across 7 files,
ADR-0090 D3) and the ci-filter-parity self-test's skills/** input count.
The move lands as its own card after the import, with the ceilings, the
wording and the counts paid in that PR. Until then ui/skills/objectui
stays where objectui kept it; the next commit hides it from the root
skills CLI so the skills-catalog boundary (create-objectstack) holds.

Co-Authored-By: Claude <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RSDL3SFtJaKzcymvCD8RsU

Author: claude

packages/spec/scripts/check-skill-examples.ts

@@ -415,18 +415,7 @@ const DOCS_DIR = path.resolve(REPO_ROOT, 'content/docs');
 const SDK_DOCS_PAGES = ['api/client-sdk.mdx', 'kernel/runtime-services/data-service.mdx'];
 
 const SKILLS_DOCS_ROOTS: SourceRoot[] = [
-  {
-    dir: path.resolve(REPO_ROOT, 'skills'),
-    ext: '.md',
-    label: 'skills',
-    marker: '<!-- os:check -->',
-    // The objectui bundle joined this catalog at the cutover (objectstack#25803)
-    // with its own reading of the same marker: it marks `json` fences as well as
-    // `ts`/`tsx`, and compiles them against `@object-ui/*`. Its gate is
-    // `ui/scripts/check-skill-examples.mjs`, which still judges every marked fence
-    // in it; read here, its 70 `json` markers are orphans by this gate's rule.
-    exclude: [path.resolve(REPO_ROOT, 'skills/objectui')],
-  },
+  { dir: path.resolve(REPO_ROOT, 'skills'), ext: '.md', label: 'skills', marker: '<!-- os:check -->' },
   {
     dir: DOCS_DIR,
     ext: '.mdx',

scripts/check-skill-identifier-liveness.mjs

@@ -257,7 +257,7 @@ const HERE = dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = join(HERE, '..');
 
 const ROOTS = ['skills'];
-const IMPL_ROOTS = ['packages', 'ui/packages'];
+const IMPL_ROOTS = ['packages'];
 const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', 'build', 'coverage', '.turbo']);
 const EXTENSIONS = new Set(['.md']);
 const IMPL_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs', '.json']);

ui/content/docs/guide/agent-skills.md

@@ -7,7 +7,7 @@ description: "Install the ObjectUI Agent Skill into Claude Code, Cursor, Codex,
 
 ObjectUI ships an official **Agent Skill** — a structured bundle of rules, guides, and evals that teaches AI coding agents how to build pages, plugins, and integrations the *right* way (schema-first, no-touch zones respected, English-only, expression-aware).
 
-The skill is published on [skills.sh](https://skills.sh/objectstack-ai/objectui) and lives in [`skills/objectui/`](https://github.com/objectstack-ai/objectstack/tree/main/skills/objectui) inside this repository.
+The skill is published on [skills.sh](https://skills.sh/objectstack-ai/objectui) and lives in [`skills/objectui/`](https://github.com/objectstack-ai/objectui/tree/main/skills/objectui) inside this repository.
 
 [![skills.sh](https://skills.sh/b/objectstack-ai/objectui)](https://skills.sh/objectstack-ai/objectui)
 
@@ -103,4 +103,4 @@ The CLI is idempotent — running it again refreshes the local copy in place.
 
 ## Contributing
 
-The skill source lives in [`skills/objectui/`](https://github.com/objectstack-ai/objectstack/tree/main/skills/objectui). PRs are welcome — see [`skills/objectui/README.md`](https://github.com/objectstack-ai/objectstack/blob/main/skills/objectui/README.md) for the maintenance rules (guide ↔ eval naming, English-only, eval assertion format).
+The skill source lives in [`skills/objectui/`](https://github.com/objectstack-ai/objectui/tree/main/skills/objectui). PRs are welcome — see [`skills/objectui/README.md`](https://github.com/objectstack-ai/objectui/blob/main/skills/objectui/README.md) for the maintenance rules (guide ↔ eval naming, English-only, eval assertion format).

ui/packages/components/src/__tests__/skill-guide-data-table-binding.test.tsx

@@ -92,10 +92,6 @@ import type { DataSource } from '@object-ui/types';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(here, '../../../..');
-// The published skill bundle is in the objectstack monorepo's `skills/` catalog
-// since the cutover (decision C, objectstack#25803), one level above this tree,
-// so its `skills/objectui/...` paths are read from there.
-const skillsBase = path.resolve(repoRoot, '..');
 
 const GUIDES = {
   'skills/objectui/guides/schema-expressions.md': 'schema-expressions',
@@ -106,7 +102,7 @@ const GUIDES = {
 const GUIDE_PATHS = Object.keys(GUIDES) as (keyof typeof GUIDES)[];
 
 function readGuide(rel: string): string {
-  return fs.readFileSync(path.join(skillsBase, rel), 'utf8');
+  return fs.readFileSync(path.join(repoRoot, rel), 'utf8');
 }
 
 /**

ui/packages/components/src/__tests__/skill-guide-provider-envelope.test.tsx

@@ -81,11 +81,7 @@ import type { DataSource } from '@object-ui/types';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(here, '../../../..');
-// The published skill bundle is in the objectstack monorepo's `skills/` catalog
-// since the cutover (decision C, objectstack#25803), one level above this tree,
-// so its `skills/objectui/...` paths are read from there.
-const skillsBase = path.resolve(repoRoot, '..');
-const skillsRoot = path.join(skillsBase, 'skills/objectui');
+const skillsRoot = path.join(repoRoot, 'skills/objectui');
 
 // The DECLARED column keys (`TableColumn`: `header` + `accessorKey`). These
 // mirror the two published guides' `data-table` example, which is why they
@@ -127,15 +123,15 @@ function publishedFiles(): string[] {
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
       const full = path.join(dir, entry.name);
       if (entry.isDirectory()) walk(full);
-      else out.push(path.relative(skillsBase, full));
+      else out.push(path.relative(repoRoot, full));
     }
   };
   walk(skillsRoot);
   return out.sort();
 }
 
 function readSkillFile(rel: string): string {
-  return fs.readFileSync(path.join(skillsBase, rel), 'utf8');
+  return fs.readFileSync(path.join(repoRoot, rel), 'utf8');
 }
 
 describe('#5372 behaviour — a provider `dataSource` into a `data-table`', () => {

ui/packages/permissions/src/__tests__/skill-guide-permission-config.test.tsx

@@ -47,11 +47,7 @@ import { usePermissions } from '../usePermissions';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(here, '../../../..');
-// The published skill bundle is in the objectstack monorepo's `skills/` catalog
-// since the cutover (decision C, objectstack#25803), one level above this tree,
-// so its `skills/objectui/...` paths are read from there.
-const skillsBase = path.resolve(repoRoot, '..');
-const GUIDE = path.join(skillsBase, 'skills/objectui/guides/auth-permissions.md');
+const GUIDE = path.join(repoRoot, 'skills/objectui/guides/auth-permissions.md');
 
 // --- 8< --- guide example begin --- 8< ---
 // A role definition carries identity and inheritance only. Its grants live in
@@ -119,7 +115,7 @@ describe('objectui#4812 — the guide example is the shape the types declare', (
     const start = guide.findIndex((l) => l === want[0]);
     expect(
       start,
-      `first line of the pinned example not found in ${path.relative(skillsBase, GUIDE)}`,
+      `first line of the pinned example not found in ${path.relative(repoRoot, GUIDE)}`,
     ).toBeGreaterThan(-1);
     expect(guide.slice(start, start + want.length)).toEqual(want);
   });

ui/packages/types/src/__tests__/list-bind-only-11405.test.ts

@@ -63,10 +63,6 @@ const stripJsonComments: (source: string) => string = stripUntyped;
 /** Rooted at THIS file, never at `process.cwd()`. */
 const HERE = dirname(fileURLToPath(import.meta.url));
 const REPO_ROOT = resolve(HERE, '..', '..', '..', '..');
-// The published skill bundle is in the objectstack monorepo's `skills/` catalog
-// since the cutover (decision C, objectstack#25803), one level above this tree,
-// so its `skills/objectui/...` paths are read from there.
-const SKILLS_BASE = resolve(REPO_ROOT, '..');
 
 const GUIDES = [
   'skills/objectui/guides/data-integration.md',
@@ -137,7 +133,7 @@ type Fence = { guide: string; fenceLine: number; teachesWrong: boolean; node: Re
 function bindOnlyListFences(): Fence[] {
   const out: Fence[] = [];
   for (const guide of GUIDES) {
-    const { fences } = scanSkillFences(readFileSync(resolve(SKILLS_BASE, guide), 'utf8'));
+    const { fences } = scanSkillFences(readFileSync(resolve(REPO_ROOT, guide), 'utf8'));
     for (const fence of fences) {
       if (!fence.marked || fence.kind !== 'json') continue;
       // The marker's own gate already requires every marked fence to parse.

ui/scripts/__tests__/check-doc-json-fences.test.ts

@@ -33,7 +33,6 @@ import {
   FRAGMENT_MARKER as SNIPPET_FRAGMENT_MARKER,
   FRAGMENT_MARKER_EXAMPLES as SNIPPET_FRAGMENT_MARKER_EXAMPLES,
 } from '../check-doc-snippet-types.mjs';
-import { labelPath } from '../skill-bundle-root.mjs';
 import { packageReadmePages as familyPackageReadmes, ROOT_PAGES as FAMILY_ROOT_PAGES } from '../check-doc-component-types.mjs';
 // The sibling gate over the skill bundle — imported HERE, never by the gate: the
 // gate spells its opt-in line itself, and this file pins the two spellings equal.
@@ -434,7 +433,7 @@ describe('the scan surface — the published skill bundle (objectui#12204)', ()
     // Non-vacuous: the bundle carries declared counter-examples; none would make the loop below pass over nothing.
     expect(pages.size, 'no declared fragment under the bundle').toBeGreaterThan(0);
     for (const doc of pages) {
-      const scan = scanSkillFences(fs.readFileSync(labelPath(repoRoot, doc), 'utf8'));
+      const scan = scanSkillFences(fs.readFileSync(path.join(repoRoot, doc), 'utf8'));
       expect(scan.orphans, `${doc}: orphaned opt-in lines`).toEqual([]);
     }
   });

ui/scripts/__tests__/check-governed-queue-guard.test.ts

@@ -13,7 +13,6 @@ import {
   GOVERNED_SURFACES,
   governedPathsIn,
 } from '../check-governed-queue-guard.mjs';
-import { skillBundleBase } from '../skill-bundle-root.mjs';
 
 import { selfTestCases, stripAnsi } from './helpers/child-verdict';
 
@@ -169,11 +168,8 @@ describe('the governed surface is the ruled definition, and it is real', () => {
       // these types from the `.mjs` (allowJs, checkJs off), so the optional-chain
       // spelling is a real type error here rather than a stylistic preference.
       const target = 'prefix' in surface ? surface.prefix : surface.exact;
-      // The published `skills/` catalog is the monorepo root's since the cutover
-      // (decision C, `scripts/skill-bundle-root.mjs`), so that row is read from there.
-      const base = surface.id === 'skills-catalog' ? skillBundleBase(ROOT) : ROOT;
       expect(
-        fs.existsSync(path.join(base, target)),
+        fs.existsSync(path.join(ROOT, target)),
         `GOVERNED_SURFACES declares ${target}, which does not exist. A governed path nobody can ` +
           `edit is a rule about nothing; either the surface moved (update the register) or the ` +
           `entry was speculative (drop it).`,

ui/scripts/__tests__/check-skill-examples.test.ts

@@ -43,7 +43,6 @@ import {
   rootDeclaredSpecifiers,
   specifierRoot,
 } from '../check-doc-snippet-types.mjs';
-import { labelPath } from '../skill-bundle-root.mjs';
 
 /**
  * objectui#7359 — the test for `scripts/check-skill-examples.mjs`.
@@ -310,7 +309,7 @@ describe('the corpus this gate governs', () => {
   const guides = listGuides(repoRoot) as string[];
   const scans = guides.map((g) => ({
     guide: g,
-    scan: scanSkillFences(fs.readFileSync(labelPath(repoRoot, g), 'utf8')) as Scan,
+    scan: scanSkillFences(fs.readFileSync(path.join(repoRoot, g), 'utf8')) as Scan,
   }));
 
   it('carries no orphan marker', () => {
@@ -352,7 +351,7 @@ describe('the corpus this gate governs', () => {
     // reads as a marker and claims nothing. It would surface as an orphan only
     // if it matched the orphan scan's own literal — which it does not.
     for (const guide of guides) {
-      const source = fs.readFileSync(labelPath(repoRoot, guide), 'utf8');
+      const source = fs.readFileSync(path.join(repoRoot, guide), 'utf8');
       for (const [index, line] of source.split('\n').entries()) {
         if (!/os:check/.test(line)) continue;
         expect(line, `${guide}:${index + 1} carries a near-spelling of the marker`).toBe(MARKER);
@@ -378,7 +377,7 @@ describe('the shrink-only floor on the marked population', () => {
   type Breach = { category: string; count: number; floor: number };
   const corpusMarked = (listGuides(repoRoot) as string[]).flatMap(
     (guide) =>
-      (scanSkillFences(fs.readFileSync(labelPath(repoRoot, guide), 'utf8')) as Scan).fences.filter(
+      (scanSkillFences(fs.readFileSync(path.join(repoRoot, guide), 'utf8')) as Scan).fences.filter(
         (f) => f.marked,
       ),
   );
@@ -899,7 +898,7 @@ describe('the ROOT BOUND, and its declared debt (objectui#7463 item 2)', () => {
       const lastColon = site.lastIndexOf(':');
       const guide = site.slice(0, lastColon);
       const line = Number(site.slice(lastColon + 1));
-      const source = fs.readFileSync(labelPath(repoRoot, guide), 'utf8');
+      const source = fs.readFileSync(path.join(repoRoot, guide), 'utf8');
       const { fences: all } = scanSkillFences(source) as {
         fences: { fenceLine: number; marked: boolean }[];
       };
@@ -1343,7 +1342,7 @@ describe('the shadowed-published-type assertion (objectui#7646)', () => {
       const guides = new Map(
         (listGuides(repoRoot) as string[]).map((g) => [
           g,
-          scanSkillFences(fs.readFileSync(labelPath(repoRoot, g), 'utf8')) as Scan,
+          scanSkillFences(fs.readFileSync(path.join(repoRoot, g), 'utf8')) as Scan,
         ]),
       );
       for (const row of (KNOWN_SHADOWED_PUBLISHED_TYPES as Map<string, string>).keys()) {