@tiagojct/subsub 0.11.4 → 0.12.1

package/src/web.ts

@@ -22,7 +22,7 @@ import { homedir } from "node:os";
 import { extname, join, normalize, resolve, sep } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 import { agentDirFor, chooseCwd, PACKAGE_DIR, packageVersion } from "./cli.ts";
-import { configPath, expand, loadConfig, RECOMMENDED_MODELS, readConfigFile, saveConfig, type SubsubConfig, withStarbuck } from "./config.ts";
+import { configPath, expand, loadConfig, RECOMMENDED_MODELS, readConfigFile, saveConfig, type SubsubConfig, uiLanguage, withStarbuck } from "./config.ts";
 import { TESTED_MODELS } from "./init.ts";
 import { KEY_PROVIDERS, saveApiKey } from "./keys.ts";
 import { obsidianRoot } from "./layout.ts";
@@ -56,10 +56,7 @@ export function parseWebArgs(args: string[]): WebOptions {
 	return o;
 }
 
-/** "pt" when the language setting is Portuguese, else "en". */
-export function uiLanguage(language: string | undefined): "pt" | "en" {
-	return /portug|^pt\b|^pt-/i.test(language ?? "") ? "pt" : "en";
-}
+export { uiLanguage } from "./config.ts";
 
 // ---------------------------------------------------------------- providers (API keys)
 

package/web/app.css

