skillset 0.13.3 → 0.13.5

package/dist/cli.js

@@ -7024,7 +7024,7 @@ var require_dist = __commonJS((exports) => {
 });
 
 // apps/skillset/src/cli-core.ts
-import { mkdir as mkdir10, writeFile as writeFile10 } from "fs/promises";
+import { mkdir as mkdir11, writeFile as writeFile11 } from "fs/promises";
 import { basename as basename8, dirname as dirname15, resolve as resolve10 } from "path";
 
 // packages/core/src/authoring.ts
@@ -7095,7 +7095,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-112 activation probe coverage")],
     id: "activation-probes",
     kind: "workflow",
-    loweringOwner: "apps/skillset/src/test-runner.ts",
+    renderOwner: "apps/skillset/src/test-runner.ts",
     sourceShape: ".skillset/config.yaml tests.<name>.activation[]",
     status: "implemented",
     summary: "Compiles target-aware manual activation probe assets inside isolated test runs.",
@@ -7108,7 +7108,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-34/35/36 change status and entry coverage")],
     id: "changes",
     kind: "change-management",
-    loweringOwner: "apps/skillset/src/change-entries.ts",
+    renderOwner: "apps/skillset/src/change-entries.ts",
     sourceShape: ".skillset/changes/pending/*.yaml and .skillset/changes/history/*.jsonl",
     status: "implemented",
     summary: "Tracks source-unit changes, evidence hashes, pending entries, and applied history.",
@@ -7118,13 +7118,13 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
   }),
   feature({
     docs: ["docs/features/dependencies.md"],
-    evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-40 dependency lowering tests")],
+    evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-40 dependency rendering tests")],
     id: "dependencies",
     kind: "metadata",
-    loweringOwner: "packages/core/src/dependencies.ts",
+    renderOwner: "packages/core/src/dependencies.ts",
     sourceShape: "plugin skillset.yaml dependencies",
     status: "implemented",
-    summary: "Declares plugin dependencies and lowers target-specific install/awareness behavior.",
+    summary: "Declares plugin dependencies and renders target-specific install/awareness behavior.",
     targetSupport: {
       claude: {
         evidence: [docs("docs/features/dependencies.md"), externalDocs("https://docs.anthropic.com/en/docs/claude-code/plugins", "2026-06-12")],
@@ -7145,7 +7145,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-109 distribute plan coverage")],
     id: "distributions",
     kind: "workflow",
-    loweringOwner: "packages/core/src/distribution.ts",
+    renderOwner: "packages/core/src/distribution.ts",
     sourceShape: ".skillset/config.yaml distributions",
     status: "implemented",
     summary: "Plans post-build distribution of generated projections without writing or activating runtimes.",
@@ -7164,36 +7164,36 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     ],
     id: "feature-registry",
     kind: "workflow",
-    loweringOwner: "packages/core/src/feature-registry.ts",
+    renderOwner: "packages/core/src/feature-registry.ts",
     sourceShape: "typed feature entries in packages/core/src/feature-registry.ts",
     status: "implemented",
-    summary: "Records feature ids, target capability claims, docs, evidence, lowering owners, and validation owners.",
+    summary: "Records feature ids, target capability claims, docs, evidence, render owners, and validation owners.",
     targetSupport: notTargetRuntime(),
     title: "Feature Registry",
     validationOwner: "packages/core/src/feature-registry.ts"
   }),
   feature({
-    docs: ["docs/features/lowering-outcomes.md"],
+    docs: ["docs/features/render-results.md"],
     evidence: [
       docs("docs/adrs/drafts/20260614-lowering-outcomes-and-loss-ledger.md"),
-      source("packages/core/src/lowering-outcome.ts"),
-      source("packages/core/src/lowering-outcome-collector.ts"),
+      source("packages/core/src/render-result.ts"),
+      source("packages/core/src/render-result-collector.ts"),
       source("apps/skillset/src/import.ts"),
       source("apps/skillset/src/setup.ts"),
-      test("packages/core/src/__tests__/lowering-outcome.test.ts", "lowering outcome schema validation coverage"),
-      test("packages/core/src/__tests__/lowering-outcome-build.test.ts", "build lowering outcomes cover emitted, target-native, transformed, unsupported, policy-gated, scoped, and status-matrix outcomes"),
-      test("apps/skillset/src/__tests__/contract.test.ts", "SET-86 import and build warnings carry lowering outcome codes"),
-      test("apps/skillset/src/__tests__/adopt.test.ts", "SET-86 adopt survey skips carry lowering outcome codes")
+      test("packages/core/src/__tests__/render-result.test.ts", "render result schema validation coverage"),
+      test("packages/core/src/__tests__/render-result-build.test.ts", "build render results cover rendered, target-native, transformed, unsupported, policy-gated, scoped, and status-matrix results"),
+      test("apps/skillset/src/__tests__/contract.test.ts", "SET-86 import and build warnings carry render result codes"),
+      test("apps/skillset/src/__tests__/adopt.test.ts", "SET-86 adopt survey skips carry render result codes")
     ],
-    id: "lowering-outcomes",
+    id: "render-results",
     kind: "workflow",
-    loweringOwner: "packages/core/src/lowering-outcome-collector.ts",
-    sourceShape: "rendered build graph, generated lock items, companion files, unsupported feature records, and lowering-relevant import/adopt report warnings",
+    renderOwner: "packages/core/src/render-result-collector.ts",
+    sourceShape: "rendered build graph, generated lock items, companion files, unsupported feature records, and render-relevant import/adopt report warnings",
     status: "implemented",
-    summary: "Records per-build lowering facts for emitted, transformed, degraded, skipped, unsupported, and externally managed source units.",
+    summary: "Records per-build render facts for rendered, transformed, degraded, skipped, unsupported, and externally managed source units.",
     targetSupport: notTargetRuntime(),
-    title: "Lowering Outcomes",
-    validationOwner: "packages/core/src/lowering-outcome.ts"
+    title: "Render Results",
+    validationOwner: "packages/core/src/render-result.ts"
   }),
   feature({
     docs: ["docs/features/output-safety.md"],
@@ -7204,7 +7204,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     ],
     id: "output-safety",
     kind: "workflow",
-    loweringOwner: "packages/core/src/output-safety.ts",
+    renderOwner: "packages/core/src/output-safety.ts",
     sourceShape: "generated .skillset.lock ownership plus current rendered output paths",
     status: "implemented",
     summary: "Protects unmanaged generated-output collisions and target-side edits with reversible backups.",
@@ -7217,7 +7217,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-26 MCP pointer coverage")],
     id: "plugin-mcp",
     kind: "plugin-component",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "plugin mcp/source pointer or conventional .mcp.json",
     status: "implemented",
     summary: "Copies validated plugin MCP server definitions into Claude and Codex plugin outputs.",
@@ -7234,7 +7234,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "Codex app manifest companion-path coverage")],
     id: "plugin-apps",
     kind: "target-native",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "plugin codex/.app.json target-native companion file",
     status: "implemented",
     summary: "Passes Codex app manifests through as target-native plugin companion files.",
@@ -7260,7 +7260,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-26 bin pointer coverage")],
     id: "plugin-bin",
     kind: "plugin-component",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "plugin bin/source pointer or conventional bin/",
     status: "implemented",
     summary: "Copies Claude plugin-root executable helpers while failing loudly for Codex-enabled plugin output.",
@@ -7297,7 +7297,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-2 hook companion-path coverage")],
     id: "plugin-hooks",
     kind: "target-native",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "plugin hooks/hooks.json",
     status: "implemented",
     summary: "Copies plugin hook declarations with broad Claude validation and strict Codex validation.",
@@ -7328,8 +7328,8 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "plugin boundary and manifest coverage")],
     id: "plugin-manifests",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: ".skillset/plugins/<plugin>/skillset.yaml",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: ".skillset/src/plugins/<plugin>/skillset.yaml",
     status: "implemented",
     summary: "Projects plugin metadata and component wiring into target-native plugin manifests.",
     targetSupport: bothTargets("native", [
@@ -7387,8 +7387,8 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "plugin skill rendering coverage")],
     id: "plugin-skills",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: ".skillset/plugins/<plugin>/skills/<skill>/SKILL.md",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: ".skillset/src/plugins/<plugin>/skills/<skill>/SKILL.md",
     status: "implemented",
     summary: "Preserves plugin-scoped skills inside each target plugin boundary.",
     targetSupport: bothTargets("native"),
@@ -7421,7 +7421,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "Codex plugin-agent failure coverage")],
     id: "plugin-agents",
     kind: "target-native",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "plugin target-native agents/",
     status: "implemented",
     summary: "Allows Claude plugin agents as target-native companion files and rejects Codex plugin agents.",
@@ -7441,13 +7441,13 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
   }),
   feature({
     docs: ["docs/features/instructions.md"],
-    evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-5 instruction lowering coverage")],
+    evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-5 instruction rendering coverage")],
     id: "project-instructions",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: ".skillset/instructions/**/*.md",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: ".skillset/src/rules/**/*.md",
     status: "implemented",
-    summary: "Lowers project instructions to Claude rules and directory-local Codex AGENTS.md files.",
+    summary: "Renders project instructions to Claude rules and directory-local Codex AGENTS.md files.",
     targetSupport: bothTargets("transformed"),
     title: "Project Instructions",
     validationOwner: "packages/core/src/resolver.ts"
@@ -7457,10 +7457,10 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "portable project agent coverage")],
     id: "project-agents",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: ".skillset/src/agents/*.md",
     status: "implemented",
-    summary: "Lowers portable project agents to Claude Markdown agents and Codex TOML agents.",
+    summary: "Renders portable project agents to Claude Markdown agents and Codex TOML agents.",
     runtimeSupport: {
       "claude-code": {
         evidence: [docs("docs/features/agents.md"), externalDocs("https://code.claude.com/docs/en/sub-agents", "2026-06-04")],
@@ -7494,7 +7494,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [docs("docs/features/runtime-adapters.md"), test("packages/core/src/__tests__/feature-registry.test.ts", "SET-113 runtime support coverage")],
     id: "runtime-adapters",
     kind: "workflow",
-    loweringOwner: "packages/core/src/feature-registry.ts",
+    renderOwner: "packages/core/src/feature-registry.ts",
     runtimeSupport: {
       "claude-code": {
         evidence: [docs("docs/features/runtime-adapters.md")],
@@ -7549,7 +7549,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-38 release apply coverage")],
     id: "releases",
     kind: "change-management",
-    loweringOwner: "apps/skillset/src/release.ts",
+    renderOwner: "apps/skillset/src/release.ts",
     sourceShape: ".skillset/releases/*.jsonl, .skillset/release-state.json, generated changelogs",
     status: "implemented",
     summary: "Applies pending changes into versions, release history, changelogs, and generated metadata.",
@@ -7562,8 +7562,8 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "shared resource rendering coverage")],
     id: "resources",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: "skill resources frontmatter and .skillset/shared/",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: "skill resources frontmatter and .skillset/src/shared/",
     status: "implemented",
     summary: "Copies declared skill resources and validates links to shared resource declarations.",
     targetSupport: bothTargets("native"),
@@ -7575,8 +7575,8 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "standalone skill rendering coverage")],
     id: "standalone-skills",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: ".skillset/skills/<skill>/SKILL.md",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: ".skillset/src/skills/<skill>/SKILL.md",
     status: "implemented",
     summary: "Projects standalone repo skills into configured target skill roots.",
     targetSupport: bothTargets("native"),
@@ -7588,7 +7588,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-39 supports coverage")],
     id: "supports",
     kind: "metadata",
-    loweringOwner: "apps/skillset/src/change-status.ts",
+    renderOwner: "apps/skillset/src/change-status.ts",
     sourceShape: "supports frontmatter metadata",
     status: "implemented",
     summary: "Records compatibility claims as source-significant metadata without target-frontmatter leakage.",
@@ -7601,8 +7601,8 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "target-native island coverage")],
     id: "target-native-islands",
     kind: "target-native",
-    loweringOwner: "packages/core/src/render.ts",
-    sourceShape: ".skillset/src/<target>/** and plugin-local target-native subdirs",
+    renderOwner: "packages/core/src/render.ts",
+    sourceShape: ".skillset/src/_claude/**, .skillset/src/_codex/**, and plugin-local provider source subdirs",
     status: "implemented",
     summary: "Mirrors explicitly target-owned files only to their intended provider output.",
     targetSupport: bothTargets("pass_through"),
@@ -7611,10 +7611,10 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
   }),
   feature({
     docs: ["docs/features/tool-intent.md"],
-    evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "tool policy lowering coverage")],
+    evidence: [test("apps/skillset/src/__tests__/skillset.test.ts", "tool policy rendering coverage")],
     id: "tool-intent",
     kind: "source",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: "skill tool_intent frontmatter",
     status: "implemented",
     summary: "Normalizes tool policy intent into Claude allowed-tools fields and Codex metadata sidecars.",
@@ -7630,7 +7630,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [docs("docs/target-surfaces.md")],
     id: "future-companion-source-pointers",
     kind: "plugin-component",
-    loweringOwner: "future",
+    renderOwner: "future",
     sourceShape: "future apps.source/hooks.source/commands.source/settings.source style feature keys",
     status: "planned",
     summary: "Reserved space for future companion-file source pointers beyond current MCP and bin feature keys.",
@@ -7646,7 +7646,7 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/contract.test.ts", "SET-111 release audit coverage")],
     id: "version-audit",
     kind: "change-management",
-    loweringOwner: "packages/core/src/version-audit.ts",
+    renderOwner: "packages/core/src/version-audit.ts",
     sourceShape: "release state and generated version loci",
     status: "implemented",
     summary: "Audits generated version fields against source and release-state authorities without writing.",
