yourskills 0.3.1 → 0.4.0

package/dist/main.js

@@ -925,15 +925,24 @@ function flattenCommands(groups) {
 }
 var POINTER = 2;
 var GAP2 = 2;
+var LABEL_CAP = 22;
+function valueColumn(items) {
+  return Math.min(items.reduce((wide, item) => Math.max(wide, item.label.length), 0), LABEL_CAP);
+}
 function CommandRow({
   item,
   width,
+  column,
   active
 }) {
   const hint = item.hint ?? "";
   const room = width - POINTER - (hint ? hint.length + GAP2 : 0);
   const label = clip(item.label, Math.max(room, 0));
-  const gap = Math.max(width - POINTER - label.length - hint.length, hint ? 1 : 0);
+  const shows = item.shows ?? "";
+  const pad = Math.max(column - label.length, 0) + GAP2;
+  const value = shows && label.length + pad + shows.length <= room ? shows : "";
+  const left = label.length + (value ? pad + value.length : 0);
+  const gap = Math.max(width - POINTER - left - hint.length, hint ? 1 : 0);
   return /* @__PURE__ */ jsxs5(Text4, {
     children: [
       /* @__PURE__ */ jsx5(Text4, {
@@ -945,6 +954,9 @@ function CommandRow({
         color: active ? tone.primary : undefined,
         children: label
       }),
+      value ? /* @__PURE__ */ jsx5(Text4, {
+        children: `${" ".repeat(pad)}${value}`
+      }) : null,
       /* @__PURE__ */ jsx5(Text4, {
         dimColor: true,
         children: `${" ".repeat(gap)}${hint}`
@@ -964,6 +976,7 @@ function CommandPalette({
   const rows = flattenCommands(visible);
   const current = rows[cursor];
   const interior = width - FRAME_CHROME;
+  const column = valueColumn(rows);
   return /* @__PURE__ */ jsxs5(Box3, {
     flexDirection: "column",
     children: [
@@ -998,6 +1011,7 @@ function CommandPalette({
           group.items.map((item) => /* @__PURE__ */ jsx5(CommandRow, {
             item,
             width: interior,
+            column,
             active: item.value === current?.value
           }, item.value))
         ]
@@ -5754,7 +5768,7 @@ import { realpathSync } from "node:fs";
 // package.json
 var package_default = {
   name: "yourskills",
-  version: "0.3.1",
+  version: "0.4.0",
   description: "Browse, install and keep up to date the agent skills and bundles your team publishes on yourskills.",
   license: "UNLICENSED",
   homepage: "https://yourskills.store",
@@ -6934,6 +6948,7 @@ function noSuchPass(id, passes) {
   };
 }
 // src/commands/facts.ts
+var NO_FEED = {};
 function count2(n, one, many = `${one}s`) {
   return `${n} ${n === 1 ? one : many}`;
 }
@@ -7026,6 +7041,7 @@ var TABLE = {
         value: "catalog.bundles",
         label: "browse bundles",
         hint: "browse",
+        shows: (facts) => facts.feed.bundles === undefined ? "" : count2(facts.feed.bundles, "bundle"),
         when: (facts) => facts.signedIn,
         opens: { kind: "browse" }
       }
@@ -7132,6 +7148,7 @@ var TABLE = {
         value: "account.org",
         label: "switch org",
         hint: "org <name>",
+        shows: (facts) => facts.feed.organizations === undefined ? "" : facts.feed.organizations <= 1 ? "only this one" : count2(facts.feed.organizations - 1, "other"),
         when: (facts) => facts.signedIn,
         says: (facts) => facts.organization ? `switch this machine out of ${facts.organization}` : "choose which organization this machine installs from"
       }
@@ -7156,6 +7173,7 @@ var TABLE = {
         value: "catalog.skills",
         label: "browse skills",
         hint: "list",
+        shows: (facts) => facts.feed.skills === undefined ? "" : count2(facts.feed.skills, "skill"),
         when: (facts) => facts.signedIn,
         opens: { kind: "list" }
       }
@@ -7333,6 +7351,7 @@ var TABLE = {
         value: "installed.update",
         label: "update all",
         hint: "update --all",
+        shows: (facts) => updateScope(facts.bundles, facts.loose),
         when: (facts) => facts.skills > 0 && facts.signedIn,
         opens: { kind: "update", all: true }
       }
@@ -7422,6 +7441,7 @@ var TABLE = {
         value: "installed.list",
         label: "list installed",
         hint: "installed",
+        shows: (facts) => count2(facts.skills, "skill"),
         when: (facts) => facts.skills > 0,
         opens: { kind: "installed" }
       }
@@ -7451,6 +7471,7 @@ var TABLE = {
         value: "installed.outdated",
         label: "outdated",
         hint: "outdated",
+        shows: (facts) => facts.feed.outdated === undefined ? "" : facts.feed.outdated === 0 ? "all current" : `${facts.feed.outdated} behind`,
         when: (facts) => facts.skills > 0 && facts.signedIn,
         opens: { kind: "outdated" }
       }
@@ -7485,6 +7506,7 @@ var TABLE = {
         value: "catalog.pending",
         label: "waiting for a review",
         hint: "pending",
+        shows: (facts) => facts.feed.pending === undefined ? "" : facts.feed.pending === 0 ? "none open" : `${facts.feed.pending} open`,
         when: (facts) => facts.signedIn,
         opens: { kind: "pending" }
       }
@@ -7591,20 +7613,21 @@ var TABLE = {
         value: "setup.scope",
         label: "scope",
         hint: "config set scope project",
-        opens: { kind: "config", action: "get", key: "scope" },
+        shows: (facts) => facts.scope,
         says: (facts) => `where installs land: ${facts.scope} right now`
       },
       {
         value: "setup.agents",
         label: "agents",
         hint: "config set agents <name>",
-        opens: { kind: "config", action: "get", key: "agents" },
-        says: () => "which agents a skill is written for when it is installed"
+        shows: (facts) => facts.agents.length > 0 ? count2(facts.agents.length, "agent") : "unset",
+        says: (facts) => facts.agents.length > 0 ? `which agents an install writes for: ${facts.agents.join(", ")}` : "which agents an install writes for; nothing pinned, so `skills` looks"
       },
       {
         value: "setup.explain",
         label: "explain",
         hint: "config get --explain",
+        shows: (facts) => `${count2(facts.settings, "setting")} set`,
         opens: { kind: "config", action: "get", explain: true }
       }
     ],
@@ -7682,6 +7705,7 @@ var TABLE = {
         value: "setup.upgrade",
         label: "upgrade",
         hint: "upgrade",
+        shows: (facts) => facts.feed.upgrade === undefined ? "" : facts.feed.upgrade === null ? "up to date" : `${facts.feed.upgrade} is out`,
         opens: { kind: "upgrade" }
       }
     ],
@@ -7778,6 +7802,9 @@ function refuseCommand(command) {
     code: EXIT.usage
   });
 }
+function doorShows(door, facts) {
+  return door.shows?.(facts) ?? "";
+}
 function doorSays(door, facts) {
   if (door.opens === undefined)
     return door.says(facts);
@@ -8079,13 +8106,19 @@ var PALETTE = [
     ]
   }
 ];
-function item(door) {
-  return { value: door.value, label: door.label, hint: door.hint };
+function item(door, facts) {
+  const shows = doorShows(door, facts);
+  return {
+    value: door.value,
+    label: door.label,
+    hint: door.hint,
+    ...shows ? { shows } : {}
+  };
 }
 function paletteGroups(facts) {
   const groups = [];
   for (const place of PALETTE) {
-    const items = place.doors.map((value) => DOORS[value]).filter((door) => door.when?.(facts) ?? true).map(item);
+    const items = place.doors.map((value) => DOORS[value]).filter((door) => door.when?.(facts) ?? true).map((door) => item(door, facts));
     if (items.length > 0)
       groups.push({ group: place.group, items });
   }
@@ -8113,13 +8146,59 @@ async function paletteFacts(scope, server) {
     manifest: nearest.path,
     skills,
     bundles: Object.keys(nearest.manifest.bundles).length,
-    loose: looseSkills(nearest.manifest).length
+    loose: looseSkills(nearest.manifest).length,
+    settings: CONFIG_KEYS.filter((key) => configValue(config, key) !== UNSET).length,
+    feed: NO_FEED
   };
 }
 // src/shell/screens/home.tsx
 import { Box as Box14, Text as Text16, useApp as useApp7, useInput as useInput8 } from "ink";
 import { useCallback as useCallback3, useEffect as useEffect9, useMemo as useMemo4, useRef, useState as useState11 } from "react";
 
+// src/shell/feed.ts
+async function feedFacts(client, where, server) {
+  const installed = Object.keys(where.manifest.skills).length > 0;
+  const [skills, bundles, passes, drift, orgs] = await Promise.allSettled([
+    client.skills.list.query({}),
+    client.bundles.list.query({}),
+    client.mirror.passes.query(),
+    installed ? driftNow(client, where) : Promise.resolve(null),
+    organizationChoices(server)
+  ]);
+  return {
+    ...skills.status === "fulfilled" ? { skills: skills.value.length } : {},
+    ...bundles.status === "fulfilled" ? { bundles: bundles.value.length } : {},
+    ...passes.status === "fulfilled" ? { pending: passes.value.length } : {},
+    ...drift.status === "fulfilled" && drift.value ? { outdated: drift.value.moved.length } : {},
+    ...orgs.status === "fulfilled" ? { organizations: orgs.value.length } : {}
+  };
+}
+
+// src/shell/probe.ts
+var importProbe = async (where) => {
+  const found = await listInstalled(where.scope);
+  const recorded = new Set(Object.keys(where.manifest.skills));
+  const news = found.filter((skill) => !recorded.has(skill.name)).length;
+  if (found.length === 0)
+    return "nothing on this machine to adopt";
+  return news === 0 ? `${count2(found.length, "skill")} on this machine, all recorded here already` : `${count2(found.length, "skill")} on this machine, ${news} not recorded here`;
+};
+var doctorProbe = async (where, server) => {
+  const checks = await diagnose(where, {
+    local: true,
+    ...server ? { server } : {}
+  });
+  const bad = checks.filter((check) => !check.ok);
+  return bad.length === 0 ? `${count2(checks.length, "local check")}, all passing` : `${bad.length} of ${checks.length} local checks failing: ${bad.map((check) => check.name).join(", ")}`;
+};
+var PROBES = {
+  "setup.import": importProbe,
+  "setup.doctor": doctorProbe
+};
+function probeFor(value) {
+  return value ? PROBES[value] : undefined;
+}
+
 // src/args.ts
 function configCommand2(rest, explain) {
   const [action, key, ...value] = rest;
@@ -8449,13 +8528,14 @@ function PickScreen({
   verb,
   single = false,
   marked,
+  preset,
   onPick,
   onBack
 }) {
   const width = useFrameWidth();
   const [query, setQuery] = useState9("");
   const [cursor, setCursor] = useState9(0);
-  const [picked, setPicked] = useState9(new Set);
+  const [picked, setPicked] = useState9(() => new Set(preset ?? []));
   const visible = useMemo3(() => {
     if (query.length === 0)
       return rows;
@@ -8663,11 +8743,30 @@ function failure(title, error) {
     json: { error: message }
   };
 }
+var HEAD_FLOOR = 14;
+var AGENTS_FLOOR = 9;
+function agentsIn(agents, room) {
+  if (agents.length === 0)
+    return "agents unset";
+  const full = agents.join(",");
+  if (full.length <= room)
+    return full;
+  for (let keep = agents.length - 1;keep > 0; keep--) {
+    const text = `${agents.slice(0, keep).join(",")} +${agents.length - keep}`;
+    if (text.length <= room)
+      return text;
+  }
+  return `${agents.length} agents`;
+}
 function AccountLine({ facts, width }) {
-  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 stat = `${facts.scope}  ${facts.skills} installed`;
+  const inner = width - FRAME_CHROME;
+  const spent = Math.min(head.length, 24) + 2 + stat.length + 4;
+  const forAgents = inner - spent;
+  const agents = forAgents >= AGENTS_FLOOR ? agentsIn(facts.agents, forAgents) : "";
+  const right = agents ? `${agents}  ${stat}` : stat;
+  const room = Math.max(inner - right.length - 2, HEAD_FLOOR);
   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;
@@ -8699,7 +8798,7 @@ function AccountLine({ facts, width }) {
       }),
       /* @__PURE__ */ jsx18(Text16, {
         dimColor: true,
-        children: right
+        children: clip(right, inner - room)
       })
     ]
   });
@@ -8715,7 +8814,9 @@ function StaleLine({ stale, width }) {
   });
 }
 var RUN = "run";
+var REST_MS = 250;
 var ASK_NPM = () => upgradeCheck();
+var ASK_REGISTRY = feedFacts;
 var NO_EXIT_CODE = () => {
   return;
 };
@@ -8731,19 +8832,20 @@ function HomeScreen({
   onWelcomed = async () => {
     return;
   },
-  checkUpgrade = ASK_NPM
+  checkUpgrade = ASK_NPM,
+  loadFeed = ASK_REGISTRY,
+  probes: probeSet = probeFor
 }) {
   const { exit } = useApp7();
   const width = useFrameWidth();
   const [facts, setFacts] = useState11(initial);
   const [where, setWhere] = useState11(initialWhere);
-  const groups = useMemo4(() => paletteGroups(facts), [facts]);
   const [query, setQuery] = useState11("");
   const [cursor, setCursor] = useState11(0);
   const [route, setRoute] = useState11(null);
   const [welcome, setWelcome] = useState11(initial.firstRun);
   const [wizard, setWizard] = useState11(false);
-  const [stale, setStale] = useState11(null);
+  const [stale, setStale] = useState11(undefined);
   useEffect9(() => {
     let live = true;
     checkUpgrade().then((found) => {
@@ -8756,6 +8858,17 @@ function HomeScreen({
       live = false;
     };
   }, [checkUpgrade]);
+  const [feed, setFeed] = useState11(NO_FEED);
+  const [probes, setProbes] = useState11({});
+  const [probing, setProbing] = useState11(null);
+  const shown = useMemo4(() => ({
+    ...facts,
+    feed: {
+      ...feed,
+      ...stale === undefined ? {} : { upgrade: stale ? stale.latest : null }
+    }
+  }), [facts, feed, stale]);
+  const groups = useMemo4(() => paletteGroups(shown), [shown]);
   const typed = useMemo4(() => typedCommand(query), [query]);
   const visible = useMemo4(() => {
     const filtered = filterCommands(groups, query);
@@ -8778,6 +8891,20 @@ function HomeScreen({
     held.current ??= await openClient();
     return held.current;
   }, [openClient]);
+  useEffect9(() => {
+    if (!facts.signedIn)
+      return;
+    let live = true;
+    connect().then((client) => loadFeed(client, where, server)).then((found) => {
+      if (live)
+        setFeed(found);
+    }).catch(() => {
+      return;
+    });
+    return () => {
+      live = false;
+    };
+  }, [facts.signedIn, connect, loadFeed, where, server]);
   const checkSession = useCallback3(async () => facts.signedIn, [facts.signedIn]);
   const answering = useCallback3((title, working, load) => ({
     kind: "report",
@@ -8873,6 +9000,52 @@ function HomeScreen({
           verb: "remove",
           command: (names) => ({ kind: "remove", names })
         };
+      case "setup.scope":
+        return {
+          kind: "pick",
+          title: "scope",
+          rows: [
+            {
+              name: "global",
+              description: "installs land in your home directory, where every project sees them"
+            },
+            {
+              name: "project",
+              description: "installs land in this project's yourskills.json, and travel with the repo"
+            }
+          ],
+          empty: "",
+          verb: "set",
+          single: true,
+          marked: facts.scope,
+          command: (names) => ({
+            kind: "config",
+            action: "set",
+            key: "scope",
+            value: names[0] ?? ""
+          })
+        };
+      case "setup.agents": {
+        const valid = await knownAgents() ?? [];
+        const onDisk = new Set(facts.agentsOnDisk);
+        return {
+          kind: "pick",
+          title: "agents",
+          rows: valid.map((name) => ({
+            name,
+            description: onDisk.has(name) ? "on this machine" : ""
+          })),
+          empty: "Could not ask the `skills` CLI which agent names it accepts. Run `yourskills doctor`.",
+          verb: "set",
+          preset: facts.agents,
+          command: (names) => ({
+            kind: "config",
+            action: "set",
+            key: "agents",
+            value: names.join(",")
+          })
+        };
+      }
       case "account.org": {
         const orgs = await organizationChoices(server);
         const active = orgs.find((org) => org.active)?.name;
@@ -8891,7 +9064,7 @@ function HomeScreen({
         };
       }
     }
-  }, [where, server]);
+  }, [where, server, facts]);
   const routeForDoor = useCallback3(async (door) => door.opens === undefined ? ownRoute(door.value) : routeForCommand(door.opens), [ownRoute, routeForCommand]);
   const open = useCallback3((pending, title) => {
     pending.then((next) => {
@@ -8908,6 +9081,29 @@ function HomeScreen({
     open(routeForCommand(parsed.command), parsed.text);
   }, [open, routeForCommand]);
   const current = rows[cursor];
+  useEffect9(() => {
+    const value = current?.value;
+    const probe = probeSet(value);
+    if (!value || !probe || probes[value] !== undefined)
+      return;
+    let live = true;
+    const timer = setTimeout(() => {
+      setProbing(value);
+      probe(where, server).then((text) => {
+        if (live)
+          setProbes((was) => ({ ...was, [value]: text }));
+      }).catch(() => {
+        return;
+      }).finally(() => {
+        if (live)
+          setProbing(null);
+      });
+    }, REST_MS);
+    return () => {
+      live = false;
+      clearTimeout(timer);
+    };
+  }, [current?.value, probes, probeSet, where, server]);
   const activate = useCallback3(() => {
     const item = rows[cursor];
     if (!item)
@@ -8934,6 +9130,7 @@ function HomeScreen({
     setRoute(null);
     setQuery("");
     setCursor(0);
+    setProbes({});
     reload().then(setFacts).catch(() => {
       return;
     });
@@ -9049,6 +9246,7 @@ function HomeScreen({
       verb: picked.verb,
       ...picked.single ? { single: true } : {},
       ...picked.marked ? { marked: picked.marked } : {},
+      ...picked.preset ? { preset: picked.preset } : {},
       onPick: (names) => {
         open(routeForCommand(picked.command(names)), picked.title);
       },
@@ -9081,14 +9279,15 @@ function HomeScreen({
     });
   }
   const highlighted = current ? doorFor(current.value) : undefined;
-  const description = current?.value === RUN && runnable(typed) ? say(typed.command, facts) : highlighted ? doorSays(highlighted, facts) : typed ? say(typed.command, facts) : "";
+  const description = current?.value === RUN && runnable(typed) ? say(typed.command, shown) : highlighted ? doorSays(highlighted, shown) : typed ? say(typed.command, shown) : "";
+  const found = current ? probes[current.value] ?? (probing === current.value ? "looking..." : "") : "";
   const empty = typed?.command.kind === "error" && typed.command.next ? `${mark.fail} ${typed.command.message}  try: ${typed.command.next.replace(/^yourskills /, "")}` : "No matching commands.";
   return /* @__PURE__ */ jsxs16(Frame, {
     title: "yourskills",
     width,
     children: [
       /* @__PURE__ */ jsx18(AccountLine, {
-        facts,
+        facts: shown,
         width
       }),
       stale ? /* @__PURE__ */ jsx18(StaleLine, {
@@ -9112,6 +9311,10 @@ function HomeScreen({
         dimColor: true,
         children: clip(description, width - FRAME_CHROME)
       }),
+      /* @__PURE__ */ jsx18(Text16, {
+        dimColor: true,
+        children: found ? clip(`  ${found}`, width - FRAME_CHROME) : " "
+      }),
       /* @__PURE__ */ jsx18(Hints, {
         hints: [
           ["^v", "move"],

package/package.json

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