@tiagojct/subsub 0.22.0 → 0.24.0

package/src/subsub.ts

@@ -45,14 +45,15 @@ import { describeArgs, formatPreview, isEmptyPreview } from "./preview.ts";
 import { perMinuteWait, providerTrouble, TROUBLE_TEXT, TROUBLE_TEXT_PT } from "./keys.ts";
 import { headerLines, LIBRARIAN_THEME, type LibraryState, paintPreview, QUOTES, type Scheme, schemeFromAnsi, themeName } from "./look.ts";
 import { footerLines, toolRenderers, usageTotals } from "./chrome.ts";
+import { type CostLevel, costStatus, money, usesModel } from "./cost.ts";
 import { ApprovalView } from "./dialogs.ts";
 import { allowedFile, listNotes, OPENABLE, openFile } from "./files.ts";
-import { LibraryView, NotesView, type LibraryItem } from "./screens.ts";
+import { itemRef, LibraryView, NotesView, type LibraryItem } from "./screens.ts";
 import { glyphs, paintFromTheme, workingFrames } from "./skin.ts";
 import { loadWords, toolWord, type Words } from "./words.ts";
 import { systemAddition } from "./prompt.ts";
 import { logUsage } from "./usage.ts";
-import { gateKind, SERVER_PREFIXES, toolsFor, unavailableReason, outboundProblem } from "./roles.ts";
+import { activeTools, gateKind, SERVER_PREFIXES, toolsFor, unavailableReason, outboundProblem } from "./roles.ts";
 
 const MODE_ENTRY = "subsub-mode";
 
@@ -181,6 +182,8 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	let resumeTimer: ReturnType<typeof setTimeout> | undefined;
 	let turnStart = 0;
 	let turnTools = 0;
