@unoverse-platform/studio 0.1.7 → 0.1.9

package/bin/studio.mjs

@@ -19,7 +19,7 @@
 import { createServer } from "vite";
 import { dirname, resolve, join } from "path";
 import { fileURLToPath } from "url";
-import { existsSync } from "fs";
+import { existsSync, readdirSync } from "fs";
 import { createInterface } from "readline/promises";
 import { createFirstProject, checkProjectName } from "../local/scaffold.mjs";
 
@@ -47,6 +47,33 @@ function findProjectRootFromCwd() {
   }
 }
 
+/**
+ * A project ONE LEVEL DOWN.
+ *
+ * The walk above only goes UP, which was right while a project WAS the folder you stood
+ * in. Now that the first run creates ./<name>/, a second run from the parent would find no
+ * rx/ above it and offer to scaffold a SECOND project beside the first one. So look down
+ * as well.
+ *
+ * ONE level, and only when there is exactly one candidate. A deeper scan would adopt some
+ * unrelated project three folders away, and picking between several would be a coin toss;
+ * reading the wrong project's disk is silent, because both folders are perfectly valid.
+ */
+function findProjectBelowCwd() {
+  const cwd = process.cwd();
+  const found = readdirSync(cwd, { withFileTypes: true })
+    .filter((e) => e.isDirectory() && !e.name.startsWith(".") && e.name !== "node_modules")
+    .filter((e) => existsSync(join(cwd, e.name, "rx")))
+    .map((e) => e.name);
+
+  if (found.length === 1) return join(cwd, found[0]);
+  if (found.length > 1) {
+    console.log(`\n  Several projects here: ${found.join(", ")}\n\n  cd into the one you want.\n`);
+    process.exit(1);
+  }
+  return null;
+}
+
 async function scaffoldIfEmpty() {
   const cwd = process.cwd();
   // The same walk findProjectRoot does. A project ABOVE us is a project; do not offer to
@@ -58,24 +85,52 @@ async function scaffoldIfEmpty() {
     dir = parent;
   }
 
+  // A project made by an earlier run, in the folder that run created.
+  const below = findProjectBelowCwd();
+  if (below) {
+    process.chdir(below);
+    return;
+  }
+
   console.log(`\n  No project here yet.\n\n  ${cwd}\n`);
   const rl = createInterface({ input: process.stdin, output: process.stdout });
 
   // Ask until the name is usable. It becomes a folder AND an item's `org` column, so a
   // rejection here is cheaper than a rename after something has been published.
-  let name;
+  let name, home;
   for (;;) {
     name = (await rl.question("  Name your project [my-project]: ")).trim() || "my-project";
     const bad = checkProjectName(name);
-    if (!bad) break;
-    console.log(`  ${bad}\n`);
+    if (bad) {
+      console.log(`  ${bad}\n`);
+      continue;
+    }
+
+    /**
+     * THE NAME OWNS A FOLDER. Studio used to scaffold into the cwd, which made whatever
+     * directory you happened to be standing in your repository: run it once in a scratch
+     * folder and that scratch folder now holds a real project, with the name you typed
+     * used only for rx/<name>/. Asking for a name and then not putting it anywhere you
+     * can see reads as the tool ignoring you.
+     */
+    home = join(cwd, name);
+    if (existsSync(home) && readdirSync(home).some((f) => !f.startsWith("."))) {
+      console.log(`  ./${name} already has something in it\n`);
+      continue;
+    }
+    break;
   }
   rl.close();
 
   // The same call the UI's New project makes, so the first project and the fifth are
-  // identical (local/scaffold.mjs).
-  createFirstProject(cwd, name);
-  console.log(`\n  Created rx/${name}/, prompts/ and nodes/\n`);
+  // identical (local/scaffold.mjs). rx/<name>/ stays nested: every subfolder of rx/ IS a
+  // project (base collect.ts listProjects) and its folder name is the `org` that
+  // publishes, so a flat rx/ could hold exactly one project and would read `components`
+  // and `templates` as orgs.
+  createFirstProject(home, name);
+  // Studio reads from the cwd, and the project is no longer the folder we launched in.
+  process.chdir(home);
+  console.log(`\n  Created ${name}/ with rx/${name}/, prompts/ and nodes/\n`);
 }
 
 await scaffoldIfEmpty();

package/package.json

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

package/screens/ComponentsView.tsx

@@ -9,7 +9,7 @@ import { UnoverseComponent, type ResolvedTheme } from "@unoverse/sdk";
 import { client, authedFetch, hasSourceAccess } from "studio-host";
 import { SourceView } from "./SourceView";
 import { stateActivation } from "./states";
-import { usePersistentState } from "studio-host";
+import { usePersistentState, useRegistryToggles, ToggleSwitch } from "studio-host";
 
 const CHAT_ID = "demo";
 
