yourskills 0.3.0 → 0.3.1

package/dist/main.js

@@ -611,6 +611,7 @@ async function localAccount(server) {
   return {
     signedIn: Boolean(config.token),
     email: config.userEmail ?? null,
+    organization: config.orgName ?? null,
     server: serverUrl(config, server)
   };
 }
@@ -5753,7 +5754,7 @@ import { realpathSync } from "node:fs";
 // package.json
 var package_default = {
   name: "yourskills",
-  version: "0.3.0",
+  version: "0.3.1",
   description: "Browse, install and keep up to date the agent skills and bundles your team publishes on yourskills.",
   license: "UNLICENSED",
   homepage: "https://yourskills.store",
@@ -6198,8 +6199,41 @@ async function runSessionStart() {
   const outcome = await sessionStart();
   emit(outcome, await upgradeCheck());
 }
-// src/org/org.ts
+// src/org/wire.ts
 var authBase2 = (base) => `${base.replace(/\/$/, "")}/api/auth`;
+async function activeOrganizationId(base, token) {
+  const res = await fetch(`${authBase2(base)}/get-session`, {
+    headers: { authorization: `Bearer ${token}` }
+  });
+  if (!res.ok)
+    return null;
+  const body = await res.json();
+  return body?.session?.activeOrganizationId ?? null;
+}
+async function listOrganizations(base, token) {
+  let res;
+  try {
+    res = await fetch(`${authBase2(base)}/organization/list`, {
+      headers: { authorization: `Bearer ${token}` }
+    });
+  } catch (error) {
+    throw new Error(`Could not reach ${base}: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (!res.ok) {
+    throw new Error(`Could not list organizations: ${res.status} ${res.statusText}`);
+  }
+  return await res.json();
+}
+async function rememberOrganization(name) {
+  try {
+    const config = await readConfig();
+    if ((config.orgName ?? null) === name)
+      return;
+    await writeConfig(name === null ? { ...config, orgName: undefined } : { ...config, orgName: name });
+  } catch {}
+}
+
+// src/org/org.ts
 var NO_ACTIVE_ORGANIZATION = "none: choose one with `yourskills org <name>`, or in the web app";
 async function namedOrganization(server) {
   const client = await createClient(server);
@@ -6208,11 +6242,9 @@ async function namedOrganization(server) {
 }
 async function whoamiReport(server) {
   const who = await whoami(server);
-  return drawWhoami({
-    user: who.user,
-    server: who.server,
-    organization: who.org ? await namedOrganization(server) : null
-  });
+  const organization = who.org ? await namedOrganization(server) : null;
+  await rememberOrganization(organization?.name ?? null);
+  return drawWhoami({ user: who.user, server: who.server, organization });
 }
 function drawWhoami({ user, server, organization }) {
   const label = (text) => text.padEnd(7);
@@ -6230,29 +6262,6 @@ function drawWhoami({ user, server, organization }) {
     json: { user, server, organization }
   };
 }
-async function activeOrganizationId(base, token) {
-  const res = await fetch(`${authBase2(base)}/get-session`, {
-    headers: { authorization: `Bearer ${token}` }
-  });
-  if (!res.ok)
-    return null;
-  const body = await res.json();
-  return body?.session?.activeOrganizationId ?? null;
-}
-async function listOrganizations(base, token) {
-  let res;
-  try {
-    res = await fetch(`${authBase2(base)}/organization/list`, {
-      headers: { authorization: `Bearer ${token}` }
-    });
-  } catch (error) {
-    throw new Error(`Could not reach ${base}: ${error instanceof Error ? error.message : String(error)}`);
-  }
-  if (!res.ok) {
-    throw new Error(`Could not list organizations: ${res.status} ${res.statusText}`);
-  }
-  return await res.json();
-}
 function rows(orgs, active) {
   if (orgs.length === 0) {
     return [
@@ -6269,12 +6278,40 @@ function rows(orgs, active) {
     note: org.slug ?? org.id
   }));
 }
+async function learnActiveOrganization(server) {
+  try {
+    const { token, base } = await requireToken(server);
+    const [orgs, active] = await Promise.all([
+      listOrganizations(base, token),
+      activeOrganizationId(base, token)
+    ]);
+    const name = orgs.find((o) => o.id === active)?.name ?? null;
+    await rememberOrganization(name);
+    return name;
+  } catch {
+    return null;
+  }
+}
+async function organizationChoices(server) {
+  const { token, base } = await requireToken(server);
+  const [orgs, active] = await Promise.all([
+    listOrganizations(base, token),
+    activeOrganizationId(base, token)
+  ]);
+  await rememberOrganization(orgs.find((o) => o.id === active)?.name ?? null);
+  return orgs.map((org) => ({
+    name: org.name,
+    slug: org.slug ?? null,
+    active: org.id === active
+  }));
+}
 async function orgListReport(server) {
   const { token, base } = await requireToken(server);
   const [orgs, active] = await Promise.all([
     listOrganizations(base, token),
     activeOrganizationId(base, token)
   ]);
+  await rememberOrganization(orgs.find((o) => o.id === active)?.name ?? null);
   return {
     title: "org",
     lines: rows(orgs, active),
@@ -6331,6 +6368,7 @@ async function orgSwitchReport(name, server) {
       failed: true
     };
   }
+  await rememberOrganization(match.name);
   return {
     title: "org",
     lines: [{ mark: "ok", text: `Active organization: ${match.name}` }],
@@ -7095,7 +7133,7 @@ var TABLE = {
         label: "switch org",
         hint: "org <name>",
         when: (facts) => facts.signedIn,
-        opens: { kind: "org" }
+        says: (facts) => facts.organization ? `switch this machine out of ${facts.organization}` : "choose which organization this machine installs from"
       }
     ],
     invitesHooks: false,
@@ -8056,18 +8094,21 @@ function paletteGroups(facts) {
 // src/shell/facts.ts
 import { existsSync as existsSync7 } from "node:fs";
 async function paletteFacts(scope, server) {
-  const [account, nearest, config] = await Promise.all([
+  const [account, nearest, config, agents] = await Promise.all([
     localAccount(server),
     nearestManifest(scope),
-    readConfig()
+    readConfig(),
+    resolveAgents()
   ]);
   const skills = Object.keys(nearest.manifest.skills).length;
   return {
     signedIn: account.signedIn,
     email: account.email,
+    organization: account.organization,
     server: account.server,
     firstRun: !account.signedIn && skills === 0 && !config.welcomed,
     agentsOnDisk: HOOK_ADAPTERS.filter((adapter) => existsSync7(adapter.home())).map((adapter) => adapter.agent),
+    agents,
     scope: nearest.scope,
     manifest: nearest.path,
     skills,
@@ -8406,6 +8447,8 @@ function PickScreen({
   rows,
   empty,
   verb,
+  single = false,
+  marked,
   onPick,
   onBack
 }) {
@@ -8439,7 +8482,7 @@ function PickScreen({
     } else if (key.backspace || key.delete) {
       setQuery((q) => q.slice(0, -1));
       setCursor(0);
-    } else if (input === " ") {
+    } else if (input === " " && !single) {
       const row = visible[cursor];
       if (!row)
         return;
@@ -8490,21 +8533,21 @@ function PickScreen({
           names,
           selectable: true,
           cursor: i === cursor,
-          selected: picked.has(row.name)
+          selected: single ? row.name === marked : picked.has(row.name)
         }, row.name)),
         /* @__PURE__ */ jsx16(Divider, {
           width
         }),
         /* @__PURE__ */ jsxs14(Box12, {
           children: [
-            picked.size > 0 ? /* @__PURE__ */ jsx16(Text14, {
+            picked.size > 0 && !single ? /* @__PURE__ */ jsx16(Text14, {
               color: tone.notice,
               children: `${mark.selected} ${picked.size} marked   `
             }) : null,
             /* @__PURE__ */ jsx16(Hints, {
               hints: [
                 ["^v", "move"],
-                ["space", "mark"],
+                ...single ? [] : [["space", "mark"]],
                 ["enter", verb],
                 ["esc", query ? "clear" : "back"]
               ]
@@ -8621,11 +8664,15 @@ function failure(title, error) {
   };
 }
 function AccountLine({ facts, width }) {
-  const right = `${facts.scope}  ${facts.skills} installed`;
+  const agents = facts.agents.length > 0 ? facts.agents.join(",") : "agents unset";
+  const right = `${agents}  ${facts.scope}  ${facts.skills} installed`;
   const head = facts.signedIn ? facts.email ?? "signed in" : "not signed in";
   const room = Math.max(width - FRAME_CHROME - right.length - 2, 12);
   const tail = facts.signedIn ? `  ${hostOf(facts.server)}` : " — the catalog needs a session";
+  const org = facts.signedIn && facts.organization ? `  ${facts.organization}` : "";
   const spare = room - 2 - head.length;
+  const showOrg = spare >= org.length;
+  const showTail = spare - (showOrg ? org.length : 0) >= tail.length;
   return /* @__PURE__ */ jsxs16(Box14, {
     width: width - FRAME_CHROME,
     justifyContent: "space-between",
@@ -8640,7 +8687,11 @@ function AccountLine({ facts, width }) {
             color: facts.signedIn ? undefined : tone.notice,
             children: ` ${clip(head, room - 2)}`
           }),
-          spare >= tail.length ? /* @__PURE__ */ jsx18(Text16, {
+          showOrg ? /* @__PURE__ */ jsx18(Text16, {
+            color: tone.primary,
+            children: org
+          }) : null,
+          showTail ? /* @__PURE__ */ jsx18(Text16, {
             dimColor: true,
             children: tail
           }) : null
@@ -8806,20 +8857,41 @@ function HomeScreen({
       held.current = null;
     return routeFrom(answer, say(command, facts));
   }, [catalogDoor, ctx, facts, routeFrom]);
-  const ownRoute = useCallback3((value) => {
+  const ownRoute = useCallback3(async (value) => {
     switch (value) {
       case "catalog.search":
         return { kind: "browse", tab: "skills" };
       case "installed.remove":
         return {
           kind: "pick",
+          title: "remove",
           rows: installedRows(where).map((row) => ({
             name: row.name,
             description: `${row.bundle ?? "loose"}  ${shortRef(row.ref)}`
-          }))
+          })),
+          empty: "Nothing installed here.",
+          verb: "remove",
+          command: (names) => ({ kind: "remove", names })
         };
+      case "account.org": {
+        const orgs = await organizationChoices(server);
+        const active = orgs.find((org) => org.active)?.name;
+        return {
+          kind: "pick",
+          title: "org",
+          rows: orgs.map((org) => ({
+            name: org.name,
+            description: org.slug ?? ""
+          })),
+          empty: "You are not a member of any organization yet.",
+          verb: "switch",
+          single: true,
+          ...active ? { marked: active } : {},
+          command: (names) => ({ kind: "org", name: names[0] ?? "" })
+        };
+      }
     }
-  }, [where]);
+  }, [where, server]);
   const routeForDoor = useCallback3(async (door) => door.opens === undefined ? ownRoute(door.value) : routeForCommand(door.opens), [ownRoute, routeForCommand]);
   const open = useCallback3((pending, title) => {
     pending.then((next) => {
@@ -8870,6 +8942,9 @@ function HomeScreen({
     });
   }, [reload, resite]);
   const afterLogin = useCallback3(() => {
+    learnActiveOrganization(server).then(() => reload()).then(setFacts).catch(() => {
+      return;
+    });
     if (!wizard) {
       back();
       return;
@@ -8879,7 +8954,7 @@ function HomeScreen({
       setFacts(next);
       setRoute({ kind: "browse" });
     }).catch(() => setRoute(null));
-  }, [wizard, back, reload]);
+  }, [wizard, back, reload, server]);
   const leaveWelcome = useCallback3((start) => {
     setWelcome(false);
     onWelcomed().catch(() => {
@@ -8966,13 +9041,16 @@ function HomeScreen({
     });
   }
   if (route?.kind === "pick") {
+    const picked = route;
     return /* @__PURE__ */ jsx18(PickScreen, {
-      title: "remove",
-      rows: route.rows,
-      empty: "Nothing installed here.",
-      verb: "remove",
+      title: picked.title,
+      rows: picked.rows,
+      empty: picked.empty,
+      verb: picked.verb,
+      ...picked.single ? { single: true } : {},
+      ...picked.marked ? { marked: picked.marked } : {},
       onPick: (names) => {
-        open(routeForCommand({ kind: "remove", names }), "remove");
+        open(routeForCommand(picked.command(names)), picked.title);
       },
       onBack: back
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "yourskills",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "Browse, install and keep up to date the agent skills and bundles your team publishes on yourskills.",
 	"license": "UNLICENSED",
 	"homepage": "https://yourskills.store",