+	/** The cost level already noted in this session, so each note comes once. */
+	let costNoted: CostLevel | undefined;
 	let webCtx: ExtensionContext | undefined;
 	function emitWeb(): void {
 		const ctx = webCtx;
@@ -195,6 +198,8 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 			userName: cfg.userName ?? null,
 			vault: cfg.vault ?? null,
 			starbuck: starbuckEnabled(cfg),
+			// Shown next to the model only when there is a limit.
+			cost: cfg.costLimit ? { spent: usageTotals(ctx.sessionManager.getEntries()).cost, limit: cfg.costLimit } : null,
 		};
 		try {
 			ctx.ui.setStatus("subsub.web", JSON.stringify(state));
@@ -277,15 +282,11 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	/** /library: search as you type; Enter puts /read <item> in the box (the Librarian gets the key), ctrl+n puts /lit-note <item>. */
 	async function openLibrary(ctx: ExtensionContext): Promise<void> {
 		if (!screenOk(ctx)) return;
-		const ref = (it: LibraryItem) => it.citekey || it.key;
+		const ref = itemRef;
 		await ctx.ui.custom<void>(
 			(tui, theme, _keys, done) =>
 				new LibraryView({
-					search: async (query) => {
-						const r = await current().call("zotero_find_items", { query, limit: 25 });
-						if (r.isError) throw new Error(r.text);
-						return ((r.data as { items?: LibraryItem[] })?.items ?? []).filter((it) => it && it.key);
-					},
+					search: searchLibraries,
 					choose: (it) => {
 						ctx.ui.setEditorText(mode === "researcher" ? `/read ${ref(it)}` : ref(it));
 						done();
@@ -326,6 +327,33 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 				: text;
 	}
 
+	/** The group libraries in Zotero, from the last library check (read-only; searched with the user's library). */
+	let groups: Array<{ library: string; name: string }> = [];
+
+	/** Search the user's library, then each group library; a group's items carry the group. */
+	async function searchLibraries(query: string): Promise<LibraryItem[]> {
+		const first = await current().call("zotero_find_items", { query, limit: 25 });
+		if (first.isError) throw new Error(first.text);
+		const items = ((first.data as { items?: LibraryItem[] })?.items ?? []).filter((it) => it && it.key);
+		for (const g of groups) {
+			const r = await current().call("zotero_find_items", { query, limit: 25, library: g.library });
+			if (r.isError) continue;
+			for (const it of (r.data as { items?: LibraryItem[] })?.items ?? []) if (it?.key) items.push({ ...it, library: g.library, group: g.name });
+		}
+		return items;
+	}
+
+	async function refreshGroups(): Promise<void> {
+		if (!current().has("zotero_list_libraries")) return;
+		try {
+			const r = await current().call("zotero_list_libraries", {});
+			const all = ((r.data as { libraries?: Array<{ library: string; name?: string }> })?.libraries ?? []);
+			groups = r.isError ? [] : all.filter((l) => l.library?.startsWith("group:")).map((l) => ({ library: l.library, name: l.name || l.library }));
+		} catch {
+			groups = [];
+		}
+	}
+
 	async function refreshLibrary(): Promise<void> {
 		try {
 			const st = await current().call("zotero_status", {});
@@ -336,6 +364,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 				const ov = await current().call("zotero_library_overview", {});
 				const o = (ov.data ?? {}) as Record<string, unknown>;
 				Object.assign(library, { zotero: "reachable", items: o.items as number, toReview: o.awaiting_review as number });
+				await refreshGroups();
 			}
 		} catch {
 			library.zotero = "down";
@@ -410,7 +439,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	/** Set the mode's tools and, unless `switchModel` is false, the mode's model. */
 	async function applyMode(ctx: ExtensionContext, next: Mode, remember: boolean, switchModel = true): Promise<void> {
 		mode = next;
-		pi.setActiveTools(toolsFor(mode, registered(), toolOpts()));
+		pi.setActiveTools(activeTools(pi.getActiveTools(), toolsFor(mode, registered(), toolOpts()), standalone));
 		const spec = cfg.models[mode];
 		if (spec && switchModel) {
 			const i = spec.indexOf("/");
@@ -442,6 +471,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	}
 
 	pi.on("session_start", async (_event, ctx) => {
+		costNoted = undefined; // a new or another conversation: its own cost
 		if (!bridge) {
 			const b = new Bridge();
 			await b.start(deps.specs ?? serverSpecs(cfg), cfg.startTimeout * 1000);
@@ -531,6 +561,17 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	// A per-minute limit (free tiers): wait as long as the provider says, then continue the task,
 	// up to three times per request of the user. Anything the user types cancels the wait.
 	pi.on("agent_end", async (_event, ctx) => {
+		const spent = costStatus(usageTotals(ctx.sessionManager.getEntries()).cost, cfg.costLimit);
+		if (spent.level !== "ok" && costNoted !== spent.level) {
+			costNoted = spent.level;
+			ctx.ui.notify(
+				spent.level === "near"
+					? L(`Sub-Sub: this conversation has used 80% of your cost limit (${money(spent.spent)} of ${money(spent.limit!)}).`, `Sub-Sub: esta conversa já usou 80% do seu limite de custo (${money(spent.spent)} de ${money(spent.limit!)}).`)
+					: L(`Sub-Sub: this conversation has reached your cost limit (${money(spent.spent)} of ${money(spent.limit!)}). Sub-Sub will ask before each new request.`, `Sub-Sub: esta conversa atingiu o seu limite de custo (${money(spent.spent)} de ${money(spent.limit!)}). O Sub-Sub vai perguntar antes de cada pedido novo.`),
+				"warning",
+			);
+		}
+		if (cfg.costLimit) emitWeb(); // the cost next to the model in the browser view
 		if (turnStart) logUsage(cfg.usageLog, { ev: "turn", seconds: Math.round((Date.now() - turnStart) / 1000), tools: turnTools, error: providerTrouble(lastError) ?? (lastError ? "other" : undefined) });
 		turnStart = 0;
 		const wait = perMinuteWait(lastError);
@@ -558,6 +599,19 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 		resumeTimer = undefined;
 		resumes = 0;
 		const cmd = /^\/([\w-]+)(?:\s|$)/.exec(event.text.trim())?.[1];
+		// Over the cost limit: ask before each new request to the model (a running answer is not cut).
+		const spent = costStatus(usageTotals(ctx.sessionManager.getEntries()).cost, cfg.costLimit);
+		if (spent.level === "over" && usesModel(event.text)) {
+			const text = L(
+				`This conversation has cost ${money(spent.spent)}, over your limit of ${money(spent.limit!)} (costLimit in the settings). Send this request to the model?`,
+				`Esta conversa já custou ${money(spent.spent)}, acima do seu limite de ${money(spent.limit!)} (costLimit nas definições). Enviar este pedido ao modelo?`,
+			);
+			const go = ctx.hasUI ? await ctx.ui.confirm(L("Sub-Sub: cost limit", "Sub-Sub: limite de custo"), text) : false;
+			if (!go) {
+				if (!ctx.hasUI) ctx.ui.notify(text, "warning");
+				return { action: "handled" };
+			}
+		}
 		// The usage log keeps the kind of request and its length, never its text.
 		if (cmd !== "subsub-refresh") logUsage(cfg.usageLog, { ev: "ask", kind: cmd ? `/${cmd}` : "message", words: event.text.trim().split(/\s+/).filter(Boolean).length });
 		if (mode === "librarian" && cmd && RESEARCH_PROMPTS.includes(cmd)) {
@@ -578,7 +632,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 	});
 
 	pi.on("before_agent_start", async (event, ctx) => ({
-		systemPrompt: `${event.systemPrompt}\n\n${systemAddition(mode, cfg, ctx.cwd)}`,
+		systemPrompt: `${event.systemPrompt}\n\n${systemAddition(mode, cfg, ctx.cwd, { zoteroDown: library.zotero === "down" })}`,
 	}));
 
 	/** Model test (subsub-bench): record every change instead of asking, and apply none. */
@@ -846,6 +900,8 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 							? ov.text
 							: `Items: ${o.items}. Without tags: ${o.without_manual_tags}. Missing facets: ${JSON.stringify(o.missing_facet)}. Awaiting review (_agent): ${o.awaiting_review}.`,
 					);
+					await refreshGroups();
+					if (groups.length) lines.push(`Group libraries (read-only, searched with yours): ${groups.map((g) => g.name).join(", ")}.`);
 				}
 			}
 			redraw();
@@ -870,8 +926,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 			const q = String(args ?? "").trim();
 			let out: Record<string, unknown>;
 			try {
-				const r = await current().call("zotero_find_items", { query: q, limit: 25 });
-				out = r.isError ? { error: r.text } : { items: (r.data as { items?: unknown[] })?.items ?? [] };
+				out = { items: await searchLibraries(q) };
 			} catch (err) {
 				out = { error: (err as Error).message };
 			}

package/src/tui-view.ts

@@ -252,7 +252,7 @@ export function sideLines(s: SideState, width: number, rows: number, p: Paint, g
 	const w = Math.max(16, width);
 	const words = SIDE_WORDS[s.lang];
 	const mode = s.mode === "librarian" ? "Librarian" : "Researcher";
-	const lib = s.library.zotero === "reachable" ? `${s.library.items ?? "?"} ${s.lang === "pt" ? "itens" : "items"}` : s.library.zotero === "down" ? `${g.hollow} Zotero` : "Zotero...";
+	const lib = s.library.zotero === "reachable" ? `${s.library.items ?? "?"} ${s.lang === "pt" ? "itens" : "items"}` : s.library.zotero === "down" ? `${g.hollow} Zotero: ${s.lang === "pt" ? "só pesquisa" : "search only"}` : "Zotero...";
 	const lines = [p.mark(cut(` Sub-Sub ${s.version}`, w)), p.text(cut(` ${mode}`, w)), p.muted(cut(` ${lib}`, w)), p.dim(cut(` ${s.model}`, w)), rule(w, "solid", p.muted, g)];
 	for (const [key, word] of [["F2", words.notes], ["F3", words.library], ["F4", words.actions], ["F5", words.mode]] as const) lines.push(p.muted(cut(` ${key.padEnd(4)}${word}`, w)));
 	lines.push(rule(w, "solid", p.muted, g), p.text(cut(` ${words.conversations}`, w)));

package/src/tui.ts

@@ -12,12 +12,15 @@ import { CombinedAutocompleteProvider, Editor, HStack, Markdown, matchesKey, Pro
 import { agentDirFor, chooseCwd, PACKAGE_DIR, packageVersion } from "./cli.ts";
 import { fill, footerLines } from "./chrome.ts";
 import { loadConfig, uiLanguage } from "./config.ts";
+import { modelsAfterLogin } from "./init.ts";
 import { type LibraryState, LIBRARIAN_THEME, DEFAULT_THEME, paintPreview, QUOTES } from "./look.ts";
 import { PURPOSES } from "./read.ts";
 import { allowedFile, listNotes, OPENABLE, openFile } from "./files.ts";
 import { Agent, findLibrary, isDialog, Side, withHints } from "./rpc.ts";
+import { KEY_PROVIDERS, saveApiKey } from "./keys.ts";
+import { CUSTOM_DEFAULT_NAME, saveCustomProvider } from "./providers.ts";
 import { ApprovalView } from "./dialogs.ts";
-import { type Choice, ChoiceView, InputView, LibraryView, type LibraryItem, NotesView } from "./screens.ts";
+import { itemRef, type Choice, ChoiceView, InputView, LibraryView, type LibraryItem, NotesView } from "./screens.ts";
 import { glyphs as chooseGlyphs, type Glyphs, workingFrames } from "./skin.ts";
 import { bannerLines, type Entry, entriesFromMessages, loadPalette, messageText, type Palette, schemeFromEnv, type Scheme, SIDE_WIDTH, sideLines, transcriptLines } from "./tui-view.ts";
 import { loadWords, type Words } from "./words.ts";
@@ -58,6 +61,10 @@ export interface TuiDeps {
 	searchDelay?: number;
 	/** Called when the user quits or pi stops. */
 	onQuit?: (code: number) => void;
+	/** pi's agent folder, where /login saves keys (auth.json) and other providers (models.json). */
+	agentDir?: string;
+	/** After /login saved a provider: set the models when none are set (spec: the other provider's model). */
+	afterLogin?: (provider: string, spec?: string) => void;
 }
 
 const SHORT = (s: string, n: number) => (s.length > n ? `${s.slice(0, n - 3)}...` : s);
@@ -213,6 +220,8 @@ export class TuiApp {
 			{ name: "library", description: pt ? "Pesquisar na biblioteca à medida que escreve" : "Search your library as you type" },
 			{ name: "actions", description: pt ? "As ações da vista no navegador" : "The actions of the browser view" },
 			{ name: "sessions", description: pt ? "Conversas anteriores" : "Earlier conversations" },
+			{ name: "resume", description: pt ? "Retomar uma conversa anterior" : "Resume an earlier conversation" },
+			{ name: "login", description: pt ? "Ligar um fornecedor do modelo" : "Connect a model provider" },
 			{ name: "new", description: pt ? "Uma conversa nova" : "A new conversation" },
 			{ name: "model", description: pt ? "Escolher o modelo" : "Choose the model" },
 			{ name: "restart", description: pt ? "Recomeçar o pi na mesma conversa" : "Start pi again in the same conversation" },
@@ -492,7 +501,7 @@ export class TuiApp {
 	/** Alt+L, /library: search as you type; Enter puts /read <item> in the editor (the Librarian gets the key), ctrl+n puts /lit-note <item>. */
 	async openLibrary(): Promise<void> {
 		if (this.overlay) return;
-		const ref = (it: LibraryItem) => it.citekey || it.key;
+		const ref = itemRef;
 		this.open(
 			new LibraryView({
 				...this.common(),
@@ -558,6 +567,70 @@ export class TuiApp {
 		);
 	}
 
+	/** Ask one line on its own screen; undefined when the user presses Esc. */
+	private ask(title: string, opts: { placeholder?: string; secret?: boolean } = {}): Promise<string | undefined> {
+		return new Promise((resolve) => {
+			this.open(
+				new InputView({
+					...this.common(),
+					title,
+					...opts,
+					submit: (text) => (this.close(), resolve(text.trim())),
+					cancel: () => (this.close(), resolve(undefined)),
+				}),
+				true,
+			);
+		});
+	}
+
+	/** /login: a provider that pi has (its API key) or another provider that speaks the OpenAI API; then pi starts again. */
+	async openLogin(): Promise<void> {
+		if (this.overlay) return;
+		const pt = this.lang === "pt";
+		const agentDir = this.d.agentDir;
+		if (!agentDir) return void this.notice("error", pt ? "Sem pasta do agente: use subsub web." : "No agent folder: use subsub web.");
+		const choices: Choice[] = [
+			...KEY_PROVIDERS.map((p) => ({ label: p.label, hint: p.url, value: p.id })),
+			{ label: pt ? "Outro fornecedor (API da OpenAI)" : "Another provider (OpenAI API)", hint: pt ? "servidor da instituição, Ollama, LM Studio" : "your institution's server, Ollama, LM Studio", value: CUSTOM_DEFAULT_NAME },
+		];
+		const provider = await new Promise<string | undefined>((resolve) => {
+			this.open(
+				new ChoiceView({
+					...this.common(),
+					title: pt ? "Ligar um fornecedor" : "Connect a provider",
+					choices,
+					choose: (v) => (this.close(), resolve(v)),
+					cancel: () => (this.close(), resolve(undefined)),
+				}),
+				true,
+			);
+		});
+		if (!provider) return;
+		let spec: string | undefined;
+		try {
+			if (provider === CUSTOM_DEFAULT_NAME) {
+				const baseUrl = await this.ask(pt ? "Endereço do servidor" : "Server address", { placeholder: "https://llm.example.org/v1" });
+				if (baseUrl === undefined) return;
+				const model = await this.ask(pt ? "Identificador do modelo" : "Model id");
+				if (model === undefined) return;
+				const key = await this.ask(pt ? "Chave de API (Enter sem chave, num servidor local)" : "API key (Enter for none, for a local server)", { secret: true });
+				if (key === undefined) return;
+				[spec] = saveCustomProvider(agentDir, { name: CUSTOM_DEFAULT_NAME, baseUrl, apiKey: key, models: [model] });
+			} else {
+				const label = KEY_PROVIDERS.find((p) => p.id === provider)?.label ?? provider;
+				const key = await this.ask(pt ? `Chave de API de ${label}` : `API key for ${label}`, { secret: true });
+				if (!key) return;
+				saveApiKey(agentDir, provider, key);
+			}
+			this.d.afterLogin?.(provider, spec);
+		} catch (err) {
+			this.notice("error", (err as Error).message);
+			return void this.tui.requestRender();
+		}
+		this.notice("info", pt ? "Guardado. O pi recomeça com o fornecedor." : "Saved. pi starts again with the provider.");
+		await this.restart();
+	}
+
 	/** /new: an empty conversation. */
 	async newConversation(): Promise<void> {
 		try {
@@ -633,12 +706,12 @@ export class TuiApp {
 		this.editor.addToHistory?.(line);
 		this.editor.setText("");
 		if (/^\/(quit|exit)\s*$/.test(line)) return void (await this.quit());
-		const unavailable = /^\/(login|logout|settings|tree|resume|fork|share|export|import|hotkeys|reload)\b/.exec(line);
+		const unavailable = /^\/(logout|settings|tree|fork|share|export|import|hotkeys|reload)\b/.exec(line);
 		if (unavailable) {
 			this.notice("info", this.lang === "pt" ? `/${unavailable[1]} não existe em subsub tui. Use subsub no terminal ou subsub web.` : `/${unavailable[1]} is not in subsub tui. Use subsub in the terminal, or subsub web.`);
 			return void this.tui.requestRender();
 		}
-		const own: Record<string, () => Promise<void> | void> = { "/restart": () => this.restart(), "/model": () => this.openModels(), "/notes": () => this.openNotes(), "/library": () => this.openLibrary(), "/actions": () => this.openActions(), "/sessions": () => this.openSessions(), "/new": () => this.newConversation() };
+		const own: Record<string, () => Promise<void> | void> = { "/restart": () => this.restart(), "/model": () => this.openModels(), "/notes": () => this.openNotes(), "/library": () => this.openLibrary(), "/actions": () => this.openActions(), "/sessions": () => this.openSessions(), "/resume": () => this.openSessions(), "/login": () => this.openLogin(), "/new": () => this.newConversation() };
 		if (own[line]) return void (await own[line]());
 		try {
 			await this.d.agent.request({ type: "prompt", message: line, ...(this.busy ? { streamingBehavior: "followUp" } : {}) });
@@ -703,6 +776,8 @@ export async function runTui(args: string[], env: NodeJS.ProcessEnv = process.en
 			themes: { researcher: typeof cfg.themes === "string" ? cfg.themes : undefined, librarian: cfg.themesLibrarian ?? (typeof cfg.themes === "string" ? cfg.themes : undefined) },
 			sessions: async () => (await SessionManager.list(cwd)).filter((s) => s.messageCount > 0).sort((a, b) => +new Date(b.modified) - +new Date(a.modified)).map((s) => ({ title: s.name ?? s.firstMessage.slice(0, 60), path: s.path })),
 			onQuit: resolve,
+			agentDir: env.PI_CODING_AGENT_DIR,
+			afterLogin: (provider, spec) => modelsAfterLogin(env, provider, spec),
 		});
 		void app.start();
 	});

package/src/web.ts

@@ -21,8 +21,9 @@ import { homedir } from "node:os";
 import { basename, dirname, extname, join, normalize, relative, resolve, sep } from "node:path";
 import { agentDirFor, chooseCwd, PACKAGE_DIR, packageVersion } from "./cli.ts";
 import { configPath, loadConfig, RECOMMENDED_MODELS, readConfigFile, saveConfig, type SubsubConfig, uiLanguage, withStarbuck } from "./config.ts";
-import { TESTED_MODELS } from "./init.ts";
+import { modelsAfterLogin } from "./init.ts";
 import { KEY_PROVIDERS, saveApiKey } from "./keys.ts";
+import { CUSTOM_DEFAULT_NAME, saveCustomProvider } from "./providers.ts";
 
 // ---------------------------------------------------------------- options
 
@@ -479,9 +480,13 @@ export async function startWeb(opts: WebOptions, env: NodeJS.ProcessEnv = proces
 					if (busy || switching) return send(res, 409, { error: "busy" });
 					const body = await readJson(req);
 					return withRestart(res, () => {
+						if (body.provider === CUSTOM_DEFAULT_NAME) {
+							// Another provider (OpenAI API): models.json; its model becomes the default when none is set.
+							const [spec] = saveCustomProvider(agentDir, { name: CUSTOM_DEFAULT_NAME, baseUrl: String(body.baseUrl ?? ""), apiKey: String(body.key ?? ""), models: [String(body.model ?? "")] });
+							return modelsAfterLogin(env, CUSTOM_DEFAULT_NAME, spec);
+						}
 						saveApiKey(agentDir, String(body.provider ?? ""), String(body.key ?? ""));
-						const current = loadConfig(env);
-						if (body.provider === "opencode-go" && Object.keys(current.models).length === 0) saveConfig({ models: TESTED_MODELS, model: undefined }, env);
+						modelsAfterLogin(env, String(body.provider ?? ""));
 					});
 				}
 				case "GET /api/notes":