@unoverse-platform/studio 0.1.73 → 0.1.75

package/bin/studio.mjs

@@ -167,6 +167,11 @@ process.env.UNOVERSE_HOME = projectRoot;
 // topUpSamples explains the record that makes that distinction safe.
 {
   const { topUpSamples } = await import("../local/scaffold.mjs");
+  // NO PROJECT ARGUMENT ON PURPOSE. Since skills and blocks became org-scoped
+  // (2026-08-24) their samples need a project to land in, and a workspace may hold
+  // several — picking one here would drop a sample into an arbitrary org. Those
+  // samples arrive with `createFirstProject`, which is the only moment a destination
+  // is unambiguous; workspace-level samples (nodes) still top up on every launch.
   try { topUpSamples(projectRoot); } catch { /* a read-only folder must not block launch */ }
 }
 console.log(`\n  Studio reading: ${designHome(projectRoot)}\n`);

package/local/scaffold.mjs

@@ -73,7 +73,11 @@ export function createProject(home, name) {
   const root = join(designHome(home), name);
   if (existsSync(root)) throw new Error(`${name} already exists in this workspace`);
 
-  for (const d of ["components/welcome", "apps", "styles"]) mkdirSync(join(root, d), { recursive: true });
+  // EVERY AUTHORED KIND LIVES UNDER THE ORG (2026-08-24). skills/ and blocks/ moved in
+  // beside components/apps/styles so a skill is org-scoped exactly like a component —
+  // two orgs may each ship an `hr-education-coach` without colliding on one flat name
+  // (items/collect.ts qualifies a skill's row `<org>/<name>`).
+  for (const d of ["components/welcome", "apps", "styles", "skills", "blocks"]) mkdirSync(join(root, d), { recursive: true });
   writeFileSync(join(root, "components/welcome/welcome.yaml"), WELCOME);
 
   // Worked example styles (sample-styles: brand ingredients + the override rules), so
@@ -111,9 +115,14 @@ export function createProject(home, name) {
  * makes that safe.
  */
 const SAMPLES = [
-  { id: "nodes/samples", dir: "sample-nodes/samples", to: "nodes/samples" },
-  { id: "prompts/skills/sample-complaint-handling", dir: "sample-prompts/skills/sample-complaint-handling", to: "prompts/skills/sample-complaint-handling" },
-  { id: "prompts/blocks/sample-concise-answers", dir: "sample-prompts/blocks/formatting/sample-concise-answers.md", to: "prompts/blocks/formatting/sample-concise-answers.md" },
+  { id: "nodes/samples", dir: "sample-nodes/samples", to: () => "nodes/samples" },
+  // ORG-SCOPED since 2026-08-24: a sample skill/block lands in the FIRST project's own
+  // folder, because that is where authored skills and blocks now live. `to` is a
+  // function of the project for exactly that reason — the id stays the old flat string
+  // so a workspace that already installed these is not offered them a second time in a
+  // new location (the record is keyed by id, and re-copying is what it exists to stop).
+  { id: "prompts/skills/sample-complaint-handling", dir: "sample-prompts/skills/sample-complaint-handling", to: (p) => `design/${p}/skills/sample-complaint-handling` },
+  { id: "prompts/blocks/sample-concise-answers", dir: "sample-prompts/blocks/formatting/sample-concise-answers.md", to: (p) => `design/${p}/blocks/formatting/sample-concise-answers.md` },
 ];
 
 /**
@@ -127,25 +136,39 @@ const SAMPLES = [
  * That is what lets `unoverse studio` top up new samples on every launch without ever
  * resurrecting deleted work or overwriting changed files.
  */
-export function topUpSamples(home) {
+export function topUpSamples(home, project) {
   const record = join(home, ".unoverse", "samples.json");
+  // An org-scoped sample has nowhere to go without a project. Called at launch (where
+  // the project is not known) the org samples are simply skipped — they arrive with the
+  // next `createFirstProject`, which is the only moment their destination exists.
+  const destOf = (s) => (typeof s.to === "function" ? s.to(project) : s.to);
+  const placeable = (s) => typeof s.to !== "function" || !!project;
   let seen = [];
   try {
     seen = JSON.parse(readFileSync(record, "utf8")).installed ?? [];
   } catch {
     // No record: a workspace from before records existed. Treat every sample already
     // on disk as seen (it was installed by an old scaffold), so nothing is re-copied.
-    seen = SAMPLES.filter((s) => existsSync(join(home, s.to))).map((s) => s.id);
+    // The OLD flat paths count too: a workspace that installed these before the org
+    // move still holds them at prompts/…, and must not be handed a second copy.
+    const legacy = {
+      "prompts/skills/sample-complaint-handling": "prompts/skills/sample-complaint-handling",
+      "prompts/blocks/sample-concise-answers": "prompts/blocks/formatting/sample-concise-answers.md",
+    };
+    seen = SAMPLES.filter(
+      (s) => (placeable(s) && existsSync(join(home, destOf(s)))) || (legacy[s.id] && existsSync(join(home, legacy[s.id]))),
+    ).map((s) => s.id);
   }
   const here = dirname(fileURLToPath(import.meta.url));
   let changed = false;
   for (const s of SAMPLES) {
-    if (seen.includes(s.id)) continue;
+    if (seen.includes(s.id) || !placeable(s)) continue;
     const src = join(here, s.dir);
     if (!existsSync(src)) continue;
-    if (!existsSync(join(home, s.to))) {
-      mkdirSync(dirname(join(home, s.to)), { recursive: true });
-      cpSync(src, join(home, s.to), { recursive: true });
+    const dest = join(home, destOf(s));
+    if (!existsSync(dest)) {
+      mkdirSync(dirname(dest), { recursive: true });
+      cpSync(src, dest, { recursive: true });
     }
     seen.push(s.id);
     changed = true;
@@ -164,9 +187,11 @@ export function topUpSamples(home) {
  */
 export function createFirstProject(home, name) {
   const root = createProject(home, name);
-  for (const d of ["prompts/skills", "prompts/blocks", "nodes"]) mkdirSync(join(home, d), { recursive: true });
+  // Only nodes/ remains beside the design tree; skills/ and blocks/ moved INTO the org
+  // (createProject makes them) so every authored kind sits in one place.
+  for (const d of ["nodes"]) mkdirSync(join(home, d), { recursive: true });
 
-  topUpSamples(home);
+  topUpSamples(home, name);
 
   // SCAFFOLD WRITES NO `.claude/skills` (2026-08-21). It used to copy the Claude Code
   // authoring skills out of `vendor/skills` and into `<home>/.claude/skills`, which meant

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unoverse-platform/studio",
-  "version": "0.1.73",
+  "version": "0.1.75",
   "type": "module",
   "description": "Unoverse Studio: the local authoring app. Reads your own rx/ folder, no backend.",
   "scripts": {