@@ -58,6 +58,7 @@ const VIEWPORTS: { id: string; label: string; w: number | null }[] = [
 export function ComponentsView({ theme, org = "all" }: { theme: ResolvedTheme; org?: string }) {
   const store = useMemo(() => new ComponentStore(), []);
   const [components, setComponents] = useState<ComponentDef[]>([]);
+  const available = useRegistryToggles("component");
   const [selected, setSelected] = usePersistentState<string | null>("wb:components:selected", null);
   const [values, setValues] = useState<Record<string, unknown>>({}); // typed values → store/render
   const [text, setText] = useState<Record<string, string>>({}); // raw editor strings (decoupled from the typed value)
@@ -500,11 +501,22 @@ export function ComponentsView({ theme, org = "all" }: { theme: ResolvedTheme; o
             {/* Spatial toggle — ONLY for spatial-capable components (manifest.json present).
                 Same two-level model as templates/skills: this is Level 1 (workbench
                 eligibility); the Content Engine's per-workflow toggle is Level 2. */}
-            {/* NO SPATIAL TOGGLE HERE. It wrote `plugin_state.enabled`, which the spatial catalogue
-                deliberately IGNORES (`routeRegistrySpatial`): published IS available. What is actually
-                on a map is the PER-WORKFLOW row, switched in Canvas's Content Library — spatial is
-                unique to each workflow, and this screen has no workflow. A control that reads as the
-                answer to "is this in spatial?" while writing where nothing reads is worse than none. */}
+            {/* AVAILABLE — the MASTER switch, and the first of two.
+                  Studio    available: is this offered to workflows at all? (here)
+                  A canvas  installed: is it on THIS workflow's map? (Content Library)
+                Studio decides the menu; each canvas orders from it. Both exist because
+                spatial is per workflow and an org can have hundreds of them carrying
+                different components.
+                It is NOT called "Spatial": two controls both called that, one of which the
+                catalogue ignored, is what made this switch look authoritative and do
+                nothing. This one is honoured — off means no canvas can install it. */}
+            {current?.spatial && (
+              <ToggleSwitch
+                on={available.isEnabled(current.name)}
+                onClick={() => available.toggle(current.name)}
+                label="Available"
+              />
+            )}
             {current?.spatial && (
               <button
                 onClick={() => setMetaOpen((o) => !o)}

package/screens/SkillsView.tsx

@@ -11,7 +11,7 @@
  */
 import { useEffect, useState } from "react";
 import { fetchUnoverse } from "studio-host";
-import { usePersistentState } from "studio-host";
+import { usePersistentState, useRegistryToggles, ToggleSwitch } from "studio-host";
 import { IdentityHeader } from "./IdentityHeader";
 
 interface SkillSummary {
@@ -33,6 +33,7 @@ interface SkillDetail extends SkillSummary {
 
 export function SkillsView() {
   const [skills, setSkills] = useState<SkillSummary[]>([]);
+  const available = useRegistryToggles("skill");
   const [selected, setSelected] = usePersistentState<string | null>("wb:skills:selected", null);
   const [detail, setDetail] = useState<SkillDetail | null>(null);
   const [loadingDetail, setLoadingDetail] = useState(false);
@@ -122,14 +123,17 @@ export function SkillsView() {
           <div className="flex h-full items-center justify-center text-sm text-gray-500">Select a skill</div>
         ) : (
           <div className="mx-auto max-w-3xl p-8">
+            {/* AVAILABLE — the master switch. Which workflows actually carry this skill is
+                installed per workflow, in Canvas's Content Library. */}
             <IdentityHeader
+              right={<ToggleSwitch on={available.isEnabled(selected)} onClick={() => available.toggle(selected)} label="Available" />}
               name={detail?.name ?? selected}
               category={detail?.category}
               version={detail?.version}
               description={detail?.description}
               whenToUse={detail?.whenToUse}
             />
-            <p className="mb-3 text-[11px] text-gray-500">Whether this skill is on a map is switched per workflow, in Canvas’s Content Library: spatial is unique to each workflow.</p>
+            <p className="mb-3 text-[11px] text-gray-500">Available means workflows may install this skill. Which ones actually have it is chosen per workflow, in Canvas’s Content Library.</p>
 
             {detail?.triggers && detail.triggers.length > 0 && (
               <div className="mb-5 flex flex-wrap gap-1.5">

package/screens/TemplatesView.tsx

@@ -9,7 +9,7 @@
  */
 import { useCallback, useEffect, useMemo, useState, useSyncExternalStore } from "react";
 import { useAuth } from "react-oidc-context";
-import { usePersistentState } from "studio-host";
+import { usePersistentState, useRegistryToggles, ToggleSwitch } from "studio-host";
 import { ComponentStore } from "@unoverse/sdk";
 import { StreamedUnoverseTemplate, useUnoverseConnection, computeAppWidth, resolveActiveLayout, type ResolvedTheme, type UseVoiceServiceConfig } from "@unoverse/sdk";
 import { NativeAppHost } from "./NativeAppHost";
@@ -131,6 +131,7 @@ export function TemplatesView({
   // MOCK (offline) vs LIVE (real data plane). A fresh store per mode keeps the two paths
   // from bleeding into each other.
   const [live, setLive] = useState(defaultLive);
+  const available = useRegistryToggles("template");
   const [templates, setTemplates] = useState<Def[]>([]);
   const [components, setComponents] = useState<Def[]>([]);
   const [selected, setSelected] = usePersistentState<string | null>("wb:templates:selected", null);
@@ -635,11 +636,11 @@ export function TemplatesView({
               })}
             </div>
           )}
-          {/* NO SPATIAL TOGGLE HERE. It wrote `plugin_state.enabled`, which the spatial catalogue
-              deliberately IGNORES (`routeRegistrySpatial`): published IS available. What is actually
-              on a map is the PER-WORKFLOW row, switched in Canvas's Content Library — spatial is
-              unique to each workflow, and this screen has no workflow. A control that reads as the
-              answer to "is this in spatial?" while writing where nothing reads is worse than none. */}
+          {/* AVAILABLE — the master switch (see ComponentsView for the two-level model).
+              Studio offers; each canvas installs from what is offered. */}
+          {selected && (
+            <ToggleSwitch on={available.isEnabled(selected)} onClick={() => available.toggle(selected)} label="Available" />
+          )}
           {selected && (
             <button
               onClick={() => setMetaOpen((o) => !o)}