yourskills 0.4.3 → 0.5.0

package/dist/main.js

@@ -61,136 +61,647 @@ function buildHelp(lines) {
   return `${PREAMBLE}${block}${REST}`;
 }
 
-// src/auth/auth.ts
-import { setTimeout as sleep } from "node:timers/promises";
+// src/auth/screens/gate.tsx
+import { Box as Box6, Text as Text8, useApp as useApp2, useInput as useInput3 } from "ink";
+import {
+  useCallback,
+  useEffect as useEffect3,
+  useMemo,
+  useState as useState4
+} from "react";
 
-// src/settings/agents.ts
-import { readFileSync } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join2 } from "node:path";
+// src/ui/back.tsx
+import { useInput } from "ink";
 
-// src/settings/store.ts
-import { chmodSync, mkdirSync, rmSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-var DEFAULT_URL = "https://api.yourskills.store";
-function configDir() {
-  const xdg = process.env.XDG_CONFIG_HOME;
-  return join(xdg && xdg.length > 0 ? xdg : join(homedir(), ".config"), "yourskills");
+// ../../packages/ui/src/lib/ascii.ts
+var DEFAULT_ASCII_CHARS = {
+  top: "-",
+  bottom: "-",
+  left: "|",
+  right: "|",
+  divider: "-",
+  junction: "+"
+};
+function fill(n, seq = "-") {
+  const count = Math.max(n, 0);
+  if (count === 0) {
+    return "";
+  }
+  const unit = seq.length > 0 ? seq : " ";
+  return unit.repeat(Math.ceil(count / unit.length)).slice(0, count);
 }
-function configPath() {
-  return join(configDir(), "config.json");
+function junctionGlyph(chars) {
+  return chars.junction.length > 0 ? chars.junction[0] : DEFAULT_ASCII_CHARS.junction;
 }
-async function readConfig() {
-  try {
-    return JSON.parse(await readFile(configPath(), "utf8"));
-  } catch {
-    return {};
+function topBorder(width, title, chars = DEFAULT_ASCII_CHARS) {
+  const j = junctionGlyph(chars);
+  if (!title) {
+    return `${j}${fill(width - 2, chars.top)}${j}`;
   }
+  const label = ` ${title} `;
+  const left = 2;
+  const right = Math.max(width - 2 - left - label.length, 1);
+  return `${j}${fill(left, chars.top)}${label}${fill(right, chars.top)}${j}`;
 }
-async function updateConfig(change) {
-  let current = {};
-  try {
-    current = JSON.parse(await readFile(configPath(), "utf8"));
-  } catch (error) {
-    if (error?.code !== "ENOENT")
-      return null;
-  }
-  const next = change(current);
-  await writeConfig(next);
-  return next;
+
+// src/ui/frame.tsx
+import { Box, Text, useWindowSize } from "ink";
+
+// src/ui/theme.ts
+var tone = {
+  primary: "cyan",
+  notice: "yellow",
+  danger: "red"
+};
+var stateTone = {
+  "state-active": undefined,
+  "state-experimental": "yellow",
+  "state-deprecated": "red"
+};
+var mark = {
+  ok: "+",
+  warn: "!",
+  fail: "x",
+  pending: ".",
+  none: "",
+  cursor: ">",
+  selected: "*",
+  unselected: " "
+};
+
+// src/ui/frame.tsx
+import { jsx, jsxs } from "react/jsx-runtime";
+var MAX_WIDTH = 96;
+var MIN_WIDTH = 44;
+var FRAME_CHROME = 4;
+function useFrameWidth() {
+  const { columns } = useWindowSize();
+  return Math.max(MIN_WIDTH, Math.min(MAX_WIDTH, columns - 2));
 }
-async function writeConfig(config) {
-  mkdirSync(configDir(), { recursive: true, mode: 448 });
-  await writeFile(configPath(), `${JSON.stringify(config, null, 2)}
-`);
-  chmodSync(configPath(), 384);
+var j = DEFAULT_ASCII_CHARS.junction;
+var BORDER = {
+  topLeft: j,
+  top: DEFAULT_ASCII_CHARS.top,
+  topRight: j,
+  right: DEFAULT_ASCII_CHARS.right,
+  bottomRight: j,
+  bottom: DEFAULT_ASCII_CHARS.bottom,
+  bottomLeft: j,
+  left: DEFAULT_ASCII_CHARS.left
+};
+function Frame({
+  title,
+  width,
+  children
+}) {
+  return /* @__PURE__ */ jsxs(Box, {
+    flexDirection: "column",
+    width,
+    children: [
+      /* @__PURE__ */ jsx(Text, {
+        color: tone.primary,
+        children: topBorder(width, title)
+      }),
+      /* @__PURE__ */ jsx(Box, {
+        flexDirection: "column",
+        width,
+        paddingLeft: 1,
+        paddingRight: 1,
+        borderStyle: BORDER,
+        borderColor: tone.primary,
+        borderTop: false,
+        children
+      })
+    ]
+  });
 }
-function clearConfig() {
-  rmSync(configPath(), { force: true });
+function Divider({ width }) {
+  return /* @__PURE__ */ jsx(Box, {
+    marginLeft: -1,
+    marginRight: -1,
+    children: /* @__PURE__ */ jsx(Text, {
+      color: tone.primary,
+      children: fill(width - 2, DEFAULT_ASCII_CHARS.divider)
+    })
+  });
 }
-function serverUrl(config = {}, override) {
-  return override || process.env.YOURSKILLS_URL || config.serverUrl || DEFAULT_URL;
+function Blank() {
+  return /* @__PURE__ */ jsx(Text, {
+    children: " "
+  });
 }
-
-// src/settings/agents.ts
-function stockLockPath() {
-  const state = process.env.XDG_STATE_HOME;
-  if (state && state.length > 0)
-    return join2(state, "skills", ".skill-lock.json");
-  const home = process.env.HOME;
-  return join2(home && home.length > 0 ? home : homedir2(), ".agents", ".skill-lock.json");
+function clip(text, width) {
+  if (width <= 0)
+    return "";
+  if (text.length <= width)
+    return text;
+  return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}~`;
 }
-var LOCK_VERSION = 3;
-function rememberedAgents() {
-  let lock;
-  try {
-    lock = JSON.parse(readFileSync(stockLockPath(), "utf8"));
-  } catch {
-    return [];
+
+// ../../packages/skills/src/lifecycle.ts
+var LIFECYCLES = [
+  { status: "active", word: "active", glyph: "#", tone: "state-active" },
+  {
+    status: "experimental",
+    word: "experimental",
+    glyph: "?",
+    tone: "state-experimental"
+  },
+  {
+    status: "deprecated",
+    word: "deprecated",
+    glyph: "x",
+    tone: "state-deprecated"
   }
-  if (!lock || typeof lock !== "object")
-    return [];
-  const raw = lock;
-  if (typeof raw.version !== "number" || raw.version < LOCK_VERSION)
-    return [];
-  if (!raw.skills)
-    return [];
-  return Array.isArray(raw.lastSelectedAgents) ? raw.lastSelectedAgents.filter((a) => typeof a === "string") : [];
+];
+var LIFECYCLE_ORDER = LIFECYCLES.map((lifecycle) => lifecycle.status);
+var BY_STATUS = new Map(LIFECYCLES.map((lifecycle) => [lifecycle.status, lifecycle]));
+function lifecycleOf(status) {
+  const lifecycle = BY_STATUS.get(status);
+  if (!lifecycle) {
+    throw new Error(`No lifecycle vocabulary for "${status}". Add it to LIFECYCLES.`);
+  }
+  return lifecycle;
 }
-async function resolveAgents(flagAgents) {
-  if (flagAgents && flagAgents.length > 0)
-    return flagAgents;
-  const config = await readConfig();
-  if (config.agents?.length)
-    return config.agents;
-  return rememberedAgents();
+// src/ui/rows.tsx
+import { Box as Box2, Text as Text2 } from "ink";
+import { jsx as jsx2, jsxs as jsxs2, Fragment } from "react/jsx-runtime";
+function lifecycleTag(status) {
+  if (!status || status === "active")
+    return "";
+  return `[${lifecycleOf(status).word}]`;
 }
-// src/tracking/answer.ts
-function trackingDisabledByEnv() {
-  const value = process.env.YOURSKILLS_NO_TRACK;
-  return value !== undefined && value !== "" && value !== "0";
+function lifecycleColor(status) {
+  return stateTone[lifecycleOf(status ?? "active").tone];
 }
-function trackingOn(config) {
-  return !trackingDisabledByEnv() && config.track !== false;
+var GUTTER = 4;
+var GAP = 2;
+function nameWidth(rows, max = 28) {
+  return Math.min(max, Math.max(8, ...rows.map((r) => r.name.length)));
 }
-var ON_NOTE = "on; turn off with `yourskills config set track false`";
-function trackingAnswer(question) {
-  const { track, configPath, organization } = question;
-  if (trackingDisabledByEnv()) {
-    return {
-      state: "off-here",
-      sending: false,
-      note: "off (YOURSKILLS_NO_TRACK is set)",
-      value: "off",
-      from: "YOURSKILLS_NO_TRACK in the environment"
-    };
-  }
-  if (track === false) {
-    return {
-      state: "off-here",
-      sending: false,
-      note: "off; turn on with `yourskills config set track true`",
-      value: "off",
-      from: `track in ${configPath}`
-    };
-  }
-  if (organization?.enabled === false) {
-    return {
-      state: "off-for-organization",
-      sending: true,
-      note: "off; your organization turned usage tracking off for everyone",
+function SkillRow({
+  row,
+  width,
+  names,
+  cursor,
+  selected,
+  selectable = false
+}) {
+  const tag = lifecycleTag(row.status);
+  const meta = row.count !== undefined ? `${row.count} skills` : tag;
+  const gutter = selectable ? GUTTER : 0;
+  const rest = width - gutter - names - GAP - (meta ? meta.length + GAP : 0);
+  return /* @__PURE__ */ jsxs2(Box2, {
+    children: [
+      selectable ? /* @__PURE__ */ jsx2(Text2, {
+        color: cursor ? "cyan" : undefined,
+        children: `${cursor ? mark.cursor : " "} ${selected ? mark.selected : mark.unselected} `
+      }) : null,
+      /* @__PURE__ */ jsx2(Text2, {
+        bold: cursor,
+        color: lifecycleColor(row.status),
+        children: clip(row.name, names).padEnd(names)
+      }),
+      /* @__PURE__ */ jsx2(Text2, {
+        children: " ".repeat(GAP)
+      }),
+      /* @__PURE__ */ jsx2(Text2, {
+        dimColor: true,
+        children: clip(row.description ?? "", Math.max(rest, 0))
+      }),
+      meta ? /* @__PURE__ */ jsxs2(Fragment, {
+        children: [
+          /* @__PURE__ */ jsx2(Text2, {
+            children: " ".repeat(GAP)
+          }),
+          /* @__PURE__ */ jsx2(Text2, {
+            color: lifecycleColor(row.status),
+            dimColor: !tag,
+            children: meta
+          })
+        ]
+      }) : null
+    ]
+  });
+}
+function Hints({ hints }) {
+  return /* @__PURE__ */ jsx2(Box2, {
+    children: hints.map(([key, label], i) => /* @__PURE__ */ jsxs2(Text2, {
+      children: [
+        i > 0 ? /* @__PURE__ */ jsx2(Text2, {
+          dimColor: true,
+          children: "   "
+        }) : null,
+        /* @__PURE__ */ jsx2(Text2, {
+          color: "cyan",
+          children: key
+        }),
+        /* @__PURE__ */ jsx2(Text2, {
+          dimColor: true,
+          children: ` ${label}`
+        })
+      ]
+    }, key))
+  });
+}
+
+// src/ui/back.tsx
+import { jsx as jsx3, jsxs as jsxs3, Fragment as Fragment2 } from "react/jsx-runtime";
+function Back({
+  width,
+  onBack,
+  extra = []
+}) {
+  useInput((input, key) => {
+    if (key.escape || input === "x")
+      onBack?.();
+  }, { isActive: Boolean(onBack) });
+  if (!onBack)
+    return null;
+  return /* @__PURE__ */ jsxs3(Fragment2, {
+    children: [
+      /* @__PURE__ */ jsx3(Divider, {
+        width
+      }),
+      /* @__PURE__ */ jsx3(Hints, {
+        hints: [...extra, ["esc/x", "back"]]
+      })
+    ]
+  });
+}
+// src/ui/command.tsx
+import { Box as Box3, Text as Text4 } from "ink";
+
+// src/ui/text-input.tsx
+import { Text as Text3 } from "ink";
+import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+function SearchInput({
+  value,
+  placeholder = "",
+  focus = true
+}) {
+  return /* @__PURE__ */ jsxs4(Text3, {
+    children: [
+      value.length > 0 ? /* @__PURE__ */ jsx4(Text3, {
+        children: value
+      }) : /* @__PURE__ */ jsx4(Text3, {
+        dimColor: true,
+        children: placeholder
+      }),
+      focus ? /* @__PURE__ */ jsx4(Text3, {
+        color: tone.primary,
+        children: "_"
+      }) : null
+    ]
+  });
+}
+
+// src/ui/viewport.ts
+import { useWindowSize as useWindowSize2 } from "ink";
+var MIN_ROWS = 3;
+var MAX_ROWS = 20;
+function useViewport({
+  cursor,
+  total,
+  chrome
+}) {
+  const { rows } = useWindowSize2();
+  const size = Math.max(MIN_ROWS, Math.min(MAX_ROWS, rows - chrome));
+  const first = Math.max(0, Math.min(cursor - Math.floor(size / 2), total - size));
+  return { first, size };
+}
+function position(cursor, total) {
+  return `${total > 0 ? cursor + 1 : 0}/${total}`;
+}
+
+// src/ui/command.tsx
+import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+function filterCommands(groups, query) {
+  if (query.length === 0)
+    return groups;
+  const q = query.toLowerCase();
+  return groups.map((group) => ({
+    group: group.group,
+    items: group.items.filter((item) => item.label.toLowerCase().includes(q) || (item.hint ?? "").toLowerCase().includes(q))
+  })).filter((group) => group.items.length > 0);
+}
+function flattenCommands(groups) {
+  return groups.flatMap((group) => group.items);
+}
+function windowGroups(groups, first, count) {
+  const out = [];
+  let index = 0;
+  for (const group of groups) {
+    const items = group.items.filter((_, i) => {
+      const row = index + i;
+      return row >= first && row < first + count;
+    });
+    index += group.items.length;
+    if (items.length > 0)
+      out.push({ group: group.group, items });
+  }
+  return out;
+}
+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 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, {
+        color: tone.primary,
+        children: `${active ? mark.cursor : " "} `
+      }),
+      /* @__PURE__ */ jsx5(Text4, {
+        bold: active,
+        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}`
+      })
+    ]
+  });
+}
+function CommandPalette({
+  groups,
+  query,
+  cursor,
+  width,
+  chrome = 11,
+  placeholder = "type a command or search",
+  emptyMessage = "No matching commands."
+}) {
+  const visible = filterCommands(groups, query);
+  const rows = flattenCommands(visible);
+  const current = rows[cursor];
+  const interior = width - FRAME_CHROME;
+  const column = valueColumn(rows);
+  const { first, size } = useViewport({
+    cursor,
+    total: rows.length,
+    chrome: chrome + Math.max(0, visible.length * 2 - 1)
+  });
+  const paged = windowGroups(visible, first, size);
+  return /* @__PURE__ */ jsxs5(Box3, {
+    flexDirection: "column",
+    children: [
+      /* @__PURE__ */ jsxs5(Box3, {
+        children: [
+          /* @__PURE__ */ jsx5(Text4, {
+            color: tone.primary,
+            children: "> "
+          }),
+          /* @__PURE__ */ jsx5(SearchInput, {
+            value: query,
+            placeholder
+          })
+        ]
+      }),
+      /* @__PURE__ */ jsx5(Divider, {
+        width
+      }),
+      rows.length === 0 ? /* @__PURE__ */ jsx5(Text4, {
+        dimColor: true,
+        children: emptyMessage
+      }) : paged.map((group, i) => /* @__PURE__ */ jsxs5(Box3, {
+        flexDirection: "column",
+        children: [
+          i > 0 ? /* @__PURE__ */ jsx5(Divider, {
+            width
+          }) : null,
+          /* @__PURE__ */ jsx5(Text4, {
+            dimColor: true,
+            children: group.group.toUpperCase()
+          }),
+          group.items.map((item) => /* @__PURE__ */ jsx5(CommandRow, {
+            item,
+            width: interior,
+            column,
+            active: item.value === current?.value
+          }, item.value))
+        ]
+      }, group.group))
+    ]
+  });
+}
+// src/ui/confirm.tsx
+import { Box as Box4, Text as Text5, useInput as useInput2 } from "ink";
+import { useState } from "react";
+import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+function ConfirmScreen({
+  title,
+  headline,
+  lines,
+  notes = [],
+  yes,
+  no,
+  argv,
+  onYes,
+  onNo
+}) {
+  const width = useFrameWidth();
+  const [choice, setChoice] = useState("yes");
+  useInput2((input, key) => {
+    if (key.upArrow || key.downArrow) {
+      setChoice((c) => c === "yes" ? "no" : "yes");
+    } else if (key.return) {
+      if (choice === "yes")
+        onYes();
+      else
+        onNo();
+    } else if (key.escape || input === "x") {
+      onNo();
+    }
+  });
+  const interior = width - FRAME_CHROME;
+  const row = (label, active, hint) => {
+    const room = interior - 2 - (hint ? hint.length + 2 : 0);
+    const text = clip(label, Math.max(room, 0));
+    const gap = Math.max(interior - 2 - text.length - (hint?.length ?? 0), 1);
+    return /* @__PURE__ */ jsxs6(Text5, {
+      children: [
+        /* @__PURE__ */ jsx6(Text5, {
+          color: tone.primary,
+          children: `${active ? mark.cursor : " "} `
+        }),
+        /* @__PURE__ */ jsx6(Text5, {
+          bold: active,
+          color: active ? tone.primary : undefined,
+          children: text
+        }),
+        hint ? /* @__PURE__ */ jsx6(Text5, {
+          dimColor: true,
+          children: `${" ".repeat(gap)}${hint}`
+        }) : null
+      ]
+    });
+  };
+  return /* @__PURE__ */ jsxs6(Frame, {
+    title,
+    width,
+    children: [
+      /* @__PURE__ */ jsxs6(Box4, {
+        flexDirection: "column",
+        children: [
+          /* @__PURE__ */ jsx6(Text5, {
+            color: tone.notice,
+            children: clip(headline, interior)
+          }),
+          /* @__PURE__ */ jsx6(Text5, {
+            children: " "
+          }),
+          lines.map((line) => /* @__PURE__ */ jsxs6(Text5, {
+            children: [
+              /* @__PURE__ */ jsx6(Text5, {
+                color: line.mark === "fail" ? tone.danger : undefined,
+                children: `${mark[line.mark] || " "} `
+              }),
+              /* @__PURE__ */ jsx6(Text5, {
+                children: clip(line.text, interior - 2)
+              }),
+              line.note ? /* @__PURE__ */ jsx6(Text5, {
+                dimColor: true,
+                children: clip(`  ${line.note}`, Math.max(interior - 2 - line.text.length, 0))
+              }) : null
+            ]
+          }, `${line.mark}:${line.text}`)),
+          notes.length > 0 ? /* @__PURE__ */ jsx6(Text5, {
+            children: " "
+          }) : null,
+          notes.map((note) => /* @__PURE__ */ jsx6(Text5, {
+            dimColor: true,
+            children: clip(note, interior)
+          }, note)),
+          /* @__PURE__ */ jsx6(Text5, {
+            children: " "
+          }),
+          row(yes, choice === "yes", argv),
+          row(no, choice === "no")
+        ]
+      }),
+      /* @__PURE__ */ jsx6(Divider, {
+        width
+      }),
+      /* @__PURE__ */ jsx6(Hints, {
+        hints: [
+          ["^v", "choose"],
+          ["enter", choice === "yes" ? yes : no],
+          ["esc", no]
+        ]
+      })
+    ]
+  });
+}
+// src/ui/spinner.tsx
+import { Text as Text6 } from "ink";
+import { useEffect, useState as useState2 } from "react";
+import { jsx as jsx7 } from "react/jsx-runtime";
+var FRAMES = ["-", "\\", "|", "/"];
+var INTERVAL_MS = 90;
+function Spinner() {
+  const [frame, setFrame] = useState2(0);
+  useEffect(() => {
+    const timer = setInterval(() => setFrame((f) => (f + 1) % FRAMES.length), INTERVAL_MS);
+    return () => clearInterval(timer);
+  }, []);
+  return /* @__PURE__ */ jsx7(Text6, {
+    color: tone.primary,
+    children: FRAMES[frame]
+  });
+}
+// src/auth/session.ts
+import { setTimeout as sleep } from "node:timers/promises";
+
+// src/settings/agents.ts
+import { readFileSync } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { join as join2 } from "node:path";
+
+// src/settings/answer.ts
+import { dirname } from "node:path";
+
+// src/tracking/answer.ts
+function trackingFrom(layer, configPath) {
+  switch (layer) {
+    case "env":
+      return "YOURSKILLS_NO_TRACK in the environment";
+    case "config":
+      return `track in ${configPath}`;
+    case "organization":
+      return "usage tracking in your organization's settings";
+    case "default":
+      return "built-in default: turn off with `config set track false`";
+  }
+}
+function trackingDisabledByEnv() {
+  const value = process.env.YOURSKILLS_NO_TRACK;
+  return value !== undefined && value !== "" && value !== "0";
+}
+function trackingOn(config) {
+  return !trackingDisabledByEnv() && config.track !== false;
+}
+var ON_NOTE = "on; turn off with `yourskills config set track false`";
+function trackingAnswer(question) {
+  const { track, configPath, organization } = question;
+  if (trackingDisabledByEnv()) {
+    return {
+      state: "off-here",
+      sending: false,
+      note: "off (YOURSKILLS_NO_TRACK is set)",
+      value: "off",
+      layer: "env",
+      from: trackingFrom("env", configPath)
+    };
+  }
+  if (track === false) {
+    return {
+      state: "off-here",
+      sending: false,
+      note: "off; turn on with `yourskills config set track true`",
+      value: "off",
+      layer: "config",
+      from: trackingFrom("config", configPath)
+    };
+  }
+  if (organization?.enabled === false) {
+    return {
+      state: "off-for-organization",
+      sending: true,
+      note: "off; your organization turned usage tracking off for everyone",
       value: "off",
-      from: "usage tracking in your organization's settings"
+      layer: "organization",
+      from: trackingFrom("organization", configPath)
     };
   }
+  const layer = track === true ? "config" : "default";
   return {
     state: "on",
     sending: true,
     note: ON_NOTE,
     value: "on",
-    from: track === true ? `track in ${configPath}` : "built-in default: turn off with `config set track false`"
+    layer,
+    from: trackingFrom(layer, configPath)
   };
 }
 async function trackingNow(question) {
@@ -249,20 +760,6 @@ function near(a, b) {
   return true;
 }
 var UNSET = "(unset)";
-function configValue(config, key) {
-  switch (key) {
-    case "scope":
-      return config.defaultScope ?? UNSET;
-    case "agents":
-      return config.agents?.length ? config.agents.join(",") : UNSET;
-    case "server":
-      return config.serverUrl ?? UNSET;
-    case "track":
-      return String(trackingOn(config));
-    case "autoUpdate":
-      return String(config.autoUpdate !== false);
-  }
-}
 function setConfigValue(config, key, value) {
   if (!isConfigKey(key)) {
     return {
@@ -314,875 +811,686 @@ function setConfigValue(config, key, value) {
       const serverUrl = url.toString().replace(/\/$/, "");
       return { ok: true, config: { ...config, serverUrl }, shown: serverUrl };
     }
-    case "track": {
-      if (value !== "true" && value !== "false") {
-        return { ok: false, message: "track must be `true` or `false`." };
-      }
-      const track = value === "true";
-      return { ok: true, config: { ...config, track }, shown: String(track) };
-    }
-    case "autoUpdate": {
-      if (value !== "true" && value !== "false") {
-        return { ok: false, message: "autoUpdate must be `true` or `false`." };
-      }
-      const autoUpdate = value === "true";
-      return {
-        ok: true,
-        config: { ...config, autoUpdate },
-        shown: String(autoUpdate)
-      };
-    }
-  }
-}
-function configLines(config) {
-  const width = Math.max(...CONFIG_KEYS.map((k) => k.length), "user".length);
-  const lines = CONFIG_KEYS.map((key) => ({
-    mark: "none",
-    text: `${key.padEnd(width)}  ${configValue(config, key)}`
-  }));
-  lines.push({
-    mark: "none",
-    text: `${"user".padEnd(width)}  ${config.userEmail ?? UNSET}`
-  });
-  lines.push({
-    mark: "none",
-    text: `${"token".padEnd(width)}  ${config.token ? REDACTED : UNSET}`
-  });
-  return lines;
-}
-function configGetReport(config, key, path) {
-  if (key === undefined) {
-    return {
-      title: "config",
-      lines: configLines(config),
-      json: {
-        path,
-        ...Object.fromEntries(CONFIG_KEYS.map((k) => [k, configValue(config, k)])),
-        user: config.userEmail ?? null,
-        token: config.token ? REDACTED : null
-      }
-    };
-  }
-  if (!isConfigKey(key)) {
-    return {
-      title: "config",
-      lines: [
-        {
-          mark: "fail",
-          text: `Unknown config key: ${key}`,
-          note: `Known keys: ${CONFIG_KEYS.join(", ")}`
-        }
-      ],
-      json: { path, error: `unknown key: ${key}`, keys: CONFIG_KEYS },
-      failed: true
-    };
-  }
-  const value = configValue(config, key);
-  return {
-    title: "config",
-    lines: [{ mark: "none", text: value }],
-    json: { path, key, value }
-  };
-}
-
-// src/settings/command.ts
-async function configGet(key) {
-  return configGetReport(await readConfig(), key, configPath());
-}
-async function configSet(key, value, known) {
-  const path = configPath();
-  const config = await readConfig();
-  const result = setConfigValue(config, key, value);
-  if (!result.ok) {
-    return {
-      title: "config",
-      lines: [{ mark: "fail", text: result.message }],
-      json: { path, error: result.message },
-      failed: true
-    };
-  }
-  if (key === "agents") {
-    const valid = await known();
-    const refusal = valid && refuse(result.config.agents ?? [], valid, path);
-    if (refusal)
-      return refusal;
-  }
-  await writeConfig(result.config);
-  return {
-    title: "config",
-    lines: [{ mark: "ok", text: `${key} = ${result.shown}`, note: path }],
-    json: { path, key, value: result.shown }
-  };
-}
-function refuse(asked, valid, path) {
-  const { unknown, suggest } = unknownAgents(asked, valid);
-  if (unknown.length === 0)
-    return;
-  const named = unknown.join(", ");
-  return {
-    title: "config",
-    lines: [
-      {
-        mark: "fail",
-        text: `No agent is called ${named}.`,
-        note: suggest.length > 0 ? `did you mean ${suggest.join(", ")}?` : ""
-      },
-      {
-        mark: "none",
-        text: "The stock `skills` CLI keeps the list of agent names, and it does not have this one, so every install would stop at it."
-      },
-      {
-        mark: "none",
-        text: "Run `yourskills doctor` to see the names this machine accepts."
-      }
-    ],
-    json: { path, error: `unknown agents: ${named}`, suggest },
-    failed: true
-  };
-}
-// src/settings/scope.ts
-import { existsSync } from "node:fs";
-import { readFile as readFile2 } from "node:fs/promises";
-import { dirname, join as join3, resolve } from "node:path";
-var PROJECT_MANIFEST = "yourskills.json";
-function findProjectManifest(from) {
-  let dir = resolve(from ?? process.cwd());
-  for (;; ) {
-    const candidate = join3(dir, PROJECT_MANIFEST);
-    if (existsSync(candidate))
-      return candidate;
-    const parent = dirname(dir);
-    if (parent === dir)
-      return null;
-    dir = parent;
-  }
-}
-async function scopeInManifest(path) {
-  try {
-    const parsed = JSON.parse(await readFile2(path, "utf8"));
-    return parsed.scope === "global" || parsed.scope === "project" ? parsed.scope : null;
-  } catch {
-    return null;
-  }
-}
-async function resolveScope(opts = {}) {
-  const manifestPath = findProjectManifest(opts.cwd);
-  if (opts.flag)
-    return { scope: opts.flag, source: "flag", manifestPath };
-  if (manifestPath) {
-    const declared = await scopeInManifest(manifestPath);
-    if (declared)
-      return { scope: declared, source: "project", manifestPath };
-  }
-  const config = await readConfig();
-  if (config.defaultScope)
-    return { scope: config.defaultScope, source: "config", manifestPath };
-  return { scope: "global", source: "default", manifestPath };
-}
-// src/auth/auth.ts
-var CLIENT_ID = "yourskills-cli";
-var GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
-var SLOW_DOWN_STEP_MS = 5000;
-var authBase = (base) => `${base.replace(/\/$/, "")}/api/auth`;
-async function post(url, body) {
-  const res = await fetch(url, {
-    method: "POST",
-    headers: { "content-type": "application/json" },
-    body: JSON.stringify(body)
-  });
-  const text = await res.text();
-  let parsed;
-  try {
-    parsed = JSON.parse(text);
-  } catch {
-    return {
-      error: "invalid_response",
-      error_description: text.slice(0, 200) || res.statusText
-    };
-  }
-  if (res.ok)
-    return { ok: true, data: parsed };
-  const err = parsed;
-  return {
-    error: err.error ?? `http_${res.status}`,
-    error_description: err.error_description
-  };
-}
-async function* login() {
-  const config = await readConfig();
-  const base = serverUrl(config);
-  const start = await post(`${authBase(base)}/device/code`, {
-    client_id: CLIENT_ID
-  });
-  if (!("ok" in start)) {
-    throw new Error(`Could not start device login: ${start.error_description ?? start.error}`);
-  }
-  const device = start.data;
-  const deadline = Date.now() + device.expires_in * 1000;
-  yield {
-    kind: "prompt",
-    userCode: device.user_code,
-    verificationUri: device.verification_uri_complete ?? device.verification_uri,
-    expiresAt: deadline
-  };
-  let intervalMs = Math.max(device.interval, 1) * 1000;
-  while (Date.now() < deadline) {
-    await sleep(intervalMs);
-    const poll = await post(`${authBase(base)}/device/token`, {
-      grant_type: GRANT_TYPE,
-      device_code: device.device_code,
-      client_id: CLIENT_ID
-    });
-    if ("ok" in poll) {
-      const token = poll.data.access_token;
-      const who = await fetchSession(base, token);
-      await writeConfig({
-        ...config,
-        token,
-        serverUrl: base,
-        userEmail: who?.user?.email
-      });
-      yield { kind: "done", email: who?.user?.email };
-      return;
+    case "track": {
+      if (value !== "true" && value !== "false") {
+        return { ok: false, message: "track must be `true` or `false`." };
+      }
+      const track = value === "true";
+      return { ok: true, config: { ...config, track }, shown: String(track) };
     }
-    switch (poll.error) {
-      case "authorization_pending":
-        yield { kind: "waiting" };
-        break;
-      case "slow_down":
-        intervalMs += SLOW_DOWN_STEP_MS;
-        yield { kind: "waiting" };
-        break;
-      case "access_denied":
-        throw new Error("Login was denied.");
-      case "expired_token":
-        throw new Error("The device code expired. Run `yourskills login` again.");
-      default:
-        throw new Error(`Login failed: ${poll.error_description ?? poll.error}`);
+    case "autoUpdate": {
+      if (value !== "true" && value !== "false") {
+        return { ok: false, message: "autoUpdate must be `true` or `false`." };
+      }
+      const autoUpdate = value === "true";
+      return {
+        ok: true,
+        config: { ...config, autoUpdate },
+        shown: String(autoUpdate)
+      };
     }
   }
-  throw new Error("The device code expired. Run `yourskills login` again.");
 }
-async function logout() {
-  const config = await readConfig();
-  if (config.token) {
-    await fetch(`${authBase(serverUrl(config))}/sign-out`, {
-      method: "POST",
-      headers: { authorization: `Bearer ${config.token}` }
-    }).catch(() => {
-      return;
-    });
-  }
-  clearConfig();
+
+// src/settings/store.ts
+import { chmodSync, mkdirSync, rmSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+function configDir() {
+  const xdg = process.env.XDG_CONFIG_HOME;
+  return join(xdg && xdg.length > 0 ? xdg : join(homedir(), ".config"), "yourskills");
 }
-async function fetchSession(base, token) {
-  const res = await fetch(`${authBase(base)}/get-session`, {
-    headers: { authorization: `Bearer ${token}` }
-  });
-  if (!res.ok)
-    return null;
-  return await res.json();
+function configPath() {
+  return join(configDir(), "config.json");
 }
-async function whoami(server) {
-  const config = await readConfig();
-  if (!config.token)
-    throw new Error("Not logged in. Run `yourskills login`.");
-  const base = serverUrl(config, server);
-  const session = await fetchSession(base, config.token);
-  if (!session?.user)
-    throw new Error("Session is no longer valid. Run `yourskills login`.");
-  return {
-    user: session.user.email ?? session.user.id,
-    org: session.session?.activeOrganizationId ?? null,
-    server: base
-  };
+async function readConfig() {
+  try {
+    return JSON.parse(await readFile(configPath(), "utf8"));
+  } catch {
+    return {};
+  }
 }
-async function requireToken(server) {
-  const config = await readConfig();
-  if (!config.token)
-    throw new Error("Not logged in. Run `yourskills login`.");
-  return { token: config.token, base: serverUrl(config, server) };
+async function updateConfig(change) {
+  let current = {};
+  try {
+    current = JSON.parse(await readFile(configPath(), "utf8"));
+  } catch (error) {
+    if (error?.code !== "ENOENT")
+      return null;
+  }
+  const next = change(current);
+  await writeConfig(next);
+  return next;
 }
-async function hasSession() {
-  return Boolean((await readConfig()).token);
+async function writeConfig(config) {
+  mkdirSync(configDir(), { recursive: true, mode: 448 });
+  await writeFile(configPath(), `${JSON.stringify(config, null, 2)}
+`);
+  chmodSync(configPath(), 384);
 }
-async function localAccount(server) {
-  const config = await readConfig();
-  return {
-    signedIn: Boolean(config.token),
-    email: config.userEmail ?? null,
-    organization: config.orgName ?? null,
-    server: serverUrl(config, server)
-  };
+function clearConfig() {
+  rmSync(configPath(), { force: true });
 }
-// src/auth/screens/gate.tsx
-import { Box as Box6, Text as Text8, useApp as useApp2, useInput as useInput3 } from "ink";
-import {
-  useCallback,
-  useEffect as useEffect3,
-  useMemo,
-  useState as useState4
-} from "react";
-
-// src/ui/back.tsx
-import { useInput } from "ink";
 
-// ../../packages/ui/src/lib/ascii.ts
-var DEFAULT_ASCII_CHARS = {
-  top: "-",
-  bottom: "-",
-  left: "|",
-  right: "|",
-  divider: "-",
-  junction: "+"
-};
-function fill(n, seq = "-") {
-  const count = Math.max(n, 0);
-  if (count === 0) {
-    return "";
+// src/settings/answer.ts
+function decide(consulted, last) {
+  const layers = [...consulted, last];
+  const spoke = consulted.find((layer) => layer.value !== null);
+  if (spoke && spoke.value !== null) {
+    return {
+      value: spoke.value,
+      layer: spoke.layer,
+      from: spoke.from,
+      layers,
+      decided: true
+    };
   }
-  const unit = seq.length > 0 ? seq : " ";
-  return unit.repeat(Math.ceil(count / unit.length)).slice(0, count);
+  return {
+    value: last.value,
+    layer: last.layer,
+    from: last.from,
+    layers,
+    decided: false
+  };
 }
-function junctionGlyph(chars) {
-  return chars.junction.length > 0 ? chars.junction[0] : DEFAULT_ASCII_CHARS.junction;
+function scopeAnswer(held) {
+  const { project } = held;
+  return decide([
+    {
+      layer: "flag",
+      value: held.flags?.scope ?? null,
+      from: "-g or -p on the command line"
+    },
+    project ? {
+      layer: "project",
+      value: project.scope,
+      from: `yourskills.json at ${dirname(project.path)}${project.scope ? "" : " (declares no scope)"}`
+    } : {
+      layer: "project",
+      value: null,
+      from: "no yourskills.json above here"
+    },
+    {
+      layer: "config",
+      value: held.config.defaultScope ?? null,
+      from: `defaultScope in ${held.configPath}`
+    }
+  ], { layer: "default", value: "global", from: "built-in default" });
 }
-function topBorder(width, title, chars = DEFAULT_ASCII_CHARS) {
-  const j = junctionGlyph(chars);
-  if (!title) {
-    return `${j}${fill(width - 2, chars.top)}${j}`;
-  }
-  const label = ` ${title} `;
-  const left = 2;
-  const right = Math.max(width - 2 - left - label.length, 1);
-  return `${j}${fill(left, chars.top)}${label}${fill(right, chars.top)}${j}`;
+function agentsAnswer(held) {
+  const some = (agents) => agents && agents.length > 0 ? agents : null;
+  return decide([
+    {
+      layer: "flag",
+      value: some(held.flags?.agents),
+      from: "-a on the command line"
+    },
+    {
+      layer: "config",
+      value: some(held.config.agents),
+      from: `agents in ${held.configPath}`
+    },
+    {
+      layer: "stock",
+      value: some(held.stock?.agents),
+      from: held.stock ? `lastSelectedAgents in ${held.stock.path}` : "what the stock `skills` CLI remembers (not read)"
+    }
+  ], {
+    layer: "default",
+    value: [],
+    from: "nothing pinned; the stock `skills` CLI looks at what is installed"
+  });
 }
-
-// src/ui/frame.tsx
-import { Box, Text, useWindowSize } from "ink";
-
-// src/ui/theme.ts
-var tone = {
-  primary: "cyan",
-  notice: "yellow",
-  danger: "red"
-};
-var stateTone = {
-  "state-active": undefined,
-  "state-experimental": "yellow",
-  "state-deprecated": "red"
-};
-var mark = {
-  ok: "+",
-  fail: "x",
-  pending: ".",
-  none: "",
-  cursor: ">",
-  selected: "*",
-  unselected: " "
-};
-
-// src/ui/frame.tsx
-import { jsx, jsxs } from "react/jsx-runtime";
-var MAX_WIDTH = 96;
-var MIN_WIDTH = 44;
-var FRAME_CHROME = 4;
-function useFrameWidth() {
-  const { columns } = useWindowSize();
-  return Math.max(MIN_WIDTH, Math.min(MAX_WIDTH, columns - 2));
+var DEFAULT_URL = "https://api.yourskills.store";
+function serverAnswer(held) {
+  return decide([
+    {
+      layer: "flag",
+      value: held.flags?.server || null,
+      from: "--server on the command line"
+    },
+    {
+      layer: "env",
+      value: process.env.YOURSKILLS_URL || null,
+      from: "YOURSKILLS_URL in the environment"
+    },
+    {
+      layer: "config",
+      value: held.config.serverUrl || null,
+      from: `server in ${held.configPath}`
+    }
+  ], { layer: "default", value: DEFAULT_URL, from: "built-in default" });
 }
-var j = DEFAULT_ASCII_CHARS.junction;
-var BORDER = {
-  topLeft: j,
-  top: DEFAULT_ASCII_CHARS.top,
-  topRight: j,
-  right: DEFAULT_ASCII_CHARS.right,
-  bottomRight: j,
-  bottom: DEFAULT_ASCII_CHARS.bottom,
-  bottomLeft: j,
-  left: DEFAULT_ASCII_CHARS.left
-};
-function Frame({
-  title,
-  width,
-  children
-}) {
-  return /* @__PURE__ */ jsxs(Box, {
-    flexDirection: "column",
-    width,
-    children: [
-      /* @__PURE__ */ jsx(Text, {
-        color: tone.primary,
-        children: topBorder(width, title)
-      }),
-      /* @__PURE__ */ jsx(Box, {
-        flexDirection: "column",
-        width,
-        paddingLeft: 1,
-        paddingRight: 1,
-        borderStyle: BORDER,
-        borderColor: tone.primary,
-        borderTop: false,
-        children
-      })
-    ]
-  });
+function serverUrl(config = {}, override) {
+  return serverAnswer({
+    config,
+    configPath: configPath(),
+    flags: { server: override }
+  }).value;
 }
-function Divider({ width }) {
-  return /* @__PURE__ */ jsx(Box, {
-    marginLeft: -1,
-    marginRight: -1,
-    children: /* @__PURE__ */ jsx(Text, {
-      color: tone.primary,
-      children: fill(width - 2, DEFAULT_ASCII_CHARS.divider)
-    })
+function trackingOf(held) {
+  return trackingAnswer({
+    track: held.config.track,
+    configPath: held.configPath,
+    organization: held.organization
   });
 }
-function Blank() {
-  return /* @__PURE__ */ jsx(Text, {
-    children: " "
-  });
+function trackAnswer(held) {
+  const tracking = trackingOf(held);
+  const { configPath, organization } = held;
+  const layers = [
+    {
+      layer: "env",
+      value: trackingDisabledByEnv() ? false : null,
+      from: trackingFrom("env", configPath)
+    },
+    {
+      layer: "config",
+      value: held.config.track ?? null,
+      from: trackingFrom("config", configPath)
+    },
+    {
+      layer: "organization",
+      value: organization ? organization.enabled : null,
+      from: trackingFrom("organization", configPath)
+    },
+    {
+      layer: "default",
+      value: true,
+      from: trackingFrom("default", configPath)
+    }
+  ];
+  return {
+    value: tracking.value === "on",
+    layer: tracking.layer,
+    from: tracking.from,
+    layers,
+    decided: tracking.layer !== "default"
+  };
+}
+function autoUpdateAnswer(held) {
+  return decide([
+    {
+      layer: "config",
+      value: held.config.autoUpdate ?? null,
+      from: `autoUpdate in ${held.configPath}`
+    }
+  ], { layer: "default", value: true, from: "built-in default" });
+}
+function spell(key, answer, as) {
+  return {
+    key,
+    json: answer.value,
+    value: as(answer.value),
+    layer: answer.layer,
+    from: answer.from,
+    decided: answer.decided,
+    layers: answer.layers.map((layer) => ({
+      layer: layer.layer,
+      from: layer.from,
+      value: layer.value === null ? null : as(layer.value)
+    }))
+  };
 }
-function clip(text, width) {
-  if (width <= 0)
-    return "";
-  if (text.length <= width)
-    return text;
-  return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}~`;
+function shown(key, held) {
+  switch (key) {
+    case "scope":
+      return spell(key, scopeAnswer(held), (scope) => scope);
+    case "agents":
+      return spell(key, agentsAnswer(held), (agents) => agents.length > 0 ? agents.join(",") : UNSET);
+    case "server":
+      return spell(key, serverAnswer(held), (server) => server);
+    case "track":
+      return spell(key, trackAnswer(held), String);
+    case "autoUpdate":
+      return spell(key, autoUpdateAnswer(held), String);
+  }
+}
+function settingsShown(held) {
+  return CONFIG_KEYS.map((key) => shown(key, held));
 }
 
-// ../../packages/skills/src/lifecycle.ts
-var LIFECYCLES = [
-  { status: "active", word: "active", glyph: "#", tone: "state-active" },
-  {
-    status: "experimental",
-    word: "experimental",
-    glyph: "?",
-    tone: "state-experimental"
-  },
-  {
-    status: "deprecated",
-    word: "deprecated",
-    glyph: "x",
-    tone: "state-deprecated"
-  }
-];
-var LIFECYCLE_ORDER = LIFECYCLES.map((lifecycle) => lifecycle.status);
-var BY_STATUS = new Map(LIFECYCLES.map((lifecycle) => [lifecycle.status, lifecycle]));
-function lifecycleOf(status) {
-  const lifecycle = BY_STATUS.get(status);
-  if (!lifecycle) {
-    throw new Error(`No lifecycle vocabulary for "${status}". Add it to LIFECYCLES.`);
+// src/settings/agents.ts
+function stockLockPath() {
+  const state = process.env.XDG_STATE_HOME;
+  if (state && state.length > 0)
+    return join2(state, "skills", ".skill-lock.json");
+  const home = process.env.HOME;
+  return join2(home && home.length > 0 ? home : homedir2(), ".agents", ".skill-lock.json");
+}
+var LOCK_VERSION = 3;
+function rememberedAgents() {
+  let lock;
+  try {
+    lock = JSON.parse(readFileSync(stockLockPath(), "utf8"));
+  } catch {
+    return [];
   }
-  return lifecycle;
+  if (!lock || typeof lock !== "object")
+    return [];
+  const raw = lock;
+  if (typeof raw.version !== "number" || raw.version < LOCK_VERSION)
+    return [];
+  if (!raw.skills)
+    return [];
+  return Array.isArray(raw.lastSelectedAgents) ? raw.lastSelectedAgents.filter((a) => typeof a === "string") : [];
 }
-// src/ui/rows.tsx
-import { Box as Box2, Text as Text2 } from "ink";
-import { jsx as jsx2, jsxs as jsxs2, Fragment } from "react/jsx-runtime";
-function lifecycleTag(status) {
-  if (!status || status === "active")
-    return "";
-  return `[${lifecycleOf(status).word}]`;
+async function resolveAgents(flagAgents) {
+  const config = await readConfig();
+  return agentsAnswer({
+    config,
+    configPath: configPath(),
+    flags: { agents: flagAgents },
+    stock: { path: stockLockPath(), agents: rememberedAgents() }
+  }).value;
 }
-function lifecycleColor(status) {
-  return stateTone[lifecycleOf(status ?? "active").tone];
+// src/settings/scope.ts
+import { existsSync } from "node:fs";
+import { readFile as readFile2 } from "node:fs/promises";
+import { dirname as dirname2, join as join3, resolve } from "node:path";
+var PROJECT_MANIFEST = "yourskills.json";
+function findProjectManifest(from) {
+  let dir = resolve(from ?? process.cwd());
+  for (;; ) {
+    const candidate = join3(dir, PROJECT_MANIFEST);
+    if (existsSync(candidate))
+      return candidate;
+    const parent = dirname2(dir);
+    if (parent === dir)
+      return null;
+    dir = parent;
+  }
 }
-var GUTTER = 4;
-var GAP = 2;
-function nameWidth(rows, max = 28) {
-  return Math.min(max, Math.max(8, ...rows.map((r) => r.name.length)));
+async function scopeInManifest(path) {
+  try {
+    const parsed = JSON.parse(await readFile2(path, "utf8"));
+    return parsed.scope === "global" || parsed.scope === "project" ? parsed.scope : null;
+  } catch {
+    return null;
+  }
 }
-function SkillRow({
-  row,
-  width,
-  names,
-  cursor,
-  selected,
-  selectable = false
-}) {
-  const tag = lifecycleTag(row.status);
-  const meta = row.count !== undefined ? `${row.count} skills` : tag;
-  const gutter = selectable ? GUTTER : 0;
-  const rest = width - gutter - names - GAP - (meta ? meta.length + GAP : 0);
-  return /* @__PURE__ */ jsxs2(Box2, {
-    children: [
-      selectable ? /* @__PURE__ */ jsx2(Text2, {
-        color: cursor ? "cyan" : undefined,
-        children: `${cursor ? mark.cursor : " "} ${selected ? mark.selected : mark.unselected} `
-      }) : null,
-      /* @__PURE__ */ jsx2(Text2, {
-        bold: cursor,
-        color: lifecycleColor(row.status),
-        children: clip(row.name, names).padEnd(names)
-      }),
-      /* @__PURE__ */ jsx2(Text2, {
-        children: " ".repeat(GAP)
-      }),
-      /* @__PURE__ */ jsx2(Text2, {
-        dimColor: true,
-        children: clip(row.description ?? "", Math.max(rest, 0))
-      }),
-      meta ? /* @__PURE__ */ jsxs2(Fragment, {
-        children: [
-          /* @__PURE__ */ jsx2(Text2, {
-            children: " ".repeat(GAP)
-          }),
-          /* @__PURE__ */ jsx2(Text2, {
-            color: lifecycleColor(row.status),
-            dimColor: !tag,
-            children: meta
-          })
-        ]
-      }) : null
-    ]
-  });
+async function nearestProject(cwd) {
+  const path = findProjectManifest(cwd);
+  return path ? { path, scope: await scopeInManifest(path) } : null;
 }
-function Hints({ hints }) {
-  return /* @__PURE__ */ jsx2(Box2, {
-    children: hints.map(([key, label], i) => /* @__PURE__ */ jsxs2(Text2, {
-      children: [
-        i > 0 ? /* @__PURE__ */ jsx2(Text2, {
-          dimColor: true,
-          children: "   "
-        }) : null,
-        /* @__PURE__ */ jsx2(Text2, {
-          color: "cyan",
-          children: key
-        }),
-        /* @__PURE__ */ jsx2(Text2, {
-          dimColor: true,
-          children: ` ${label}`
-        })
-      ]
-    }, key))
+async function resolveScope(opts = {}) {
+  const [config, project] = await Promise.all([
+    readConfig(),
+    nearestProject(opts.cwd)
+  ]);
+  const answer = scopeAnswer({
+    config,
+    configPath: configPath(),
+    flags: { scope: opts.flag },
+    project
   });
+  return {
+    scope: answer.value,
+    source: answer.layer,
+    manifestPath: project?.path ?? null
+  };
 }
 
-// src/ui/back.tsx
-import { jsx as jsx3, jsxs as jsxs3, Fragment as Fragment2 } from "react/jsx-runtime";
-function Back({
-  width,
-  onBack,
-  extra = []
-}) {
-  useInput((input, key) => {
-    if (key.escape || input === "x")
-      onBack?.();
-  }, { isActive: Boolean(onBack) });
-  if (!onBack)
-    return null;
-  return /* @__PURE__ */ jsxs3(Fragment2, {
-    children: [
-      /* @__PURE__ */ jsx3(Divider, {
-        width
-      }),
-      /* @__PURE__ */ jsx3(Hints, {
-        hints: [...extra, ["esc/x", "back"]]
-      })
-    ]
-  });
+// src/settings/held.ts
+async function holdSettings(ask = {}) {
+  const [config, project] = await Promise.all([
+    readConfig(),
+    nearestProject(ask.cwd)
+  ]);
+  const organization = ask.askOrganization && trackingOn(config) ? await ask.askOrganization() : undefined;
+  return {
+    config,
+    configPath: configPath(),
+    flags: ask.flags,
+    project,
+    stock: { path: stockLockPath(), agents: rememberedAgents() },
+    organization
+  };
 }
-// src/ui/command.tsx
-import { Box as Box3, Text as Text4 } from "ink";
 
-// src/ui/text-input.tsx
-import { Text as Text3 } from "ink";
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-function SearchInput({
-  value,
-  placeholder = "",
-  focus = true
-}) {
-  return /* @__PURE__ */ jsxs4(Text3, {
-    children: [
-      value.length > 0 ? /* @__PURE__ */ jsx4(Text3, {
-        children: value
-      }) : /* @__PURE__ */ jsx4(Text3, {
-        dimColor: true,
-        children: placeholder
-      }),
-      focus ? /* @__PURE__ */ jsx4(Text3, {
-        color: tone.primary,
-        children: "_"
-      }) : null
-    ]
+// src/settings/command.ts
+async function configGet(key) {
+  return configGetReport(await holdSettings(), key);
+}
+function configLines(held) {
+  const width = Math.max(...CONFIG_KEYS.map((k) => k.length), "user".length);
+  const lines = settingsShown(held).map((setting) => ({
+    mark: "none",
+    text: `${setting.key.padEnd(width)}  ${setting.value}`
+  }));
+  lines.push({
+    mark: "none",
+    text: `${"user".padEnd(width)}  ${held.config.userEmail ?? UNSET}`
+  });
+  lines.push({
+    mark: "none",
+    text: `${"token".padEnd(width)}  ${held.config.token ? REDACTED : UNSET}`
   });
+  return lines;
+}
+function configGetReport(held, key) {
+  const path = held.configPath;
+  if (key === undefined) {
+    return {
+      title: "config",
+      lines: configLines(held),
+      json: {
+        path,
+        ...Object.fromEntries(settingsShown(held).map((setting) => [setting.key, setting.json])),
+        user: held.config.userEmail ?? null,
+        token: held.config.token ? REDACTED : null
+      }
+    };
+  }
+  if (!isConfigKey(key)) {
+    return {
+      title: "config",
+      lines: [
+        {
+          mark: "fail",
+          text: `Unknown config key: ${key}`,
+          note: `Known keys: ${CONFIG_KEYS.join(", ")}`
+        }
+      ],
+      json: { path, error: `unknown key: ${key}`, keys: CONFIG_KEYS },
+      failed: true
+    };
+  }
+  const setting = shown(key, held);
+  return {
+    title: "config",
+    lines: [{ mark: "none", text: setting.value }],
+    json: { path, key, value: setting.json }
+  };
 }
-
-// src/ui/viewport.ts
-import { useWindowSize as useWindowSize2 } from "ink";
-var MIN_ROWS = 3;
-var MAX_ROWS = 20;
-function useViewport({
-  cursor,
-  total,
-  chrome
-}) {
-  const { rows } = useWindowSize2();
-  const size = Math.max(MIN_ROWS, Math.min(MAX_ROWS, rows - chrome));
-  const first = Math.max(0, Math.min(cursor - Math.floor(size / 2), total - size));
-  return { first, size };
+async function configSet(key, value, known) {
+  const path = configPath();
+  const config = await readConfig();
+  const result = setConfigValue(config, key, value);
+  if (!result.ok) {
+    return {
+      title: "config",
+      lines: [{ mark: "fail", text: result.message }],
+      json: { path, error: result.message },
+      failed: true
+    };
+  }
+  if (key === "agents") {
+    const valid = await known();
+    const refusal = valid && refuse(result.config.agents ?? [], valid, path);
+    if (refusal)
+      return refusal;
+  }
+  await writeConfig(result.config);
+  return {
+    title: "config",
+    lines: [{ mark: "ok", text: `${key} = ${result.shown}`, note: path }],
+    json: { path, key, value: result.shown }
+  };
 }
-function position(cursor, total) {
-  return `${total > 0 ? cursor + 1 : 0}/${total}`;
+function refuse(asked, valid, path) {
+  const { unknown, suggest } = unknownAgents(asked, valid);
+  if (unknown.length === 0)
+    return;
+  const named = unknown.join(", ");
+  return {
+    title: "config",
+    lines: [
+      {
+        mark: "fail",
+        text: `No agent is called ${named}.`,
+        note: suggest.length > 0 ? `did you mean ${suggest.join(", ")}?` : ""
+      },
+      {
+        mark: "none",
+        text: "The stock `skills` CLI keeps the list of agent names, and it does not have this one, so every install would stop at it."
+      },
+      {
+        mark: "none",
+        text: "Run `yourskills doctor` to see the names this machine accepts."
+      }
+    ],
+    json: { path, error: `unknown agents: ${named}`, suggest },
+    failed: true
+  };
 }
+// src/auth/session.ts
+var CLIENT_ID = "yourskills-cli";
+var GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
+var SLOW_DOWN_STEP_MS = 5000;
+var LOGIN = "yourskills login";
+var EXPIRED = `The device code expired. Run \`${LOGIN}\` again.`;
+var authBase = (base) => `${base.replace(/\/$/, "")}/api/auth`;
+var bearer = (token) => ({ authorization: `Bearer ${token}` });
+var REFUSED = {
+  "no-token": { said: "Not logged in.", fact: "no token on this machine" },
+  stale: {
+    said: "Session is no longer valid.",
+    fact: "the registry no longer accepts the token on this machine"
+  }
+};
 
-// src/ui/command.tsx
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function filterCommands(groups, query) {
-  if (query.length === 0)
-    return groups;
-  const q = query.toLowerCase();
-  return groups.map((group) => ({
-    group: group.group,
-    items: group.items.filter((item) => item.label.toLowerCase().includes(q) || (item.hint ?? "").toLowerCase().includes(q))
-  })).filter((group) => group.items.length > 0);
+class SessionRefusal extends Error {
+  reason;
+  fact;
+  next = LOGIN;
+  constructor(reason) {
+    super(`${REFUSED[reason].said} Run \`${LOGIN}\`.`);
+    this.name = "SessionRefusal";
+    this.reason = reason;
+    this.fact = REFUSED[reason].fact;
+  }
 }
-function flattenCommands(groups) {
-  return groups.flatMap((group) => group.items);
+function isSessionRefusal(error) {
+  return error instanceof Error && error.name === "SessionRefusal";
 }
-function windowGroups(groups, first, count) {
-  const out = [];
-  let index = 0;
-  for (const group of groups) {
-    const items = group.items.filter((_, i) => {
-      const row = index + i;
-      return row >= first && row < first + count;
-    });
-    index += group.items.length;
-    if (items.length > 0)
-      out.push({ group: group.group, items });
-  }
-  return out;
+async function requireToken(server) {
+  const config = await readConfig();
+  if (!config.token)
+    throw new SessionRefusal("no-token");
+  return { token: config.token, base: serverUrl(config, server) };
 }
-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);
+async function hasSession() {
+  return Boolean((await readConfig()).token);
 }
-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 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, {
-        color: tone.primary,
-        children: `${active ? mark.cursor : " "} `
-      }),
-      /* @__PURE__ */ jsx5(Text4, {
-        bold: active,
-        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}`
-      })
-    ]
-  });
+async function localAccount(server) {
+  const config = await readConfig();
+  return {
+    signedIn: Boolean(config.token),
+    email: config.userEmail ?? null,
+    organization: config.orgName ?? null,
+    server: serverUrl(config, server)
+  };
 }
-function CommandPalette({
-  groups,
-  query,
-  cursor,
-  width,
-  chrome = 11,
-  placeholder = "type a command or search",
-  emptyMessage = "No matching commands."
-}) {
-  const visible = filterCommands(groups, query);
-  const rows = flattenCommands(visible);
-  const current = rows[cursor];
-  const interior = width - FRAME_CHROME;
-  const column = valueColumn(rows);
-  const { first, size } = useViewport({
-    cursor,
-    total: rows.length,
-    chrome: chrome + Math.max(0, visible.length * 2 - 1)
-  });
-  const paged = windowGroups(visible, first, size);
-  return /* @__PURE__ */ jsxs5(Box3, {
-    flexDirection: "column",
-    children: [
-      /* @__PURE__ */ jsxs5(Box3, {
-        children: [
-          /* @__PURE__ */ jsx5(Text4, {
-            color: tone.primary,
-            children: "> "
-          }),
-          /* @__PURE__ */ jsx5(SearchInput, {
-            value: query,
-            placeholder
-          })
-        ]
-      }),
-      /* @__PURE__ */ jsx5(Divider, {
-        width
-      }),
-      rows.length === 0 ? /* @__PURE__ */ jsx5(Text4, {
-        dimColor: true,
-        children: emptyMessage
-      }) : paged.map((group, i) => /* @__PURE__ */ jsxs5(Box3, {
-        flexDirection: "column",
-        children: [
-          i > 0 ? /* @__PURE__ */ jsx5(Divider, {
-            width
-          }) : null,
-          /* @__PURE__ */ jsx5(Text4, {
-            dimColor: true,
-            children: group.group.toUpperCase()
-          }),
-          group.items.map((item) => /* @__PURE__ */ jsx5(CommandRow, {
-            item,
-            width: interior,
-            column,
-            active: item.value === current?.value
-          }, item.value))
-        ]
-      }, group.group))
-    ]
+async function post(talk, url, body) {
+  const res = await talk(url, {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify(body)
   });
-}
-// src/ui/confirm.tsx
-import { Box as Box4, Text as Text5, useInput as useInput2 } from "ink";
-import { useState } from "react";
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
-function ConfirmScreen({
-  title,
-  headline,
-  lines,
-  notes = [],
-  yes,
-  no,
-  argv,
-  onYes,
-  onNo
-}) {
-  const width = useFrameWidth();
-  const [choice, setChoice] = useState("yes");
-  useInput2((input, key) => {
-    if (key.upArrow || key.downArrow) {
-      setChoice((c) => c === "yes" ? "no" : "yes");
-    } else if (key.return) {
-      if (choice === "yes")
-        onYes();
-      else
-        onNo();
-    } else if (key.escape || input === "x") {
-      onNo();
-    }
+  const text = await res.text();
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return {
+      error: "invalid_response",
+      error_description: text.slice(0, 200) || res.statusText
+    };
+  }
+  if (res.ok)
+    return { ok: true, data: parsed };
+  const err = parsed;
+  return {
+    error: err.error ?? `http_${res.status}`,
+    error_description: err.error_description
+  };
+}
+async function getSession(talk, base, token) {
+  const res = await talk(`${authBase(base)}/get-session`, {
+    headers: bearer(token)
   });
-  const interior = width - FRAME_CHROME;
-  const row = (label, active, hint) => {
-    const room = interior - 2 - (hint ? hint.length + 2 : 0);
-    const text = clip(label, Math.max(room, 0));
-    const gap = Math.max(interior - 2 - text.length - (hint?.length ?? 0), 1);
-    return /* @__PURE__ */ jsxs6(Text5, {
-      children: [
-        /* @__PURE__ */ jsx6(Text5, {
-          color: tone.primary,
-          children: `${active ? mark.cursor : " "} `
-        }),
-        /* @__PURE__ */ jsx6(Text5, {
-          bold: active,
-          color: active ? tone.primary : undefined,
-          children: text
-        }),
-        hint ? /* @__PURE__ */ jsx6(Text5, {
-          dimColor: true,
-          children: `${" ".repeat(gap)}${hint}`
-        }) : null
-      ]
+  if (!res.ok)
+    return null;
+  return await res.json();
+}
+async function sessionOf(talk, base, token) {
+  const answer = await getSession(talk, base, token);
+  if (!answer?.user)
+    throw new SessionRefusal("stale");
+  return {
+    user: answer.user.email ?? answer.user.id,
+    organizationId: answer.session?.activeOrganizationId ?? null,
+    server: base
+  };
+}
+async function listOrganizations(talk, base, token) {
+  let res;
+  try {
+    res = await talk(`${authBase(base)}/organization/list`, {
+      headers: 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* login(reach = {}) {
+  const talk = reach.talk ?? fetch;
+  const wait = reach.wait ?? ((ms) => sleep(ms));
+  const config = await readConfig();
+  const base = serverUrl(config, reach.server);
+  const start = await post(talk, `${authBase(base)}/device/code`, { client_id: CLIENT_ID });
+  if (!("ok" in start)) {
+    throw new Error(`Could not start device login: ${start.error_description ?? start.error}`);
+  }
+  const device = start.data;
+  const deadline = Date.now() + device.expires_in * 1000;
+  yield {
+    kind: "prompt",
+    userCode: device.user_code,
+    verificationUri: device.verification_uri_complete ?? device.verification_uri,
+    expiresAt: deadline
   };
-  return /* @__PURE__ */ jsxs6(Frame, {
-    title,
-    width,
-    children: [
-      /* @__PURE__ */ jsxs6(Box4, {
-        flexDirection: "column",
-        children: [
-          /* @__PURE__ */ jsx6(Text5, {
-            color: tone.notice,
-            children: clip(headline, interior)
-          }),
-          /* @__PURE__ */ jsx6(Text5, {
-            children: " "
-          }),
-          lines.map((line) => /* @__PURE__ */ jsxs6(Text5, {
-            children: [
-              /* @__PURE__ */ jsx6(Text5, {
-                color: line.mark === "fail" ? tone.danger : undefined,
-                children: `${mark[line.mark] || " "} `
-              }),
-              /* @__PURE__ */ jsx6(Text5, {
-                children: clip(line.text, interior - 2)
-              }),
-              line.note ? /* @__PURE__ */ jsx6(Text5, {
-                dimColor: true,
-                children: clip(`  ${line.note}`, Math.max(interior - 2 - line.text.length, 0))
-              }) : null
-            ]
-          }, `${line.mark}:${line.text}`)),
-          notes.length > 0 ? /* @__PURE__ */ jsx6(Text5, {
-            children: " "
-          }) : null,
-          notes.map((note) => /* @__PURE__ */ jsx6(Text5, {
-            dimColor: true,
-            children: clip(note, interior)
-          }, note)),
-          /* @__PURE__ */ jsx6(Text5, {
-            children: " "
-          }),
-          row(yes, choice === "yes", argv),
-          row(no, choice === "no")
-        ]
-      }),
-      /* @__PURE__ */ jsx6(Divider, {
-        width
-      }),
-      /* @__PURE__ */ jsx6(Hints, {
-        hints: [
-          ["^v", "choose"],
-          ["enter", choice === "yes" ? yes : no],
-          ["esc", no]
-        ]
-      })
-    ]
-  });
+  let intervalMs = Math.max(device.interval, 1) * 1000;
+  while (Date.now() < deadline) {
+    await wait(intervalMs);
+    const poll = await post(talk, `${authBase(base)}/device/token`, {
+      grant_type: GRANT_TYPE,
+      device_code: device.device_code,
+      client_id: CLIENT_ID
+    });
+    if ("ok" in poll) {
+      const token = poll.data.access_token;
+      const who = await getSession(talk, base, token);
+      await writeConfig({
+        ...config,
+        token,
+        serverUrl: base,
+        userEmail: who?.user?.email
+      });
+      yield { kind: "done", email: who?.user?.email };
+      return;
+    }
+    switch (poll.error) {
+      case "authorization_pending":
+        yield { kind: "waiting" };
+        break;
+      case "slow_down":
+        intervalMs += SLOW_DOWN_STEP_MS;
+        yield { kind: "waiting" };
+        break;
+      case "access_denied":
+        throw new Error("Login was denied.");
+      case "expired_token":
+        throw new Error(EXPIRED);
+      default:
+        throw new Error(`Login failed: ${poll.error_description ?? poll.error}`);
+    }
+  }
+  throw new Error(EXPIRED);
 }
-// src/ui/spinner.tsx
-import { Text as Text6 } from "ink";
-import { useEffect, useState as useState2 } from "react";
-import { jsx as jsx7 } from "react/jsx-runtime";
-var FRAMES = ["-", "\\", "|", "/"];
-var INTERVAL_MS = 90;
-function Spinner() {
-  const [frame, setFrame] = useState2(0);
-  useEffect(() => {
-    const timer = setInterval(() => setFrame((f) => (f + 1) % FRAMES.length), INTERVAL_MS);
-    return () => clearInterval(timer);
-  }, []);
-  return /* @__PURE__ */ jsx7(Text6, {
-    color: tone.primary,
-    children: FRAMES[frame]
+async function logout(reach = {}) {
+  const config = await readConfig();
+  if (config.token) {
+    await (reach.talk ?? fetch)(`${authBase(serverUrl(config, reach.server))}/sign-out`, { method: "POST", headers: bearer(config.token) }).catch(() => {
+      return;
+    });
+  }
+  clearConfig();
+}
+async function readSession(reach = {}) {
+  const { token, base } = await requireToken(reach.server);
+  return sessionOf(reach.talk ?? fetch, base, token);
+}
+var REACH_TIMEOUT_MS = 5000;
+async function reachable(reach = {}, timeoutMs = REACH_TIMEOUT_MS) {
+  const base = serverUrl(await readConfig(), reach.server);
+  try {
+    const res = await (reach.talk ?? fetch)(`${authBase(base)}/ok`, {
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    return { base, status: res.status };
+  } catch (error) {
+    return {
+      base,
+      status: null,
+      said: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+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 {}
+}
+async function organizations(reach = {}) {
+  const { token, base } = await requireToken(reach.server);
+  const talk = reach.talk ?? fetch;
+  const [who, list] = await Promise.allSettled([
+    sessionOf(talk, base, token),
+    listOrganizations(talk, base, token)
+  ]);
+  if (who.status === "rejected")
+    throw who.reason;
+  if (list.status === "rejected")
+    throw list.reason;
+  const active = list.value.find((o) => o.id === who.value.organizationId) ?? null;
+  await rememberOrganization(active?.name ?? null);
+  return { all: list.value, active };
+}
+async function switchOrganization(name, reach = {}) {
+  const { token, base } = await requireToken(reach.server);
+  const talk = reach.talk ?? fetch;
+  const all = await listOrganizations(talk, base, token);
+  const wanted = name.toLowerCase();
+  const match = all.find((o) => o.name.toLowerCase() === wanted || o.slug?.toLowerCase() === wanted);
+  if (!match)
+    return { kind: "unknown", offered: all };
+  const res = await talk(`${authBase(base)}/organization/set-active`, {
+    method: "POST",
+    headers: { "content-type": "application/json", ...bearer(token) },
+    body: JSON.stringify({ organizationId: match.id })
   });
+  if (!res.ok) {
+    const detail = (await res.text()).slice(0, 200);
+    return {
+      kind: "refused",
+      organization: match,
+      detail: detail || `${res.status} ${res.statusText}`
+    };
+  }
+  await rememberOrganization(match.name);
+  return { kind: "switched", organization: match };
 }
+
 // src/auth/screens/login.tsx
 import { Box as Box5, Text as Text7, useApp } from "ink";
 import { useEffect as useEffect2, useState as useState3 } from "react";
@@ -1533,7 +1841,7 @@ import { useCallback as useCallback2, useEffect as useEffect6, useMemo as useMem
 
 // src/manifest/manifest.ts
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "node:fs";
-import { dirname as dirname2, join as join4, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, join as join4, resolve as resolve2 } from "node:path";
 function emptyManifest(scope) {
   return { version: 1, scope, agents: [], bundles: {}, skills: {} };
 }
@@ -1561,7 +1869,7 @@ function readManifest(path) {
   };
 }
 function writeManifest(path, m) {
-  mkdirSync2(dirname2(path), { recursive: true });
+  mkdirSync2(dirname3(path), { recursive: true });
   writeFileSync(path, `${JSON.stringify(m, null, 2)}
 `);
 }
@@ -1637,7 +1945,7 @@ async function nearestManifest(flag, cwd) {
 // src/install/install.ts
 import { spawn } from "node:child_process";
 import { createRequire } from "node:module";
-import { dirname as dirname3, join as join5 } from "node:path";
+import { dirname as dirname4, join as join5 } from "node:path";
 function skillsAddArgv(location, opts = {}) {
   const path = location.path.replace(/^\/+|\/+$/g, "");
   const at = location.ref ? `#${location.ref}` : "";
@@ -1671,7 +1979,7 @@ function skillsBin() {
   if (!bin) {
     throw new Error("The bundled `skills` package declares no `skills` binary. Re-install yourskills.");
   }
-  return join5(dirname3(pkgPath), bin);
+  return join5(dirname4(pkgPath), bin);
 }
 function runSkills(argv) {
   const bin = skillsBin();
@@ -1703,9 +2011,9 @@ function runSkills(argv) {
 }
 function pendingMessage(pending) {
   const where = `${pending.repo}/${pending.path}`;
-  return pending.prUrl ? `${pending.skillName}  not in your catalog yet — opened a pull request against ${where}
+  return `${pending.skillName}  not in your catalog yet — opened a pull request against ${where}
 ` + `  ${pending.prUrl}
-` + "  Merge it, then run this command again." : `${pending.skillName}  not in your catalog yet — written to ${where}. ` + "Re-run once it has been indexed.";
+` + "  Merge it, then run this command again.";
 }
 function licenceQuestionMessage(name, licence) {
   const repos = [...new Set(licence.upstreams.map((one) => one.repo))];
@@ -2185,7 +2493,7 @@ function InstallLine({ line, width }) {
               })
             ]
           }),
-          line.vendor.prUrl ? /* @__PURE__ */ jsxs9(Text9, {
+          /* @__PURE__ */ jsxs9(Text9, {
             children: [
               /* @__PURE__ */ jsx10(Text9, {
                 children: "    "
@@ -2195,7 +2503,7 @@ function InstallLine({ line, width }) {
                 children: line.vendor.prUrl
               })
             ]
-          }) : null
+          })
         ]
       });
     case "question":
@@ -2371,64 +2679,13 @@ function Installer({
             ]
           }) : null
         ]
-      }),
-      done || error !== null ? /* @__PURE__ */ jsx10(Back, {
-        width,
-        onBack
-      }) : null
-    ]
-  });
-}
-function plainLine(line) {
-  switch (line.state) {
-    case "installing":
-      return `installing ${line.name}  ${line.where}`;
-    case "installed":
-      return `${line.name}  ${line.where}${line.deprecated ? `  ${lifecycleTag("deprecated")}` : ""}`;
-    case "pending":
-      return pendingMessage(line.vendor);
-    case "question":
-      return licenceQuestionMessage(line.name, line.licence);
-    case "failed":
-      return `error: ${line.name}: ${line.message}`;
-    default:
-      return null;
-  }
-}
-async function installPlain(stream) {
-  let lines = [];
-  const printed = new Set;
-  const started = new Set;
-  for await (const event of stream) {
-    lines = reduce(lines, event);
-    for (const line of lines) {
-      if (line.state === "installing" && !started.has(line.name)) {
-        started.add(line.name);
-        const text = plainLine(line);
-        if (text !== null)
-          console.log(text);
-        continue;
-      }
-      if (printed.has(line.name) || !settled(line))
-        continue;
-      const text = plainLine(line);
-      if (text === null)
-        continue;
-      printed.add(line.name);
-      if (line.state === "failed") {
-        console.error(text);
-        if (line.detail)
-          console.error(line.detail);
-      } else {
-        console.log(text);
-      }
-    }
-  }
-  const counts = receipt(lines);
-  if (counts) {
-    console.log(`${counts.installed} installed, ${counts.pending} pending, ${counts.failed} failed` + (counts.questions > 0 ? `, ${counts.questions} unanswered` : ""));
-  }
-  return summarise(lines);
+      }),
+      done || error !== null ? /* @__PURE__ */ jsx10(Back, {
+        width,
+        onBack
+      }) : null
+    ]
+  });
 }
 // src/screens.tsx
 import { Box as Box8, Text as Text10, useApp as useApp4, useInput as useInput4 } from "ink";
@@ -2437,29 +2694,41 @@ import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 var HELP_COLUMN = 26;
 function NoticeScreen({
   title,
-  message
+  message,
+  exitWhenDone = true,
+  onBack
 }) {
   const { exit } = useApp4();
   const width = useFrameWidth();
-  useEffect5(exit, [exit]);
-  return /* @__PURE__ */ jsx11(Frame, {
+  useEffect5(() => {
+    if (exitWhenDone)
+      exit();
+  }, [exit, exitWhenDone]);
+  return /* @__PURE__ */ jsxs10(Frame, {
     title,
     width,
-    children: /* @__PURE__ */ jsxs10(Text10, {
-      children: [
-        /* @__PURE__ */ jsx11(Text10, {
-          color: "green",
-          children: mark.ok
-        }),
-        /* @__PURE__ */ jsx11(Text10, {
-          children: ` ${message}`
-        })
-      ]
-    })
+    children: [
+      /* @__PURE__ */ jsxs10(Text10, {
+        children: [
+          /* @__PURE__ */ jsx11(Text10, {
+            color: "green",
+            children: mark.ok
+          }),
+          /* @__PURE__ */ jsx11(Text10, {
+            children: ` ${message}`
+          })
+        ]
+      }),
+      /* @__PURE__ */ jsx11(Back, {
+        width,
+        onBack
+      })
+    ]
   });
 }
 var COLOURS = {
   ok: "green",
+  warn: tone.notice,
   fail: tone.danger,
   pending: tone.notice,
   none: undefined
@@ -2571,39 +2840,105 @@ function numberedLines(text) {
   return text.split(`
 `).map((line, i) => ({ id: `${i}:${line}`, line }));
 }
-function HelpScreen({ text }) {
+function HelpScreen({
+  text,
+  exitWhenDone = true,
+  onBack
+}) {
   const { exit } = useApp4();
   const width = useFrameWidth();
-  useEffect5(exit, [exit]);
-  return /* @__PURE__ */ jsx11(Frame, {
+  useEffect5(() => {
+    if (exitWhenDone)
+      exit();
+  }, [exit, exitWhenDone]);
+  return /* @__PURE__ */ jsxs10(Frame, {
     title: "yourskills",
     width,
-    children: /* @__PURE__ */ jsx11(Box8, {
-      flexDirection: "column",
-      children: numberedLines(text).map(({ id, line }) => {
-        if (line.length === 0)
-          return /* @__PURE__ */ jsx11(Blank, {}, id);
-        if (!line.startsWith("  "))
-          return /* @__PURE__ */ jsx11(Text10, {
-            children: clip(line, width - FRAME_CHROME)
-          }, id);
-        return /* @__PURE__ */ jsxs10(Text10, {
-          children: [
-            /* @__PURE__ */ jsx11(Text10, {
-              color: tone.primary,
-              children: line.slice(0, HELP_COLUMN)
-            }),
-            /* @__PURE__ */ jsx11(Text10, {
-              dimColor: true,
-              children: clip(line.slice(HELP_COLUMN), width - FRAME_CHROME - HELP_COLUMN)
-            })
-          ]
-        }, line);
+    children: [
+      /* @__PURE__ */ jsx11(Box8, {
+        flexDirection: "column",
+        children: numberedLines(text).map(({ id, line }) => {
+          if (line.length === 0)
+            return /* @__PURE__ */ jsx11(Blank, {}, id);
+          if (!line.startsWith("  "))
+            return /* @__PURE__ */ jsx11(Text10, {
+              children: clip(line, width - FRAME_CHROME)
+            }, id);
+          return /* @__PURE__ */ jsxs10(Text10, {
+            children: [
+              /* @__PURE__ */ jsx11(Text10, {
+                color: tone.primary,
+                children: line.slice(0, HELP_COLUMN)
+              }),
+              /* @__PURE__ */ jsx11(Text10, {
+                dimColor: true,
+                children: clip(line.slice(HELP_COLUMN), width - FRAME_CHROME - HELP_COLUMN)
+              })
+            ]
+          }, line);
+        })
+      }),
+      /* @__PURE__ */ jsx11(Back, {
+        width,
+        onBack
       })
-    })
+    ]
   });
 }
 
+// src/install/plain.ts
+function plainLine(line) {
+  switch (line.state) {
+    case "installing":
+      return `installing ${line.name}  ${line.where}`;
+    case "installed":
+      return `${line.name}  ${line.where}${line.deprecated ? `  ${lifecycleTag("deprecated")}` : ""}`;
+    case "pending":
+      return pendingMessage(line.vendor);
+    case "question":
+      return licenceQuestionMessage(line.name, line.licence);
+    case "failed":
+      return `error: ${line.name}: ${line.message}`;
+    default:
+      return null;
+  }
+}
+async function installPlain(stream, io) {
+  let lines = [];
+  const printed = new Set;
+  const started = new Set;
+  for await (const event of stream) {
+    lines = reduce(lines, event);
+    for (const line of lines) {
+      if (line.state === "installing" && !started.has(line.name)) {
+        started.add(line.name);
+        const text = plainLine(line);
+        if (text !== null)
+          io.out(text);
+        continue;
+      }
+      if (printed.has(line.name) || !settled(line))
+        continue;
+      const text = plainLine(line);
+      if (text === null)
+        continue;
+      printed.add(line.name);
+      if (line.state === "failed") {
+        io.err(text);
+        if (line.detail)
+          io.err(line.detail);
+      } else {
+        io.out(text);
+      }
+    }
+  }
+  const counts = receipt(lines);
+  if (counts) {
+    io.out(`${counts.installed} installed, ${counts.pending} pending, ${counts.failed} failed` + (counts.questions > 0 ? `, ${counts.questions} unanswered` : ""));
+  }
+  return summarise(lines);
+}
+
 // src/install/screens/run.tsx
 import { jsx as jsx12 } from "react/jsx-runtime";
 function RunScreen({
@@ -2636,13 +2971,13 @@ function RunScreen({
     ...onNext ? { onNext } : {}
   });
 }
-async function plainRun(run, emit) {
+async function plainRun(run, emit, io) {
   if (run.kind === "report") {
     const done = await run.report();
     emit(done);
     return done;
   }
-  return installPlain(run.stream());
+  return installPlain(run.stream(), io);
 }
 // src/install/empty.ts
 function nothingTracked(nearest, kind, all = false) {
@@ -3272,7 +3607,7 @@ function shellFromEnv(shell) {
 // src/doctor/doctor.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { dirname as dirname5, join as join8 } from "node:path";
+import { dirname as dirname6, join as join8 } from "node:path";
 
 // ../../node_modules/.bun/@trpc+client@11.18.0+acc6907a906fa511/node_modules/@trpc/client/dist/objectSpread2-BvkFp-_Y.mjs
 var __create = Object.create;
@@ -4702,7 +5037,7 @@ var EXIT_CODES = [
   [EXIT.usage, "the command line was wrong; the last line says the spelling"],
   [EXIT.session, "needs a session: run `yourskills login`"]
 ];
-var LOGIN = "yourskills login";
+var LOGIN2 = "yourskills login";
 function needsTerminal(kind) {
   if (kind === "login")
     return new CliError("login needs a terminal", {
@@ -4726,7 +5061,7 @@ function describeError(error) {
   const message = error instanceof Error ? error.message : String(error);
   if (isUnauthorized(error)) {
     return {
-      lines: shape("you are not signed in", message.startsWith("Session") ? "the registry no longer accepts the token on this machine" : "the catalog needs a session, and there is no token on this machine", LOGIN),
+      lines: shape("you are not signed in", message.startsWith("Session") ? "the registry no longer accepts the token on this machine" : "the catalog needs a session, and there is no token on this machine", LOGIN2),
       code: EXIT.session
     };
   }
@@ -4845,7 +5180,7 @@ import { existsSync as existsSync2 } from "node:fs";
 // src/hooks/settings.ts
 import { mkdirSync as mkdirSync3 } from "node:fs";
 import { readFile as readFile3, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname4 } from "node:path";
+import { dirname as dirname5 } from "node:path";
 function binaryName(command) {
   const parts = command.split(/[\\/]/);
   return (parts[parts.length - 1] ?? "").replace(/\.(js|mjs|cjs|exe)$/i, "");
@@ -4967,7 +5302,7 @@ function serialiseSettings(settings, indent) {
 `;
 }
 async function writeSettingsFile(path, settings, indent) {
-  mkdirSync3(dirname4(path), { recursive: true });
+  mkdirSync3(dirname5(path), { recursive: true });
   await writeFile2(path, serialiseSettings(settings, indent));
 }
 async function applyTo(path, change) {
@@ -5752,7 +6087,7 @@ async function hooksStatus() {
     { mark: "none", text: "tracking", note: tracking.note }
   ];
   const agents = [];
-  for (const agent of agentsToReport(config.agents ?? [])) {
+  for (const agent of agentsToReport(await resolveAgents())) {
     const adapter = adapterFor(agent);
     if (!adapter) {
       lines.push({
@@ -5817,7 +6152,7 @@ import { realpathSync } from "node:fs";
 // package.json
 var package_default = {
   name: "yourskills",
-  version: "0.4.3",
+  version: "0.5.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",
@@ -6262,40 +6597,6 @@ async function runSessionStart() {
   const outcome = await sessionStart();
   emit(outcome, await upgradeCheck());
 }
-// 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) {
@@ -6304,8 +6605,8 @@ async function namedOrganization(server) {
   return view.organization;
 }
 async function whoamiReport(server) {
-  const who = await whoami(server);
-  const organization = who.org ? await namedOrganization(server) : null;
+  const who = await readSession({ server });
+  const organization = who.organizationId ? await namedOrganization(server) : null;
   await rememberOrganization(organization?.name ?? null);
   return drawWhoami({ user: who.user, server: who.server, organization });
 }
@@ -6343,152 +6644,167 @@ function rows(orgs, active) {
 }
 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;
+    return (await organizations({ server })).active?.name ?? null;
   } 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) => ({
+  const { all, active } = await organizations({ server });
+  return all.map((org) => ({
     name: org.name,
     slug: org.slug ?? null,
-    active: org.id === active
+    active: org.id === active?.id
   }));
 }
 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);
+  const { all, active } = await organizations({ server });
   return {
     title: "org",
-    lines: rows(orgs, active),
+    lines: rows(all, active?.id ?? null),
     json: {
-      active,
-      organizations: orgs.map((o) => ({
+      active: active?.id ?? null,
+      organizations: all.map((o) => ({
         id: o.id,
         name: o.name,
         slug: o.slug ?? null,
-        active: o.id === active
+        active: o.id === active?.id
       }))
     }
   };
 }
-async function orgSwitchReport(name, server) {
-  const { token, base } = await requireToken(server);
-  const orgs = await listOrganizations(base, token);
-  const wanted = name.toLowerCase();
-  const match = orgs.find((o) => o.name.toLowerCase() === wanted || o.slug?.toLowerCase() === wanted);
-  if (!match) {
-    return {
-      title: "org",
-      lines: [
-        {
-          mark: "fail",
-          text: `No organization called ${name}.`,
-          note: orgs.map((o) => o.name).join(", ") || "you are in none"
+function drawSwitch(name, outcome) {
+  switch (outcome.kind) {
+    case "unknown":
+      return {
+        title: "org",
+        lines: [
+          {
+            mark: "fail",
+            text: `No organization called ${name}.`,
+            note: outcome.offered.map((o) => o.name).join(", ") || "you are in none"
+          }
+        ],
+        json: { error: `unknown organization: ${name}` },
+        failed: true
+      };
+    case "refused":
+      return {
+        title: "org",
+        lines: [
+          {
+            mark: "fail",
+            text: `Could not switch to ${outcome.organization.name}.`,
+            note: outcome.detail
+          }
+        ],
+        json: { error: outcome.detail },
+        failed: true
+      };
+    case "switched": {
+      const { organization } = outcome;
+      return {
+        title: "org",
+        lines: [
+          { mark: "ok", text: `Active organization: ${organization.name}` }
+        ],
+        json: {
+          active: organization.id,
+          name: organization.name,
+          slug: organization.slug ?? null
         }
-      ],
-      json: { error: `unknown organization: ${name}` },
-      failed: true
-    };
+      };
+    }
   }
-  const res = await fetch(`${authBase2(base)}/organization/set-active`, {
-    method: "POST",
-    headers: {
-      "content-type": "application/json",
-      authorization: `Bearer ${token}`
-    },
-    body: JSON.stringify({ organizationId: match.id })
-  });
-  if (!res.ok) {
-    const detail = (await res.text()).slice(0, 200);
+}
+async function orgSwitchReport(name, server) {
+  return drawSwitch(name, await switchOrganization(name, { server }));
+}
+// src/doctor/check.ts
+function fixable(checks) {
+  return checks.filter((check) => check.state === "fail" && check.fix?.apply !== undefined);
+}
+var MARK = {
+  pass: "ok",
+  warn: "warn",
+  fail: "fail"
+};
+function markOf(state) {
+  return MARK[state];
+}
+function blocks(checks) {
+  return checks.some((check) => check.state === "fail");
+}
+function nextFor2(checks, fixing) {
+  const fixes = fixable(checks);
+  if (!fixing && fixes.length > 0)
     return {
-      title: "org",
-      lines: [
-        {
-          mark: "fail",
-          text: `Could not switch to ${match.name}.`,
-          note: detail || `${res.status} ${res.statusText}`
-        }
-      ],
-      json: { error: detail || res.statusText },
-      failed: true
+      command: "yourskills doctor --fix",
+      why: `repair ${fixes.length === 1 ? "it" : "them"}`
     };
-  }
-  await rememberOrganization(match.name);
-  return {
-    title: "org",
-    lines: [{ mark: "ok", text: `Active organization: ${match.name}` }],
-    json: { active: match.id, name: match.name, slug: match.slug ?? null }
-  };
+  const names = (name) => checks.some((check) => check.fix?.name === name);
+  if (names("login"))
+    return { command: "yourskills login", why: "start a session" };
+  if (names("upgrade"))
+    return { command: "yourskills upgrade", why: "get the newer yourskills" };
+  return;
 }
+
 // src/doctor/doctor.ts
-var REACH_TIMEOUT_MS = 5000;
 var liveDiagnosis = async (server) => (await createClient(server)).downstream.diagnosis.query();
-function withLogin(message) {
-  return message.includes("yourskills login") ? message : `${message} — run \`yourskills login\``;
-}
 function home() {
   const env = process.env.HOME;
   return env && env.length > 0 ? env : homedir4();
 }
-async function reachable(base) {
-  const url = `${base.replace(/\/$/, "")}/api/auth/ok`;
-  try {
-    const res = await fetch(url, {
-      signal: AbortSignal.timeout(REACH_TIMEOUT_MS)
-    });
-    return {
-      name: "server reachable",
-      ok: true,
-      detail: `${base} (${res.status})`
-    };
-  } catch (error) {
-    return {
-      name: "server reachable",
-      ok: false,
-      detail: `${base}: ${error instanceof Error ? error.message : String(error)}`
-    };
-  }
+function said(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+async function reached(server) {
+  const answer = await reachable({ server });
+  return answer.status === null ? {
+    name: "server reachable",
+    state: "fail",
+    summary: `${answer.base}: ${answer.said}`,
+    fix: null
+  } : {
+    name: "server reachable",
+    state: "pass",
+    summary: `${answer.base} (${answer.status})`,
+    fix: null
+  };
 }
 async function session(ask, server) {
   try {
-    const who = await whoami(server);
+    const who = await readSession({ server });
+    const id = who.organizationId;
     return [
-      { name: "session valid", ok: true, detail: who.user },
+      { name: "session valid", state: "pass", summary: who.user, fix: null },
       {
         name: "active organization",
-        ok: who.org !== null,
-        detail: who.org ? (await ask(server).catch(() => null))?.name ?? who.org : NO_ACTIVE_ORGANIZATION
+        state: id ? "pass" : "fail",
+        summary: id ? (await ask(server).catch(() => null))?.name ?? id : NO_ACTIVE_ORGANIZATION,
+        fix: null
       }
     ];
   } catch (error) {
+    const refused = isSessionRefusal(error);
     return [
-      {
+      refused ? {
+        name: "session valid",
+        state: "fail",
+        summary: error.fact,
+        fix: { name: "login", sentence: `run \`${error.next}\`` }
+      } : {
         name: "session valid",
-        ok: false,
-        detail: withLogin(error instanceof Error ? error.message : String(error))
+        state: "fail",
+        summary: said(error),
+        fix: null
       },
       {
         name: "active organization",
-        ok: false,
-        detail: "unknown until you are logged in"
+        state: "fail",
+        summary: refused ? "unknown until you are logged in" : "not asked: the session could not be read",
+        fix: null
       }
     ];
   }
@@ -6496,27 +6812,42 @@ async function session(ask, server) {
 function configParses() {
   const path = configPath();
   if (!existsSync5(path))
-    return { name: "config", ok: true, detail: `${path} (not created yet)` };
+    return {
+      name: "config",
+      state: "pass",
+      summary: `${path} (not created yet)`,
+      fix: null
+    };
   try {
     JSON.parse(readFileSync3(path, "utf8"));
-    return { name: "config", ok: true, detail: path };
+    return { name: "config", state: "pass", summary: path, fix: null };
   } catch (error) {
     return {
       name: "config",
-      ok: false,
-      detail: `${path}: ${error instanceof Error ? error.message : String(error)} — fix it by hand, or move it aside and log in again`
+      state: "fail",
+      summary: `${path}: ${said(error)}`,
+      fix: {
+        name: "by-hand",
+        sentence: "fix it by hand, or move it aside and log in again"
+      }
     };
   }
 }
 function skillsResolvable() {
   try {
     const bin = skillsBin();
-    return existsSync5(bin) ? { name: "skills dependency", ok: true, detail: bin } : { name: "skills dependency", ok: false, detail: `missing: ${bin}` };
+    return existsSync5(bin) ? { name: "skills dependency", state: "pass", summary: bin, fix: null } : {
+      name: "skills dependency",
+      state: "fail",
+      summary: `missing: ${bin}`,
+      fix: null
+    };
   } catch (error) {
     return {
       name: "skills dependency",
-      ok: false,
-      detail: error instanceof Error ? error.message : String(error)
+      state: "fail",
+      summary: said(error),
+      fix: null
     };
   }
 }
@@ -6525,7 +6856,7 @@ async function agents(nearest, local) {
   const found = local ? [] : [
     ...new Set((await listInstalled(nearest.scope)).flatMap((row) => row.agents))
   ];
-  const said = [
+  const sentences = [
     pinned.length > 0 ? `pinned: ${pinned.join(", ")}` : "",
     found.length > 0 ? `found: ${found.join(", ")} (the stock CLI's labels)` : ""
   ].filter(Boolean);
@@ -6536,15 +6867,25 @@ async function agents(nearest, local) {
       const hint = suggest.length > 0 ? `did you mean ${suggest.join(", ")}?` : "run `yourskills config set agents <name>` with a name the stock CLI knows";
       return {
         name: "agents",
-        ok: false,
-        detail: `no agent is called ${unknown.join(", ")} — every install would stop at it; ${hint}`
+        state: "fail",
+        summary: `no agent is called ${unknown.join(", ")}: every install would stop at it`,
+        fix: { name: "pin-agent", sentence: hint }
       };
     }
   }
-  return {
+  return sentences.length > 0 ? {
+    name: "agents",
+    state: "pass",
+    summary: sentences.join("  "),
+    fix: null
+  } : {
     name: "agents",
-    ok: said.length > 0,
-    detail: said.length > 0 ? said.join("  ") : "none — pin one with `yourskills config set agents claude-code`"
+    state: "fail",
+    summary: "none",
+    fix: {
+      name: "pin-agent",
+      sentence: "pin one with `yourskills config set agents claude-code`"
+    }
   };
 }
 function hookCheck(gap) {
@@ -6552,22 +6893,28 @@ function hookCheck(gap) {
   if (gap.error)
     return {
       name,
-      ok: false,
-      detail: `${gap.path}: ${gap.error} — left untouched; fix the JSON by hand`
+      state: "fail",
+      summary: `${gap.path}: ${gap.error}`,
+      fix: {
+        name: "by-hand",
+        sentence: "left untouched; fix the JSON by hand"
+      }
     };
   if (gap.missing.length === 0)
     return {
       name,
-      ok: true,
-      detail: `${gap.registered.join(" + ")}  ${gap.path}`
+      state: "pass",
+      summary: `${gap.registered.join(" + ")}  ${gap.path}`,
+      fix: null
     };
   const kinds = gap.missing.join(" + ");
   return {
     name,
-    ok: false,
-    detail: `${kinds} not registered  ${gap.path}`,
+    state: "fail",
+    summary: `${kinds} not registered`,
     fix: {
-      what: `register ${kinds} in ${gap.path}`,
+      name: "register-hooks",
+      sentence: `register ${kinds} in ${gap.path}`,
       apply: () => registerMissing(gap)
     }
   };
@@ -6576,26 +6923,30 @@ function manifestParses(nearest) {
   if (!existsSync5(nearest.path)) {
     return {
       name: "manifest",
-      ok: true,
-      detail: `${nearest.path} (not created yet)`
+      state: "pass",
+      summary: `${nearest.path} (not created yet)`,
+      fix: null
     };
   }
   try {
     const raw = JSON.parse(readFileSync3(nearest.path, "utf8"));
     return raw && typeof raw === "object" ? {
       name: "manifest",
-      ok: true,
-      detail: `${nearest.path} (${nearest.scope})`
+      state: "pass",
+      summary: `${nearest.path} (${nearest.scope})`,
+      fix: null
     } : {
       name: "manifest",
-      ok: false,
-      detail: `${nearest.path}: not an object`
+      state: "fail",
+      summary: `${nearest.path}: not an object`,
+      fix: null
     };
   } catch (error) {
     return {
       name: "manifest",
-      ok: false,
-      detail: `${nearest.path}: ${error instanceof Error ? error.message : String(error)}`
+      state: "fail",
+      summary: `${nearest.path}: ${said(error)}`,
+      fix: null
     };
   }
 }
@@ -6603,7 +6954,7 @@ function onDisk(nearest, name) {
   const entry = nearest.manifest.skills[name];
   if (entry?.unpinned)
     return existsSync5(entry.path);
-  const root = nearest.scope === "project" ? dirname5(nearest.path) : home();
+  const root = nearest.scope === "project" ? dirname6(nearest.path) : home();
   return existsSync5(join8(root, ".agents", "skills", name));
 }
 function manifestMatchesDisk(nearest) {
@@ -6612,16 +6963,18 @@ function manifestMatchesDisk(nearest) {
   if (missing.length === 0)
     return {
       name: "manifest matches disk",
-      ok: true,
-      detail: `${names.length} skill(s) recorded`
+      state: "pass",
+      summary: `${names.length} skill(s) recorded`,
+      fix: null
     };
   const list = missing.join(", ");
   return {
     name: "manifest matches disk",
-    ok: false,
-    detail: `missing on disk: ${list} — run \`yourskills install\` to restore, or \`doctor --fix\` to forget`,
+    state: "fail",
+    summary: `missing on disk: ${list}`,
     fix: {
-      what: `forget ${list} in ${nearest.path}`,
+      name: "forget",
+      sentence: `forget ${list} in ${nearest.path}, or \`yourskills install\` to restore ${missing.length === 1 ? "it" : "them"}`,
       apply: async () => {
         openManifest({ path: nearest.path, scope: nearest.scope }).forget(missing);
         return `forgot ${list}; \`yourskills add <name>\` brings one back`;
@@ -6635,8 +6988,9 @@ function unpinned(nearest) {
     return null;
   return {
     name: "unpinned",
-    ok: true,
-    detail: `${names.join(", ")} — on this machine, not in your catalog; nothing keeps ${names.length === 1 ? "it" : "them"} up to date`
+    state: "warn",
+    summary: `${names.join(", ")}: on this machine, not in your catalog; nothing keeps ${names.length === 1 ? "it" : "them"} up to date`,
+    fix: null
   };
 }
 async function downstreamChecks(ask, server) {
@@ -6647,8 +7001,9 @@ async function downstreamChecks(ask, server) {
     return [
       {
         name: "downstream",
-        ok: false,
-        detail: `could not ask the registry: ${error instanceof Error ? error.message : String(error)}`
+        state: "fail",
+        summary: `could not ask the registry: ${said(error)}`,
+        fix: null
       }
     ];
   }
@@ -6656,21 +7011,24 @@ async function downstreamChecks(ask, server) {
     return [
       {
         name: "downstream",
-        ok: false,
-        detail: `${answer.headline} — nothing you install can be vendored until one is set`
+        state: "fail",
+        summary: `${answer.headline}: nothing you install can be vendored until one is set`,
+        fix: null
       }
     ];
   }
   return [
     {
       name: "downstream",
-      ok: answer.tone !== "fail",
-      detail: `${answer.repo.repo} — ${answer.headline}`
+      state: answer.tone,
+      summary: `${answer.repo.repo}: ${answer.headline}`,
+      fix: null
     },
     ...answer.checks.map((check) => ({
       name: `downstream: ${check.key}`,
-      ok: check.state !== "fail",
-      detail: check.fix ? `${check.summary} — ${check.fix.sentence}` : check.summary
+      state: check.state,
+      summary: check.summary,
+      fix: check.fix
     }))
   ];
 }
@@ -6683,16 +7041,18 @@ async function unwatchedCheck(nearest, ask, server) {
   } catch (error) {
     return {
       name,
-      ok: false,
-      detail: `could not ask the registry: ${error instanceof Error ? error.message : String(error)}`
+      state: "fail",
+      summary: `could not ask the registry: ${said(error)}`,
+      fix: null
     };
   }
   const orphans = drift.unknown.filter((row) => row.reason === "orphaned");
   if (orphans.length === 0)
     return {
       name,
-      ok: true,
-      detail: "every installed skill came from a source this organization still connects"
+      state: "pass",
+      summary: "every installed skill came from a source this organization still connects",
+      fix: null
     };
   const names = orphans.map((row) => row.name);
   const repos = [
@@ -6701,8 +7061,12 @@ async function unwatchedCheck(nearest, ask, server) {
   const one = names.length === 1;
   return {
     name,
-    ok: true,
-    detail: `${names.join(", ")}: installed from ${repos.join(", ")}, which this ` + "organization does not connect any more, so nothing is watching " + `${repos.length === 1 ? "it" : "them"} for changes. The ` + `${one ? "copy on this machine goes" : "copies on this machine go"} on ` + "working. A team member can reconnect the source or vendor the skill into " + "your catalog, and then `yourskills update --all` moves this machine onto it."
+    state: "warn",
+    summary: `${names.join(", ")}: installed from ${repos.join(", ")}, which this ` + "organization does not connect any more, so nothing is watching " + `${repos.length === 1 ? "it" : "them"} for changes. The ` + `${one ? "copy on this machine goes" : "copies on this machine go"} on ` + "working.",
+    fix: {
+      name: "unwatched",
+      sentence: "A team member can reconnect the source or vendor the skill into your " + "catalog, and then `yourskills update --all` moves this machine onto it."
+    }
   };
 }
 function version(config) {
@@ -6710,20 +7074,23 @@ function version(config) {
   if (latest && isNewer(latest, VERSION))
     return {
       name: "version",
-      ok: true,
-      detail: `${VERSION} — ${latest} is out; run \`yourskills upgrade\``
+      state: "warn",
+      summary: VERSION,
+      fix: {
+        name: "upgrade",
+        sentence: `${latest} is out; run \`yourskills upgrade\``
+      }
     };
-  return { name: "version", ok: true, detail: VERSION };
+  return { name: "version", state: "pass", summary: VERSION, fix: null };
 }
 async function diagnose(nearest, options = {}) {
   const config = await readConfig();
-  const base = serverUrl(config, options.server);
   const local = options.local ?? false;
   const checks = [configParses()];
   if (!local) {
     const account = await session(options.askOrganization ?? namedOrganization, options.server);
-    checks.push(await reachable(base), ...account);
-    if (account[0].ok) {
+    checks.push(await reached(options.server), ...account);
+    if (account[0].state !== "fail") {
       checks.push(...await downstreamChecks(options.ask ?? liveDiagnosis, options.server), await unwatchedCheck(nearest, options.askDrift ?? liveDrift, options.server));
     }
   }
@@ -6736,53 +7103,41 @@ async function diagnose(nearest, options = {}) {
   checks.push(version(config));
   return checks;
 }
-function fixable(checks) {
-  return checks.filter((check) => !check.ok && check.fix !== undefined);
-}
 async function applyFixes(checks) {
   const out = [];
   for (const check of checks) {
-    if (check.ok || !check.fix) {
+    const [own] = fixable([check]);
+    if (!own) {
       out.push(check);
       continue;
     }
-    try {
-      const detail = await check.fix.apply();
-      out.push({ ...check, ok: true, fixed: { ok: true, detail } });
-    } catch (error) {
-      out.push({
-        ...check,
-        fixed: {
-          ok: false,
-          detail: error instanceof Error ? error.message : String(error)
-        }
-      });
-    }
+    out.push(await applied(own));
   }
   return out;
 }
-function nextFor2(checks, fixing) {
-  if (!fixing && fixable(checks).length > 0)
-    return {
-      command: "yourskills doctor --fix",
-      why: `repair ${fixable(checks).length === 1 ? "it" : "them"}`
-    };
-  if (checks.some((check) => check.name === "session valid" && !check.ok))
-    return { command: "yourskills login", why: "start a session" };
-  if (checks.some((check) => check.name === "version" && check.detail.includes("is out")))
-    return { command: "yourskills upgrade", why: "get the newer yourskills" };
-  return;
+async function applied(check) {
+  try {
+    const detail = await check.fix.apply();
+    return { ...check, state: "pass", fixed: { ok: true, detail } };
+  } catch (error) {
+    return { ...check, fixed: { ok: false, detail: said(error) } };
+  }
+}
+function noteFor(check, fixing) {
+  if (check.fixed)
+    return check.fixed.ok ? `fixed: ${check.fixed.detail}` : `${check.summary}  could not fix: ${check.fixed.detail}`;
+  if (!check.fix)
+    return check.summary;
+  const own = check.fix.apply && !fixing ? "  [fixable]" : "";
+  return `${check.summary}  ${check.fix.sentence}${own}`;
 }
 function doctorLines(checks, fixing = false) {
-  const width = Math.max(...checks.map((check) => check.name.length));
-  const lines = checks.map((check) => {
-    const note = check.fixed ? check.fixed.ok ? `fixed: ${check.fixed.detail}` : `${check.detail} — could not fix: ${check.fixed.detail}` : check.fix && !fixing ? `${check.detail}  [fixable]` : check.detail;
-    return {
-      mark: check.ok ? "ok" : "fail",
-      text: check.name.padEnd(width),
-      note
-    };
-  });
+  const width = Math.max(...checks.map((check) => check.name.length));
+  const lines = checks.map((check) => ({
+    mark: markOf(check.state),
+    text: check.name.padEnd(width),
+    note: noteFor(check, fixing)
+  }));
   const next = nextFor2(checks, fixing);
   return {
     title: fixing ? "doctor --fix" : "doctor",
@@ -6790,11 +7145,12 @@ function doctorLines(checks, fixing = false) {
     json: {
       checks: checks.map(({ fix, ...rest }) => ({
         ...rest,
-        fixable: fix !== undefined
+        fix: fix ? { name: fix.name, sentence: fix.sentence } : null,
+        fixable: fix?.apply !== undefined
       })),
       fixed: checks.filter((check) => check.fixed?.ok).map((check) => check.fixed?.detail)
     },
-    failed: checks.some((check) => !check.ok),
+    failed: blocks(checks),
     ...next ? { next } : {}
   };
 }
@@ -6806,38 +7162,6 @@ async function doctorReport(nearest, options = {}) {
   return { ...report, json: { ...report.json, manifest: nearest.path } };
 }
 // src/doctor/explain.ts
-import { existsSync as existsSync6 } from "node:fs";
-import { dirname as dirname6 } from "node:path";
-function scopeLayers(resolved, manifestScope, config) {
-  const project = resolved.manifestPath ? {
-    layer: "project",
-    value: manifestScope,
-    from: `yourskills.json at ${dirname6(resolved.manifestPath)}${manifestScope ? "" : " (declares no scope)"}`
-  } : { layer: "project", value: null, from: "no yourskills.json above here" };
-  return [
-    {
-      layer: "flag",
-      value: resolved.source === "flag" ? "given" : null,
-      from: "-g or -p on the command line"
-    },
-    project,
-    {
-      layer: "config",
-      value: config.defaultScope ?? null,
-      from: `defaultScope in ${configPath()}`
-    },
-    { layer: "default", value: "global", from: "built-in default" }
-  ];
-}
-function serverFrom(config, override) {
-  if (override)
-    return "--server on the command line";
-  if (process.env.YOURSKILLS_URL)
-    return "YOURSKILLS_URL in the environment";
-  if (config.serverUrl)
-    return `server in ${configPath()}`;
-  return "built-in default";
-}
 var LABEL = 12;
 function row(label, value, from) {
   return {
@@ -6846,36 +7170,32 @@ function row(label, value, from) {
     note: `<- ${from}`
   };
 }
-function losers(layers, winner) {
-  return layers.filter((layer) => layer.layer !== winner).map((layer) => ({
+var LOSER = LABEL + 22;
+function losers(setting) {
+  return setting.layers.filter((layer) => layer.layer !== setting.layer).map((layer) => ({
     mark: "none",
-    text: `${"".padEnd(LABEL)}(${layer.layer}: ${layer.value ?? "unset"}`.padEnd(LABEL + 18),
+    text: `${"".padEnd(LABEL)}(${layer.layer}: ${layer.value ?? "unset"}`.padEnd(LOSER),
     note: `${layer.from})`
   }));
 }
+function settingRows(settings) {
+  return settings.flatMap((setting) => [
+    row(setting.key, setting.value, setting.from),
+    ...losers(setting)
+  ]);
+}
 async function explainReport(server) {
-  const [config, resolved, nearest, queue] = await Promise.all([
-    readConfig(),
-    resolveScope({}),
+  const [held, nearest, queue] = await Promise.all([
+    holdSettings({
+      flags: { server },
+      askOrganization: () => organizationTracking(server)
+    }),
     nearestManifest(),
     readQueue()
   ]);
-  const track = await trackingNow({
-    track: config.track,
-    configPath: configPath(),
-    askOrganization: () => organizationTracking(server)
-  });
-  const manifestScope = resolved.manifestPath && existsSync6(resolved.manifestPath) ? resolved.source === "project" ? resolved.scope : null : null;
-  const layers = scopeLayers(resolved, manifestScope, config);
-  const winner = layers.find((layer) => layer.layer === resolved.source);
-  const lines = [
-    row("scope", resolved.scope, winner?.from ?? resolved.source),
-    ...losers(layers, resolved.source),
-    row("agents", config.agents?.length ? config.agents.join(", ") : "(the stock CLI detects)", config.agents?.length ? `agents in ${configPath()}` : "nothing pinned; `skills` looks at what is installed"),
-    row("server", serverUrl(config, server), serverFrom(config, server)),
-    row("track", track.value, track.from),
-    row("autoUpdate", config.autoUpdate === false ? "off" : "on", config.autoUpdate === undefined ? "built-in default" : `autoUpdate in ${configPath()}`)
-  ];
+  const settings = settingsShown(held);
+  const tracking = trackingOf(held);
+  const lines = settingRows(settings);
   const skills = Object.keys(nearest.manifest.skills).length;
   const bundles = Object.keys(nearest.manifest.bundles).length;
   const loose = looseSkills(nearest.manifest).length;
@@ -6912,16 +7232,19 @@ async function explainReport(server) {
     title: "config --explain",
     lines,
     json: {
-      path: configPath(),
-      scope: { value: resolved.scope, source: resolved.source, layers },
-      agents: config.agents ?? [],
-      server: {
-        value: serverUrl(config, server),
-        source: serverFrom(config, server)
-      },
-      track: track.value === "on",
-      trackingState: track.state,
-      autoUpdate: config.autoUpdate !== false,
+      path: held.configPath,
+      settings: Object.fromEntries(settings.map((setting) => [
+        setting.key,
+        {
+          value: setting.json,
+          layer: setting.layer,
+          from: setting.from,
+          layers: setting.layers,
+          decided: setting.decided
+        }
+      ])),
+      track: tracking.value === "on",
+      trackingState: tracking.state,
       manifest: { path: nearest.path, skills, bundles, loose },
       queue: { path: queuePath(), events: queue.length },
       hooks: hooksJson
@@ -7199,7 +7522,25 @@ var TABLE = {
         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"
+        says: (facts) => facts.organization ? `switch this machine out of ${facts.organization}` : "choose which organization this machine installs from",
+        asks: {
+          title: "org",
+          verb: "switch",
+          pick: "one",
+          empty: "You are not a member of any organization yet.",
+          choices: async (ctx, _facts, ask = organizationChoices) => {
+            const orgs = await ask(ctx.server);
+            const active = orgs.find((org) => org.active)?.name;
+            return {
+              rows: orgs.map((org) => ({
+                name: org.name,
+                description: org.slug ?? ""
+              })),
+              chosen: active ? [active] : []
+            };
+          },
+          opens: (picked) => ({ kind: "org", name: picked[0] ?? "" })
+        }
       }
     ],
     invitesHooks: false,
@@ -7272,6 +7613,7 @@ var TABLE = {
         label: "search",
         hint: "search <query>",
         when: (facts) => facts.signedIn,
+        opens: { kind: "search", query: "" },
         says: () => "filter the same catalog by name and description"
       }
     ],
@@ -7341,7 +7683,21 @@ var TABLE = {
         label: "remove",
         hint: "remove <name...>",
         when: (facts) => facts.skills > 0,
-        says: (facts) => `pick which of the ${count2(facts.skills, "skill")} to delete from this machine; it asks before it does`
+        says: (facts) => `pick which of the ${count2(facts.skills, "skill")} to delete from this machine; it asks before it does`,
+        asks: {
+          title: "remove",
+          verb: "remove",
+          pick: "many",
+          empty: "Nothing installed here.",
+          choices: async (ctx) => ({
+            rows: installedRows(ctx.where).map((row) => ({
+              name: row.name,
+              description: `${row.bundle ?? "loose"}  ${shortRef(row.ref)}`
+            })),
+            chosen: []
+          }),
+          opens: (picked) => ({ kind: "remove", names: [...picked] })
+        }
       }
     ],
     invitesHooks: true,
@@ -7617,7 +7973,7 @@ var TABLE = {
         lines: fixes.map((check) => ({
           mark: "fail",
           text: check.name,
-          note: check.fix?.what ?? ""
+          note: check.fix.sentence
         })),
         notes: [
           "Every other check stays as it is; a session or an upgrade is yours to run."
@@ -7663,14 +8019,62 @@ var TABLE = {
         label: "scope",
         hint: "config set scope project",
         shows: (facts) => facts.scope,
-        says: (facts) => `where installs land: ${facts.scope} right now`
+        says: (facts) => `where installs land: ${facts.scope} right now`,
+        asks: {
+          title: "scope",
+          verb: "set",
+          pick: "one",
+          empty: "",
+          choices: async (_ctx, facts) => ({
+            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"
+              }
+            ],
+            chosen: [facts.scope]
+          }),
+          opens: (picked) => ({
+            kind: "config",
+            action: "set",
+            key: "scope",
+            value: picked[0] ?? ""
+          })
+        }
       },
       {
         value: "setup.agents",
         label: "agents",
         hint: "config set agents <name>",
         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"
+        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",
+        asks: {
+          title: "agents",
+          verb: "set",
+          pick: "many",
+          empty: "Could not ask the `skills` CLI which agent names it accepts. Run `yourskills doctor`.",
+          choices: async (_ctx, facts, ask = knownAgents) => {
+            const valid = await ask() ?? [];
+            const onDisk = new Set(facts.agentsOnDisk);
+            return {
+              rows: valid.map((name) => ({
+                name,
+                description: onDisk.has(name) ? "on this machine" : ""
+              })),
+              chosen: facts.agents
+            };
+          },
+          opens: (picked) => ({
+            kind: "config",
+            action: "set",
+            key: "agents",
+            value: picked.join(",")
+          })
+        }
       },
       {
         value: "setup.explain",
@@ -8173,14 +8577,13 @@ function paletteGroups(facts) {
   }
   return groups;
 }
-// src/shell/facts.ts
-import { existsSync as existsSync7 } from "node:fs";
+// src/shell/machine.ts
+import { existsSync as existsSync6 } from "node:fs";
 async function paletteFacts(scope, server) {
-  const [account, nearest, config, agents] = await Promise.all([
+  const [account, nearest, held] = await Promise.all([
     localAccount(server),
     nearestManifest(scope),
-    readConfig(),
-    resolveAgents()
+    holdSettings({ flags: { server } })
   ]);
   const skills = Object.keys(nearest.manifest.skills).length;
   return {
@@ -8188,31 +8591,26 @@ async function paletteFacts(scope, server) {
     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,
+    firstRun: !account.signedIn && skills === 0 && !held.config.welcomed,
+    agentsOnDisk: HOOK_ADAPTERS.filter((adapter) => existsSync6(adapter.home())).map((adapter) => adapter.agent),
+    agents: agentsAnswer(held).value,
     scope: nearest.scope,
     manifest: nearest.path,
     skills,
     bundles: Object.keys(nearest.manifest.bundles).length,
     loose: looseSkills(nearest.manifest).length,
-    settings: CONFIG_KEYS.filter((key) => configValue(config, key) !== UNSET).length,
+    settings: settingsShown(held).filter((setting) => setting.decided).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) {
+async function feedFacts(client, where, server, choices = organizationChoices) {
   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)
+    choices(server)
   ]);
   return {
     ...skills.status === "fulfilled" ? { skills: skills.value.length } : {},
@@ -8222,8 +8620,6 @@ async function feedFacts(client, where, server) {
     ...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));
@@ -8237,7 +8633,7 @@ var doctorProbe = async (where, server) => {
     local: true,
     ...server ? { server } : {}
   });
-  const bad = checks.filter((check) => !check.ok);
+  const bad = checks.filter((check) => check.state === "fail");
   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 = {
@@ -8247,6 +8643,259 @@ var PROBES = {
 function probeFor(value) {
   return value ? PROBES[value] : undefined;
 }
+var REST_MS = 250;
+var noop3 = () => {
+  return;
+};
+function knowMachine(from, talkers = {}) {
+  const { server } = from;
+  const ask = {
+    upgrade: talkers.upgrade ?? (() => upgradeCheck()),
+    feed: talkers.feed ?? feedFacts,
+    probes: talkers.probes ?? probeFor,
+    learnOrganization: talkers.learnOrganization ?? learnActiveOrganization
+  };
+  const restMs = talkers.restMs ?? REST_MS;
+  let where = from.where;
+  let local = from.facts;
+  let feed = from.facts.feed;
+  let upgrade;
+  let probes = {};
+  let probing = null;
+  let dead = false;
+  let epoch = 0;
+  const listeners = new Set;
+  const pending = new Set;
+  function fold() {
+    return {
+      where,
+      facts: {
+        ...local,
+        feed: {
+          ...feed,
+          ...upgrade === undefined ? {} : { upgrade: upgrade ? upgrade.latest : null }
+        }
+      },
+      upgrade,
+      probes,
+      probing
+    };
+  }
+  let state = fold();
+  function set() {
+    state = fold();
+    for (const listener of listeners)
+      listener();
+  }
+  function track(work) {
+    const done = work.then(noop3, noop3).then(() => {
+      pending.delete(done);
+    });
+    pending.add(done);
+    return done;
+  }
+  let held = null;
+  async function client() {
+    held ??= await from.client();
+    return held;
+  }
+  function askUpgrade() {
+    track(ask.upgrade().then((found) => {
+      if (dead)
+        return;
+      upgrade = found;
+      set();
+    }));
+  }
+  function askFeed() {
+    if (dead || !local.signedIn)
+      return;
+    const mine = epoch;
+    track(client().then((live) => ask.feed(live, where, server)).then((found) => {
+      if (dead || mine !== epoch)
+        return;
+      feed = found;
+      set();
+    }));
+  }
+  let resting;
+  let timer = null;
+  let wake = null;
+  function unrest() {
+    if (timer)
+      clearTimeout(timer);
+    timer = null;
+    wake?.();
+    wake = null;
+  }
+  function scan(value, probe) {
+    const mine = epoch;
+    probing = value;
+    set();
+    track(probe(where, server).then((text) => {
+      if (dead || mine !== epoch)
+        return;
+      probes = { ...probes, [value]: text };
+    }).catch(noop3).finally(() => {
+      if (dead || mine !== epoch)
+        return;
+      if (probing === value)
+        probing = null;
+      set();
+    }));
+  }
+  function rest(value) {
+    resting = value;
+    unrest();
+    if (dead || !value)
+      return;
+    const probe = ask.probes(value);
+    if (!probe || probes[value] !== undefined)
+      return;
+    let fired = false;
+    track(new Promise((resolve) => {
+      wake = resolve;
+      timer = setTimeout(() => {
+        fired = true;
+        timer = null;
+        wake = null;
+        resolve();
+      }, restMs);
+    }).then(() => {
+      if (fired && !dead)
+        scan(value, probe);
+    }));
+  }
+  async function reread() {
+    const [nextFacts, nextWhere] = await Promise.allSettled([
+      from.reload(),
+      from.resite()
+    ]);
+    if (dead)
+      return;
+    if (nextFacts.status === "fulfilled")
+      local = nextFacts.value;
+    if (nextWhere.status === "fulfilled")
+      where = nextWhere.value;
+    if (!local.signedIn)
+      feed = NO_FEED;
+    set();
+    askFeed();
+    rest(resting);
+  }
+  function forgetScans() {
+    epoch += 1;
+    probes = {};
+    probing = null;
+    set();
+  }
+  function back() {
+    forgetScans();
+    track(reread());
+  }
+  function loggedIn() {
+    forgetScans();
+    return track(ask.learnOrganization(server).catch(noop3).then(reread));
+  }
+  function stop() {
+    dead = true;
+    unrest();
+    listeners.clear();
+  }
+  async function settled() {
+    while (pending.size > 0)
+      await Promise.all([...pending]);
+  }
+  askUpgrade();
+  askFeed();
+  return {
+    read: () => state,
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    back,
+    loggedIn,
+    rest,
+    client,
+    forget: () => {
+      held = null;
+    },
+    resite: from.resite,
+    stop,
+    settled
+  };
+}
+// 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,
+  useState as useState11,
+  useSyncExternalStore
+} from "react";
+
+// src/draw.tsx
+import { jsx as jsx15 } from "react/jsx-runtime";
+function drawInk(answer, {
+  onError,
+  onSummary,
+  onReport,
+  exitWhenDone,
+  onBack,
+  onNext,
+  working
+}) {
+  const leaves = exitWhenDone === undefined ? {} : { exitWhenDone };
+  const back = onBack ? { onBack } : {};
+  const next = onNext ? { onNext } : {};
+  const reported = onReport ? { onReport } : {};
+  switch (answer.kind) {
+    case "text":
+      return answer.style === "document" ? /* @__PURE__ */ jsx15(HelpScreen, {
+        text: answer.body,
+        ...leaves,
+        ...back
+      }) : /* @__PURE__ */ jsx15(NoticeScreen, {
+        title: answer.title,
+        message: answer.body,
+        ...leaves,
+        ...back
+      });
+    case "report": {
+      const says = working ?? answer.working;
+      return /* @__PURE__ */ jsx15(ReportScreen, {
+        title: answer.title,
+        load: answer.load,
+        onError,
+        ...says ? { working: says } : {},
+        ...reported,
+        ...leaves,
+        ...back,
+        ...next
+      });
+    }
+    case "rows":
+      return /* @__PURE__ */ jsx15(CatalogScreen, {
+        title: answer.title,
+        load: async () => toRows(await answer.load()),
+        onError
+      });
+    case "stream":
+      return /* @__PURE__ */ jsx15(RunScreen, {
+        run: answer.run,
+        onError,
+        ...onSummary ? { onDone: onSummary } : {},
+        ...reported,
+        ...leaves,
+        ...back,
+        ...next
+      });
+  }
+}
 
 // src/args.ts
 function configCommand2(rest, explain) {
@@ -8502,7 +9151,7 @@ function runnable(typed) {
 
 // src/shell/screens/keys.tsx
 import { Box as Box11, Text as Text13 } from "ink";
-import { jsx as jsx15, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx16, jsxs as jsxs13 } from "react/jsx-runtime";
 var KEYS = [
   ["^ v", "move the cursor", "move, or scroll"],
   ["enter", "run the highlighted row", "confirm the layer's action"],
@@ -8528,15 +9177,15 @@ function KeysScreen({ onBack }) {
         children: [
           /* @__PURE__ */ jsxs13(Text13, {
             children: [
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 dimColor: true,
                 children: "".padEnd(key)
               }),
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 dimColor: true,
                 children: "at the prompt".padEnd(half)
               }),
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 dimColor: true,
                 children: "in a layer"
               })
@@ -8544,21 +9193,21 @@ function KeysScreen({ onBack }) {
           }),
           KEYS.map(([k, root, layer]) => /* @__PURE__ */ jsxs13(Text13, {
             children: [
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 color: tone.primary,
                 children: k.padEnd(key)
               }),
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 children: clip(root, half - 2).padEnd(half)
               }),
-              /* @__PURE__ */ jsx15(Text13, {
+              /* @__PURE__ */ jsx16(Text13, {
                 children: clip(layer, interior - key - half)
               })
             ]
           }, k))
         ]
       }),
-      /* @__PURE__ */ jsx15(Back, {
+      /* @__PURE__ */ jsx16(Back, {
         width,
         onBack
       })
@@ -8569,7 +9218,7 @@ function KeysScreen({ onBack }) {
 // src/shell/screens/picker.tsx
 import { Box as Box12, Text as Text14, useInput as useInput6 } from "ink";
 import { useEffect as useEffect8, useMemo as useMemo3, useState as useState9 } from "react";
-import { jsx as jsx16, jsxs as jsxs14 } from "react/jsx-runtime";
+import { jsx as jsx17, jsxs as jsxs14 } from "react/jsx-runtime";
 function PickScreen({
   title,
   rows,
@@ -8639,7 +9288,7 @@ function PickScreen({
   });
   const names = nameWidth(rows);
   const page = visible.slice(first, first + size);
-  return /* @__PURE__ */ jsx16(Frame, {
+  return /* @__PURE__ */ jsx17(Frame, {
     title,
     width,
     children: /* @__PURE__ */ jsxs14(Box12, {
@@ -8647,26 +9296,26 @@ function PickScreen({
       children: [
         /* @__PURE__ */ jsxs14(Box12, {
           children: [
-            /* @__PURE__ */ jsx16(Text14, {
+            /* @__PURE__ */ jsx17(Text14, {
               color: tone.primary,
               children: "> "
             }),
-            /* @__PURE__ */ jsx16(SearchInput, {
+            /* @__PURE__ */ jsx17(SearchInput, {
               value: query,
               placeholder: "type to filter"
             })
           ]
         }),
-        /* @__PURE__ */ jsx16(Divider, {
+        /* @__PURE__ */ jsx17(Divider, {
           width
         }),
-        rows.length === 0 ? /* @__PURE__ */ jsx16(Text14, {
+        rows.length === 0 ? /* @__PURE__ */ jsx17(Text14, {
           dimColor: true,
           children: empty
-        }) : visible.length === 0 ? /* @__PURE__ */ jsx16(Text14, {
+        }) : visible.length === 0 ? /* @__PURE__ */ jsx17(Text14, {
           dimColor: true,
           children: `Nothing matches "${query}".`
-        }) : page.map((row, i) => /* @__PURE__ */ jsx16(SkillRow, {
+        }) : page.map((row, i) => /* @__PURE__ */ jsx17(SkillRow, {
           row,
           width: width - 2,
           names,
@@ -8674,20 +9323,20 @@ function PickScreen({
           cursor: first + i === cursor,
           selected: single ? row.name === marked : picked.has(row.name)
         }, row.name)),
-        /* @__PURE__ */ jsx16(Divider, {
+        /* @__PURE__ */ jsx17(Divider, {
           width
         }),
         /* @__PURE__ */ jsxs14(Box12, {
           children: [
-            /* @__PURE__ */ jsx16(Text14, {
+            /* @__PURE__ */ jsx17(Text14, {
               dimColor: true,
               children: `${position(cursor, visible.length)}  `
             }),
-            picked.size > 0 && !single ? /* @__PURE__ */ jsx16(Text14, {
+            picked.size > 0 && !single ? /* @__PURE__ */ jsx17(Text14, {
               color: tone.notice,
               children: `${mark.selected} ${picked.size} marked   `
             }) : null,
-            /* @__PURE__ */ jsx16(Hints, {
+            /* @__PURE__ */ jsx17(Hints, {
               hints: [
                 ["^v", "move"],
                 ...single ? [] : [["space", "mark"]],
@@ -8705,7 +9354,7 @@ function PickScreen({
 // src/shell/screens/welcome.tsx
 import { Box as Box13, Text as Text15, useInput as useInput7 } from "ink";
 import { useState as useState10 } from "react";
-import { jsx as jsx17, jsxs as jsxs15 } from "react/jsx-runtime";
+import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
 function WelcomeScreen({
   agents,
   onStart,
@@ -8736,16 +9385,16 @@ function WelcomeScreen({
     const gap = Math.max(interior - 2 - label.length - hint.length, 1);
     return /* @__PURE__ */ jsxs15(Text15, {
       children: [
-        /* @__PURE__ */ jsx17(Text15, {
+        /* @__PURE__ */ jsx18(Text15, {
           color: tone.primary,
           children: `${active ? mark.cursor : " "} `
         }),
-        /* @__PURE__ */ jsx17(Text15, {
+        /* @__PURE__ */ jsx18(Text15, {
           bold: active,
           color: active ? tone.primary : undefined,
           children: label
         }),
-        /* @__PURE__ */ jsx17(Text15, {
+        /* @__PURE__ */ jsx18(Text15, {
           dimColor: true,
           children: `${" ".repeat(gap)}${hint}`
         })
@@ -8759,34 +9408,34 @@ function WelcomeScreen({
       /* @__PURE__ */ jsxs15(Box13, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsx17(Text15, {
+          /* @__PURE__ */ jsx18(Text15, {
             children: "Welcome. Three steps, about a minute."
           }),
-          /* @__PURE__ */ jsx17(Blank, {}),
+          /* @__PURE__ */ jsx18(Blank, {}),
           steps.map(([n, what, how]) => /* @__PURE__ */ jsxs15(Text15, {
             children: [
-              /* @__PURE__ */ jsx17(Text15, {
+              /* @__PURE__ */ jsx18(Text15, {
                 color: tone.primary,
                 children: `${n}  `
               }),
-              /* @__PURE__ */ jsx17(Text15, {
+              /* @__PURE__ */ jsx18(Text15, {
                 children: what.padEnd(16)
               }),
-              /* @__PURE__ */ jsx17(Text15, {
+              /* @__PURE__ */ jsx18(Text15, {
                 dimColor: true,
                 children: clip(how, interior - 19)
               })
             ]
           }, n)),
-          /* @__PURE__ */ jsx17(Blank, {}),
+          /* @__PURE__ */ jsx18(Blank, {}),
           row("start", "", choice === "start"),
           row("skip, I know what I am doing", "yourskills login", choice === "skip")
         ]
       }),
-      /* @__PURE__ */ jsx17(Divider, {
+      /* @__PURE__ */ jsx18(Divider, {
         width
       }),
-      /* @__PURE__ */ jsx17(Hints, {
+      /* @__PURE__ */ jsx18(Hints, {
         hints: [
           ["enter", choice === "start" ? "start" : "skip"],
           ["esc", "skip"]
@@ -8797,7 +9446,7 @@ function WelcomeScreen({
 }
 
 // src/shell/screens/home.tsx
-import { jsx as jsx18, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx19, jsxs as jsxs16 } from "react/jsx-runtime";
 function failure(title, error) {
   const message = error instanceof Error ? error.message : String(error);
   return {
@@ -8841,25 +9490,25 @@ function AccountLine({ facts, width }) {
     children: [
       /* @__PURE__ */ jsxs16(Text16, {
         children: [
-          /* @__PURE__ */ jsx18(Text16, {
+          /* @__PURE__ */ jsx19(Text16, {
             color: facts.signedIn ? "green" : tone.notice,
             children: facts.signedIn ? mark.ok : mark.fail
           }),
-          /* @__PURE__ */ jsx18(Text16, {
+          /* @__PURE__ */ jsx19(Text16, {
             color: facts.signedIn ? undefined : tone.notice,
             children: ` ${clip(head, room - 2)}`
           }),
-          showOrg ? /* @__PURE__ */ jsx18(Text16, {
+          showOrg ? /* @__PURE__ */ jsx19(Text16, {
             color: tone.primary,
             children: org
           }) : null,
-          showTail ? /* @__PURE__ */ jsx18(Text16, {
+          showTail ? /* @__PURE__ */ jsx19(Text16, {
             dimColor: true,
             children: tail
           }) : null
         ]
       }),
-      /* @__PURE__ */ jsx18(Text16, {
+      /* @__PURE__ */ jsx19(Text16, {
         dimColor: true,
         children: clip(right, inner - room)
       })
@@ -8868,70 +9517,39 @@ function AccountLine({ facts, width }) {
 }
 function StaleLine({ stale, width }) {
   const text = `${mark.ok} ${stale.latest} is out; you have ${stale.current}. type upgrade`;
-  return /* @__PURE__ */ jsx18(Box14, {
+  return /* @__PURE__ */ jsx19(Box14, {
     width: width - FRAME_CHROME,
-    children: /* @__PURE__ */ jsx18(Text16, {
+    children: /* @__PURE__ */ jsx19(Text16, {
       color: tone.notice,
       children: clip(text, width - FRAME_CHROME)
     })
   });
 }
 var RUN = "run";
-var REST_MS = 250;
-var ASK_NPM = () => upgradeCheck();
-var ASK_REGISTRY = feedFacts;
 var NO_EXIT_CODE = () => {
   return;
 };
 function HomeScreen({
-  where: initialWhere,
-  resite,
-  facts: initial,
-  reload,
+  known,
   server,
-  openClient,
   onError,
   onSummary,
   onWelcomed = async () => {
     return;
-  },
-  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);
+  useEffect9(() => () => known.stop(), [known]);
+  const machine = useSyncExternalStore(known.subscribe, known.read, known.read);
+  const { where, facts, upgrade: stale, probes, probing } = machine;
+  const { resite } = known;
   const [query, setQuery] = useState11("");
   const [cursor, setCursor] = useState11(0);
   const [route, setRoute] = useState11(null);
-  const [welcome, setWelcome] = useState11(initial.firstRun);
+  const [welcome, setWelcome] = useState11(() => known.read().facts.firstRun);
   const [wizard, setWizard] = useState11(false);
-  const [stale, setStale] = useState11(undefined);
-  useEffect9(() => {
-    let live = true;
-    checkUpgrade().then((found) => {
-      if (live)
-        setStale(found);
-    }).catch(() => {
-      return;
-    });
-    return () => {
-      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 groups = useMemo4(() => paletteGroups(facts), [facts]);
   const typed = useMemo4(() => typedCommand(query), [query]);
   const visible = useMemo4(() => {
     const filtered = filterCommands(groups, query);
@@ -8949,48 +9567,17 @@ function HomeScreen({
   useEffect9(() => {
     setCursor((c) => Math.max(0, Math.min(c, rows.length - 1)));
   }, [rows.length]);
-  const held = useRef(null);
-  const connect = useCallback3(async () => {
-    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 connect = known.client;
   const checkSession = useCallback3(async () => facts.signedIn, [facts.signedIn]);
-  const answering = useCallback3((title, working, load) => ({
-    kind: "report",
-    title,
-    working,
-    load: async () => {
-      try {
-        return await load();
-      } catch (error) {
-        return failure(title, error);
-      }
+  const failing = useCallback3((title, error) => ({
+    kind: "answer",
+    working: "",
+    answer: {
+      kind: "report",
+      title,
+      load: async () => failure(title, error)
     }
   }), []);
-  const answeringRun = useCallback3((run) => run.kind === "stream" ? run : {
-    ...run,
-    report: async () => {
-      try {
-        return await run.report();
-      } catch (error) {
-        return failure(run.title, error);
-      }
-    }
-  }, []);
   const ctx = useMemo4(() => ({
     where,
     resite,
@@ -9020,20 +9607,9 @@ function HomeScreen({
           ...answer.tab ? { tab: answer.tab } : {},
           ...answer.query ? { query: answer.query } : {}
         };
-      case "text":
-        return answering(answer.title, plan, async () => ({
-          title: answer.title,
-          lines: [{ mark: "ok", text: answer.body }],
-          json: { ok: true }
-        }));
-      case "report":
-        return answering(answer.title, plan, answer.load);
-      case "rows":
-        return answering(answer.title, plan, async () => answer.report(await answer.load()));
-      case "stream":
-        return { kind: "run", run: answeringRun(answer.run) };
     }
-  }, [answering, answeringRun]);
+    return { kind: "answer", answer, working: plan };
+  }, []);
   const routeForCommand = useCallback3(async (command) => {
     if (command.kind === "error")
       return null;
@@ -9044,99 +9620,29 @@ function HomeScreen({
     const asked = await row.confirm?.(command, ctx, facts);
     const answer = asked ?? await row.run(command, ctx);
     if (command.kind === "logout")
-      held.current = null;
+      known.forget();
     return routeFrom(answer, say(command, facts));
-  }, [catalogDoor, ctx, facts, routeFrom]);
-  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 "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;
-        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, server, facts]);
-  const routeForDoor = useCallback3(async (door) => door.opens === undefined ? ownRoute(door.value) : routeForCommand(door.opens), [ownRoute, routeForCommand]);
+  }, [catalogDoor, ctx, facts, known, routeFrom]);
+  const routeForDoor = useCallback3(async (door) => {
+    if (door.opens !== undefined)
+      return routeForCommand(door.opens);
+    const { asks } = door;
+    const choices = await asks.choices(ctx, facts);
+    return {
+      kind: "pick",
+      ask: asks,
+      rows: [...choices.rows],
+      chosen: [...choices.chosen]
+    };
+  }, [ctx, facts, routeForCommand]);
   const open = useCallback3((pending, title) => {
     pending.then((next) => {
       if (next)
         setRoute(next);
     }).catch((error) => {
-      setRoute(answering(title, "", async () => failure(title, error)));
+      setRoute(failing(title, error));
     });
-  }, [answering]);
+  }, [failing]);
   const runText = useCallback3((text) => {
     const parsed = typedCommand(text);
     if (!runnable(parsed))
@@ -9144,29 +9650,10 @@ function HomeScreen({
     open(routeForCommand(parsed.command), parsed.text);
   }, [open, routeForCommand]);
   const current = rows[cursor];
+  const resting = current?.value;
   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]);
+    known.rest(resting);
+  }, [known, resting]);
   const activate = useCallback3(() => {
     const item = rows[cursor];
     if (!item)
@@ -9189,32 +9676,24 @@ function HomeScreen({
     setQuery(item.hint.includes("<") ? `${bare} ` : bare);
     setCursor(0);
   }, [rows, cursor]);
-  const back = useCallback3(() => {
+  const land = useCallback3(() => {
     setRoute(null);
     setQuery("");
     setCursor(0);
-    setProbes({});
-    reload().then(setFacts).catch(() => {
-      return;
-    });
-    resite().then(setWhere).catch(() => {
-      return;
-    });
-  }, [reload, resite]);
+  }, []);
+  const back = useCallback3(() => {
+    land();
+    known.back();
+  }, [land, known]);
   const afterLogin = useCallback3(() => {
-    learnActiveOrganization(server).then(() => reload()).then(setFacts).catch(() => {
-      return;
-    });
     if (!wizard) {
-      back();
+      land();
+      known.loggedIn();
       return;
     }
     setWizard(false);
-    reload().then((next) => {
-      setFacts(next);
-      setRoute({ kind: "browse" });
-    }).catch(() => setRoute(null));
-  }, [wizard, back, reload, server]);
+    known.loggedIn().then(() => setRoute({ kind: "browse" }));
+  }, [wizard, land, known]);
   const leaveWelcome = useCallback3((start) => {
     setWelcome(false);
     onWelcomed().catch(() => {
@@ -9227,7 +9706,7 @@ function HomeScreen({
   }, [onWelcomed]);
   const browseTab = route?.kind === "browse" ? route.tab : undefined;
   const browseQuery = route?.kind === "browse" ? route.query : undefined;
-  const browser = useCallback3((live) => /* @__PURE__ */ jsx18(BrowserScreen, {
+  const browser = useCallback3((live) => /* @__PURE__ */ jsx19(BrowserScreen, {
     client: live,
     where,
     onError,
@@ -9236,6 +9715,14 @@ function HomeScreen({
     ...browseTab ? { initialTab: browseTab } : {},
     ...browseQuery ? { initialQuery: browseQuery } : {}
   }), [where, onError, onSummary, back, browseTab, browseQuery]);
+  const drawn = useMemo4(() => route?.kind === "answer" ? drawInk(route.answer, {
+    onError: (error) => setRoute(failing(route.answer.title, error)),
+    onSummary,
+    exitWhenDone: false,
+    onBack: back,
+    onNext: runText,
+    working: route.working
+  }) : null, [route, onSummary, back, runText, failing]);
   useInput8((input, key) => {
     if (key.upArrow) {
       setCursor((c) => Math.max(0, c - 1));
@@ -9261,64 +9748,43 @@ function HomeScreen({
     }
   }, { isActive: route === null && !welcome });
   if (welcome) {
-    return /* @__PURE__ */ jsx18(WelcomeScreen, {
+    return /* @__PURE__ */ jsx19(WelcomeScreen, {
       agents: facts.agentsOnDisk,
       onStart: () => leaveWelcome(true),
       onSkip: () => leaveWelcome(false)
     });
   }
   if (route?.kind === "login") {
-    return /* @__PURE__ */ jsx18(LoginScreen, {
+    return /* @__PURE__ */ jsx19(LoginScreen, {
       onError,
       onDone: afterLogin,
       onBack: back
     });
   }
   if (route?.kind === "keys") {
-    return /* @__PURE__ */ jsx18(KeysScreen, {
+    return /* @__PURE__ */ jsx19(KeysScreen, {
       onBack: back
     });
   }
-  if (route?.kind === "report") {
-    return /* @__PURE__ */ jsx18(ReportScreen, {
-      title: route.title,
-      load: route.load,
-      working: route.working,
-      onError,
-      exitWhenDone: false,
-      onBack: back,
-      onNext: runText
-    });
-  }
-  if (route?.kind === "run") {
-    return /* @__PURE__ */ jsx18(RunScreen, {
-      run: route.run,
-      exitWhenDone: false,
-      onError,
-      onDone: onSummary,
-      onBack: back,
-      onNext: runText
-    });
-  }
+  if (drawn)
+    return drawn;
   if (route?.kind === "pick") {
-    const picked = route;
-    return /* @__PURE__ */ jsx18(PickScreen, {
-      title: picked.title,
-      rows: picked.rows,
-      empty: picked.empty,
-      verb: picked.verb,
-      ...picked.single ? { single: true } : {},
-      ...picked.marked ? { marked: picked.marked } : {},
-      ...picked.preset ? { preset: picked.preset } : {},
+    const { ask, rows: choices, chosen } = route;
+    return /* @__PURE__ */ jsx19(PickScreen, {
+      title: ask.title,
+      rows: choices,
+      empty: ask.empty,
+      verb: ask.verb,
+      ...ask.pick === "one" ? { single: true, ...chosen[0] ? { marked: chosen[0] } : {} } : { preset: chosen },
       onPick: (names) => {
-        open(routeForCommand(picked.command(names)), picked.title);
+        open(routeForCommand(ask.opens(names)), ask.title);
       },
       onBack: back
     });
   }
   if (route?.kind === "ask") {
     const { spec } = route;
-    return /* @__PURE__ */ jsx18(ConfirmScreen, {
+    return /* @__PURE__ */ jsx19(ConfirmScreen, {
       title: spec.title,
       headline: spec.headline,
       lines: spec.lines,
@@ -9326,12 +9792,16 @@ function HomeScreen({
       yes: spec.yes,
       no: spec.no,
       argv: spec.argv,
-      onYes: () => setRoute(answering(spec.title, spec.working, spec.run)),
+      onYes: () => setRoute({
+        kind: "answer",
+        working: spec.working,
+        answer: { kind: "report", title: spec.title, load: spec.run }
+      }),
       onNo: back
     });
   }
   if (route?.kind === "browse") {
-    return /* @__PURE__ */ jsx18(AuthGate, {
+    return /* @__PURE__ */ jsx19(AuthGate, {
       title: "browse",
       check: checkSession,
       connect,
@@ -9342,43 +9812,43 @@ function HomeScreen({
     });
   }
   const highlighted = current ? doorFor(current.value) : undefined;
-  const description = current?.value === RUN && runnable(typed) ? say(typed.command, shown) : highlighted ? doorSays(highlighted, shown) : typed ? say(typed.command, shown) : "";
+  const description = current?.value === RUN && runnable(typed) ? say(typed.command, facts) : highlighted ? doorSays(highlighted, facts) : typed ? say(typed.command, facts) : "";
   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: shown,
+      /* @__PURE__ */ jsx19(AccountLine, {
+        facts,
         width
       }),
-      stale ? /* @__PURE__ */ jsx18(StaleLine, {
+      stale ? /* @__PURE__ */ jsx19(StaleLine, {
         stale,
         width
       }) : null,
-      /* @__PURE__ */ jsx18(Divider, {
+      /* @__PURE__ */ jsx19(Divider, {
         width
       }),
-      /* @__PURE__ */ jsx18(CommandPalette, {
+      /* @__PURE__ */ jsx19(CommandPalette, {
         groups: visible,
         query,
         cursor,
         width,
         emptyMessage: empty
       }),
-      /* @__PURE__ */ jsx18(Divider, {
+      /* @__PURE__ */ jsx19(Divider, {
         width
       }),
-      /* @__PURE__ */ jsx18(Text16, {
+      /* @__PURE__ */ jsx19(Text16, {
         dimColor: true,
         children: clip(description, width - FRAME_CHROME)
       }),
-      /* @__PURE__ */ jsx18(Text16, {
+      /* @__PURE__ */ jsx19(Text16, {
         dimColor: true,
         children: found ? clip(`  ${found}`, width - FRAME_CHROME) : " "
       }),
-      /* @__PURE__ */ jsx18(Hints, {
+      /* @__PURE__ */ jsx19(Hints, {
         hints: [
           ["^v", "move"],
           ["tab", "complete"],
@@ -9391,7 +9861,7 @@ function HomeScreen({
   });
 }
 // src/drive.tsx
-import { jsx as jsx19 } from "react/jsx-runtime";
+import { jsx as jsx20 } from "react/jsx-runtime";
 var liveChores = {
   sendUsage: flushQuietly,
   offerHooks: ensureHooksRegistered,
@@ -9466,7 +9936,7 @@ async function drawPlain(answer, output, io) {
       let code = EXIT.ok;
       const done = await plainRun(answer.run, (report) => {
         code = emit2(report, output, io);
-      });
+      }, io);
       return "pending" in done ? landed(done) : code;
     }
   }
@@ -9474,7 +9944,7 @@ async function drawPlain(answer, output, io) {
 async function screenFor(command, ctx, resite, fail, exit) {
   const summarise = (summary) => exit.raise(landed(summary));
   const report = (result) => exit.raise(result.failed ? EXIT.failed : EXIT.ok);
-  const gate = (title, build) => /* @__PURE__ */ jsx19(AuthGate, {
+  const gate = (title, build) => /* @__PURE__ */ jsx20(AuthGate, {
     title,
     build,
     connect: ctx.client,
@@ -9484,13 +9954,17 @@ async function screenFor(command, ctx, resite, fail, exit) {
   const { row, answer } = await answerFor(command, ctx);
   if (answer.kind === "home") {
     const reload = () => paletteFacts(ctx.where.scope, ctx.server);
-    return /* @__PURE__ */ jsx19(HomeScreen, {
+    const known = knowMachine({
       where: ctx.where,
-      resite,
       facts: await reload(),
+      ...ctx.server ? { server: ctx.server } : {},
       reload,
+      resite,
+      client: ctx.client
+    });
+    return /* @__PURE__ */ jsx20(HomeScreen, {
+      known,
       ...ctx.server ? { server: ctx.server } : {},
-      openClient: ctx.client,
       onError: fail,
       onSummary: summarise,
       onWelcomed: async () => {
@@ -9503,54 +9977,26 @@ async function screenFor(command, ctx, resite, fail, exit) {
     });
   }
   if (answer.kind === "login")
-    return /* @__PURE__ */ jsx19(LoginScreen, {
+    return /* @__PURE__ */ jsx20(LoginScreen, {
       onError: fail
     });
   if (answer.kind === "browse")
-    return gate("browse", (client) => /* @__PURE__ */ jsx19(BrowserScreen, {
+    return gate("browse", (client) => /* @__PURE__ */ jsx20(BrowserScreen, {
       client,
       where: ctx.where,
       onError: fail,
       onSummary: summarise
     }));
-  const drawn = drawInk(answer, fail, summarise, report);
+  const drawn = drawInk(answer, {
+    onError: fail,
+    onSummary: summarise,
+    onReport: report
+  });
   return sessionFirst(row, answer) ? gate(answer.title, () => drawn) : drawn;
 }
 function sessionFirst(row, answer) {
   return answer.kind === "stream" ? answer.run.needsSession : row.needs === "session";
 }
-function drawInk(answer, fail, summarise, report) {
-  switch (answer.kind) {
-    case "text":
-      return answer.style === "document" ? /* @__PURE__ */ jsx19(HelpScreen, {
-        text: answer.body
-      }) : /* @__PURE__ */ jsx19(NoticeScreen, {
-        title: answer.title,
-        message: answer.body
-      });
-    case "report":
-      return /* @__PURE__ */ jsx19(ReportScreen, {
-        title: answer.title,
-        load: answer.load,
-        onError: fail,
-        onReport: report,
-        ...answer.working ? { working: answer.working } : {}
-      });
-    case "rows":
-      return /* @__PURE__ */ jsx19(CatalogScreen, {
-        title: answer.title,
-        load: async () => toRows(await answer.load()),
-        onError: fail
-      });
-    case "stream":
-      return /* @__PURE__ */ jsx19(RunScreen, {
-        run: answer.run,
-        onError: fail,
-        onDone: summarise,
-        onReport: report
-      });
-  }
-}
 async function runInk(command, ctx, resite, io, exit) {
   let failure = null;
   let frame = null;