yourskills 0.4.2 → 0.4.4

package/dist/main.js

@@ -1198,6 +1198,7 @@ function LoginScreen({
   const { exit } = useApp();
   const width = useFrameWidth();
   const [state, setState] = useState3({ phase: "starting" });
+  const [finished, setFinished] = useState3(false);
   useEffect2(() => {
     let live = true;
     (async () => {
@@ -1218,15 +1219,18 @@ function LoginScreen({
       }
       if (!live)
         return;
+      setFinished(true);
       if (onDone)
         onDone();
-      else
-        exit();
     })();
     return () => {
       live = false;
     };
-  }, [exit, onError, onDone]);
+  }, [onError, onDone]);
+  useEffect2(() => {
+    if (finished && !onDone)
+      exit();
+  }, [finished, onDone, exit]);
   if (state.phase === "done") {
     return /* @__PURE__ */ jsx8(Frame, {
       title: "login",
@@ -2273,13 +2277,15 @@ function Installer({
         return;
       setDone(true);
       onDone?.(summarise(current));
-      if (exitWhenDone)
-        exit();
     })();
     return () => {
       live = false;
     };
-  }, [stream, onDone, exit, exitWhenDone]);
+  }, [stream, onDone]);
+  useEffect4(() => {
+    if (done && exitWhenDone)
+      exit();
+  }, [done, exit, exitWhenDone]);
   const counts = done ? receipt(lines) : null;
   const pending = counts?.pending ?? 0;
   const questions = counts?.questions ?? 0;
@@ -2373,57 +2379,6 @@ function Installer({
     ]
   });
 }
-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);
-}
 // src/screens.tsx
 import { Box as Box8, Text as Text10, useApp as useApp4, useInput as useInput4 } from "ink";
 import { useEffect as useEffect5, useState as useState6 } from "react";
@@ -2431,25 +2386,36 @@ 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 = {
@@ -2565,39 +2531,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({
@@ -2630,13 +2662,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) {
@@ -3066,7 +3098,6 @@ function CatalogScreen({
       if (!live)
         return;
       setRows(result);
-      exit();
     }).catch((error) => {
       if (live)
         onError(error);
@@ -3074,7 +3105,11 @@ function CatalogScreen({
     return () => {
       live = false;
     };
-  }, [load, exit, onError]);
+  }, [load, onError]);
+  useEffect7(() => {
+    if (rows !== null)
+      exit();
+  }, [rows, exit]);
   if (rows === null) {
     return /* @__PURE__ */ jsx14(Frame, {
       title,
@@ -5808,7 +5843,7 @@ import { realpathSync } from "node:fs";
 // package.json
 var package_default = {
   name: "yourskills",
-  version: "0.4.2",
+  version: "0.4.4",
   description: "Browse, install and keep up to date the agent skills and bundles your team publishes on yourskills.",
   license: "UNLICENSED",
   homepage: "https://yourskills.store",
@@ -8195,6 +8230,65 @@ async function paletteFacts(scope, server) {
 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/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/shell/feed.ts
 async function feedFacts(client, where, server) {
   const installed = Object.keys(where.manifest.skills).length > 0;
@@ -8493,7 +8587,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"],
@@ -8519,15 +8613,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"
               })
@@ -8535,21 +8629,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
       })
@@ -8560,7 +8654,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,
@@ -8630,7 +8724,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, {
@@ -8638,26 +8732,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,
@@ -8665,20 +8759,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"]],
@@ -8696,7 +8790,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,
@@ -8727,16 +8821,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}`
         })
@@ -8750,34 +8844,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"]
@@ -8788,7 +8882,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 {
@@ -8832,25 +8926,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)
       })
@@ -8859,9 +8953,9 @@ 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)
     })
@@ -8960,28 +9054,15 @@ function HomeScreen({
     };
   }, [facts.signedIn, connect, loadFeed, where, server]);
   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,
@@ -9011,20 +9092,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;
@@ -9125,9 +9195,9 @@ function HomeScreen({
       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))
@@ -9218,7 +9288,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,
@@ -9227,6 +9297,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));
@@ -9252,48 +9330,29 @@ 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, {
+    return /* @__PURE__ */ jsx19(PickScreen, {
       title: picked.title,
       rows: picked.rows,
       empty: picked.empty,
@@ -9309,7 +9368,7 @@ function HomeScreen({
   }
   if (route?.kind === "ask") {
     const { spec } = route;
-    return /* @__PURE__ */ jsx18(ConfirmScreen, {
+    return /* @__PURE__ */ jsx19(ConfirmScreen, {
       title: spec.title,
       headline: spec.headline,
       lines: spec.lines,
@@ -9317,12 +9376,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,
@@ -9340,36 +9403,36 @@ function HomeScreen({
     title: "yourskills",
     width,
     children: [
-      /* @__PURE__ */ jsx18(AccountLine, {
+      /* @__PURE__ */ jsx19(AccountLine, {
         facts: shown,
         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"],
@@ -9382,7 +9445,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,
@@ -9457,7 +9520,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;
     }
   }
@@ -9465,7 +9528,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,
@@ -9475,7 +9538,7 @@ 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, {
+    return /* @__PURE__ */ jsx20(HomeScreen, {
       where: ctx.where,
       resite,
       facts: await reload(),
@@ -9494,54 +9557,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;

package/package.json

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