gloomberb 0.18.2 → 0.18.4

package/src/plugins/builtin/plugin-marketplace/pane.tsx

@@ -22,6 +22,7 @@ import {
   type PaneHint,
 } from "../../../components";
 import { loadingErrorFooterInfo } from "../../../components/data-table/table-pane";
+import { useRowNotes } from "../../../components/ui/row-notes";
 import { colors } from "../../../theme/colors";
 import { t, tf } from "../../../i18n";
 import type { PaneProps } from "../../../types/plugin";
@@ -31,6 +32,7 @@ import { isPlainKeyboardEvent } from "../../../utils/keyboard";
 import { formatRelativeAge } from "../../../utils/datetime-format";
 import { displayWidth } from "../../../utils/format";
 import { requiredGloomberb } from "../../../utils/semver";
+import { logFailure } from "../../../utils/log-failure";
 import { VERSION } from "../../../version";
 import { getCurrentPluginTarget, runsExternalPlugins } from "../../current-target";
 import { pluginSetupCommandId } from "../../registry/setup-command";
@@ -67,6 +69,7 @@ import {
   versionLabel,
   type MarketplaceEntry,
   type MarketplaceRow,
+  type MarketplaceStatus,
   type MarketplaceStatusKind,
   type RegistryPlugin,
 } from "../../marketplace/model";