@@ -7659,10 +7659,10 @@ var skillsetFeatureRegistry = defineFeatureRegistry([
     evidence: [test("apps/skillset/src/__tests__/ci.test.ts", "CI and build-scope coverage")],
     id: "workflows",
     kind: "workflow",
-    loweringOwner: "apps/skillset/src/cli-core.ts",
+    renderOwner: "apps/skillset/src/cli-core.ts",
     sourceShape: "skillset CLI workflows such as build, check, ci, test, init, and create",
     status: "implemented",
-    summary: "Provides repo-local workflow commands without lowering them into target runtime artifacts.",
+    summary: "Provides repo-local workflow commands without rendering them into target runtime artifacts.",
     targetSupport: notTargetRuntime(),
     title: "Workflows",
     validationOwner: "apps/skillset/src/cli-core.ts"
@@ -7757,7 +7757,7 @@ function pluginCompanionFeature(entry) {
     evidence: [source("packages/core/src/render.ts")],
     id: entry.id,
     kind: "target-native",
-    loweringOwner: "packages/core/src/render.ts",
+    renderOwner: "packages/core/src/render.ts",
     sourceShape: entry.sourceShape,
     status: "implemented",
     summary: entry.summary,
@@ -7796,44 +7796,45 @@ function fixture(ref) {
   return { kind: "fixture", ref };
 }
 
-// packages/core/src/lowering-outcome.ts
-var LOWERING_OUTCOME_SCHEMA = "skillset-lowering-outcome@1";
-var LOWERING_OUTCOME_STATUS_VALUES = [
+// packages/core/src/render-result.ts
+var RENDER_RESULT_SCHEMA = "skillset-render-result@1";
+var RENDER_RESULT_STATUS_VALUES = [
   "degraded",
-  "emitted",
   "externally_managed",
   "failed",
   "intentionally_skipped",
   "lossy",
   "metadata_only",
+  "rendered",
   "target_native",
   "transformed",
   "unsupported"
 ];
 
-class SkillsetLoweringError extends Error {
-  loweringOutcomes;
-  constructor(message, loweringOutcomes) {
+class SkillsetRenderResultError extends Error {
+  renderResults;
+  constructor(message, renderResults) {
     super(message);
-    this.name = "SkillsetLoweringError";
-    this.loweringOutcomes = loweringOutcomes.map(normalizeLoweringOutcome);
+    this.name = "SkillsetRenderResultError";
+    this.renderResults = renderResults.map(normalizeRenderResult);
   }
 }
-function defineLoweringOutcome(input) {
-  const outcome = normalizeLoweringOutcome({
+function defineRenderResult(input) {
+  const outcome = normalizeRenderResult({
     ...input,
-    schema: input.schema ?? LOWERING_OUTCOME_SCHEMA
+    schema: input.schema ?? RENDER_RESULT_SCHEMA
   });
-  assertLoweringOutcome(outcome);
+  assertRenderResult(outcome);
   return outcome;
 }
-function normalizeLoweringOutcome(outcome) {
+function normalizeRenderResult(outcome) {
   return {
     schema: outcome.schema,
     sourceUnit: outcome.sourceUnit,
     ...outcome.sourcePath === undefined ? {} : { sourcePath: outcome.sourcePath },
     featureId: outcome.featureId,
     ...outcome.target === undefined ? {} : { target: outcome.target },
+    ...outcome.destination === undefined ? {} : { destination: outcome.destination },
     status: outcome.status,
     ...outcome.reason === undefined ? {} : { reason: outcome.reason },
     ...outcome.policy === undefined ? {} : { policy: outcome.policy },
@@ -7842,38 +7843,41 @@ function normalizeLoweringOutcome(outcome) {
     ...outcome.evidence === undefined ? {} : { evidence: normalizeEvidence(outcome.evidence) }
   };
 }
-function assertLoweringOutcome(outcome) {
-  if (outcome.schema !== LOWERING_OUTCOME_SCHEMA) {
-    throw new Error(`skillset: unsupported lowering outcome schema ${outcome.schema}`);
+function assertRenderResult(outcome) {
+  if (outcome.schema !== RENDER_RESULT_SCHEMA) {
+    throw new Error(`skillset: unsupported render result schema ${outcome.schema}`);
   }
   if (outcome.sourceUnit.trim().length === 0) {
-    throw new Error("skillset: lowering outcome sourceUnit is required");
+    throw new Error("skillset: render result sourceUnit is required");
   }
   if (outcome.featureId.trim().length === 0) {
-    throw new Error("skillset: lowering outcome featureId is required");
+    throw new Error("skillset: render result featureId is required");
   }
-  if (!new Set(LOWERING_OUTCOME_STATUS_VALUES).has(outcome.status)) {
-    throw new Error(`skillset: unknown lowering outcome status ${outcome.status}`);
+  if (outcome.destination !== undefined && outcome.destination.trim().length === 0) {
+    throw new Error("skillset: render result destination must be non-empty when present");
+  }
+  if (!new Set(RENDER_RESULT_STATUS_VALUES).has(outcome.status)) {
+    throw new Error(`skillset: unknown render result status ${outcome.status}`);
   }
   if ((outcome.status === "degraded" || outcome.status === "failed" || outcome.status === "lossy" || outcome.status === "unsupported") && outcome.reason === undefined) {
-    throw new Error(`skillset: lowering outcome ${outcome.status} status requires a reason`);
+    throw new Error(`skillset: render result ${outcome.status} status requires a reason`);
   }
   for (const output of outcome.outputs ?? []) {
     if (output.path.trim().length === 0) {
-      throw new Error("skillset: lowering outcome output path is required");
+      throw new Error("skillset: render result output path is required");
     }
   }
   for (const diagnostic of outcome.diagnostics ?? []) {
     if (diagnostic.code.trim().length === 0) {
-      throw new Error("skillset: lowering outcome diagnostic code is required");
+      throw new Error("skillset: render result diagnostic code is required");
     }
   }
   for (const evidence of outcome.evidence ?? []) {
     if (evidence.ref.trim().length === 0) {
-      throw new Error("skillset: lowering outcome evidence ref is required");
+      throw new Error("skillset: render result evidence ref is required");
     }
     if (evidence.kind === "external-docs" && evidence.verifiedAt === undefined) {
-      throw new Error("skillset: lowering outcome external docs evidence requires verifiedAt");
+      throw new Error("skillset: render result external docs evidence requires verifiedAt");
     }
   }
 }
@@ -7899,7 +7903,7 @@ function normalizeEvidence(evidence) {
   })).sort((left, right) => compareStrings(`${left.kind}\x00${left.ref}\x00${left.verifiedAt ?? ""}\x00${left.note ?? ""}`, `${right.kind}\x00${right.ref}\x00${right.verifiedAt ?? ""}\x00${right.note ?? ""}`));
 }
 
-// packages/core/src/lowering-outcome-collector.ts
+// packages/core/src/render-result-collector.ts
 import { existsSync, readdirSync, statSync } from "fs";
 import { join, relative as relative2 } from "path";
 
@@ -7992,8 +7996,10 @@ var TARGET_NAMES = ["claude", "codex"];
 var DEFAULT_SURFACES = new Set(["agents", "instructions", "plugins", "skills"]);
 var CONFIG_TOP_LEVEL_KEYS = new Set(["agents", "changes", "claude", "codex", "defaults", "dependencies", "skillset", "supports"]);
 var ROOT_CONFIG_TOP_LEVEL_KEYS = new Set([...CONFIG_TOP_LEVEL_KEYS, "compile", "distributions", "tests"]);
+var WORKSPACE_CONFIG_TOP_LEVEL_KEYS = new Set(["agents", "changes", "claude", "codex", "compile", "defaults", "dependencies", "distributions", "tests"]);
+var ROOT_SOURCE_MANIFEST_TOP_LEVEL_KEYS = new Set(["dependencies", "skillset", "supports"]);
 var COMPILE_BUILD_MODES = new Set(["updated", "all"]);
-var COMPILE_UNSUPPORTED_POLICIES = new Set([
+var UNSUPPORTED_DESTINATION_POLICIES = new Set([
   "error",
   "warn",
   "skip",
@@ -8042,23 +8048,23 @@ function readCompileConfig(record, label) {
       build: "updated",
       skillset: { metadata: true },
       targets: [...TARGET_NAMES],
-      unsupported: "error"
+      unsupportedDestination: "error"
     };
   }
   for (const key of Object.keys(compile)) {
-    if (key !== "build" && key !== "skillset" && key !== "targets" && key !== "unsupported") {
+    if (key !== "build" && key !== "skillset" && key !== "targets" && key !== "unsupportedDestination") {
       throw new Error(`skillset: unsupported compile key ${key} in ${label}`);
     }
   }
-  const unsupported = readCompileUnsupportedPolicy(compile, `${label}.compile.unsupported`);
-  if (unsupported !== "error") {
-    throw new Error(`skillset: ${label}.compile.unsupported ${unsupported} is reserved but not supported yet; ` + "use error until warning, skip, or force provenance is implemented");
+  const unsupportedDestination = readUnsupportedDestinationPolicy(compile, `${label}.compile.unsupportedDestination`);
+  if (unsupportedDestination !== "error") {
+    throw new Error(`skillset: ${label}.compile.unsupportedDestination ${unsupportedDestination} is reserved but not supported yet; ` + "use error until warning, skip, or force provenance is implemented");
   }
   return {
     build: readCompileBuildMode(compile, `${label}.compile.build`),
     skillset: readCompileSkillsetConfig(compile, `${label}.compile.skillset`),
     targets: readCompileTargetNames(compile, `${label}.compile.targets`),
-    unsupported
+    unsupportedDestination
   };
 }
 function readCompileTargets(record, label) {
@@ -8180,6 +8186,22 @@ function validateConfigDocument(record, label, options = {}) {
     }
   }
 }
+function validateWorkspaceConfigDocument(record, label) {
+  rejectTargetsKey(record, label);
+  for (const key of Object.keys(record)) {
+    if (!WORKSPACE_CONFIG_TOP_LEVEL_KEYS.has(key)) {
+      throw new Error(`skillset: unsupported workspace config key ${key} in ${label}; ` + "move source identity and compatibility metadata to .skillset/src/skillset.yaml");
+    }
+  }
+}
+function validateRootSourceManifestDocument(record, label) {
+  rejectTargetsKey(record, label);
+  for (const key of Object.keys(record)) {
+    if (!ROOT_SOURCE_MANIFEST_TOP_LEVEL_KEYS.has(key)) {
+      throw new Error(`skillset: unsupported root source manifest key ${key} in ${label}`);
+    }
+  }
+}
 function resolveTargets(parent, record, label, options = {}) {
   rejectTargetsKey(record, label);
   if (record.defaults !== undefined && options.allowDefaults !== true) {
@@ -8333,14 +8355,14 @@ function readCompileSkillsetConfig(record, label) {
   }
   return { metadata };
 }
-function readCompileUnsupportedPolicy(record, label) {
-  const value = record.unsupported;
+function readUnsupportedDestinationPolicy(record, label) {
+  const value = record.unsupportedDestination;
   if (value === undefined)
     return "error";
   if (typeof value !== "string") {
     throw new Error(`skillset: expected ${label} to be one of: error, warn, skip, force`);
   }
-  if (!COMPILE_UNSUPPORTED_POLICIES.has(value)) {
+  if (!UNSUPPORTED_DESTINATION_POLICIES.has(value)) {
     throw new Error(`skillset: unsupported ${label} ${JSON.stringify(value)}; expected one of: error, warn, skip, force`);
   }
   return value;
@@ -9087,10 +9109,10 @@ function targetNativeSurface(relativePath) {
   return first.replace(/[^A-Za-z0-9-]/g, "") || "native";
 }
 
-// packages/core/src/lowering-outcome-collector.ts
+// packages/core/src/render-result-collector.ts
 var LOCK_FILE = ".skillset.lock";
 var TARGETS2 = ["claude", "codex"];
-function collectLoweringOutcomes(graph, rendered, options) {
+function collectRenderResults(graph, rendered, options) {
   const mapOutputPath = options.mapOutputPath ?? ((path) => path);
   const outcomes = [];
   const assignedOutputPaths = new Set;
@@ -9113,18 +9135,18 @@ function collectLoweringOutcomes(graph, rendered, options) {
       outcomes.push(outcome);
   }
   outcomes.push(...unsupportedPluginFeatureOutcomes(graph, options.scopes));
-  return outcomes.sort((left, right) => compareStrings(`${left.sourceUnit}\x00${left.target ?? ""}\x00${left.featureId}\x00${left.status}\x00${left.sourcePath ?? ""}`, `${right.sourceUnit}\x00${right.target ?? ""}\x00${right.featureId}\x00${right.status}\x00${right.sourcePath ?? ""}`));
+  return outcomes.sort((left, right) => compareStrings(`${left.sourceUnit}\x00${left.target ?? ""}\x00${left.featureId}\x00${left.destination ?? ""}\x00${left.status}\x00${left.sourcePath ?? ""}`, `${right.sourceUnit}\x00${right.target ?? ""}\x00${right.featureId}\x00${right.destination ?? ""}\x00${right.status}\x00${right.sourcePath ?? ""}`));
 }
 function parseRenderedLock(file) {
   const parsed = JSON.parse(new TextDecoder().decode(file.content));
   if (!isJsonRecord(parsed)) {
-    throw new Error(`skillset: generated lock ${file.path} cannot produce lowering outcomes`);
+    throw new Error(`skillset: generated lock ${file.path} cannot produce render results`);
   }
   const outputRoot = stringField(parsed, "outputRoot");
   const target = stringField(parsed, "target");
   const rawItems = parsed.items;
   if (!Array.isArray(rawItems)) {
-    throw new Error(`skillset: generated lock ${file.path} cannot produce lowering outcomes`);
+    throw new Error(`skillset: generated lock ${file.path} cannot produce render results`);
   }
   return {
     items: rawItems.map((item) => parseRenderedLockItem(file.path, item)),
@@ -9165,7 +9187,8 @@ function outcomeForLockItem(graph, lock, item, outputPaths, includedPaths, mapOu
   const policy = isIncluded ? undefined : "scope:excluded";
   const reason = isIncluded ? reasonForStatus(featureId, target, status) : "excluded by build scope";
   const evidence = evidenceFor(featureId, target);
-  return defineLoweringOutcome({
+  return defineRenderResult({
+    destination: destinationForLockItem(item),
     ...evidence === undefined ? {} : { evidence },
     featureId,
     ...isIncluded ? { outputs: outputPaths.map((path) => ({ kind: item.kind, path: mapOutputPath(path) })) } : {},
@@ -9184,7 +9207,8 @@ function outcomeForCompanionFile(graph, file, isIncluded, mapOutputPath) {
   const plugin = graph.plugins.find((candidate) => candidate.id === companion.pluginId);
   const sourcePath = plugin === undefined ? undefined : normalizePath(relative2(graph.rootPath, join(plugin.path, companion.sourceRelativePath)));
   const evidence = evidenceFor(companion.featureId, companion.target);
-  return defineLoweringOutcome({
+  return defineRenderResult({
+    destination: companion.featureKey,
     ...evidence === undefined ? {} : { evidence },
     featureId: companion.featureId,
     ...isIncluded ? { outputs: [{ kind: "companion", path: mapOutputPath(file.path) }] } : {},
@@ -9200,6 +9224,7 @@ function featureOutcomesForLockItem(graph, lock, item, outputPaths, includedPath
   const outcomes = [];
   if (item.kind === "plugin" && item.dependencies !== undefined && item.dependencies.length > 0) {
     outcomes.push(featureOutcome({
+      destination: "plugin-manifest",
       featureId: "dependencies",
       isIncluded: outputPaths.some((path) => includedPaths.has(path)),
       mapOutputPath,
@@ -9207,13 +9232,14 @@ function featureOutcomesForLockItem(graph, lock, item, outputPaths, includedPath
       outputPaths,
       sourcePath: item.sourcePath,
       sourceUnit: selectorForPluginFeature(item.name, "dependencies"),
-      status: target === "codex" ? "degraded" : "emitted",
+      status: target === "codex" ? "degraded" : "rendered",
       target
     }));
   }
   const claudeToolIntentOutputPaths = target === "claude" && skillHasClaudeToolIntent(graph, item) ? outputPaths.filter((path) => path.endsWith("/SKILL.md") || path === "SKILL.md") : [];
   if (claudeToolIntentOutputPaths.length > 0) {
     outcomes.push(featureOutcome({
+      destination: "skill-frontmatter",
       featureId: "tool-intent",
       isIncluded: claudeToolIntentOutputPaths.some((path) => includedPaths.has(path)),
       mapOutputPath,
@@ -9228,6 +9254,7 @@ function featureOutcomesForLockItem(graph, lock, item, outputPaths, includedPath
   const toolIntentOutputPaths = outputPaths.filter((path) => path.endsWith("/.skillset.tools.yaml"));
   if (toolIntentOutputPaths.length > 0) {
     outcomes.push(featureOutcome({
+      destination: "skill-tools",
       featureId: "tool-intent",
       isIncluded: toolIntentOutputPaths.some((path) => includedPaths.has(path)),
       mapOutputPath,
@@ -9260,7 +9287,8 @@ function featureOutcome(args) {
   const status = args.isIncluded ? args.status : "intentionally_skipped";
   const evidence = evidenceFor(args.featureId, args.target);
   const reason = args.isIncluded ? reasonForStatus(args.featureId, args.target, status) : "excluded by build scope";
-  return defineLoweringOutcome({
+  return defineRenderResult({
+    destination: args.destination,
     ...evidence === undefined ? {} : { evidence },
     featureId: args.featureId,
     ...args.isIncluded ? { outputs: args.outputPaths.map((path) => ({ kind: args.outputKind, path: args.mapOutputPath(path) })) } : {},
@@ -9285,7 +9313,8 @@ function unsupportedPluginFeatureOutcomes(graph, scopes) {
         continue;
       const featureId2 = "plugin-bin";
       const evidence2 = evidenceFor(featureId2, "codex");
-      outcomes.push(defineLoweringOutcome({
+      outcomes.push(defineRenderResult({
+        destination: "bin",
         ...evidence2 === undefined ? {} : { evidence: evidence2 },
         featureId: featureId2,
         policy: "unsupported:error",
@@ -9301,7 +9330,8 @@ function unsupportedPluginFeatureOutcomes(graph, scopes) {
       continue;
     const featureId = "plugin-agents";
     const evidence = evidenceFor(featureId, "codex");
-    outcomes.push(defineLoweringOutcome({
+    outcomes.push(defineRenderResult({
+      destination: "agents",
       ...evidence === undefined ? {} : { evidence },
       featureId,
       policy: "unsupported:error",
@@ -9362,6 +9392,23 @@ function featureIdForLockItem(item) {
     return "plugin-bin";
   return item.feature ?? item.kind;
 }
+function destinationForLockItem(item) {
+  if (item.kind === "standalone-skill" || item.kind === "plugin-skill")
+    return "skill";
+  if (item.kind === "plugin")
+    return "plugin-manifest";
+  if (item.kind === "rule")
+    return "instruction";
+  if (item.kind === "project-agent")
+    return "agent";
+  if (item.kind === "island")
+    return "target-native-island";
+  if (item.kind === "changelog")
+    return "changelog";
+  if (item.kind === "plugin-feature" && item.feature !== undefined)
+    return item.feature;
+  return item.feature ?? item.kind;
+}
 function sourceUnitForLockItem(item, target) {
   if (item.kind === "standalone-skill")
     return selectorForStandaloneSkill(item.name);
@@ -9405,7 +9452,7 @@ function statusForLockItem(item, target) {
     return "transformed";
   if (item.validation === "opaque-copy")
     return "target_native";
-  return "emitted";
+  return "rendered";
 }
 function targetForLockItem(graph, lock, item, outputPaths) {
   if (lock.target !== "workspace")
@@ -9587,20 +9634,20 @@ function sourceWarningDiagnostic(message) {
 import { mkdir as mkdir3, readdir as readdir4, readFile as readFile8, rm, stat as stat7, writeFile as writeFile3 } from "fs/promises";
 import { dirname as dirname7, join as join9, relative as relative9 } from "path";
 
-// packages/core/src/lowering-policy.ts
-function enforceLoweringOutcomePolicy(loweringOutcomes, unsupportedPolicy) {
-  const blocked = loweringOutcomes.filter(isPolicyBlockingOutcome);
+// packages/core/src/render-result-policy.ts
+function enforceRenderResultPolicy(renderResults, unsupportedPolicy) {
+  const blocked = renderResults.filter(isPolicyBlockingOutcome);
   if (blocked.length === 0)
     return;
-  throw new SkillsetLoweringError(formatLoweringPolicyError(blocked, unsupportedPolicy), blocked);
+  throw new SkillsetRenderResultError(formatRenderResultPolicyError(blocked, unsupportedPolicy), blocked);
 }
 function isPolicyBlockingOutcome(outcome) {
   return outcome.status === "failed" || outcome.status === "lossy" || outcome.status === "unsupported";
 }
-function formatLoweringPolicyError(outcomes, unsupportedPolicy) {
-  const noun = outcomes.length === 1 ? "outcome" : "outcomes";
+function formatRenderResultPolicyError(outcomes, unsupportedPolicy) {
+  const noun = outcomes.length === 1 ? "render result" : "render results";
   return [
-    `skillset: lowering policy blocked ${outcomes.length} ${noun} (compile.unsupported: ${unsupportedPolicy})`,
+    `skillset: unsupported destination policy blocked ${outcomes.length} ${noun} (compile.unsupportedDestination: ${unsupportedPolicy})`,
     ...outcomes.map(formatBlockedOutcome)
   ].join(`
 `);
@@ -12028,7 +12075,7 @@ async function renderClaudeProjectAgent(graph, agent) {
     preprocessDependencies,
     rootPath: graph.rootPath,
     sourcePath: agent.sourcePath,
-    sourceRoot: graph.sourceDir
+    sourceRoot: join6(graph.sourceDir, "src")
   });
   const targetPath = join6(targetProjectRoot2(graph, "claude"), "agents", `${agent.outputName}.md`);
   return {
@@ -12064,7 +12111,7 @@ async function renderCodexProjectAgentInstructions(graph, agent, targetOptions,
     preprocessDependencies,
     rootPath: graph.rootPath,
     sourcePath: agent.sourcePath,
-    sourceRoot: graph.sourceDir
+    sourceRoot: join6(graph.sourceDir, "src")
   });
   const sections = [];
   if (skills !== undefined && skills.length > 0) {
@@ -12077,7 +12124,7 @@ async function renderCodexProjectAgentInstructions(graph, agent, targetOptions,
       preprocessDependencies,
       rootPath: graph.rootPath,
       sourcePath: agent.sourcePath,
-      sourceRoot: graph.sourceDir
+      sourceRoot: join6(graph.sourceDir, "src")
     });
     if (renderedPrompt.includes("</initial_prompt>")) {
       throw new Error(`skillset: ${relative7(graph.rootPath, agent.sourcePath)} initialPrompt must not contain </initial_prompt>`);
@@ -12168,7 +12215,7 @@ async function renderTextIslandFile(graph, island, targetPath, preprocessDepende
       preprocessDependencies,
       rootPath: graph.rootPath,
       sourcePath: island.sourcePath,
-      sourceRoot: graph.sourceDir
+      sourceRoot: join6(graph.sourceDir, "src")
     });
     return renderValidatedMarkdown(stripSourceFrontmatter(parsed.frontmatter, island.sourcePath), body, `${relative7(graph.rootPath, island.sourcePath)} -> ${targetPath}`);
   }
@@ -12177,7 +12224,7 @@ async function renderTextIslandFile(graph, island, targetPath, preprocessDepende
     preprocessDependencies,
     rootPath: graph.rootPath,
     sourcePath: island.sourcePath,
-    sourceRoot: graph.sourceDir
+    sourceRoot: join6(graph.sourceDir, "src")
   });
 }
 function rejectIslandTargetEscape(frontmatter, island) {
@@ -12289,7 +12336,7 @@ async function renderSkillMarkdown(graph, plugin, skill, target) {
     frontmatter: skill.frontmatter,
     rootPath: graph.rootPath,
     sourcePath: skill.sourcePath,
-    sourceRoot: graph.sourceDir,
+    sourceRoot: join6(graph.sourceDir, "src"),
     ...plugin === undefined ? {} : { pluginPath: plugin.path }
   });
   const dependencyNotice = target === "codex" && plugin !== undefined ? renderCodexDependencyNotice(graph, plugin) : undefined;
@@ -12337,7 +12384,7 @@ async function renderCodexSkillAgentFile(graph, plugin, skill, target, sourceDir
     frontmatter: skill.frontmatter,
     rootPath: graph.rootPath,
     sourcePath: sourceOpenAiPath,
-    sourceRoot: graph.sourceDir,
+    sourceRoot: join6(graph.sourceDir, "src"),
     ...plugin === undefined ? {} : { pluginPath: plugin.path }
   }), sourceOpenAiPath) : {};
   const merged = mergeRecords(source2, generated);
@@ -12521,7 +12568,7 @@ async function renderRuleBody(graph, rule, outputPath) {
     frontmatter: rule.frontmatter,
     rootPath: graph.rootPath,
     sourcePath: rule.sourcePath,
-    sourceRoot: graph.sourceDir,
+    sourceRoot: join6(graph.sourceDir, "src"),
     variables: ruleVariables(graph, rule, outputPath)
   });
 }
@@ -12700,7 +12747,7 @@ function renderLockFiles(graph, lockRoots) {
       skillsetMetadata: graph.root.compile.skillset.metadata,
       outputRoot,
       schemaVersion: 1,
-      sourceRoot: graph.sourceDir,
+      sourceRoot: join6(graph.sourceDir, "src"),
       target: lock.target
     };
     rendered.push(textFile(join6(outputRoot, ".skillset.lock"), renderValidatedJson(value, `${outputRoot}/.skillset.lock`)));
@@ -13205,26 +13252,35 @@ async function exists4(path) {
 // packages/core/src/resolver.ts
 var DEFAULT_SOURCE_DIR = ".skillset";
 var ROOT_CONFIG_FILE = "config.yaml";
+var ROOT_SOURCE_MANIFEST_FILE = "skillset.yaml";
 var PLUGIN_CONFIG_FILES = ["skillset.yaml", "config.yaml"];
 var PLUGINS_DIR = "plugins";
-var INSTRUCTIONS_DIR = "instructions";
+var SOURCE_ROOT_DIR = "src";
+var RULES_DIR = "rules";
 var SKILLS_DIR = "skills";
+var SHARED_DIR = "shared";
 var SKILL_FILE = "SKILL.md";
 var RULES_OUTPUT_ROOT = ".claude/rules";
-var TARGET_NATIVE_SOURCE_DIR = "src";
 var PROJECT_AGENTS_DIR = "agents";
+var PROVIDER_SOURCE_DIRS = {
+  claude: "_claude",
+  codex: "_codex"
+};
 var PLUGIN_FEATURE_KEYS = ["bin", "mcp"];
 async function loadBuildGraph(rootPath, options = {}) {
   const sourceDir = options.sourceDir ?? DEFAULT_SOURCE_DIR;
   const sourcePath = resolveInside(rootPath, sourceDir);
   const rootConfigPath = join8(sourcePath, ROOT_CONFIG_FILE);
+  const rootSourceManifestPath = join8(sourcePath, SOURCE_ROOT_DIR, ROOT_SOURCE_MANIFEST_FILE);
   const rootConfig = parseYamlRecord(await readFile7(rootConfigPath, "utf8"), rootConfigPath);
-  validateConfigDocument(rootConfig, rootConfigPath, { allowCompile: true });
-  const metadata = readSkillsetMetadata(rootConfig, rootConfigPath);
-  validateSchemaField(metadata, `${rootConfigPath}.skillset.schema`);
-  validateVersionField(metadata, `${rootConfigPath}.skillset.version`);
-  readSkillsetName(metadata, basename2(rootPath), rootConfigPath);
-  const outputs = readOutputConfig(rootConfig, metadata, options.distDir === undefined ? {} : { distDir: options.distDir });
+  validateWorkspaceConfigDocument(rootConfig, rootConfigPath);
+  const sourceManifest = parseYamlRecord(await readFile7(rootSourceManifestPath, "utf8"), rootSourceManifestPath);
+  validateRootSourceManifestDocument(sourceManifest, rootSourceManifestPath);
+  const metadata = readSkillsetMetadata(sourceManifest, rootSourceManifestPath);
+  validateSchemaField(metadata, `${rootSourceManifestPath}.skillset.schema`);
+  validateVersionField(metadata, `${rootSourceManifestPath}.skillset.version`);
+  readSkillsetName(metadata, basename2(rootPath), rootSourceManifestPath);
+  const outputs = readOutputConfig(rootConfig, {}, options.distDir === undefined ? {} : { distDir: options.distDir });
   const distributions = readDistributionConfig(rootConfig, rootConfigPath);
   const rootTargets = resolveTargets(readCompileTargets(rootConfig, rootConfigPath), rootConfig, rootConfigPath, {
     allowDefaults: true,
@@ -13245,7 +13301,8 @@ async function loadBuildGraph(rootPath, options = {}) {
     targets: filteredTargets
   };
   const warnings = [];
-  await validateSupports(rootConfig.supports, { label: rootConfigPath, rootPath, warnings });
+  await rejectLegacySourceLayout(rootPath, sourceDir);
+  await validateSupports(sourceManifest.supports, { label: rootSourceManifestPath, rootPath, warnings });
   const releaseState = await readReleaseState(rootPath, options);
   const plugins = await loadPlugins(rootPath, sourceDir, filteredTargets, warnings, outputs);
   try {
@@ -13254,7 +13311,7 @@ async function loadBuildGraph(rootPath, options = {}) {
     throw featureDiagnosticError(error, {
       code: "plugin-dependencies-invalid",
       featureId: "dependencies",
-      path: join8(sourceDir, PLUGINS_DIR)
+      path: join8(sourceDir, SOURCE_ROOT_DIR, PLUGINS_DIR)
     });
   }
   const standaloneSkills = await loadStandaloneSkills(rootPath, sourceDir, filteredTargets, warnings);
@@ -13262,7 +13319,7 @@ async function loadBuildGraph(rootPath, options = {}) {
   const projectAgents = await loadProjectAgents(rootPath, sourceDir, filteredTargets, warnings);
   const projectIslands = await loadProjectIslands(rootPath, sourceDir, plugins);
   if (plugins.length === 0 && standaloneSkills.length === 0 && rules.length === 0 && projectAgents.length === 0 && projectIslands.length === 0) {
-    throw new Error(`skillset: no source plugins, skills, instructions, project agents, or target-native islands found under ${sourceDir}/`);
+    throw new Error(`skillset: no source plugins, skills, rules, project agents, or provider source found under ${sourceDir}/${SOURCE_ROOT_DIR}/`);
   }
   const outputRoots = await outputRootsFor(rootPath, outputs, plugins, standaloneSkills, rules);
   validateOutputRoots(rootPath, sourcePath, outputRoots);
@@ -13307,20 +13364,52 @@ function featureDiagnosticError(error, args) {
     ...args.path === undefined ? {} : { path: args.path }
   });
 }
+async function rejectLegacySourceLayout(rootPath, sourceDir) {
+  const moves = [
+    ["instructions", `${SOURCE_ROOT_DIR}/${RULES_DIR}`],
+    ["rules", `${SOURCE_ROOT_DIR}/${RULES_DIR}`],
+    [SKILLS_DIR, `${SOURCE_ROOT_DIR}/${SKILLS_DIR}`],
+    [PLUGINS_DIR, `${SOURCE_ROOT_DIR}/${PLUGINS_DIR}`],
+    [SHARED_DIR, `${SOURCE_ROOT_DIR}/${SHARED_DIR}`],
+    [`${SOURCE_ROOT_DIR}/claude`, `${SOURCE_ROOT_DIR}/${PROVIDER_SOURCE_DIRS.claude}`],
+    [`${SOURCE_ROOT_DIR}/codex`, `${SOURCE_ROOT_DIR}/${PROVIDER_SOURCE_DIRS.codex}`]
+  ];
+  for (const [oldPath, newPath] of moves) {
+    const absoluteOldPath = resolveInside(rootPath, join8(sourceDir, oldPath));
+    if (await exists5(absoluteOldPath)) {
+      throw new Error(`skillset: ${join8(sourceDir, oldPath)} uses the retired source layout; move it to ${join8(sourceDir, newPath)}`);
+    }
+  }
+  const pluginsPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, PLUGINS_DIR));
+  if (!await exists5(pluginsPath))
+    return;
+  for (const entry of await readdir3(pluginsPath, { withFileTypes: true })) {
+    if (!entry.isDirectory())
+      continue;
+    for (const [oldProviderDir, newProviderDir] of Object.entries(PROVIDER_SOURCE_DIRS)) {
+      const oldPath = join8(SOURCE_ROOT_DIR, PLUGINS_DIR, entry.name, oldProviderDir);
+      const absoluteOldPath = resolveInside(rootPath, join8(sourceDir, oldPath));
+      if (!await exists5(absoluteOldPath))
+        continue;
+      const newPath = join8(SOURCE_ROOT_DIR, PLUGINS_DIR, entry.name, newProviderDir);
+      throw new Error(`skillset: ${join8(sourceDir, oldPath)} uses the retired provider source layout; move it to ${join8(sourceDir, newPath)}`);
+    }
+  }
+}
 async function loadProjectIslands(rootPath, sourceDir, plugins) {
-  const srcPath = resolveInside(rootPath, join8(sourceDir, TARGET_NATIVE_SOURCE_DIR));
+  const srcPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR));
   if (!await exists5(srcPath))
     return [];
   const islands = [];
-  islands.push(...await loadTargetIsland(rootPath, join8(srcPath, "claude"), "claude"));
-  islands.push(...await loadTargetIsland(rootPath, join8(srcPath, "codex"), "codex"));
+  islands.push(...await loadTargetIsland(rootPath, join8(srcPath, PROVIDER_SOURCE_DIRS.claude), "claude"));
+  islands.push(...await loadTargetIsland(rootPath, join8(srcPath, PROVIDER_SOURCE_DIRS.codex), "codex"));
   const pluginsPath = join8(srcPath, "plugins");
   if (await exists5(pluginsPath)) {
     await validatePluginIslandOwners(rootPath, pluginsPath, plugins);
     for (const plugin of plugins) {
       const pluginPath = join8(pluginsPath, plugin.id);
-      islands.push(...await loadTargetIsland(rootPath, join8(pluginPath, "claude"), "claude", plugin.id));
-      islands.push(...await loadTargetIsland(rootPath, join8(pluginPath, "codex"), "codex", plugin.id));
+      islands.push(...await loadTargetIsland(rootPath, join8(pluginPath, PROVIDER_SOURCE_DIRS.claude), "claude", plugin.id));
+      islands.push(...await loadTargetIsland(rootPath, join8(pluginPath, PROVIDER_SOURCE_DIRS.codex), "codex", plugin.id));
     }
   }
   for (const island of islands) {
@@ -13338,7 +13427,7 @@ async function loadProjectIslands(rootPath, sourceDir, plugins) {
       throw new SkillsetFeatureDiagnosticError({
         code: "target-native-island-unsupported",
         featureId: "target-native-islands",
-        message: `skillset: ${path} targets Codex .rules outside .skillset/src/codex/rules/; ` + "Codex .rules are project-only command policy",
+        message: `skillset: ${path} targets Codex .rules outside .skillset/src/_codex/rules/; ` + "Codex .rules are project-only command policy",
         path
       });
     }
@@ -13367,7 +13456,7 @@ async function loadTargetIsland(rootPath, islandPath, target, plugin) {
   }));
 }
 async function loadProjectAgents(rootPath, sourceDir, rootTargets, warnings) {
-  const agentsPath = resolveInside(rootPath, join8(sourceDir, TARGET_NATIVE_SOURCE_DIR, PROJECT_AGENTS_DIR));
+  const agentsPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, PROJECT_AGENTS_DIR));
   if (!await exists5(agentsPath))
     return [];
   const entries = await readdir3(agentsPath, { withFileTypes: true });
@@ -13449,15 +13538,10 @@ function validateProjectAgentCollisions(agents) {
   }
 }
 async function loadInstructions(rootPath, sourceDir, rootTargets, warnings) {
-  const canonicalPath = resolveInside(rootPath, join8(sourceDir, INSTRUCTIONS_DIR));
+  const canonicalPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, RULES_DIR));
   const canonicalFiles = await exists5(canonicalPath) ? await findMarkdownFiles(canonicalPath) : [];
-  const rulesPath = resolveInside(rootPath, join8(sourceDir, "rules"));
-  const rulesFiles = await exists5(rulesPath) ? await findMarkdownFiles(rulesPath) : [];
-  if (rulesFiles.length > 0) {
-    throw new Error(`skillset: ${sourceDir}/rules is not supported; move instruction files to ${sourceDir}/${INSTRUCTIONS_DIR}`);
-  }
   if (canonicalFiles.length === 0) {
-    return { rules: [], instructionsDir: INSTRUCTIONS_DIR };
+    return { rules: [], instructionsDir: join8(SOURCE_ROOT_DIR, RULES_DIR) };
   }
   const ruleFiles = canonicalFiles;
   const rules = [];
@@ -13484,7 +13568,7 @@ async function loadInstructions(rootPath, sourceDir, rootTargets, warnings) {
   }
   return {
     rules: rules.sort((left, right) => compareStrings(left.relativePath, right.relativePath)),
-    instructionsDir: INSTRUCTIONS_DIR
+    instructionsDir: join8(SOURCE_ROOT_DIR, RULES_DIR)
   };
 }
 function readDialect(frontmatter, label) {
@@ -13503,7 +13587,7 @@ function normalizeRuleFrontmatter(frontmatter, label) {
   return frontmatter;
 }
 async function loadPlugins(rootPath, sourceDir, rootTargets, warnings, outputs) {
-  const pluginsPath = resolveInside(rootPath, join8(sourceDir, PLUGINS_DIR));
+  const pluginsPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, PLUGINS_DIR));
   if (!await exists5(pluginsPath))
     return [];
   const entries = await readdir3(pluginsPath, { withFileTypes: true });
@@ -13517,7 +13601,7 @@ async function loadPlugins(rootPath, sourceDir, rootTargets, warnings, outputs)
   return plugins;
 }
 async function loadPlugin(rootPath, sourceDir, id, parentTargets, warnings, outputs) {
-  const pluginPath = resolveInside(rootPath, join8(sourceDir, PLUGINS_DIR, id));
+  const pluginPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, PLUGINS_DIR, id));
   const configPath = await resolvePluginConfigPath(pluginPath);
   const configRelativePath = relative8(rootPath, configPath);
   const config = parseYamlRecord(await readFile7(configPath, "utf8"), configPath);
@@ -13700,7 +13784,7 @@ async function loadSkillsFromDirectory(rootPath, sourceDir, skillsPath, relative
     const resources = await readSkillResources(parts.frontmatter.resources, {
       label: sourcePath,
       ...pluginPath === undefined ? {} : { pluginSharedPath: join8(pluginPath, "shared") },
-      sharedPath: resolveInside(rootPath, join8(sourceDir, "shared"))
+      sharedPath: resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, SHARED_DIR))
     });
     const dialect = readDialect(parts.frontmatter, relative8(rootPath, sourcePath));
     skills.push({
@@ -13719,7 +13803,7 @@ async function loadSkillsFromDirectory(rootPath, sourceDir, skillsPath, relative
   return skills.sort((left, right) => compareStrings(left.relativePath, right.relativePath));
 }
 async function loadStandaloneSkills(rootPath, sourceDir, rootTargets, warnings) {
-  const skillsPath = resolveInside(rootPath, join8(sourceDir, SKILLS_DIR));
+  const skillsPath = resolveInside(rootPath, join8(sourceDir, SOURCE_ROOT_DIR, SKILLS_DIR));
   if (!await exists5(skillsPath))
     return [];
   const skills = await loadSkillsFromDirectory(rootPath, sourceDir, skillsPath, skillsPath, rootTargets, warnings);
@@ -13969,17 +14053,17 @@ async function buildSkillsetResult(rootPath, options = {}) {
   const outPath = outPathMapper(options);
   const allRendered = await renderBuildGraph(graph);
   const scopedRendered = scopedRenderedFiles(graph, allRendered, options.scopes);
-  const loweringOutcomes = collectLoweringOutcomes(graph, allRendered, {
+  const renderResults = collectRenderResults(graph, allRendered, {
     includedPaths: new Set(scopedRendered.map((file) => file.path)),
     mapOutputPath: outPath,
     scopes: options.scopes
   });
-  enforceLoweringOutcomePolicy(loweringOutcomes, graph.root.compile.unsupported);
+  enforceRenderResultPolicy(renderResults, graph.root.compile.unsupportedDestination);
   const renderedWithoutOutcomeMetadata = mirroredRenderedFiles(scopedRendered, outPath);
   const instructionDiagnostics = diagnoseLargeInstructionFiles(renderedWithoutOutcomeMetadata);
   diagnostics.push(...instructionDiagnostics);
-  const loweringOutcomesWithDiagnostics = attachDiagnosticsToLoweringOutcomes(loweringOutcomes, instructionDiagnostics);
-  const rendered = withPersistedLoweringOutcomes(renderedWithoutOutcomeMetadata, loweringOutcomesWithDiagnostics);
+  const renderResultsWithDiagnostics = attachDiagnosticsToRenderResults(renderResults, instructionDiagnostics);
+  const rendered = withPersistedRenderResults(renderedWithoutOutcomeMetadata, renderResultsWithDiagnostics);
   const liveOutputRoots = scopedOutputRoots(graph, options.scopes);
   const outputRoots = mirroredOutputRoots(liveOutputRoots, outPath);
   const includeWorkspaceLock = includesProjectScope(options.scopes);
@@ -13992,7 +14076,7 @@ async function buildSkillsetResult(rootPath, options = {}) {
     diagnostics.push(...safety2.diagnostics);
     const deletedPaths2 = await removeStaleGeneratedFiles(rootPath, new Set(staleManagedPaths2), expectedPaths);
     const writtenPaths2 = await writeRenderedFiles(rootPath, rendered);
-    return buildResult(rendered, diagnostics, loweringOutcomesWithDiagnostics, withBackupSummary(writeSummary(writtenPaths2, deletedPaths2), safety2.backup));
+    return buildResult(rendered, diagnostics, renderResultsWithDiagnostics, withBackupSummary(writeSummary(writtenPaths2, deletedPaths2), safety2.backup));
   }
   const actualPaths = new Set(await listGeneratedFiles(rootPath, outputRoots, rendered, previousManagedState.paths));
   const staleManagedPaths = staleManagedOutputPaths(previousManagedState.paths, expectedPaths).filter((path) => actualPaths.has(path));
@@ -14000,7 +14084,7 @@ async function buildSkillsetResult(rootPath, options = {}) {
   diagnostics.push(...safety.diagnostics);
   const deletedPaths = await removeStaleGeneratedFiles(rootPath, new Set(staleManagedPaths), expectedPaths);
   const writtenPaths = await writeChangedRenderedFiles(rootPath, rendered, actualPaths);
-  return buildResult(rendered, diagnostics, loweringOutcomesWithDiagnostics, withBackupSummary(writeSummary(writtenPaths, deletedPaths), safety.backup));
+  return buildResult(rendered, diagnostics, renderResultsWithDiagnostics, withBackupSummary(writeSummary(writtenPaths, deletedPaths), safety.backup));
 }
 async function diffSkillset(rootPath, options = {}) {
   return (await diffSkillsetResult(rootPath, options)).data;
@@ -14011,17 +14095,17 @@ async function diffSkillsetResult(rootPath, options = {}) {
   const outPath = outPathMapper(options);
   const allRendered = await renderBuildGraph(graph);
   const scopedRendered = scopedRenderedFiles(graph, allRendered, options.scopes);
-  const loweringOutcomes = collectLoweringOutcomes(graph, allRendered, {
+  const renderResults = collectRenderResults(graph, allRendered, {
     includedPaths: new Set(scopedRendered.map((file) => file.path)),
     mapOutputPath: outPath,
     scopes: options.scopes
   });
-  enforceLoweringOutcomePolicy(loweringOutcomes, graph.root.compile.unsupported);
+  enforceRenderResultPolicy(renderResults, graph.root.compile.unsupportedDestination);
   const renderedWithoutOutcomeMetadata = mirroredRenderedFiles(scopedRendered, outPath);
   const instructionDiagnostics = diagnoseLargeInstructionFiles(renderedWithoutOutcomeMetadata);
   diagnostics.push(...instructionDiagnostics);
-  const loweringOutcomesWithDiagnostics = attachDiagnosticsToLoweringOutcomes(loweringOutcomes, instructionDiagnostics);
-  const rendered = withPersistedLoweringOutcomes(renderedWithoutOutcomeMetadata, loweringOutcomesWithDiagnostics);
+  const renderResultsWithDiagnostics = attachDiagnosticsToRenderResults(renderResults, instructionDiagnostics);
+  const rendered = withPersistedRenderResults(renderedWithoutOutcomeMetadata, renderResultsWithDiagnostics);
   const expected = new Map(rendered.map((file) => [file.path, file.content]));
   const liveOutputRoots = scopedOutputRoots(graph, options.scopes);
   const outputRoots = mirroredOutputRoots(liveOutputRoots, outPath);
@@ -14063,7 +14147,7 @@ async function diffSkillsetResult(rootPath, options = {}) {
   return {
     data: diff,
     diagnostics,
-    loweringOutcomes: loweringOutcomesWithDiagnostics,
+    renderResults: renderResultsWithDiagnostics,
     ok: true,
     operation: "diff",
     writes: {
@@ -14080,17 +14164,17 @@ async function checkSkillsetResult(rootPath, options = {}) {
   const outPath = outPathMapper(options);
   const allRendered = await renderBuildGraph(graph);
   const scopedRendered = scopedRenderedFiles(graph, allRendered, options.scopes);
-  const loweringOutcomes = collectLoweringOutcomes(graph, allRendered, {
+  const renderResults = collectRenderResults(graph, allRendered, {
     includedPaths: new Set(scopedRendered.map((file) => file.path)),
     mapOutputPath: outPath,
     scopes: options.scopes
   });
-  enforceLoweringOutcomePolicy(loweringOutcomes, graph.root.compile.unsupported);
+  enforceRenderResultPolicy(renderResults, graph.root.compile.unsupportedDestination);
   const renderedWithoutOutcomeMetadata = mirroredRenderedFiles(scopedRendered, outPath);
   const instructionDiagnostics = diagnoseLargeInstructionFiles(renderedWithoutOutcomeMetadata);
   diagnostics.push(...instructionDiagnostics);
-  const loweringOutcomesWithDiagnostics = attachDiagnosticsToLoweringOutcomes(loweringOutcomes, instructionDiagnostics);
-  const rendered = withPersistedLoweringOutcomes(renderedWithoutOutcomeMetadata, loweringOutcomesWithDiagnostics);
+  const renderResultsWithDiagnostics = attachDiagnosticsToRenderResults(renderResults, instructionDiagnostics);
+  const rendered = withPersistedRenderResults(renderedWithoutOutcomeMetadata, renderResultsWithDiagnostics);
   const expected = new Map(rendered.map((file) => [file.path, file.content]));
   const liveOutputRoots = scopedOutputRoots(graph, options.scopes);
   const outputRoots = mirroredOutputRoots(liveOutputRoots, outPath);
@@ -14125,7 +14209,7 @@ async function checkSkillsetResult(rootPath, options = {}) {
   return {
     data: { checkedFiles: rendered.length, failures },
     diagnostics: [...diagnostics, ...driftDiagnostics],
-    loweringOutcomes: loweringOutcomesWithDiagnostics,
+    renderResults: renderResultsWithDiagnostics,
     ok: failures.length === 0,
     operation: "check",
     writes: {
@@ -14153,21 +14237,21 @@ function generatedDriftMessage(kind, path) {
     return `missing managed generated file: ${path}`;
   return `stale generated file: ${path}`;
 }
-function buildResult(rendered, diagnostics, loweringOutcomes, writes) {
+function buildResult(rendered, diagnostics, renderResults, writes) {
   return {
     data: rendered,
     diagnostics,
-    loweringOutcomes,
+    renderResults,
     ok: true,
     operation: "build",
     writes
   };
 }
-function attachDiagnosticsToLoweringOutcomes(loweringOutcomes, diagnostics) {
+function attachDiagnosticsToRenderResults(renderResults, diagnostics) {
   const outputDiagnostics = diagnostics.filter((diagnostic) => diagnostic.outputPath !== undefined);
   if (outputDiagnostics.length === 0)
-    return loweringOutcomes;
-  return loweringOutcomes.map((outcome) => {
+    return renderResults;
+  return renderResults.map((outcome) => {
     const outputPaths = new Set((outcome.outputs ?? []).map((output) => output.path));
     if (outputPaths.size === 0)
       return outcome;
@@ -14180,7 +14264,7 @@ function attachDiagnosticsToLoweringOutcomes(loweringOutcomes, diagnostics) {
     });
     if (matching.length === 0)
       return outcome;
-    return defineLoweringOutcome({
+    return defineRenderResult({
       ...outcome,
       diagnostics: [
         ...outcome.diagnostics ?? [],
@@ -14191,7 +14275,7 @@ function attachDiagnosticsToLoweringOutcomes(loweringOutcomes, diagnostics) {
 }
 function diagnosticRefForOutput(diagnostic) {
   if (diagnostic.outputPath === undefined) {
-    throw new Error("skillset: lowering outcome diagnostic ref requires an output path");
+    throw new Error("skillset: render result diagnostic ref requires an output path");
   }
   return {
     code: diagnostic.code,
@@ -14199,17 +14283,17 @@ function diagnosticRefForOutput(diagnostic) {
     path: diagnostic.outputPath
   };
 }
-function withPersistedLoweringOutcomes(rendered, loweringOutcomes) {
-  if (loweringOutcomes.length === 0)
+function withPersistedRenderResults(rendered, renderResults) {
+  if (renderResults.length === 0)
     return rendered;
   return rendered.map((file) => {
     if (!isLockFilePath(file.path))
       return file;
     const lock = parseLockFile(file);
-    const lockOutcomes = loweringOutcomesForLock(file.path, lock, loweringOutcomes);
+    const lockOutcomes = renderResultsForLock(file.path, lock, renderResults);
     const value = {
       ...lock,
-      ...lockOutcomes.length === 0 ? {} : { loweringOutcomes: lockOutcomes }
+      ...lockOutcomes.length === 0 ? {} : { renderResults: lockOutcomes }
     };
     return {
       ...file,
@@ -14224,11 +14308,11 @@ function parseLockFile(file) {
   }
   return parsed;
 }
-function loweringOutcomesForLock(lockPath, lock, loweringOutcomes) {
+function renderResultsForLock(lockPath, lock, renderResults) {
   const target = typeof lock.target === "string" ? lock.target : undefined;
   const outputRoot = outputRootForLockPath(lockPath);
   const lockOutputs = outputPathsForLock(outputRoot, lock);
-  return loweringOutcomes.filter((outcome) => {
+  return renderResults.filter((outcome) => {
     if (target !== undefined && (outcome.target ?? "workspace") !== target)
       return false;
     const outputPaths = outcome.outputs?.map((output) => output.path) ?? [];
@@ -14236,7 +14320,7 @@ function loweringOutcomesForLock(lockPath, lock, loweringOutcomes) {
       return outputRoot === "." && outcome.target === undefined;
     }
     return outputPaths.some((path) => lockOutputs.has(path));
-  }).sort((left, right) => compareStrings(`${left.sourceUnit}\x00${left.target ?? ""}\x00${left.featureId}\x00${left.status}\x00${left.sourcePath ?? ""}`, `${right.sourceUnit}\x00${right.target ?? ""}\x00${right.featureId}\x00${right.status}\x00${right.sourcePath ?? ""}`));
+  }).sort((left, right) => compareStrings(`${left.sourceUnit}\x00${left.target ?? ""}\x00${left.featureId}\x00${left.destination ?? ""}\x00${left.status}\x00${left.sourcePath ?? ""}`, `${right.sourceUnit}\x00${right.target ?? ""}\x00${right.featureId}\x00${right.destination ?? ""}\x00${right.status}\x00${right.sourcePath ?? ""}`));
 }
 function outputPathsForLock(outputRoot, lock) {
   const items = Array.isArray(lock.items) ? lock.items : [];
@@ -15177,7 +15261,7 @@ async function explainPath(rootPath, inputPath, options = {}) {
   const graph = await loadBuildGraph(rootPath, options);
   const allRendered = await renderBuildGraph(graph);
   const rendered = scopedRenderedFiles(graph, allRendered, options.scopes);
-  const loweringOutcomes = collectLoweringOutcomes(graph, allRendered, {
+  const renderResults = collectRenderResults(graph, allRendered, {
     includedPaths: new Set(rendered.map((file) => file.path)),
     scopes: options.scopes
   });
@@ -15185,51 +15269,51 @@ async function explainPath(rootPath, inputPath, options = {}) {
   const items = collectLockItems(rendered);
   const asSource = items.filter((item) => item.sourcePath === target);
   if (asSource.length > 0) {
-    const matchedLoweringOutcomes = explainLoweringOutcomes(target, asSource, loweringOutcomes);
+    const matchedRenderResults = explainRenderResults(target, asSource, renderResults);
     return {
       path: target,
       kind: explainSourceKind(graph, target),
       entries: asSource.map((item) => item.entry),
-      features: featureCapabilitiesForPath(graph, target, asSource, matchedLoweringOutcomes),
-      loweringOutcomes: matchedLoweringOutcomes,
+      features: featureCapabilitiesForPath(graph, target, asSource, matchedRenderResults),
+      renderResults: matchedRenderResults,
       notes: sourceNotes(graph, target)
     };
   }
   const asGenerated = items.filter((item) => item.outputPath === target || item.files.some((file) => joinOutputRoot2(item.outputRoot, file) === target));
   if (asGenerated.length > 0) {
-    const matchedLoweringOutcomes = explainLoweringOutcomes(target, asGenerated, loweringOutcomes, {
+    const matchedRenderResults = explainRenderResults(target, asGenerated, renderResults, {
       includeSourcePaths: false
     });
     return {
       path: target,
       kind: "generated",
       entries: asGenerated.map((item) => item.entry),
-      features: featureCapabilitiesForPath(graph, target, asGenerated, matchedLoweringOutcomes),
-      loweringOutcomes: matchedLoweringOutcomes,
+      features: featureCapabilitiesForPath(graph, target, asGenerated, matchedRenderResults),
+      renderResults: matchedRenderResults,
       notes: [`Generated output; rebuild with skillset build, verify with skillset check.`]
     };
   }
   const prefixMatch = items.filter((item) => item.sourcePath.startsWith(`${target}/`));
   if (prefixMatch.length > 0) {
-    const matchedLoweringOutcomes = explainLoweringOutcomes(target, prefixMatch, loweringOutcomes);
+    const matchedRenderResults = explainRenderResults(target, prefixMatch, renderResults);
     return {
       path: target,
       kind: "source-plugin",
       entries: prefixMatch.map((item) => item.entry),
-      features: featureCapabilitiesForPath(graph, target, prefixMatch, matchedLoweringOutcomes),
-      loweringOutcomes: matchedLoweringOutcomes,
+      features: featureCapabilitiesForPath(graph, target, prefixMatch, matchedRenderResults),
+      renderResults: matchedRenderResults,
       notes: [`Matched ${prefixMatch.length} generated entries under this source path.`]
     };
   }
-  const sourceOnlyOutcomes = explainLoweringOutcomes(target, [], loweringOutcomes);
+  const sourceOnlyOutcomes = explainRenderResults(target, [], renderResults);
   if (sourceOnlyOutcomes.length > 0) {
     return {
       path: target,
       kind: explainSourceKind(graph, target),
       entries: [],
       features: featureCapabilitiesForPath(graph, target, [], sourceOnlyOutcomes),
-      loweringOutcomes: sourceOnlyOutcomes,
-      notes: [`Matched ${sourceOnlyOutcomes.length} lowering outcome(s) under this source path.`]
+      renderResults: sourceOnlyOutcomes,
+      notes: [`Matched ${sourceOnlyOutcomes.length} render result(s) under this source path.`]
     };
   }
   return {
@@ -15237,7 +15321,7 @@ async function explainPath(rootPath, inputPath, options = {}) {
     kind: "unknown",
     entries: [],
     features: [],
-    loweringOutcomes: [],
+    renderResults: [],
     notes: [
       `No lock entry references ${target}. Pass a source path under ${graph.sourceDir}/ or a generated output path.`
     ]
@@ -15269,15 +15353,15 @@ async function doctorSkillset(rootPath, options = {}) {
     graph = await loadBuildGraph(rootPath, options);
   } catch (error) {
     const buildDiagnostics2 = diagnosticsFromError(error);
-    const loweringOutcomes2 = loweringOutcomesFromError(error);
+    const renderResults2 = renderResultsFromError(error);
     return {
       buildError: errorMessage(error),
       buildDiagnostics: buildDiagnostics2,
       drift: { added: [], changed: [], missing: [], removed: [] },
       featureCapabilities: summarizeFeatureCapabilities(),
       lintIssues: [],
-      loweringOutcomes: loweringOutcomes2,
-      notableLoweringOutcomes: notableLoweringOutcomes(loweringOutcomes2),
+      renderResults: renderResults2,
+      notableRenderResults: notableRenderResults(renderResults2),
       ok: false,
       warnings: []
     };
@@ -15286,31 +15370,31 @@ async function doctorSkillset(rootPath, options = {}) {
   let drift = { added: [], changed: [], missing: [], removed: [] };
   let buildDiagnostics = [];
   let buildError;
-  let loweringOutcomes = [];
+  let renderResults = [];
   try {
     const diff = await diffSkillsetResult(rootPath, options);
     drift = diff.data;
-    loweringOutcomes = diff.loweringOutcomes;
+    renderResults = diff.renderResults;
   } catch (error) {
     buildDiagnostics = diagnosticsFromError(error);
     buildError = errorMessage(error);
-    loweringOutcomes = loweringOutcomesFromError(error);
+    renderResults = renderResultsFromError(error);
   }
   const hasDrift = drift.added.length > 0 || drift.changed.length > 0 || drift.missing.length > 0 || drift.removed.length > 0;
-  const notable = notableLoweringOutcomes(loweringOutcomes);
+  const notable = notableRenderResults(renderResults);
   return {
     ...buildError === undefined ? {} : { buildError },
     buildDiagnostics,
     drift,
     featureCapabilities: summarizeFeatureCapabilities(),
     lintIssues: lint.issues,
-    loweringOutcomes,
-    notableLoweringOutcomes: notable,
+    renderResults,
+    notableRenderResults: notable,
     ok: lint.issues.length === 0 && !hasDrift && buildError === undefined,
     warnings: graph.warnings
   };
 }
-function explainLoweringOutcomes(target, items, outcomes, options = {}) {
+function explainRenderResults(target, items, outcomes, options = {}) {
   const includeSourcePaths = options.includeSourcePaths !== false;
   const itemSourcePaths = new Set(items.map((item) => item.sourcePath));
   const itemOutputPaths = new Set(items.flatMap((item) => [
@@ -15334,11 +15418,11 @@ function explainLoweringOutcomes(target, items, outcomes, options = {}) {
   }
   return matched;
 }
-function notableLoweringOutcomes(outcomes) {
+function notableRenderResults(outcomes) {
   return outcomes.filter((outcome) => outcome.status === "degraded" || outcome.status === "externally_managed" || outcome.status === "failed" || outcome.status === "intentionally_skipped" || outcome.status === "lossy" || outcome.status === "unsupported").sort((left, right) => compareStrings(`${left.target ?? "workspace"}\x00${left.sourceUnit}\x00${left.featureId}\x00${left.status}`, `${right.target ?? "workspace"}\x00${right.sourceUnit}\x00${right.featureId}\x00${right.status}`));
 }
-function loweringOutcomesFromError(error) {
-  return error instanceof SkillsetLoweringError ? error.loweringOutcomes : [];
+function renderResultsFromError(error) {
+  return error instanceof SkillsetRenderResultError ? error.renderResults : [];
 }
 function diagnosticsFromError(error) {
   if (!(error instanceof SkillsetFeatureDiagnosticError))
@@ -16171,7 +16255,7 @@ import { join as join13 } from "path";
 
 // apps/skillset/src/change-status.ts
 import { createHash as createHash5 } from "crypto";
-import { mkdtemp, readFile as readFile12, rm as rm2, stat as stat9 } from "fs/promises";
+import { mkdir as mkdir4, mkdtemp, readdir as readdir5, readFile as readFile12, rename, rm as rm2, stat as stat9, writeFile as writeFile4 } from "fs/promises";
 import { tmpdir } from "os";
 import { dirname as dirname9, join as join12, relative as relative12 } from "path";
 // apps/skillset/src/git-env.ts
@@ -16191,6 +16275,17 @@ function gitSafeEnv(sourceEnv = process.env) {
 // apps/skillset/src/change-status.ts
 var SOURCE_HASH_SCHEMA = "skillset-source-unit-v2";
 var ROOT_CONFIG_FILE2 = "config.yaml";
+var SOURCE_ROOT_DIR2 = "src";
+var ROOT_SOURCE_MANIFEST_FILE2 = "skillset.yaml";
+var LEGACY_BASELINE_SOURCE_MOVES = [
+  ["instructions", "src/rules"],
+  ["rules", "src/rules"],
+  ["skills", "src/skills"],
+  ["plugins", "src/plugins"],
+  ["shared", "src/shared"],
+  ["src/claude", "src/_claude"],
+  ["src/codex", "src/_codex"]
+];
 var PLUGIN_COMPANION_PATHS = [
   "README.md",
   "commands",
@@ -16229,8 +16324,7 @@ async function collectSourceInventory(rootPath, options = {}) {
 }
 async function sourceInventoryForGraph(graph) {
   const units = [];
-  const rootConfigPath = join12(graph.sourcePath, ROOT_CONFIG_FILE2);
-  units.push(await fileUnit(graph, "root-config", selectorForRootConfig(), rootConfigPath, await regionsForYaml(rootConfigPath), "root-config"));
+  units.push(await rootConfigUnit(graph));
   for (const skill of graph.standaloneSkills) {
     units.push(await skillUnit(graph, skill, "standalone-skill", selectorForStandaloneSkill(skill.id)));
   }
@@ -16264,6 +16358,30 @@ async function sourceInventoryForGraph(graph) {
     units: [...dedupeUnits(units)].sort((left, right) => compareStrings(left.id, right.id))
   };
 }
+async function rootConfigUnit(graph) {
+  const configPath = join12(graph.sourcePath, ROOT_CONFIG_FILE2);
+  const manifestPath = join12(graph.sourcePath, SOURCE_ROOT_DIR2, ROOT_SOURCE_MANIFEST_FILE2);
+  const sourcePaths = [relativePath(graph, configPath), relativePath(graph, manifestPath)];
+  const hash = createSourceHash("root-config");
+  hash.update("metadata\x00");
+  hash.update(stringifyJson({ id: "root-config", sourcePaths }));
+  hash.update("\x00config\x00");
+  await hashPathInto(hash, configPath);
+  hash.update("\x00manifest\x00");
+  await hashPathInto(hash, manifestPath);
+  return {
+    hash: digest(hash),
+    hashSchema: SOURCE_HASH_SCHEMA,
+    id: selectorForRootConfig(),
+    kind: "root-config",
+    regions: mergeRegions([
+      ...await regionsForYaml(configPath),
+      ...await regionsForYaml(manifestPath)
+    ]),
+    sourcePath: sourcePaths[0] ?? "",
+    sourcePaths
+  };
+}
 async function fileUnit(graph, kind, id, sourcePath, regions = [], hashId = id) {
   const sourcePaths = [relativePath(graph, sourcePath)];
   return {
@@ -16513,7 +16631,7 @@ async function skillPreprocessDependencies(graph, skill, plugin) {
     preprocessDependencies: dependencies,
     rootPath: graph.rootPath,
     sourcePath: skill.sourcePath,
-    sourceRoot: graph.sourceDir,
+    sourceRoot: join12(graph.sourceDir, "src"),
     ...plugin === undefined ? {} : { pluginPath: plugin.path }
   };
   await preprocessText(skill.body, context);
@@ -16533,7 +16651,7 @@ async function rulePreprocessDependencies(graph, rule) {
     preprocessDependencies: dependencies,
     rootPath: graph.rootPath,
     sourcePath: rule.sourcePath,
-    sourceRoot: graph.sourceDir,
+    sourceRoot: join12(graph.sourceDir, "src"),
     variables: {
       "skillset.output_dir": ".",
       "skillset.repo_root": ".",
@@ -16552,7 +16670,7 @@ async function projectAgentPreprocessDependencies2(graph, agent) {
       preprocessDependencies: dependencies,
       rootPath: graph.rootPath,
       sourcePath: agent.sourcePath,
-      sourceRoot: graph.sourceDir
+      sourceRoot: join12(graph.sourceDir, "src")
     });
   };
   await collect(agent.body);
@@ -16574,7 +16692,7 @@ async function islandPreprocessDependencies(graph, island) {
       preprocessDependencies: dependencies,
       rootPath: graph.rootPath,
       sourcePath: island.sourcePath,
-      sourceRoot: graph.sourceDir
+      sourceRoot: join12(graph.sourceDir, "src")
     });
   } else {
     await preprocessText(source2, {
@@ -16582,7 +16700,7 @@ async function islandPreprocessDependencies(graph, island) {
       preprocessDependencies: dependencies,
       rootPath: graph.rootPath,
       sourcePath: island.sourcePath,
-      sourceRoot: graph.sourceDir
+      sourceRoot: join12(graph.sourceDir, "src")
     });
   }
   return [...dependencies].sort(compareStrings);
@@ -16683,6 +16801,7 @@ async function fallbackBaselineInventory(rootPath, options) {
 async function inventoryFromGitRef(rootPath, ref, options) {
   const snapshotPath = await snapshotGitRef(rootPath, ref);
   try {
+    await normalizeLegacyBaselineSnapshot(snapshotPath, options);
     const inventory = await collectSourceInventory(snapshotPath, options);
     const resolvedRef = await gitRevParse(rootPath, ref);
     return {
@@ -16693,6 +16812,74 @@ async function inventoryFromGitRef(rootPath, ref, options) {
     await rm2(snapshotPath, { force: true, recursive: true });
   }
 }
+async function normalizeLegacyBaselineSnapshot(snapshotPath, options) {
+  const sourceDir = options.sourceDir ?? ".skillset";
+  const skillsetPath = join12(snapshotPath, sourceDir);
+  if (!await exists7(skillsetPath))
+    return;
+  for (const [from, to] of LEGACY_BASELINE_SOURCE_MOVES) {
+    await moveLegacyBaselinePath(join12(skillsetPath, from), join12(skillsetPath, to));
+  }
+  await moveLegacyBaselinePluginProviderDirs(join12(skillsetPath, SOURCE_ROOT_DIR2, "plugins"));
+  await splitLegacyBaselineRootConfig(skillsetPath);
+}
+async function moveLegacyBaselinePluginProviderDirs(pluginsPath) {
+  if (!await exists7(pluginsPath))
+    return;
+  const entries = await readdir5(pluginsPath, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory())
+      continue;
+    const pluginPath = join12(pluginsPath, entry.name);
+    await moveLegacyBaselinePath(join12(pluginPath, "claude"), join12(pluginPath, "_claude"));
+    await moveLegacyBaselinePath(join12(pluginPath, "codex"), join12(pluginPath, "_codex"));
+  }
+}
+async function splitLegacyBaselineRootConfig(skillsetPath) {
+  const configPath = join12(skillsetPath, ROOT_CONFIG_FILE2);
+  if (!await exists7(configPath))
+    return;
+  const config2 = parseYamlRecord(await readFile12(configPath, "utf8"), configPath);
+  const manifest = sourceManifestFromLegacyRootConfig(config2);
+  if (manifest === undefined)
+    return;
+  const manifestPath = join12(skillsetPath, SOURCE_ROOT_DIR2, ROOT_SOURCE_MANIFEST_FILE2);
+  if (await exists7(manifestPath)) {
+    throw new Error(`skillset: cannot normalize baseline with both root source metadata and ${manifestPath}`);
+  }
+  await mkdir4(dirname9(manifestPath), { recursive: true });
+  await writeFile4(manifestPath, stringifyYaml(manifest), "utf8");
+  await writeFile4(configPath, stringifyLegacyWorkspaceConfig(workspaceConfigFromLegacyRootConfig(config2)), "utf8");
+}
+function sourceManifestFromLegacyRootConfig(record) {
+  const manifest = {};
+  if (isJsonRecord(record.skillset))
+    manifest.skillset = record.skillset;
+  if (record.supports !== undefined)
+    manifest.supports = record.supports;
+  return Object.keys(manifest).length === 0 ? undefined : manifest;
+}
+function workspaceConfigFromLegacyRootConfig(record) {
+  const config2 = {};
+  for (const [key, value] of Object.entries(record)) {
+    if (key === "skillset" || key === "supports")
+      continue;
+    config2[key] = value;
+  }
+  return config2;
+}
+function stringifyLegacyWorkspaceConfig(record) {
+  return Object.keys(record).length === 0 ? `
+` : stringifyYaml(record);
+}
+async function moveLegacyBaselinePath(from, to) {
+  if (!await exists7(from))
+    return;
+  if (await exists7(to))
+    throw new Error(`skillset: cannot normalize baseline because ${to} already exists`);
+  await mkdir4(dirname9(to), { recursive: true });
+  await rename(from, to);
+}
 async function sourceInventoryFromReleaseState(rootPath, options, fallback) {
   const state = await readReleaseState(rootPath, options);
   const releaseScopes = Object.entries(state.scopes).filter(([, scope]) => scope.sourceHash !== undefined || scope.removed === true);
@@ -16875,6 +17062,17 @@ function regionsForRecord(record) {
     regions.push({ name: "bin", severityBearing: true });
   return regions.sort((left, right) => compareStrings(left.name, right.name));
 }
+function mergeRegions(regions) {
+  const byName = new Map;
+  for (const region of regions) {
+    const existing = byName.get(region.name);
+    byName.set(region.name, {
+      name: region.name,
+      severityBearing: region.severityBearing || existing?.severityBearing === true
+    });
+  }
+  return [...byName.values()].sort((left, right) => compareStrings(left.name, right.name));
+}
 function companionRegions(path2) {
   if (path2 === "hooks")
     return [{ name: "hooks", severityBearing: true }];
@@ -16974,6 +17172,7 @@ async function validateChangeCheck(rootPath, status, entries, options) {
     entries,
     issues: issues.sort(compareIssues),
     ok: !issues.some((issue) => issue.severity === "error"),
+    stackedEvidence: stackedEvidenceGroups(validEntries, context),
     status
   };
 }
@@ -17117,6 +17316,28 @@ function findDuplicateIds(entries) {
   }
   return new Set([...counts].filter(([, count]) => count > 1).map(([id]) => id));
 }
+function stackedEvidenceGroups(entries, context) {
+  const groups = new Map;
+  for (const entry of entries) {
+    for (const scope of entry.scopes) {
+      const sourceHash = expectedHashForScope(scope, context);
+      if (sourceHash === undefined || !(entry.sourceHashes.get(scope) ?? []).includes(sourceHash))
+        continue;
+      const key = `${scope}\x00${sourceHash}`;
+      const existing = groups.get(key);
+      if (existing === undefined) {
+        groups.set(key, { paths: new Set([entry.path]), scope, sourceHash });
+        continue;
+      }
+      existing.paths.add(entry.path);
+    }
+  }
+  return [...groups.values()].filter((group) => group.paths.size > 1).map((group) => ({
+    paths: [...group.paths].sort(compareStrings),
+    scope: group.scope,
+    sourceHash: group.sourceHash
+  })).sort((left, right) => compareStrings(`${left.scope}\x00${left.sourceHash}`, `${right.scope}\x00${right.sourceHash}`));
+}
 function hasSeverityBearingRegion(regions) {
   return regions?.some((region) => region.severityBearing) === true;
 }
@@ -17237,12 +17458,12 @@ async function exists8(path2) {
 }
 
 // apps/skillset/src/adopt.ts
-import { mkdtemp as mkdtemp3, mkdir as mkdir6, readFile as readFile16, rm as rm5, stat as stat14, writeFile as writeFile6 } from "fs/promises";
+import { mkdtemp as mkdtemp3, mkdir as mkdir7, readFile as readFile16, rm as rm5, stat as stat14, writeFile as writeFile7 } from "fs/promises";
 import { tmpdir as tmpdir2 } from "os";
 import { basename as basename7, dirname as dirname12, join as join17, relative as relative15, resolve as resolve7 } from "path";
 
 // apps/skillset/src/import.ts
-import { mkdir as mkdir4, mkdtemp as mkdtemp2, readdir as readdir5, readFile as readFile14, realpath, rename, rm as rm4, stat as stat12, writeFile as writeFile4 } from "fs/promises";
+import { mkdir as mkdir5, mkdtemp as mkdtemp2, readdir as readdir6, readFile as readFile14, realpath, rename as rename2, rm as rm4, stat as stat12, writeFile as writeFile5 } from "fs/promises";
 import { homedir } from "os";
 import { basename as basename5, dirname as dirname10, join as join15, relative as relative13, resolve as resolve5 } from "path";
 
@@ -17250,7 +17471,7 @@ import { basename as basename5, dirname as dirname10, join as join15, relative a
 import { stat as stat11 } from "fs/promises";
 import { join as join14 } from "path";
 var ROOT_CONFIG_FILE3 = "config.yaml";
-var NO_SOURCE_MESSAGE = "skillset: no source plugins, skills, instructions, project agents, or target-native islands found";
+var NO_SOURCE_MESSAGE = "skillset: no source plugins, skills, rules, project agents, or provider source found";
 async function seedReleaseBaselines(rootPath, options = {}, seedOptions = {}) {
   const sourceDir = options.sourceDir ?? ".skillset";
   const configPath = resolveInside(rootPath, join14(sourceDir, ROOT_CONFIG_FILE3));
@@ -17385,6 +17606,9 @@ async function exists9(path2) {
 
 // apps/skillset/src/import.ts
 var DEFAULT_SOURCE_DIR2 = ".skillset";
+var SOURCE_ROOT_DIR3 = "src";
+var PLUGINS_DIR2 = "plugins";
+var SKILLS_DIR2 = "skills";
 var RECOGNIZED_SOURCE_KEYS = new Set([
   "agents",
   "allowed_tools",
@@ -17433,7 +17657,7 @@ async function importSources(options) {
     files: imports.reduce((total, report) => total + report.files, 0),
     imports,
     kind: plan.kind,
-    loweringOutcomes: imports.flatMap((report) => report.loweringOutcomes),
+    renderResults: imports.flatMap((report) => report.renderResults),
     ...options.provider === undefined ? {} : { provider: options.provider },
     sourcePath,
     warnings: plan.warnings
@@ -17443,12 +17667,12 @@ async function importSource(options) {
   const sourcePath = resolve5(options.sourcePath);
   const sourceDir = options.sourceDir ?? DEFAULT_SOURCE_DIR2;
   const name = await resolveImportName(sourcePath, options);
-  const targetPath = resolveInside(options.rootPath, join15(sourceDir, options.kind === "plugin" ? "plugins" : "skills", name));
+  const targetPath = resolveInside(options.rootPath, join15(sourceDir, SOURCE_ROOT_DIR3, options.kind === "plugin" ? PLUGINS_DIR2 : SKILLS_DIR2, name));
   if (await exists10(targetPath)) {
     throw new Error(`skillset: import target already exists: ${targetPath}. ` + "Import never overwrites; remove the existing source or import under a different --name.");
   }
   const targetParent = dirname10(targetPath);
-  await mkdir4(targetParent, { recursive: true });
+  await mkdir5(targetParent, { recursive: true });
   const stagingPath = await mkdtemp2(join15(targetParent, `.${basename5(targetPath)}.tmp-`));
   let committed = false;
   try {
@@ -17461,7 +17685,7 @@ async function importSource(options) {
     if (await exists10(targetPath)) {
       throw new Error(`skillset: import target already exists: ${targetPath}. ` + "Import never overwrites; remove the existing source or import under a different --name.");
     }
-    await rename(stagingPath, targetPath);
+    await rename2(stagingPath, targetPath);
     committed = true;
     let baselineReport;
     try {
@@ -17480,7 +17704,7 @@ async function importSource(options) {
       files: copiedFiles.length,
       inferredSourceFields: classification.recognized,
       kind: options.kind,
-      loweringOutcomes: importLoweringOutcomes({
+      renderResults: importRenderResults({
         classification,
         kind: options.kind,
         name,
@@ -17538,13 +17762,14 @@ function importWarnings(classification) {
   }
   return warnings;
 }
-function importLoweringOutcomes(args) {
+function importRenderResults(args) {
   const toolPolicyFields = args.classification.targetNative.filter(isClaudeToolPolicyField);
   if (toolPolicyFields.length === 0)
     return [];
   const sourcePath = importSourcePath(args.rootPath, args.targetPath, args.kind);
   return [
-    defineLoweringOutcome({
+    defineRenderResult({
+      destination: "skill-frontmatter",
       diagnostics: [
         {
           code: "import-preserved-target-native-frontmatter",
@@ -17609,8 +17834,8 @@ async function copyImportSource(sourcePath, targetPath, kind, name) {
   const copied = [];
   for (const file of await collectFiles6(copyRoot)) {
     const relativePath2 = relativeImportPath(copyRoot, file, kind);
-    await mkdir4(dirname10(join15(targetPath, relativePath2)), { recursive: true });
-    await writeFile4(join15(targetPath, relativePath2), await readFile14(file));
+    await mkdir5(dirname10(join15(targetPath, relativePath2)), { recursive: true });
+    await writeFile5(join15(targetPath, relativePath2), await readFile14(file));
     copied.push(relativePath2);
   }
   if (kind === "plugin" && !await exists10(join15(targetPath, "skillset.yaml"))) {
@@ -17631,11 +17856,11 @@ async function stampImportedOrigins(targetPath, sourcePath, copiedFiles, kind, s
 }
 async function writeYamlSourceOrigin(path2, origin) {
   const config2 = parseYamlRecord(await readFile14(path2, "utf8"), path2);
-  await writeFile4(path2, stringifyYaml(withSkillsetOrigin(config2, origin)));
+  await writeFile5(path2, stringifyYaml(withSkillsetOrigin(config2, origin)));
 }
 async function writeMarkdownSourceOrigin(path2, origin) {
   const parts = parseMarkdown(await readFile14(path2, "utf8"), path2);
-  await writeFile4(path2, stringifyMarkdown(withSkillsetOrigin(parts.frontmatter, origin), parts.body));
+  await writeFile5(path2, stringifyMarkdown(withSkillsetOrigin(parts.frontmatter, origin), parts.body));
 }
 function withSkillsetOrigin(record, origin) {
   const existing = isJsonRecord(record.skillset) ? record.skillset : {};
@@ -17676,7 +17901,7 @@ async function resolvePluginConfig(sourcePath) {
   return;
 }
 async function collectFiles6(root) {
-  const entries = await readdir5(root, { withFileTypes: true });
+  const entries = await readdir6(root, { withFileTypes: true });
   const files = [];
   for (const entry of entries.sort((left, right) => compareStrings(left.name, right.name))) {
     const path2 = join15(root, entry.name);
@@ -17782,7 +18007,7 @@ async function importChildren(sourcePath, kind, predicate) {
   const stats = await stat12(sourcePath);
   if (!stats.isDirectory())
     return [];
-  const entries = await readdir5(sourcePath, { withFileTypes: true });
+  const entries = await readdir6(sourcePath, { withFileTypes: true });
   const seen = new Set;
   const items = [];
   for (const entry of entries.sort((left, right) => compareStrings(left.name, right.name))) {
@@ -17816,7 +18041,7 @@ async function writeImportedPluginConfig(targetPath, name) {
     license: nativeManifest.license,
     keywords: nativeManifest.keywords
   };
-  await writeFile4(join15(targetPath, "skillset.yaml"), stringifyYaml({
+  await writeFile5(join15(targetPath, "skillset.yaml"), stringifyYaml({
     skillset: metadata
   }));
 }
@@ -17845,7 +18070,7 @@ async function exists10(path2) {
   }
 }
 // apps/skillset/src/setup.ts
-import { mkdir as mkdir5, readdir as readdir6, readFile as readFile15, realpath as realpath2, stat as stat13, writeFile as writeFile5 } from "fs/promises";
+import { mkdir as mkdir6, readdir as readdir7, readFile as readFile15, realpath as realpath2, stat as stat13, writeFile as writeFile6 } from "fs/promises";
 import { basename as basename6, dirname as dirname11, join as join16, relative as relative14, resolve as resolve6 } from "path";
 
 // apps/skillset/src/ci.ts
@@ -18073,6 +18298,16 @@ function renderCiWorkflow() {
 var DEFAULT_CREATE_NAME = "my-skillset";
 var DEFAULT_GLOBAL_SOURCE = ".skillset/src";
 var SETUP_SOURCE_DIR = ".skillset/src";
+var SETUP_SOURCE_PLACEHOLDERS = [
+  "agents",
+  "hooks",
+  "plugins",
+  "rules",
+  "shared",
+  "skills",
+  "_claude",
+  "_codex"
+];
 async function initSkillset(options = {}) {
   const rootPath = await initRootPath(options);
   return applySetupPlan("init", rootPath, options);
@@ -18087,7 +18322,7 @@ async function createSkillset(options = {}) {
     if (!stats.isDirectory()) {
       throw new Error(`skillset: create target exists and is not a directory: ${rootPath}`);
     }
-    const entries = await readdir6(rootPath);
+    const entries = await readdir7(rootPath);
     if (entries.length > 0) {
       throw new Error(`skillset: create target must be empty: ${rootPath}`);
     }
@@ -18113,6 +18348,11 @@ async function applySetupPlan(kind, rootPath, options) {
         files.push({ path: file.path, status: "exists" });
         continue;
       }
+      if (kind === "init" && file.path === `${SETUP_SOURCE_DIR}/skillset.yaml`) {
+        await validateExistingSourceManifest(absolutePath);
+        files.push({ path: file.path, status: "exists" });
+        continue;
+      }
       if (file.path === CI_WORKFLOW_PATH) {
         files.push({ path: file.path, status: "exists" });
         continue;
@@ -18127,8 +18367,8 @@ async function applySetupPlan(kind, rootPath, options) {
       const existing = await readExistingFile(absolutePath);
       if (existing !== undefined)
         continue;
-      await mkdir5(dirname11(absolutePath), { recursive: true });
-      await writeFile5(absolutePath, file.content);
+      await mkdir6(dirname11(absolutePath), { recursive: true });
+      await writeFile6(absolutePath, file.content);
     }
     if (git?.status === "create")
       await initializeGit(rootPath);
@@ -18174,7 +18414,11 @@ async function gitRoot(cwd) {
 }
 async function validateExistingRootConfig(path2) {
   const content = await readFile15(path2, "utf8");
-  validateConfigDocument(parseYamlRecord(content, path2), path2, { allowCompile: true });
+  validateWorkspaceConfigDocument(parseYamlRecord(content, path2), path2);
+}
+async function validateExistingSourceManifest(path2) {
+  const content = await readFile15(path2, "utf8");
+  validateRootSourceManifestDocument(parseYamlRecord(content, path2), path2);
 }
 var GENERATED_INSTRUCTIONS_MARKER = "<!-- Generated by skillset";
 var ROOT_INSTRUCTION_FILES = ["AGENTS.md", "CLAUDE.md"];
@@ -18211,7 +18455,7 @@ async function nestedPluginSources(rootPath) {
     return [];
   const realRoot = await realpath2(rootPath);
   const sources = [];
-  for (const entry of (await readdir6(pluginsPath)).sort()) {
+  for (const entry of (await readdir7(pluginsPath)).sort()) {
     const absolutePath = join16(pluginsPath, entry);
     if (!await pathExists(absolutePath))
       continue;
@@ -18256,17 +18500,17 @@ async function detectSurveySkips(rootPath) {
     relativeTargetPath: "agents",
     target: "claude"
   }));
-  await maybeSkip(skips, rootPath, ".claude/rules", "rules", "rules are not importable yet; adopt will lower them to .skillset/instructions/ in the transform milestone", surveySkipOutcome({
+  await maybeSkip(skips, rootPath, ".claude/rules", "rules", "rules are not importable yet; adopt will lower them to .skillset/src/rules/ in the transform milestone", surveySkipOutcome({
     featureId: "project-instructions",
     path: ".claude/rules",
-    reason: "rules are not importable yet; adopt will lower them to .skillset/instructions/ in the transform milestone",
+    reason: "rules are not importable yet; adopt will lower them to .skillset/src/rules/ in the transform milestone",
     relativeTargetPath: "rules",
     target: "claude"
   }));
   if (await hasNonSkillCodexContent(rootPath)) {
     const reason = "Codex content outside .codex/skills has no portable lowering yet; adopt will lower it to target-native islands in the transform milestone";
     skips.push({
-      loweringOutcome: surveySkipOutcome({
+      renderResult: surveySkipOutcome({
         featureId: "target-native-islands",
         path: ".codex",
         reason,
@@ -18281,7 +18525,7 @@ async function detectSurveySkips(rootPath) {
   for (const path2 of await foreignPluginManifests(rootPath)) {
     const reason = "plugin manifest for an unsupported target; skillset can only represent claude and codex surfaces";
     skips.push({
-      loweringOutcome: foreignManifestSkipOutcome(path2, reason),
+      renderResult: foreignManifestSkipOutcome(path2, reason),
       path: path2,
       reason,
       surface: "foreign-manifest"
@@ -18289,7 +18533,7 @@ async function detectSurveySkips(rootPath) {
   }
   return skips.sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0);
 }
-async function maybeSkip(skips, rootPath, path2, surface, reason, loweringOutcome) {
+async function maybeSkip(skips, rootPath, path2, surface, reason, renderResult) {
   const absolutePath = join16(rootPath, path2);
   if (!await pathExists(absolutePath))
     return;
@@ -18297,13 +18541,14 @@ async function maybeSkip(skips, rootPath, path2, surface, reason, loweringOutcom
     return;
   if (await isManagedCandidate(absolutePath))
     return;
-  const entries = await readdir6(absolutePath);
+  const entries = await readdir7(absolutePath);
   if (entries.filter((entry) => entry !== ".DS_Store").length === 0)
     return;
-  skips.push({ ...loweringOutcome === undefined ? {} : { loweringOutcome }, path: path2, reason, surface });
+  skips.push({ ...renderResult === undefined ? {} : { renderResult }, path: path2, reason, surface });
 }
 function surveySkipOutcome(args) {
-  return defineLoweringOutcome({
+  return defineRenderResult({
+    destination: "target-native-island",
     diagnostics: [
       {
         code: "adoption-survey-skip",
@@ -18321,7 +18566,7 @@ function surveySkipOutcome(args) {
   });
 }
 function foreignManifestSkipOutcome(path2, reason) {
-  return defineLoweringOutcome({
+  return defineRenderResult({
     diagnostics: [{ code: "adoption-survey-skip", message: reason, path: path2 }],
     featureId: "runtime-adapters",
     policy: "default",
@@ -18342,12 +18587,12 @@ async function hasNonSkillCodexContent(rootPath) {
     return false;
   if (await isManagedCandidate(codexPath))
     return false;
-  const entries = await readdir6(codexPath);
+  const entries = await readdir7(codexPath);
   return entries.some((entry) => entry !== "skills" && entry !== ".DS_Store");
 }
 async function foreignPluginManifests(rootPath) {
   const paths = [];
-  for (const entry of (await readdir6(rootPath)).sort()) {
+  for (const entry of (await readdir7(rootPath)).sort()) {
     if (NATIVE_PLUGIN_MANIFEST_DIRS.has(entry))
       continue;
     if (!/^\.[a-z][a-z0-9]*-plugin$/.test(entry))
@@ -18412,7 +18657,7 @@ async function maybeCandidate(candidates, rootPath, path2, kind) {
     return;
   if (await isManagedCandidate(absolutePath))
     return;
-  const entries = await readdir6(absolutePath);
+  const entries = await readdir7(absolutePath);
   if (entries.filter((entry) => entry !== ".DS_Store").length === 0)
     return;
   candidates.push({ kind, path: relative14(rootPath, absolutePath).replaceAll("\\", "/") });
@@ -18427,12 +18672,20 @@ function setupFiles(options) {
   const files = [
     {
       path: ".skillset/config.yaml",
-      content: rootConfig(options.name, options.targets)
+      content: rootConfig(options.targets)
+    },
+    {
+      path: `${SETUP_SOURCE_DIR}/skillset.yaml`,
+      content: rootSourceManifest(options.name)
     },
     {
       path: `${SETUP_SOURCE_DIR}/.gitkeep`,
       content: ""
-    }
+    },
+    ...SETUP_SOURCE_PLACEHOLDERS.map((directory) => ({
+      path: `${SETUP_SOURCE_DIR}/${directory}/.gitkeep`,
+      content: ""
+    }))
   ];
   if (options.kind === "create" && options.global !== true) {
     files.unshift({
@@ -18444,12 +18697,6 @@ function setupFiles(options) {
     });
   }
   const include = options.include ?? [];
-  if (include.includes("agents")) {
-    files.push({
-      path: `${SETUP_SOURCE_DIR}/agents/.gitkeep`,
-      content: ""
-    });
-  }
   if (include.includes("ci")) {
     files.push({ path: CI_WORKFLOW_PATH, content: renderCiWorkflow() });
   }
@@ -18464,7 +18711,7 @@ async function setupGit(kind, rootPath, options) {
   };
 }
 async function initializeGit(rootPath) {
-  await mkdir5(rootPath, { recursive: true });
+  await mkdir6(rootPath, { recursive: true });
   const proc = Bun.spawn({
     cmd: ["git", "init", "-q"],
     cwd: rootPath,
@@ -18482,12 +18729,10 @@ async function initializeGit(rootPath) {
 ${stdout}${stderr}`.trim());
   }
 }
-function rootConfig(name, targets) {
+function rootConfig(targets) {
   const targetLines = targets.map((target) => `    - ${target}`).join(`
 `);
   return [
-    "skillset:",
-    `  name: ${name}`,
     "compile:",
     "  targets:",
     targetLines,
@@ -18495,11 +18740,19 @@ function rootConfig(name, targets) {
   ].join(`
 `);
 }
+function rootSourceManifest(name) {
+  return [
+    "skillset:",
+    `  name: ${name}`,
+    ""
+  ].join(`
+`);
+}
 function createReadme(name, targets) {
   return [
     `# ${name}`,
     "",
-    "This repository is a Skillset source repo. Edit files under `.skillset/`, then run Skillset commands to preview or write generated Claude and Codex outputs.",
+    "This repository is a Skillset source repo. Edit files under `.skillset/src/`, then run Skillset commands to preview or write generated Claude and Codex outputs.",
     "",
     "## Quick Start",
     "",
@@ -18512,10 +18765,11 @@ function createReadme(name, targets) {
     "",
     "## Layout",
     "",
-    "- `.skillset/config.yaml` selects compile targets and source settings.",
-    "- `.skillset/src/` is the portable project source area for instructions, agents, and target-native islands.",
-    "- `.skillset/plugins/` holds plugin source when this repo authors marketplace plugins.",
-    "- `.skillset/skills/` holds standalone skill source when this repo authors repo-local or user skill roots.",
+    "- `.skillset/config.yaml` selects compile targets and destination settings.",
+    "- `.skillset/src/skillset.yaml` names the source loadout and carries root source metadata.",
+    "- `.skillset/src/` is the adaptive project source area for rules, agents, hooks, skills, plugins, shared files, and provider source.",
+    "- `.skillset/src/plugins/` holds plugin source when this repo authors marketplace plugins.",
+    "- `.skillset/src/skills/` holds standalone skill source when this repo authors repo-local or user skill roots.",
     "",
     `Default compile targets: ${targets.join(", ")}.`,
     ""
@@ -18530,7 +18784,8 @@ function createAgentsGuide(name) {
     "",
     "## Working Rules",
     "",
-    "- Treat `.skillset/` as editable source.",
+    "- Treat `.skillset/src/` as editable source.",
+    "- Treat `.skillset/config.yaml` as workspace/build configuration.",
     "- Treat generated target directories as outputs; do not hand-edit them as source truth.",
     "- Run `skillset build --dry-run` before writing generated outputs.",
     "- Run `skillset check` before committing source changes.",
@@ -18597,7 +18852,7 @@ function isErrno2(error, code) {
 
 // apps/skillset/src/adopt.ts
 var ADOPT_REPORT_DIR = ".skillset/build/adopt";
-var INSTRUCTIONS_DIR2 = ".skillset/instructions";
+var INSTRUCTIONS_DIR = ".skillset/src/rules";
 async function adoptSkillset(source2, options = {}) {
   const { cwd, targets, write, ...buildOptions } = options;
   const acquisition = await acquireAdoptSource(source2, cwd ?? process.cwd());
@@ -18628,7 +18883,7 @@ async function adoptResolvedRoot(acquisition, options = {}) {
       cutover: [],
       imports: [],
       lintIssues: [],
-      loweringOutcomes: surveySkipLoweringOutcomes(init.surveySkips),
+      renderResults: surveySkipRenderResults(init.surveySkips),
       ok: true,
       rootPath: init.rootPath,
       setupFiles: init.files,
@@ -18653,17 +18908,17 @@ async function adoptResolvedRoot(acquisition, options = {}) {
     buildError = errorMessage3(error);
   }
   let builtFiles = 0;
-  let loweringOutcomes = [
-    ...surveySkipLoweringOutcomes(init.surveySkips),
-    ...imports.flatMap((result) => result.loweringOutcomes)
+  let renderResults = [
+    ...surveySkipRenderResults(init.surveySkips),
+    ...imports.flatMap((result) => result.renderResults)
   ];
   if (buildError === undefined) {
     try {
       const build2 = await buildSkillsetResult(init.rootPath, { ...buildOptions, isolated: true });
       builtFiles = build2.data.length;
-      loweringOutcomes = [
-        ...loweringOutcomes,
-        ...build2.loweringOutcomes
+      renderResults = [
+        ...renderResults,
+        ...build2.renderResults
       ];
     } catch (error) {
       buildError = errorMessage3(error);
@@ -18680,7 +18935,7 @@ async function adoptResolvedRoot(acquisition, options = {}) {
     cutover,
     imports,
     lintIssues,
-    loweringOutcomes,
+    renderResults,
     ok: imports.every((result) => result.ok) && lintErrors.length === 0 && buildError === undefined,
     rootPath: init.rootPath,
     setupFiles: init.files,
@@ -18689,14 +18944,14 @@ async function adoptResolvedRoot(acquisition, options = {}) {
     write: true
   };
   const reportDir = join17(init.rootPath, ADOPT_REPORT_DIR);
-  await mkdir6(reportDir, { recursive: true });
-  await writeFile6(join17(reportDir, "report.md"), renderAdoptReportMarkdown(report, { rootPath: init.rootPath }));
-  await writeFile6(join17(reportDir, "report.json"), `${JSON.stringify(report, null, 2)}
+  await mkdir7(reportDir, { recursive: true });
+  await writeFile7(join17(reportDir, "report.md"), renderAdoptReportMarkdown(report, { rootPath: init.rootPath }));
+  await writeFile7(join17(reportDir, "report.json"), `${JSON.stringify(report, null, 2)}
 `);
   return report;
 }
-function surveySkipLoweringOutcomes(skips) {
-  return skips.flatMap((skip) => skip.loweringOutcome === undefined ? [] : [skip.loweringOutcome]);
+function surveySkipRenderResults(skips) {
+  return skips.flatMap((skip) => skip.renderResult === undefined ? [] : [skip.renderResult]);
 }
 async function acquireAdoptSource(source2, cwd) {
   const localPath = resolve7(cwd, source2);
@@ -18740,9 +18995,9 @@ async function importCandidate(rootPath, acquisition, candidate, cutover, previe
       await writeMarkdownSourceOrigin2(join17(rootPath, destination), sourceOriginFor(acquisition, candidate.path));
       cutover.push(candidate.path);
       previewSources.push(destination);
-      return { candidate, destination, detail: destination, loweringOutcomes: [], ok: true, units: [] };
+      return { candidate, destination, detail: destination, renderResults: [], ok: true, units: [] };
     } catch (error) {
-      return { candidate, detail: errorMessage3(error), loweringOutcomes: [], ok: false, units: [] };
+      return { candidate, detail: errorMessage3(error), renderResults: [], ok: false, units: [] };
     }
   }
   try {
@@ -18770,23 +19025,23 @@ async function importCandidate(rootPath, acquisition, candidate, cutover, previe
     return {
       candidate,
       detail: `${units.map((unit) => `${unit.kind} ${unit.name}`).join(", ")} (${batch.files} files)`,
-      loweringOutcomes: batch.loweringOutcomes,
+      renderResults: batch.renderResults,
       ok: true,
       units
     };
   } catch (error) {
-    return { candidate, detail: errorMessage3(error), loweringOutcomes: [], ok: false, units: [] };
+    return { candidate, detail: errorMessage3(error), renderResults: [], ok: false, units: [] };
   }
 }
 async function importInstructionFile(rootPath, sourceName) {
-  const destinationRelative = `${INSTRUCTIONS_DIR2}/${sourceName.toLowerCase()}`;
+  const destinationRelative = `${INSTRUCTIONS_DIR}/${sourceName.toLowerCase()}`;
   const destination = join17(rootPath, destinationRelative);
   if (await exists11(destination)) {
     throw new Error(`skillset: instructions import target already exists: ${destinationRelative}. ` + "Adopt never overwrites; remove the existing file or merge by hand.");
   }
   const content = await readFile16(join17(rootPath, sourceName));
-  await mkdir6(dirname12(destination), { recursive: true });
-  await writeFile6(destination, content);
+  await mkdir7(dirname12(destination), { recursive: true });
+  await writeFile7(destination, content);
   return destinationRelative;
 }
 function sourceOriginFor(acquisition, path2) {
@@ -18799,7 +19054,7 @@ function relativeOriginPath(rootPath, sourcePath, copiedFile) {
 }
 async function writeMarkdownSourceOrigin2(path2, origin) {
   const parts = parseMarkdown(await readFile16(path2, "utf8"), path2);
-  await writeFile6(path2, stringifyMarkdown(withSkillsetOrigin2(parts.frontmatter, origin), parts.body));
+  await writeFile7(path2, stringifyMarkdown(withSkillsetOrigin2(parts.frontmatter, origin), parts.body));
 }
 function withSkillsetOrigin2(record, origin) {
   const existing = isJsonRecord(record.skillset) ? record.skillset : {};
@@ -18859,7 +19114,7 @@ dialect: claude
 ---
 
 ${raw}`;
-  await writeFile6(path2, updated);
+  await writeFile7(path2, updated);
   return true;
 }
 function markdownBody(raw, label) {
@@ -18881,7 +19136,7 @@ function renderAdoptReportMarkdown(report, opts) {
   if (report.alreadyAdopted) {
     lines.push("- note: the repo already had `.skillset/config.yaml`; adoption proceeded against the existing source tree");
   }
-  lines.push(`- imports: ${succeeded.length} succeeded, ${failed.length} failed`, `- lint: ${lintErrors.length} error(s), ${lintWarnings.length} warning(s)`, report.buildError === undefined ? `- build (isolated): ${report.builtFiles} generated files` : "- build (isolated): failed", `- lowering outcomes: ${report.loweringOutcomes.length}`, "");
+  lines.push(`- imports: ${succeeded.length} succeeded, ${failed.length} failed`, `- lint: ${lintErrors.length} error(s), ${lintWarnings.length} warning(s)`, report.buildError === undefined ? `- build (isolated): ${report.builtFiles} generated files` : "- build (isolated): failed", `- render results: ${report.renderResults.length}`, "");
   lines.push("## Acquisition", "");
   if (report.acquisition.kind === "git") {
     lines.push("- source: git remote", `- repo: \`${report.acquisition.repo}\``, `- ref: \`${report.acquisition.ref}\``, `- clone: \`${report.acquisition.rootPath}\``, "");
@@ -18970,15 +19225,15 @@ function renderAdoptReportMarkdown(report, opts) {
   } else {
     lines.push("```", report.buildError.trimEnd(), "```", "");
   }
-  lines.push("### Lowering outcomes", "");
-  if (report.loweringOutcomes.length === 0) {
-    lines.push("No lowering outcomes recorded.", "");
+  lines.push("### Render results", "");
+  if (report.renderResults.length === 0) {
+    lines.push("No render results recorded.", "");
   } else {
-    for (const summary of summarizeLoweringOutcomes(report.loweringOutcomes)) {
+    for (const summary of summarizeRenderResults(report.renderResults)) {
       lines.push(`- ${summary}`);
     }
     lines.push("");
-    lines.push("Full structured lowering outcomes are in `report.json` and in the isolated `.skillset.lock` files when the isolated build completes.", "");
+    lines.push("Full structured render results are in `report.json` and in the isolated `.skillset.lock` files when the isolated build completes.", "");
   }
   lines.push("## Cutover", "");
   lines.push(`1. Review the generated mirror under \`${ISOLATED_OUT_ROOT}/\` against the originals.`);
@@ -18996,7 +19251,7 @@ function renderAdoptReportMarkdown(report, opts) {
 `).trimEnd()}
 `;
 }
-function summarizeLoweringOutcomes(outcomes) {
+function summarizeRenderResults(outcomes) {
   const counts = new Map;
   for (const outcome of outcomes) {
     const key = `${outcome.target ?? "workspace"} ${outcome.status}`;
@@ -19036,7 +19291,7 @@ async function exists11(path2) {
 
 // apps/skillset/src/change-workflow.ts
 import { createHash as createHash6, randomBytes } from "crypto";
-import { mkdir as mkdir7, readFile as readFile17, stat as stat15, writeFile as writeFile7 } from "fs/promises";
+import { mkdir as mkdir8, readFile as readFile17, stat as stat15, writeFile as writeFile8 } from "fs/promises";
 import { isAbsolute as isAbsolute2, join as join18, resolve as resolve8 } from "path";
 var PENDING_DIR2 = "changes/pending";
 var HISTORY_FILE2 = "changes/history.jsonl";
@@ -19070,8 +19325,8 @@ async function addChangeEntry(rootPath, options) {
     scopes,
     sourceHashes
   });
-  await mkdir7(resolveInside(rootPath, join18(sourceDir, PENDING_DIR2)), { recursive: true });
-  await writeFile7(absolutePath, stringifyMarkdown(entryFrontmatter, reason), "utf8");
+  await mkdir8(resolveInside(rootPath, join18(sourceDir, PENDING_DIR2)), { recursive: true });
+  await writeFile8(absolutePath, stringifyMarkdown(entryFrontmatter, reason), "utf8");
   const [entry] = await readPendingChangeEntries(rootPath, statusOptions).then((entries) => entries.filter((item) => item.id === id));
   if (entry === undefined)
     throw new Error(`skillset: failed to read created change entry ${id}`);
@@ -19087,7 +19342,7 @@ async function updateChangeReason(rootPath, options) {
   const body = options.append ? `${parts.body.trimEnd()}
 
 ${newReason}` : newReason;
-  await writeFile7(absolutePath, stringifyMarkdown(parts.frontmatter, body), "utf8");
+  await writeFile8(absolutePath, stringifyMarkdown(parts.frontmatter, body), "utf8");
   const updated = resolvePendingChangeRef(await readPendingChangeEntries(rootPath, options), entry.id ?? options.ref);
   const refs = refIndex([updated], await readHistoryEntries(rootPath, options));
   return { entry: pendingView(updated, refs) };
@@ -19823,10 +20078,10 @@ function renderAgentRuntimeSnippet(target) {
 // apps/skillset/src/runtime-hooks/source-gate.ts
 var HOOK_RELEVANT_SOURCE_PATHS = [
   ".skillset/config.yaml",
-  ".skillset/instructions",
-  ".skillset/skills",
-  ".skillset/plugins",
-  ".skillset/shared",
+  ".skillset/src/rules",
+  ".skillset/src/skills",
+  ".skillset/src/plugins",
+  ".skillset/src/shared",
   ".skillset/src",
   ".skillset/changes/pending"
 ];
@@ -19913,7 +20168,7 @@ function result(args) {
   };
 }
 // apps/skillset/src/release.ts
-import { appendFile, mkdir as mkdir8, readFile as readFile19, rm as rm6, stat as stat17, writeFile as writeFile8 } from "fs/promises";
+import { appendFile, mkdir as mkdir9, readFile as readFile19, rm as rm6, stat as stat17, writeFile as writeFile9 } from "fs/promises";
 import { createHash as createHash7 } from "crypto";
 import { dirname as dirname13, join as join20 } from "path";
 var HISTORY_FILE3 = "changes/history.jsonl";
@@ -20119,7 +20374,7 @@ async function appendHistory(rootPath, sourceDir, entries, appliedAt, files) {
     return;
   const relativePath2 = join20(sourceDir, HISTORY_FILE3).replaceAll("\\", "/");
   const absolutePath = resolveInside(rootPath, relativePath2);
-  await mkdir8(dirname13(absolutePath), { recursive: true });
+  await mkdir9(dirname13(absolutePath), { recursive: true });
   const lines = entries.flatMap((entry) => entry.id === undefined || entry.bump === undefined ? [] : [
     JSON.stringify({
       appliedAt,
@@ -20144,7 +20399,7 @@ async function appendReleaseRecord(rootPath, sourceDir, plan, appliedAt, files)
     return;
   const relativePath2 = join20(sourceDir, RELEASES_FILE).replaceAll("\\", "/");
   const absolutePath = resolveInside(rootPath, relativePath2);
-  await mkdir8(dirname13(absolutePath), { recursive: true });
+  await mkdir9(dirname13(absolutePath), { recursive: true });
   await appendFile(absolutePath, `${JSON.stringify({
     appliedAt,
     baseline: { hashSchema: SOURCE_HASH_SCHEMA, kind: "source-hashes" },
@@ -20188,8 +20443,8 @@ async function restoreSnapshots(rootPath, snapshots) {
       await rm6(absolutePath, { force: true });
       continue;
     }
-    await mkdir8(dirname13(absolutePath), { recursive: true });
-    await writeFile8(absolutePath, snapshot.content);
+    await mkdir9(dirname13(absolutePath), { recursive: true });
+    await writeFile9(absolutePath, snapshot.content);
   }
 }
 async function exists14(path2) {
@@ -20233,7 +20488,7 @@ function releaseIdFor(scopes) {
   return hash.digest("hex").slice(0, 12);
 }
 // apps/skillset/src/test-runner.ts
-import { cp, mkdir as mkdir9, mkdtemp as mkdtemp4, readFile as readFile20, rm as rm7, stat as stat18, writeFile as writeFile9 } from "fs/promises";
+import { cp, mkdir as mkdir10, mkdtemp as mkdtemp4, readFile as readFile20, rm as rm7, stat as stat18, writeFile as writeFile10 } from "fs/promises";
 import { createHash as createHash8, randomBytes as randomBytes2 } from "crypto";
 import { dirname as dirname14, join as join21, relative as relative16, resolve as resolve9 } from "path";
 import { tmpdir as tmpdir3 } from "os";
@@ -20264,7 +20519,7 @@ async function runSkillsetTest(rootPath, name, options = {}) {
   const workspaceLockPath = resolveInside(rootPath, ".skillset.lock");
   const ignoredSourceBuildPath = resolveInside(rootPath, join21(sourceDir, "build"));
   try {
-    await mkdir9(stagingWorkspacePath, { recursive: true });
+    await mkdir10(stagingWorkspacePath, { recursive: true });
     await cp(sourcePath, stagingSourcePath, {
       filter: (path2) => !isSameOrInside2(ignoredSourceBuildPath, path2),
       recursive: true
@@ -20289,7 +20544,7 @@ async function runSkillsetTest(rootPath, name, options = {}) {
     if (assertions.every((assertion) => assertion.ok)) {
       await validateActivationExpectations(stagingWorkspacePath, declaration, buildOptions);
     }
-    await mkdir9(runPath, { recursive: true });
+    await mkdir10(runPath, { recursive: true });
     await cp(stagingWorkspacePath, workspacePath, { recursive: true });
     const activationPath = await writeActivationProbes(runPath, declaration);
     const ok = assertions.every((assertion) => assertion.ok);
@@ -20314,8 +20569,8 @@ async function runSkillsetTest(rootPath, name, options = {}) {
       ...activationReport,
       workspacePath: relative16(rootPath, workspacePath)
     };
-    await writeFile9(reportPath, renderValidatedJson(report, relative16(rootPath, reportPath)), "utf8");
-    await writeFile9(reportMarkdownPath, renderMarkdownReport(report), "utf8");
+    await writeFile10(reportPath, renderValidatedJson(report, relative16(rootPath, reportPath)), "utf8");
+    await writeFile10(reportMarkdownPath, renderMarkdownReport(report), "utf8");
     await refreshLatest(buildRoot, runPath, latestPath, report, rootPath);
     return {
       assertions,
@@ -20580,16 +20835,16 @@ async function writeActivationProbes(runPath, declaration) {
     if (probes.length === 0)
       continue;
     const targetRoot = join21(activationRoot, target);
-    await mkdir9(targetRoot, { recursive: true });
+    await mkdir10(targetRoot, { recursive: true });
     const records = probes.map((probe) => activationProbeRecord(probe, target));
-    await writeFile9(join21(targetRoot, "probes.json"), renderValidatedJson({
+    await writeFile10(join21(targetRoot, "probes.json"), renderValidatedJson({
       probes: records,
       schemaVersion: TEST_SCHEMA,
       target
     }, `activation ${target} probes`), "utf8");
     for (const record of records) {
       const name = typeof record.name === "string" ? record.name : "probe";
-      await writeFile9(join21(targetRoot, `${name}.md`), renderActivationProbeMarkdown(record), "utf8");
+      await writeFile10(join21(targetRoot, `${name}.md`), renderActivationProbeMarkdown(record), "utf8");
     }
   }
   return activationRoot;
@@ -20653,7 +20908,7 @@ async function refreshLatest(buildRoot, runPath, latestPath, report, rootPath) {
     source: report.source,
     workspacePath: relative16(rootPath, join21(latestPath, "workspace"))
   };
-  await writeFile9(join21(buildRoot, "latest.json"), renderValidatedJson(latest, relative16(rootPath, join21(buildRoot, "latest.json"))), "utf8");
+  await writeFile10(join21(buildRoot, "latest.json"), renderValidatedJson(latest, relative16(rootPath, join21(buildRoot, "latest.json"))), "utf8");
 }
 function renderMarkdownReport(report) {
   const assertions = Array.isArray(report.assertions) ? report.assertions : [];
@@ -20699,7 +20954,7 @@ async function pathExists2(path2) {
 async function copyIfExists(sourcePath, targetPath) {
   if (!await pathExists2(sourcePath))
     return;
-  await mkdir9(dirname14(targetPath), { recursive: true });
+  await mkdir10(dirname14(targetPath), { recursive: true });
   await cp(sourcePath, targetPath);
 }
 async function copyWorkspaceManagedFiles(rootPath, stagingWorkspacePath, workspaceLockPath, sourceDir) {
@@ -20765,8 +21020,8 @@ var USAGE = [
   "       skillset hooks print --target <claude|codex> --agent-runtime",
   "       skillset hooks run <post-tool-use|stop> [--root <path>]",
   "       skillset adopt <path> [--yes|--dry-run] [--targets claude,codex] [--root <path>]",
-  "       skillset init [path] [--yes|--dry-run] [--targets claude,codex] [--include agents,ci] [--name <name>] [--root <path>]",
-  "       skillset create [path|--global] [--yes|--dry-run] [--targets claude,codex] [--include agents,ci] [--name <name>] [--root <path>]",
+  "       skillset init [path] [--yes|--dry-run] [--targets claude,codex] [--include ci] [--name <name>] [--root <path>]",
+  "       skillset create [path|--global] [--yes|--dry-run] [--targets claude,codex] [--include ci] [--name <name>] [--root <path>]",
   "       skillset explain <path> [--json] [--scope <scope>] [--root <path>] [--source <dir>]",
   "       skillset import <path> [--kind <skill|skills|plugin|plugins>] [--from <provider>] [--name <name>] [--root <path>] [--source <dir>]",
   "       skillset import <claude|codex|agents> [--root <path>] [--source <dir>]"
@@ -20845,8 +21100,8 @@ async function runCli(rawArgs = process.argv.slice(2), invokedName = basename8(p
     });
     if (ciReportPath !== undefined) {
       const reportPath = resolve10(ciReportPath);
-      await mkdir10(dirname15(reportPath), { recursive: true });
-      await writeFile10(reportPath, renderCiReportMarkdown(report));
+      await mkdir11(dirname15(reportPath), { recursive: true });
+      await writeFile11(reportPath, renderCiReportMarkdown(report));
     }
     printCiReport(report);
     if (!report.ok)
@@ -21159,8 +21414,8 @@ async function runCli(rawArgs = process.argv.slice(2), invokedName = basename8(p
       console.log(`    claude: ${feature2.targetSupport.claude.status}`);
       console.log(`    codex: ${feature2.targetSupport.codex.status}`);
     }
-    for (const outcome of result3.loweringOutcomes) {
-      printLoweringOutcome(outcome);
+    for (const outcome of result3.renderResults) {
+      printRenderResult(outcome);
     }
     for (const note of result3.notes)
       console.log(`  note: ${note}`);
@@ -21191,14 +21446,14 @@ async function runCli(rawArgs = process.argv.slice(2), invokedName = basename8(p
     console.log(`  features: ${report.featureCapabilities.total} registry entries; status ${formatCountSummary(report.featureCapabilities.byFeatureStatus)}`);
     console.log(`  feature support: claude ${formatCountSummary(report.featureCapabilities.byTargetSupport.claude)}`);
     console.log(`  feature support: codex ${formatCountSummary(report.featureCapabilities.byTargetSupport.codex)}`);
-    for (const outcome of report.notableLoweringOutcomes) {
-      printLoweringOutcome(outcome);
+    for (const outcome of report.notableRenderResults) {
+      printRenderResult(outcome);
     }
     if (report.ok) {
-      if (report.notableLoweringOutcomes.length === 0) {
+      if (report.notableRenderResults.length === 0) {
         console.log("skillset: doctor found no problems");
       } else {
-        console.log(`skillset: doctor found ${report.notableLoweringOutcomes.length} lowering outcome advisor${report.notableLoweringOutcomes.length === 1 ? "y" : "ies"}`);
+        console.log(`skillset: doctor found ${report.notableRenderResults.length} render result advisor${report.notableRenderResults.length === 1 ? "y" : "ies"}`);
       }
     } else {
       const problems = [];
@@ -21208,8 +21463,8 @@ async function runCli(rawArgs = process.argv.slice(2), invokedName = basename8(p
         problems.push("generated-output drift");
       if (report.buildError !== undefined)
         problems.push("a build error");
-      if (report.notableLoweringOutcomes.length > 0) {
-        problems.push(`${report.notableLoweringOutcomes.length} lowering outcome advisor${report.notableLoweringOutcomes.length === 1 ? "y" : "ies"}`);
+      if (report.notableRenderResults.length > 0) {
+        problems.push(`${report.notableRenderResults.length} render result advisor${report.notableRenderResults.length === 1 ? "y" : "ies"}`);
       }
       console.log(`skillset: doctor found ${problems.join(" and ")}`);
       process.exitCode = 1;
@@ -21275,6 +21530,9 @@ function printChangeCheck(report) {
     const path2 = issue.path === undefined ? "" : `${issue.path}: `;
     console.log(`  ${issue.severity}: ${path2}${issue.code}: ${issue.message}`);
   }
+  for (const group of report.stackedEvidence) {
+    console.log(`  stacked evidence: ${sourceUnitDisplay(group.scope)} ${group.sourceHash} shared by ${group.paths.length} pending entries: ${group.paths.join(", ")}`);
+  }
   const errors = report.issues.filter((issue) => issue.severity === "error").length;
   const warnings = report.issues.length - errors;
   if (errors === 0) {
@@ -21572,11 +21830,12 @@ function formatFeatureSupport(support) {
 function formatCountSummary(counts) {
   return Object.entries(counts).sort(([left], [right]) => left.localeCompare(right)).map(([key, count]) => `${key} ${count}`).join(", ");
 }
-function printLoweringOutcome(outcome) {
+function printRenderResult(outcome) {
   const target = outcome.target ?? "workspace";
+  const destination = outcome.destination === undefined ? "" : ` -> ${outcome.destination}`;
   const policy = outcome.policy === undefined ? "" : ` policy: ${outcome.policy}`;
   const reason = outcome.reason === undefined ? "" : ` reason: ${outcome.reason}`;
-  console.log(`  lowering [${target}] ${outcome.sourceUnit}: ${outcome.featureId} ${outcome.status}${policy}${reason}`);
+  console.log(`  render [${target}] ${outcome.sourceUnit}: ${outcome.featureId}${destination} ${outcome.status}${policy}${reason}`);
   if (outcome.outputs !== undefined && outcome.outputs.length > 0) {
     console.log(`    outputs: ${outcome.outputs.map((output) => output.path).join(", ")}`);
   }
@@ -22096,8 +22355,8 @@ function mergeSetupIncludes(current, value) {
     throw new Error("skillset: --include requires at least one value");
   const seen = new Set(current ?? []);
   for (const include of includes) {
-    if (include !== "agents" && include !== "ci") {
-      throw new Error("skillset: expected --include agents, ci, or a comma-separated combination");
+    if (include !== "ci") {
+      throw new Error("skillset: expected --include ci");
     }
     seen.add(include);
   }