@@ -883,3 +883,14 @@ body > p.empty { text-align: center; color: var(--muted); padding: 30vh 1rem 0;
 @media (prefers-reduced-motion: reduce) {
 	*, *::before, *::after { animation: none !important; transition: none !important; }
 }
+
+/* First run: what is still missing */
+.setup { margin-block: 1.4rem 1rem; padding: 0.9rem 1rem; border: 1px solid var(--rule); border-left: 3px solid var(--accent); border-radius: 6px; background: var(--raised); text-align: left; max-width: 40rem; }
+.setup h2 { margin: 0 0 0.5rem; font-size: 0.95rem; }
+.setup ol { list-style: none; margin: 0; padding: 0; display: grid; gap: 0.55rem; }
+.setup li { display: grid; grid-template-columns: 4.5rem 1fr auto; gap: 0.6rem; align-items: start; font-size: 0.88rem; line-height: 1.45; }
+.setup li > * { min-width: 0; }
+.setup .mark { font-size: 0.72rem; text-transform: uppercase; letter-spacing: 0.05em; padding-top: 0.15rem; color: var(--muted); }
+.setup li.todo .mark { color: var(--rem); }
+.setup li.ok .step-text { color: var(--muted); }
+@media (max-width: 560px) { .setup li { grid-template-columns: 1fr; gap: 0.2rem; } }

package/web/app.js

@@ -370,6 +370,7 @@ function scrollDown(force = false) {
 
 // A provider error in plain words (keep in step with providerTrouble in src/keys.ts), with the raw text below.
 function troubleOf(text) {
+	if (/requires Global regions|not available in your region|region.{0,40}not (supported|allowed)/i.test(text)) return "region";
 	if (/RESOURCE_EXHAUSTED|\b429\b|quota|rate.?limit|too many requests|usage limit/i.test(text)) return "quota";
 	if (/\b(503|529)\b|UNAVAILABLE|high demand|overloaded/i.test(text)) return "busy";
 	if (/RECITATION|SAFETY|PROHIBITED_CONTENT/.test(text)) return "blocked";
@@ -395,6 +396,36 @@ function clearEmpty() {
 	log.querySelector(".empty")?.remove();
 }
 
+/** First run: what is still missing (Zotero, a model, the servers), each with its fix. Hidden when all is ready. */
+function setupList() {
+	const L = state?.library;
+	const m = state?.model ?? session?.model;
+	const steps = [
+		{ ok: L?.zotero === "reachable", wait: !L || L.zotero === "checking", text: t("stepZotero") },
+		{ ok: Boolean(m && m.id && m.id !== "unknown"), text: t("stepModel"), action: { label: t("connect"), run: openModels } },
+		{ ok: !state?.down?.length, text: t("stepServers", { x: (state?.down ?? []).join(", ") }) },
+	];
+	if (steps.every((x) => x.ok || x.wait)) return null;
+	return el(
+		"div",
+		{ class: "setup" },
+		el("h2", { text: t("setupTitle") }),
+		el(
+			"ol",
+			{},
+			steps.map((x) =>
+				el(
+					"li",
+					{ class: x.ok ? "ok" : x.wait ? "wait" : "todo" },
+					el("span", { class: "mark", text: x.ok ? t("stepDone") : x.wait ? "…" : t("stepTodo") }),
+					el("span", { class: "step-text", text: x.ok ? x.text.split(". ")[0] : x.text }),
+					!x.ok && x.action ? el("button", { type: "button", class: "primary small-btn", text: x.action.label, onclick: x.action.run }) : null,
+				),
+			),
+		),
+	);
+}
+
 function renderEmpty() {
 	if (log.children.length) return;
 	const s = SUGGESTIONS[mode()].map((x) => x[lang] ?? x.en);
@@ -405,6 +436,7 @@ function renderEmpty() {
 			el("p", { class: "kicker", text: t(mode()) }),
 			el("h1", { text: t("emptyTitle") }),
 			el("p", { class: "lede", text: t(mode() === "librarian" ? "emptyLibrarian" : "emptyResearcher") }),
+			setupList(),
 			el(
 				"div",
 				{ class: "chips" },
@@ -505,6 +537,23 @@ function finishTool(id, result, isError) {
 	row.querySelector("pre")?.remove();
 	if (text) row.append(el("pre", { text: text.length > 6000 ? `${text.slice(0, 6000)}\n...` : text }));
 	if (isError) row.querySelector(".label").textContent = `${toolLabel(row.dataset.name)} (${t("failed")})`;
+	// An applied library change gets an Undo button; it runs /undo with its id, which previews first.
+	const jid = !isError && !/undo/.test(row.dataset.name) && /"journal_id":\s*"(\d{8}-\d{6}-\d{2}-[a-z_]+)"/.exec(text ?? "")?.[1];
+	if (jid && !row.querySelector(".undo")) {
+		row.querySelector("summary").append(
+			el("button", {
+				type: "button",
+				class: "open undo",
+				text: t("undo"),
+				title: t("undoTitle"),
+				onclick: (e) => {
+					e.preventDefault();
+					if (busy) return note(t("busy"), "warning");
+					sendMessage(`/undo ${jid}`);
+				},
+			}),
+		);
+	}
 }
 
 function attachCopyButtons(root) {
@@ -925,6 +974,7 @@ async function openModels() {
 		const free = { google: "freeGoogle", openrouter: "freeOpenRouter" }[sel.value];
 		$("login-free").hidden = !free;
 		$("login-free").textContent = free ? t(free) : "";
+		$("login-where").textContent = p?.where ? t(`where_${p.where}`) : "";
 	};
 	sel.onchange = setLink;
 	setLink();

package/web/i18n.js

@@ -53,6 +53,7 @@ export const STRINGS = {
 		rec_tested: "tested default",
 		rec_cheaper: "tested, cheaper",
 		rec_free: "tested, free",
+		rec_eu: "tested, EU",
 		needsKey: "needs a key from {x}",
 		noModels: "No models yet. Connect a provider below.",
 		connectProvider: "Connect a provider",
@@ -67,7 +68,20 @@ export const STRINGS = {
 		trouble_busy: "The model provider is busy at the moment. Try again in a few minutes, or choose another model with the model button.",
 		trouble_blocked: "The model provider stopped the reply (for example, because it repeated a source word for word). Ask again in other words, or choose another model.",
 		trouble_key: "The model provider did not accept the API key. Enter it again with the model button.",
+		trouble_region: "The provider refuses this model with your account's region setting. In OpenCode, allow Global regions in the workspace's Privacy settings, or choose a model your region allows with the model button.",
 		details: "Details",
+		undo: "Undo",
+		where_eu: "Where your data goes: servers in the European Union. Covered by the GDPR, the choice for material you would not send outside the EU.",
+		where_us: "Where your data goes: servers outside the EU, mostly in the United States, under the provider's terms for the EU. Read them before you send unpublished or sensitive material.",
+		where_cn: "Where your data goes: servers in China. Do not send unpublished or sensitive material.",
+		where_varies: "Where your data goes: it depends on the model. Each model runs at another company, in the United States, China or elsewhere. For material you would not send outside the EU, choose Mistral.",
+		setupTitle: "Before you start",
+		stepZotero: "Zotero is open and lets Sub-Sub in. If not: start Zotero, then in Settings > Advanced turn on \"Allow other applications on this computer to communicate with Zotero\".",
+		stepModel: "A model is connected. If not: select Connect and paste an API key. To try Sub-Sub for free, choose Google Gemini and get a free key there.",
+		stepServers: "The Zotero servers are running. If not ({x}): close Sub-Sub, open a terminal and type subsub doctor. Each line marked FIX says what to do.",
+		stepDone: "done",
+		stepTodo: "to do",
+		undoTitle: "Undo this change. Sub-Sub shows what it would restore before it changes anything.",
 		oauthNote: "To sign in through a provider's website (for example with a subscription), open a terminal, type subsub, then /login.",
 		saving: "Saving",
 		saved: "Saved.",
@@ -164,6 +178,7 @@ export const STRINGS = {
 		rec_tested: "testado, por omissão",
 		rec_cheaper: "testado, mais barato",
 		rec_free: "testado, gratuito",
+		rec_eu: "testado, UE",
 		needsKey: "precisa de uma chave de {x}",
 		noModels: "Ainda não há modelos. Ligue um fornecedor abaixo.",
 		connectProvider: "Ligar um fornecedor",
@@ -178,7 +193,20 @@ export const STRINGS = {
 		trouble_busy: "O fornecedor do modelo está sobrecarregado neste momento. Tente outra vez dentro de alguns minutos ou escolha outro modelo no botão do modelo.",
 		trouble_blocked: "O fornecedor do modelo interrompeu a resposta (por exemplo, por repetir uma fonte palavra por palavra). Peça outra vez por outras palavras ou escolha outro modelo.",
 		trouble_key: "O fornecedor do modelo não aceitou a chave da API. Volte a introduzi-la no botão do modelo.",
+		trouble_region: "O fornecedor recusa este modelo com a definição de região da sua conta. No OpenCode, permita as regiões globais (Global) nas definições de privacidade do workspace, ou escolha no botão do modelo um modelo que a sua região permita.",
 		details: "Detalhes",
+		undo: "Anular",
+		where_eu: "Para onde vão os seus dados: servidores na União Europeia. Abrangidos pelo RGPD; a escolha para material que não enviaria para fora da UE.",
+		where_us: "Para onde vão os seus dados: servidores fora da UE, sobretudo nos Estados Unidos, com os termos do fornecedor para a UE. Leia-os antes de enviar material inédito ou sensível.",
+		where_cn: "Para onde vão os seus dados: servidores na China. Não envie material inédito ou sensível.",
+		where_varies: "Para onde vão os seus dados: depende do modelo. Cada modelo funciona noutra empresa, nos Estados Unidos, na China ou noutro país. Para material que não enviaria para fora da UE, escolha a Mistral.",
+		setupTitle: "Antes de começar",
+		stepZotero: "O Zotero está aberto e deixa o Sub-Sub entrar. Se não: abra o Zotero e, em Definições > Avançado, ative \"Allow other applications on this computer to communicate with Zotero\".",
+		stepModel: "Há um modelo ligado. Se não: selecione Ligar e cole uma chave de API. Para experimentar sem pagar, escolha Google Gemini e obtenha lá uma chave gratuita.",
+		stepServers: "Os servidores do Zotero estão a funcionar. Se não ({x}): feche o Sub-Sub, abra um terminal e escreva subsub doctor. Cada linha marcada FIX diz o que fazer.",
+		stepDone: "feito",
+		stepTodo: "por fazer",
+		undoTitle: "Anular esta alteração. O Sub-Sub mostra o que repõe antes de alterar alguma coisa.",
 		oauthNote: "Para entrar através do site de um fornecedor (por exemplo, com uma subscrição), abra um terminal, escreva subsub e depois /login.",
 		saving: "A guardar",
 		saved: "Guardado.",
@@ -272,6 +300,10 @@ export const SUGGESTIONS = {
 export const TOOLS = {
 	en: {
 		find_items: "search the library",
+		standalone_items: "list files without a parent item",
+		set_parent_items: "give files a parent item",
+		find_reference: "look up a reference",
+		web_search: "search the web",
 		get_item: "read an item",
 		get_fulltext: "read the full text",
 		library_overview: "library overview",
@@ -328,6 +360,10 @@ export const TOOLS = {
 	},
 	pt: {
 		find_items: "pesquisar na biblioteca",
+		standalone_items: "listar ficheiros sem item principal",
+		set_parent_items: "dar um item principal aos ficheiros",
+		find_reference: "procurar uma referência",
+		web_search: "pesquisar na web",
 		get_item: "ler um item",
 		get_fulltext: "ler o texto completo",
 		library_overview: "resumo da biblioteca",

package/web/index.html

@@ -122,6 +122,7 @@
 				<input type="password" id="login-key" autocomplete="off" spellcheck="false" required>
 			</label>
 			<p class="small"><a id="login-link" href="#" target="_blank" rel="noopener noreferrer" data-i18n="getKey">Get a key</a></p>
+			<p class="small muted" id="login-where"></p>
 			<p class="small free-note" id="login-free" hidden></p>
 			<p class="small muted" data-i18n="keyNote"></p>
 			<div class="modal-buttons"><button type="submit" class="primary" id="login-save" data-i18n="save">Save</button></div>