@@ -164,7 +167,7 @@ function renderCell(
   row: MarketplaceRow,
   column: Column,
   rowState: { selected: boolean },
-  busyId: string | null,
+  rowStatus: (entry: MarketplaceEntry) => MarketplaceStatus,
   facts: (entry: MarketplaceEntry) => EntryFacts,
 ): DataTableCell {
   if (row.type === "header") return { text: "" };
@@ -191,8 +194,7 @@ function renderCell(
     case "tagline":
       return { text: entry.tagline, color: selected ?? colors.textDim };
     case "status": {
-      if (busyId === entry.id) return { text: "working", color: selected ?? colors.textDim };
-      const status = statusOf(entry);
+      const status = rowStatus(entry);
       return { text: status.text, color: selected ?? STATUS_COLORS[status.kind] };
     }
   }
@@ -211,14 +213,21 @@ function describeContributions(entry: MarketplaceEntry, host: MarketplaceHost |
   return parts;
 }
 
-function EntryDetail({ entry, width, host }: { entry: MarketplaceEntry; width: number; host: MarketplaceHost | null }) {
+function EntryDetail({ entry, width, host, status, failure }: {
+  entry: MarketplaceEntry;
+  width: number;
+  host: MarketplaceHost | null;
+  /** The row's STATUS. */
+  status: MarketplaceStatus;
+  /** What the last action on this plugin ran into, said in full. */
+  failure: ActionFailure | null;
+}) {
   const contributes = describeContributions(entry, host);
   const live = entry.installed && host ? host.contributions(entry.id) : null;
   const opensWith = live
     ? live.templates.map((template) => template.prefix ?? template.label).filter(Boolean)
     : [];
   const rowWidth = Math.max(1, width - 2);
-  const status = statusOf(entry);
 
   return (
     <ScrollBox flexDirection="column" width={width} flexGrow={1} flexBasis={0} minHeight={0} paddingLeft={1} paddingRight={1} scrollY focusable={false}>
@@ -235,6 +244,12 @@ function EntryDetail({ entry, width, host }: { entry: MarketplaceEntry; width: n
         </Box>
       ) : null}
 
+      {failure ? (
+        <Box paddingTop={1} flexDirection="column">
+          <Text fg={STATUS_COLORS[failure.kind ?? "failed"]} wrapText>{failure.text}</Text>
+        </Box>
+      ) : null}
+
       <Box paddingTop={1} flexDirection="column">
         {contributes.length > 0 ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Adds" value={contributes.join(", ")} /> : null}
         {opensWith.length > 0 ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Opens with" value={opensWith.join(", ")} /> : null}
@@ -245,7 +260,7 @@ function EntryDetail({ entry, width, host }: { entry: MarketplaceEntry; width: n
           */}
         {entry.hosts.length > 0 ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Declares" value={entry.hosts.join(", ")} /> : null}
         {entry.repo ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Source" value={`github.com/${entry.repo}`} /> : null}
-        {entry.minGloomberb ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Requires" value={requiredGloomberb(entry.minGloomberb) ? `Gloomberb ${entry.minGloomberb}, this is ${VERSION}` : `Gloomberb ${entry.minGloomberb}`} /> : null}
+        {entry.minGloomberb ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Requires" value={requiredGloomberb(entry.minGloomberb) ? `Gloom ${entry.minGloomberb}, this is ${VERSION}` : `Gloom ${entry.minGloomberb}`} /> : null}
         {entry.linked ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Linked" value={entry.directory ?? "local checkout"} /> : null}
         {entry.installedCommit ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Commit" value={entry.installedCommit.slice(0, 7)} /> : null}
         {!entry.installed && entry.availableCommit ? <KeyValueRow labelWidth={10} width={rowWidth} emphasis={false} label="Pinned" value={`${entry.availableVersion ?? ""} ${entry.availableCommit.slice(0, 7)}`.trim()} /> : null}
@@ -258,7 +273,7 @@ function EntryDetail({ entry, width, host }: { entry: MarketplaceEntry; width: n
         runsExternalPlugins() ? (
           <Box paddingTop={1} flexDirection="column">
             <Text fg={colors.textDim}>Runs with your full permissions. Read the source first.</Text>
-            <Text fg={colors.textBright}>{`gloomberb install ${entry.repo}`}</Text>
+            <Text fg={colors.textBright}>{`gloom install ${entry.repo}`}</Text>
           </Box>
         ) : (
           // No shell here, so the install command would be a dead end. Say
@@ -320,7 +335,7 @@ function BuiltinDetail({ entry, width, facts, scrollRef }: {
             <RemoteImage
               key={code}
               src={functionShotUrl(code)}
-              alt={`${code} in Gloomberb`}
+              alt={`${code} in Gloom`}
               label={code}
               width={shotWidth}
               height={Math.max(8, Math.floor(shotWidth * 0.3))}
@@ -399,6 +414,25 @@ function PackChangeBody({ change, name }: { change: PackChange; name: (id: strin
 
 type Busy = { id: string; verb: "installing" | "updating" | "removing" } | null;
 
+/**
+ * What the last action on one plugin ran into, said on its row: `status` in
+ * STATUS, `text` in its detail. It stands while the row's own status is what
+ * it was when the failure first showed, and goes when that moves: a toggle,
+ * a restart, a later install.
+ */
+interface ActionFailure {
+  status: string;
+  text: string;
+  /** STATUS's tone; a failure by default. */
+  kind?: MarketplaceStatusKind;
+}
+
+function statusKey(entry: MarketplaceEntry): string {
+  const status = statusOf(entry);
+  return `${status.kind}:${status.text}`;
+}
+const entryId = (entry: MarketplaceEntry) => entry.id;
+
 export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
   const dialog = useDialog();
   const { createPaneFromTemplate, showPane, openPluginCommandWorkflow, notify } = usePluginAppActions();
@@ -418,14 +452,15 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
   // Bumped after any local change so the list is re-read from the host.
   const [localRevision, setLocalRevision] = useState(0);
   const [busy, setBusy] = useState<Busy>(null);
-  const [lastError, setLastError] = useState<string | null>(null);
   // Remote heads for plugins the registry does not pin, so a private or
   // side-loaded install can report an update like every other row.
   const [remoteHeads, setRemoteHeads] = useState<Record<string, string>>({});
   const [checkingRemotes, setCheckingRemotes] = useState(false);
-  const busyId = busy?.id ?? null;
+  const [remoteCheckError, setRemoteCheckError] = useState<string | null>(null);
+  const [remoteRevision, setRemoteRevision] = useState(0);
 
   const refresh = useCallback((force: boolean) => {
+    if (force) setRemoteRevision((value) => value + 1);
     setStatus((current) => (current === "ready" ? current : "loading"));
     void loadRegistry({ force }).then((result) => {
       setRegistry(result.plugins);
@@ -460,12 +495,22 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
       return facts;
     };
   }, [entries, host]);
+  // By plugin id, until the next action on the plugin. A failure takes the
+  // row's status as the list shows it after the action, and goes once that
+  // status moves on.
+  const { noteFor: failureFor, setNote: setFailure } = useRowNotes<MarketplaceEntry, ActionFailure>(entries, { key: entryId, signature: statusKey });
+  // What an action on one plugin is doing, or ran into, is said on its row.
+  const rowStatus = useCallback((entry: MarketplaceEntry): MarketplaceStatus => {
+    if (busy?.id === entry.id) return { kind: "none", text: busy.verb };
+    const failure = failureFor(entry);
+    return failure ? { kind: failure.kind ?? "failed", text: failure.status } : statusOf(entry);
+  }, [busy, failureFor]);
   const renderRow = useCallback((
     row: MarketplaceRow,
     column: Column,
     _index: number,
     rowState: { selected: boolean },
-  ) => renderCell(row, column, rowState, busyId, factsFor), [busyId, factsFor]);
+  ) => renderCell(row, column, rowState, rowStatus, factsFor), [factsFor, rowStatus]);
 
   // Keyed by the folders themselves: the entries array is rebuilt whenever an
   // answer lands, and re-running the check on its own result would never stop.
@@ -476,24 +521,42 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
   const unlistedKey = unlistedDirectories.join(",");
 
   useEffect(() => {
+    const directories = unlistedKey ? unlistedKey.split(",") : [];
+    const eligible = new Set(directories);
+    // Forget removed or newly pinned/linked installs, including the last one.
+    setRemoteHeads((previous) => {
+      const retained = Object.entries(previous).filter(([directory]) => eligible.has(directory));
+      return retained.length === Object.keys(previous).length ? previous : Object.fromEntries(retained);
+    });
+    setRemoteCheckError(null);
     const check = manager?.remoteHeads;
-    if (!check || unlistedKey.length === 0) return;
+    if (!check || directories.length === 0) {
+      setCheckingRemotes(false);
+      return;
+    }
     let cancelled = false;
     setCheckingRemotes(true);
-    void check(unlistedKey.split(","))
-      // Offline, or a private repository this machine has no credentials for:
-      // the row keeps whatever it knew, without an error in the way.
-      .catch(() => ({}))
-      .then((heads) => {
+    void (async () => {
+      try {
+        const heads = await check(directories);
         if (cancelled) return;
-        setRemoteHeads(heads);
-        setCheckingRemotes(false);
-      });
-    return () => {
-      cancelled = true;
-      setCheckingRemotes(false);
-    };
-  }, [manager, unlistedKey, localRevision]);
+        // An omitted folder is unanswered, not proof that it is up to date.
+        const answers = directories.filter((directory) => !!heads[directory]);
+        setRemoteHeads((previous) => ({
+          ...previous,
+          ...Object.fromEntries(answers.map((directory) => [directory, heads[directory]!])),
+        }));
+        setRemoteCheckError(answers.length < directories.length ? "Update check incomplete" : null);
+      } catch (error) {
+        if (cancelled) return;
+        logFailure("plugin-marketplace.pane", "Check installed plugin remote heads failed")(error);
+        setRemoteCheckError("Plugin update check failed");
+      } finally {
+        if (!cancelled) setCheckingRemotes(false);
+      }
+    })();
+    return () => { cancelled = true; };
+  }, [manager, unlistedKey, localRevision, remoteRevision]);
 
   const visible = useMemo(
     () => filterEntries(entries, { query, category, showBuiltin }),
@@ -545,16 +608,23 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
   /**
    * The registry's code for this plugin needs a newer Gloomberb. Installing or
    * updating would land it anyway and it would then fail to compile, so say
-   * what to do instead. Also leaves a working older checkout alone, and does
-   * not update one that already needs a newer Gloomberb: updates only move
-   * forward, so that would not help either.
+   * what to do instead, on the row: its STATUS already says `needs …` unless
+   * something outranks it there (`failed`, `needs restart`). Also leaves a
+   * working older checkout alone, and does not update one that already needs
+   * a newer Gloomberb: updates only move forward, so that would not help either.
    */
   const refuseTooNew = useCallback((entry: MarketplaceEntry): boolean => {
     const required = requiredGloomberb(entry.minGloomberb) ?? entry.needsGloomberb;
     if (!required) return false;
-    notify({ body: `${entry.name} needs Gloomberb ${required}. Update Gloomberb first.`, type: "error" });
+    if (statusOf(entry).kind !== "needs-gloomberb") {
+      setFailure(entry.id, {
+        kind: "needs-gloomberb",
+        status: `needs ${required}`,
+        text: `${entry.name} needs Gloom ${required}. Update Gloom first.`,
+      });
+    }
     return true;
-  }, [notify]);
+  }, [setFailure]);
 
   const installSelected = useCallback(async () => {
     if (!selected || !isInstallable(selected) || !manager || !host || busy) return;
@@ -576,12 +646,11 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
 
     const entry = selected;
     setBusy({ id: entry.id, verb: "installing" });
-    setLastError(null);
+    setFailure(entry.id, null);
     const result = await manager.install(repo, pin);
     if (!result.ok) {
       setBusy(null);
-      setLastError(result.error);
-      notify({ body: `Could not install ${entry.name}: ${result.error}`, type: "error" });
+      setFailure(entry.id, { status: "install failed", text: `Could not install ${entry.name}: ${result.error}` });
       return;
     }
     const activated = await activateInstall(result, host, manager);
@@ -589,8 +658,8 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
     bump();
     if (activated.ok && activated.restart) notify({ body: `Restart to finish installing ${entry.name}.`, type: "info" });
     else if (activated.ok) announceAdded(activated.pluginId, activated.name, "Installed", host);
-    else notify({ body: `${entry.name} installed but did not load: ${activated.error}`, type: "error" });
-  }, [announceAdded, bump, busy, confirmWidth, dialog, host, manager, notify, refuseTooNew, selected]);
+    else setFailure(entry.id, { status: "load failed", text: `${entry.name} installed but did not load: ${activated.error}` });
+  }, [announceAdded, bump, busy, confirmWidth, dialog, host, manager, notify, refuseTooNew, selected, setFailure]);
 
   const updateSelected = useCallback(async () => {
     if (!selected || !isManaged(selected) || !manager || !host || busy || selected.linked) return;
@@ -599,12 +668,11 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
     const entry = selected;
     const reinstall = !!entry.loadError;
     setBusy({ id: entry.id, verb: "updating" });
-    setLastError(null);
+    setFailure(entry.id, null);
     const result = await manager.update(directory, registryPin(entry));
     if (!result.ok) {
       setBusy(null);
-      setLastError(result.error);
-      notify({ body: `Could not update ${entry.name}: ${result.error}`, type: "error" });
+      setFailure(entry.id, { status: "update failed", text: `Could not update ${entry.name}: ${result.error}` });
       return;
     }
     if (result.kept) {
@@ -620,9 +688,21 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
     } else if (activated.ok) {
       announceAdded(activated.pluginId, activated.name, reinstall ? "Reloaded" : "Updated", host);
     } else {
-      notify({ body: `${entry.name} updated but did not load: ${activated.error}`, type: "error" });
+      setFailure(entry.id, { status: "load failed", text: `${entry.name} updated but did not load: ${activated.error}` });
     }
-  }, [announceAdded, bump, busy, host, manager, notify, refuseTooNew, selected]);
+  }, [announceAdded, bump, busy, host, manager, notify, refuseTooNew, selected, setFailure]);
+
+  /**
+   * A removal that failed is said on the plugin's row while the list still
+   * has one. A stopped plugin can leave the list, files and all; then only a
+   * toast is left to say it.
+   */
+  const failRemoval = useCallback((entry: MarketplaceEntry, failure: ActionFailure) => {
+    const installed = host?.listInstalled() ?? [];
+    const listed = mergeCatalog({ registry, installed, target, remoteHeads }).some((candidate) => candidate.id === entry.id);
+    if (listed) setFailure(entry.id, failure);
+    else notify({ body: failure.text, type: "error" });
+  }, [host, notify, registry, remoteHeads, setFailure, target]);
 
   const removeSelected = useCallback(async () => {
     if (!selected || !isManaged(selected) || !manager || !host || busy) return;
@@ -637,18 +717,27 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
     });
     if (!confirmed) return;
     setBusy({ id: entry.id, verb: "removing" });
-    setLastError(null);
-    await host.deactivate(entry.id, entry.directory).catch(() => {});
-    await manager.deactivate?.(entry.id).catch(() => {});
-    const result = await manager.remove(entry.directory!);
-    setBusy(null);
-    bump();
-    if (result.ok) notify({ body: `Removed ${entry.name}.`, type: "success" });
-    else {
-      setLastError(result.error);
-      notify({ body: `Could not remove ${entry.name}: ${result.error}`, type: "error" });
+    setFailure(entry.id, null);
+    let removalStarted = false;
+    try {
+      // Stop the native side first: a successful view stop drops its catalog
+      // entry, so it must remain available if the native stop fails.
+      await manager.deactivate?.(entry.id);
+      await host.deactivate(entry.id, entry.directory);
+      removalStarted = true;
+      const result = await manager.remove(entry.directory!);
+      if (result.ok) notify({ body: `Removed ${entry.name}.`, type: "success" });
+      else failRemoval(entry, { status: "remove failed", text: `Could not remove ${entry.name}: ${result.error}` });
+    } catch (error) {
+      logFailure("plugin-marketplace.pane", "Remove plugin failed")(error);
+      failRemoval(entry, removalStarted
+        ? { status: "remove failed", text: `Could not remove ${entry.name}. Removal failed. Restart and try again.` }
+        : { status: "stop failed", text: `Could not remove ${entry.name}. Plugin could not be stopped. Files kept. Restart before removing it.` });
+    } finally {
+      setBusy(null);
+      bump();
     }
-  }, [bump, busy, confirmWidth, dialog, host, manager, notify, selected]);
+  }, [bump, busy, confirmWidth, dialog, failRemoval, host, manager, notify, selected]);
 
   const toggleSelected = useCallback(async () => {
     if (!host || !selected || !selected.installed || !selected.toggleable || selected.loadError) return;
@@ -735,7 +824,7 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
           }))}
         />
       ),
-    }).catch(() => null);
+    }).catch(logFailure("plugin-marketplace.pane", "Choose starter pack failed", null));
     const pack = STARTER_PACKS.find((candidate) => candidate.id === id);
     if (pack) await applyPack(pack);
   }, [applyPack, currentPack, dialog, disabledPlugins, host]);
@@ -827,11 +916,7 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
   const info = loadingErrorFooterInfo(status === "loading", status === "error" ? "catalog unavailable" : null);
   if (stale) info.push({ id: "stale", parts: [{ text: "stale catalog", tone: "warning" }] });
   if (checkingRemotes) info.push({ id: "remote-check", parts: [{ text: "checking unlisted plugins", tone: "muted" }] });
-  if (busy) {
-    const name = entries.find((entry) => entry.id === busy.id)?.name ?? busy.id;
-    info.push({ id: "busy", parts: [{ text: `${busy.verb} ${name}`, tone: "muted" }] });
-  }
-  if (lastError && !busy) info.push({ id: "op-error", parts: [{ text: lastError, tone: "warning" }] });
+  if (remoteCheckError) info.push({ id: "remote-error", parts: [{ text: remoteCheckError, tone: "warning" }] });
   const restartCount = entries.filter((entry) => entry.needsRestart).length;
   if (restartCount > 0 && !busy) {
     info.push({ id: "restart", parts: [{ text: "restart to finish loading", tone: "warning" }] });
@@ -868,8 +953,8 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
 
   const fit = useMemo(() => ({
     functions: Math.min(16, Math.max(9, ...visible.map((entry) => factsFor(entry).codes.join(" ").length))),
-    status: Math.min(14, Math.max(7, ...visible.map((entry) => statusOf(entry).text.length))),
-  }), [factsFor, visible]);
+    status: Math.min(14, Math.max(7, ...visible.map((entry) => rowStatus(entry).text.length))),
+  }), [factsFor, rowStatus, visible]);
   const columns = useMemo(() => buildColumns(width, fit), [fit, width]);
   // The pick is saved with the pane, so keep it listed (and resettable) even
   // when the catalog no longer has plugins in it.
@@ -917,7 +1002,7 @@ export function PluginMarketplacePane({ focused, width, height }: PaneProps) {
         detailContent={selected
           ? selected.bundled
             ? <BuiltinDetail entry={selected} width={width} facts={factsFor(selected)} scrollRef={detailScrollRef} />
-            : <EntryDetail entry={selected} width={width} host={host} />
+            : <EntryDetail entry={selected} width={width} host={host} status={rowStatus(selected)} failure={failureFor(selected)} />
           : null}
         detailTitle={selected?.name}
         rootBefore={(

package/src/plugins/builtin/portfolio-list/cli/bulk-symbols.ts

@@ -1,10 +1,11 @@
 import type { CliCommandContext } from "../../../../types/plugin";
 import type { TickerRecord } from "../../../../types/ticker";
 import type { MarketContext } from "../../../../cli/types";
-import { listingFields, loadSavedListing, parseListingArg, savedListingName } from "../../../../cli/listing-arg";
+import { listingFields, loadSavedListingOf, savedListingCandidates, savedListingName } from "../../../../cli/listing-arg";
 import { withSuggestion } from "../../../../cli/listing-suggestion";
 import { StagedTickerRepository } from "../../../../cli/staged-tickers";
-import { splitSymbolWords, symbolInputKey } from "../../../../cli/symbol-args";
+import { splitSymbolArgs, splitSymbolWords, symbolInputKey } from "../../../../cli/symbol-args";
+import { notASymbolError } from "../../../../cli/symbol-cells";
 import { readSymbolList, SymbolListError } from "../../../../cli/symbol-list";
 import { cliStyles } from "../../../../utils/cli-output";
 import { dryRunNote } from "../../../../cli/helpers";
@@ -37,23 +38,35 @@ export const FILE_OPTION = {
 export const SYMBOL_LIST_HELP = {
   title: "Several symbols",
   lines: [
-    "add and remove take any number of symbols split by spaces, commas or newlines, a --file, or piped input (or -). An entry of a list with commas or newlines that has spaces in it is a company's name when search finds one, read as its US listing first with a line under it saying which, and otherwise the symbols it holds. A CSV is read from its Symbol, Ticker or Code column. Without that header every cell is a symbol, unless names, prices or weights sit beside them: then the first column is read and the cells left out are named. Quote a list name with spaces.",
-    "Each symbol gets a line, then a summary. Exit status 0 when at least one symbol was added (or removed) or already was, 1 when none resolved or the usage is wrong.",
-    "A bare US-style symbol is not added when the listing it matched stopped trading, is abroad (DFS as DFS:LSE) or was taken by another company in the last two years (BRKL), or when nothing lists under it now and its company trades as another. Those are listed under Needs a choice, with the add for what their company trades as now and the listing that matched, which naming keeps; one symbol alone fails with the same. A symbol another company took longer ago says so under its line.",
+    "add and remove take any number of symbols split by spaces, commas or newlines, a --file, or piped input (or -). An entry of a list with commas, semicolons or newlines that has spaces in it is a company's name when search finds one (philip morris intl is PM), read as its US listing first with a line under it saying which, else the symbols it holds when each is written as a symbol or has a quote (AAPL MSFT), and otherwise a name not found. A file or piped list reads each line as such an entry. A CSV is read from its Symbol, Ticker or Code column, else its Name or Company column as names. Without that header every cell is a symbol, unless names, prices or weights sit beside them: then the first column is read and the cells left out are named. Each line is split by its own tab, semicolon, comma or spaces, and a price is never a symbol, written either way (2.582,52 or 1,899.21). A comma between plain digits (0700,25) splits them unless the line also has a tab, a semicolon or spaces between cells. Quote a list name with spaces.",
+    "Each symbol gets a line, then a summary. An entry that cannot be a symbol (N/A, $$$, --, a price alone) is named as not a symbol without a lookup. Symbols Gloom Cloud did not answer for are listed together with one command that adds them again. Exit status 0 when at least one symbol was added (or removed) or already was, 1 when none resolved or the usage is wrong.",
+    "A bare US-style symbol is not added when the listing it matched stopped trading, is abroad while the symbol also names a US listing (DFS as DFS:LSE, Discover's old symbol) or was taken by another company in the last two years (BRKL), or when nothing lists under it now and its company trades as another. Those are listed under Needs a choice, with the add for what their company trades as now and the listing that matched, which naming keeps; one symbol alone fails with the same. A symbol another company took longer ago says so under its line, and one listed only abroad (GARAN) is added with a line naming its venue and currency.",
+    "A vendor's suffix is the venue it names: GARAN.IS is stored as GARAN:BIST, the same row GARAN:BIST and GARAN add to.",
     "add --dry-run looks every symbol up and prints the same lines without saving.",
   ],
 };
 
+/**
+ * One word of a command line as a shell reads it back: as written when it
+ * holds nothing a shell treats specially (`NVDA`, `SAN:EPA`, `BRK.B`), else
+ * in single quotes (`'Altria Group'`, `'$nvda'`, `'AT&T'`).
+ */
+export function shellWord(word: string): string {
+  return /^[\p{L}\p{N}._:@%+,/][\p{L}\p{N}._:@%+,/=-]*$/u.test(word) ? word : `'${word.replaceAll("'", "'\\''")}'`;
+}
+
 /**
  * A row's line, and under it the listing a company's name was read as, the
- * company that had the symbol before the listing added, and the coin hint
- * when a bare coin ticker was read as something else.
+ * company that had the symbol before the listing added, the venue and
+ * currency of a bare symbol added on its only listing, abroad, and the coin
+ * hint when a bare coin ticker was read as something else.
  */
 function rowLines(row: SymbolRow, verb: Verb): string {
   return [
     rowLine(row, verb),
     ...row.readAs ? [`  ${cliStyles.muted(row.readAs)}`] : [],
     ...row.changeNote ? [`  ${cliStyles.warning(row.changeNote)}`] : [],
+    ...row.abroad ? [`  ${cliStyles.warning(row.abroad)}`] : [],
     ...row.hint ? [`  ${cliStyles.warning(row.hint)}`] : [],
   ].join("\n");
 }
@@ -71,9 +84,28 @@ function rowLine(row: SymbolRow, verb: Verb): string {
     case "not_found": return cliStyles.danger(`Not found: ${typed}${row.message && !NO_MATCH.test(row.message) ? ` (${reason(row.message, typed)})` : ""}${row.suggestion ? `; did you mean ${row.suggestion}?` : ""}`);
     case "needs_choice": return cliStyles.warning(`  ${row.message ?? typed}`);
     case "failed": return cliStyles.danger(`Not ${verb === "add" ? "added" : "removed"}: ${typed} (${failedReason(row, typed)})`);
+    // Named as written (`$$$`), and a figure says it is one.
+    case "not_a_symbol": return cliStyles.warning(`Not a symbol: ${row.input.trim()}${row.message?.includes("a number") ? " (a number)" : ""}`);
+    case "not_looked_up": return cliStyles.danger(`Not looked up: ${typed}`);
   }
 }
 
+/**
+ * The symbols of an add Gloom Cloud did not answer for, after the other
+ * lines: one line naming them as they were written, and one command that adds
+ * them all again, each entry one shell word (`'philip morris intl'`).
+ */
+function unansweredLines(rows: readonly SymbolRow[], retry: ((keys: string) => string) | undefined): string[] {
+  const unanswered = rows.filter((row) => row.status === "not_looked_up").map((row) => row.input.trim());
+  if (unanswered.length === 0) return [];
+  const count = unanswered.length === 1 ? "1 symbol" : `${unanswered.length} symbols`;
+  return [
+    "",
+    cliStyles.danger(`Gloom Cloud did not answer for ${count}, so ${unanswered.length === 1 ? "it was" : "they were"} not looked up: ${unanswered.join(", ")}`),
+    ...retry ? [`Try again in a minute: ${retry(unanswered.map(shellWord).join(" "))}`] : [],
+  ];
+}
+
 /**
  * What symbols that need a choice offer: the add that takes the companies
  * they trade as now, and the add that keeps each match as it is by naming its
@@ -82,7 +114,7 @@ function rowLine(row: SymbolRow, verb: Verb): string {
 function choiceOffers(choices: readonly SymbolRow[], retry: ((keys: string) => string) | undefined): { successors: string | null; matches: string | null } {
   const successors = [...new Set(choices.flatMap((row) => row.tradesAs ? [row.tradesAs] : []))];
   const matches = [...new Set(choices.flatMap((row) => row.listing ? [row.listing] : []))];
-  const command = (keys: string[]) => retry ? retry(keys.join(" ")) : keys.join(" ");
+  const command = (keys: string[]) => retry ? retry(keys.map(shellWord).join(" ")) : keys.join(" ");
   const one = choices.length === 1;
   return {
     successors: successors.length > 0 ? `Add what ${one ? "it trades" : "they trade"} as now: ${command(successors)}` : null,
@@ -131,18 +163,21 @@ export function printSymbolRows(
 ): void {
   const summary = `${collection.kind === "watchlist" ? "Watchlist" : "Portfolio"} "${collection.name}": ${summarizeSymbolRows(rows, verb, repeated)}`;
   const count = (status: SymbolStatus) => rows.filter((row) => row.status === status).length;
+  const extra = (key: string, status: SymbolStatus) => count(status) > 0 ? { [key]: count(status) } : {};
   const counts = verb === "add"
     ? { added: count("added"), alreadyListed: count("already_listed"), notFound: count("not_found"), notAdded: count("failed"),
-      ...count("needs_choice") > 0 ? { needsChoice: count("needs_choice") } : {} }
-    : { removed: count("removed"), notListed: count("not_listed"), notFound: count("not_found"), notRemoved: count("failed") };
+      ...extra("needsChoice", "needs_choice"), ...extra("notLookedUp", "not_looked_up"), ...extra("notASymbol", "not_a_symbol") }
+    : { removed: count("removed"), notListed: count("not_listed"), notFound: count("not_found"), notRemoved: count("failed"),
+      ...extra("notASymbol", "not_a_symbol") };
   ctx.printResult({
     data: rows,
     metadata: { [collection.kind]: collection.name, ...counts, repeated, summary, ...dryRun ? { dryRun } : {} },
     ...notes.length > 0 ? { warnings: [...notes] } : {},
   }, {
     text: () => [
-      ...rows.filter((row) => row.status !== "needs_choice").map((row) => rowLines(row, verb)),
+      ...rows.filter((row) => row.status !== "needs_choice" && row.status !== "not_looked_up").map((row) => rowLines(row, verb)),
       ...choiceLines(rows, retry),
+      ...unansweredLines(rows, retry),
       "",
       `${summary}${dryRunNote(dryRun)}`,
     ].join("\n"),
@@ -155,16 +190,18 @@ export function printSymbolRows(
 /**
  * `watchlist add` and `portfolio add` given one symbol: added as a symbol of a
  * list is (`addSymbol`), and said as one listing, added or already there with
- * its notes as warnings. A symbol a list would leave for a choice fails the
+ * its notes as warnings, after `notes` on what was left out of the input (the
+ * price of `ED 2.582,52`). A symbol a list would leave for a choice fails the
  * command, saying why, with what a list offers under the error; any other
  * failure fails it as the lookup's error, a busy service's to retry.
  */
 export async function addOneSymbol(
   ctx: CliCommandContext,
   market: MarketContext,
-  { symbol, exchange, collection, retry, reject, add }: {
+  { symbol, exchange, collection, notes: inputNotes = [], retry, reject, add }: {
     symbol: string;
     exchange: string | undefined;
+    notes?: readonly string[];
     collection: CollectionRef;
     /** The add of one listing, for the choices a failure names. */
     retry: (key: string) => string;
@@ -189,7 +226,8 @@ export async function addOneSymbol(
   const { change, formerIssuer, notes } = lookup;
   const data = { changed, ...listingFields(saved), [collection.kind]: collection.name,
     ...change ? { tickerChange: change } : {}, ...formerIssuer ? { formerIssuer } : {}, ...dryRun ? { dryRun } : {} };
-  const warnings = notes.length > 0 ? notes : undefined;
+  const said = [...inputNotes, ...notes, ...row.abroad ? [row.abroad] : []];
+  const warnings = said.length > 0 ? said : undefined;
   ctx.printResult({ data, warnings }, {
     text: () => changed
       ? `${cliStyles.success(`Added ${saved.label} to "${collection.name}".`)}${dryRunNote(dryRun)}`
@@ -208,7 +246,9 @@ export function retryNotice(ctx: CliCommandContext): (count: number, waitMs: num
 /**
  * The symbols an add or remove was given, failing the command when there are
  * none or the file cannot be read. An add reads a typed company's name with
- * `readNameEntries`; without it (a remove) every entry is its words.
+ * `readNameEntries`; without it (a remove) every entry is its words. `single`
+ * is the one symbol typed alone, and `notes` what the single command says
+ * beside it: none when it goes as typed, else what was left out of it.
  */
 export async function requireSymbolList(
   ctx: CliCommandContext,
@@ -218,16 +258,23 @@ export async function requireSymbolList(
   readEntries?: (entries: string[]) => Promise<string[]>,
 ): Promise<{ symbols: string[]; repeated: number; notes: string[]; single: string | null }> {
   try {
-    let typed: string[] = [];
+    // The first entries read are what was typed; a file's and standard input's come after.
+    let typed: string[] | null = null;
     const list = await readSymbolList({ args, file, readEntries: async (entries) => {
-      typed = readEntries ? await readEntries(entries) : splitSymbolWords(entries);
-      return typed;
+      const read = readEntries ? await readEntries(entries) : splitSymbolWords(entries);
+      typed ??= read;
+      return read;
     } });
-    if (list.symbols.length === 0) ctx.fail(usage);
+    // Only numbers or strays says what it left out, not only how to call the command.
+    if (list.symbols.length === 0) ctx.fail(list.notes.length > 0 ? ["No symbols.", ...list.notes].join(" ") : usage, list.notes.length > 0 ? usage : undefined);
     // One symbol typed alone keeps the single-symbol output and errors. It goes as typed, so a separator
-    // left on it (`UPST;`) is named by the listing it resolves to.
-    const single = file == null && !args.includes("-") && typed.length === 1 ? (args.length === 1 ? args[0]!.trim() : typed[0]!) : null;
-    return { ...list, single };
+    // left on it (`UPST;`) is named by the listing it resolves to; without the figure typed beside it
+    // (`ED 2.582,52`), which the notes name.
+    const entries: string[] = typed ?? [];
+    const split = splitSymbolArgs(args);
+    const asTyped = args.length === 1 && split.length === 1 && split[0] === entries[0];
+    const single = file == null && !args.includes("-") && entries.length === 1 ? (asTyped ? args[0]!.trim() : entries[0]!) : null;
+    return { ...list, single, notes: single && asTyped ? [] : list.notes };
   } catch (error) {
     if (error instanceof SymbolListError) ctx.fail(error.message, usage);
     throw error;
@@ -245,29 +292,33 @@ export async function removeSymbols({
   exchange,
   store,
   reject,
+  holds,
   remove,
 }: BulkSymbolsOptions & {
   reject?: (input: string) => Error | null;
+  /** Whether the list being changed holds the row: of two a symbol may be saved as (GARAN:BIST and GARAN.IS), the one it holds. */
+  holds?: (ticker: TickerRecord) => boolean;
   remove: (ticker: TickerRecord) => { changed: boolean; ticker: TickerRecord; extra?: Record<string, unknown> };
 }): Promise<SymbolRow[]> {
   const staged = new StagedTickerRepository(store);
   const rows: SymbolRow[] = [];
   for (const input of symbols) {
-    const refusal = reject?.(input);
+    const refusal = notASymbolError(input) ?? reject?.(input);
     if (refusal) {
       rows.push(failedRow(input, refusal));
       continue;
     }
-    let listing;
+    let listings;
     try {
-      listing = parseListingArg(input, exchange, { ownExchangeWins: true });
+      // GARAN.IS is the row of GARAN:BIST, else a row still saved under that key (a broker's).
+      listings = savedListingCandidates(input, exchange, { ownExchangeWins: true });
     } catch (error) {
       rows.push(failedRow(input, error instanceof Error ? error : new Error(String(error))));
       continue;
     }
-    const ticker = listing.symbol ? await loadSavedListing(staged, listing) : null;
+    const ticker = listings[0]!.symbol ? (await loadSavedListingOf(staged, listings, holds))?.ticker : null;
     if (!ticker) {
-      rows.push(failedRow(input, new Error(`Ticker "${listing.key}" was not found in your local data.`), "not_found"));
+      rows.push(failedRow(input, new Error(`Ticker "${listings[0]!.key}" was not found in your local data.`), "not_found"));
       continue;
     }
     const result = remove(ticker);