@tiagojct/subsub 0.6.1 → 0.7.0

package/src/subsub.ts

@@ -8,24 +8,41 @@
  * - Profiles (reader, scholar, author, editor) set what Sub-Sub writes and which
  *   tools it offers; /profile changes it.
  * - Commands: /librarian, /researcher, /profile, /subsub, /history, /undo.
+ * - Add-on: with "addons": ["starbuck"], Starbuck runs as a third server
+ *   ("verify") for reference checks; its tools belong to researcher mode.
  *
  * The Python servers start in session_start (not in the factory) and stop in
  * session_shutdown. Tools are registered once and use the current bridge.
  */
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Bridge, type ServerSpec } from "./bridge.ts";
-import { expand, findUv, isProfile, loadConfig, type Mode, type Profile, saveConfig, serverCommand, type SubsubConfig, who } from "./config.ts";
-import { profileList, profileSpec } from "./profiles.ts";
+import {
+	expand,
+	findUv,
+	isProfile,
+	loadConfig,
+	type Mode,
+	parseEnvFile,
+	type Profile,
+	saveConfig,
+	serverCommand,
+	starbuckCommand,
+	starbuckEnabled,
+	type SubsubConfig,
+	who,
+} from "./config.ts";
+import { profileList, profileSpec, promptBlocked } from "./profiles.ts";
 import { coerceArgs, loosenArrays } from "./args.ts";
+import { applyEdits, checkLiteratureNote } from "./notes.ts";
 import { buildPolicy, judgePath, normalizeToolPath, realish, within } from "./paths.ts";
 import { describeArgs, formatPreview } from "./preview.ts";
 import { headerLines, type LibraryState, paintPreview, QUOTES, type Scheme, schemeFromAnsi, themeName } from "./look.ts";
 import { systemAddition } from "./prompt.ts";
-import { gateKind, toolsFor, unavailableReason } from "./roles.ts";
+import { gateKind, SERVER_PREFIXES, toolsFor, unavailableReason } from "./roles.ts";
 
 export interface SubsubDeps {
 	config?: SubsubConfig;
@@ -48,12 +65,30 @@ function ownVersion(): string {
 
 export { findUv };
 
-export function serverSpecs(cfg: SubsubConfig): ServerSpec[] {
+export function serverSpecs(cfg: SubsubConfig, processEnv: NodeJS.ProcessEnv = process.env): ServerSpec[] {
 	const env: Record<string, string> = cfg.envFile ? { ZOTERO_MCP_ENV: cfg.envFile } : {};
-	return [
-		{ name: "zotero", ...serverCommand(cfg, "zotero-local-mcp"), env },
-		{ name: "scholar", ...serverCommand(cfg, "zotero-scholar-mcp"), env },
+	const specs: ServerSpec[] = [
+		{ name: "zotero", ...serverCommand(cfg, "zotero-local-mcp", [], processEnv), env },
+		{ name: "scholar", ...serverCommand(cfg, "zotero-scholar-mcp", [], processEnv), env },
 	];
+	if (starbuckEnabled(cfg)) specs.push({ name: "verify", ...starbuckCommand(cfg, processEnv), env: starbuckEnv(cfg, processEnv) });
+	return specs;
+}
+
+/**
+ * Starbuck reads its contact address and API keys from the environment. Sub-Sub keeps
+ * them in the zotero-local-mcp env file, so they are passed on (the environment wins).
+ */
+export function starbuckEnv(cfg: Pick<SubsubConfig, "envFile">, processEnv: NodeJS.ProcessEnv = process.env): Record<string, string> {
+	const file = cfg.envFile ? parseEnvFile(cfg.envFile) : {};
+	const out: Record<string, string> = {};
+	const email = processEnv.STARBUCK_EMAIL || file.STARBUCK_EMAIL || processEnv.ZOTERO_CONTACT_EMAIL || file.ZOTERO_CONTACT_EMAIL;
+	if (email) out.STARBUCK_EMAIL = email;
+	for (const key of ["NCBI_API_KEY", "OPENALEX_API_KEY"]) {
+		const v = processEnv[key] || file[key];
+		if (v) out[key] = v;
+	}
+	return out;
 }
 
 export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Promise<void> {
@@ -125,6 +160,7 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 			language: cfg.language,
 			userName: cfg.userName ?? null,
 			vault: cfg.vault ?? null,
+			starbuck: starbuckEnabled(cfg),
 		};
 		try {
 			ctx.ui.setStatus("subsub.web", JSON.stringify(state));
@@ -262,6 +298,15 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 
 	pi.on("model_select", async (_event, ctx) => status(ctx));
 
+	// Prompt commands that the profile does not run (/lit for Reader, /review for Reader and Scholar).
+	// The input event comes before pi expands a prompt template.
+	pi.on("input", async (event, ctx) => {
+		const why = promptBlocked(event.text, profile);
+		if (!why) return { action: "continue" };
+		ctx.ui.notify(`Sub-Sub: ${why}`, "warning");
+		return { action: "handled" };
+	});
+
 	pi.on("before_agent_start", async (event, ctx) => ({
 		systemPrompt: `${event.systemPrompt}\n\n${systemAddition(mode, { ...cfg, profile }, ctx.cwd)}`,
 	}));
@@ -276,18 +321,21 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 		// Previews and the real call must see the same, repaired arguments.
 		const schema = schemas.get(name);
 		if (schema) coerceArgs(schema, input);
-		if (name.startsWith("zotero_") || name.startsWith("scholar_")) {
+		if (SERVER_PREFIXES.some((p) => name.startsWith(p))) {
 			const why = unavailableReason(name, mode, registered(), profile);
 			if (why) {
 				if (benchOut) record({ kind: "wrong_mode", tool: name, input });
 				return { block: true, reason: why };
 			}
 		}
+		if (name.startsWith("verify_")) return verifyGate(name, input, ctx);
 		const kind = benchOut && name === "scholar_queue_imports" ? "confirm" : gateKind(name, input);
 		if (!kind) return undefined;
 		if (benchOut) return benchGate(name, input, kind, ctx.cwd, ctx.signal);
 		if (kind === "path") {
 			const target = normalizeToolPath(String(input.path ?? ""), ctx.cwd);
+			const noteProblem = literatureNoteProblem(name, target, input);
+			if (noteProblem) return { block: true, reason: noteProblem };
 			const verdict = judgePath(target, buildPolicy({ vault: cfg.vault, cwd: ctx.cwd, serverDir: cfg.serverDir, packageDir: PACKAGE_DIR }));
 			if (verdict.ok) return undefined;
 			if (!ctx.hasUI) return { block: true, reason: `Writing ${target} needs ${user}'s approval: ${verdict.why}.` };
@@ -318,9 +366,52 @@ export async function createSubsub(pi: ExtensionAPI, deps: SubsubDeps = {}): Pro
 		return ok ? undefined : { block: true, reason: `${user} did not approve this change. Ask what to change; do not retry the same call.` };
 	});
 
+	/** A literature note (front matter with a citekey) must state its evidence; see notes.ts. */
+	function literatureNoteProblem(name: string, target: string, input: Record<string, unknown>): string | undefined {
+		if (!target.toLowerCase().endsWith(".md")) return undefined;
+		if (name === "write") return checkLiteratureNote(String(input.content ?? ""));
+		if (name === "edit" && Array.isArray(input.edits) && existsSync(target)) {
+			const current = readFileSync(target, "utf8");
+			return checkLiteratureNote(applyEdits(current, input.edits as Array<{ oldText?: unknown; newText?: unknown }>));
+		}
+		return undefined;
+	}
+
+	/**
+	 * Starbuck writes its reports into a folder: report_dir, or _starbuck next to the
+	 * manuscript. Inside the vault or the working folder that needs no approval; elsewhere
+	 * Sub-Sub asks, as for any file write. record_claims gets the current model's name.
+	 */
+	async function verifyGate(name: string, input: Record<string, unknown>, ctx: ExtensionContext) {
+		if (name === "verify_record_claims") {
+			input.judged_by = ctx.model ? [ctx.model.provider, ctx.model.id].filter(Boolean).join("/") : "the agent's model";
+		}
+		if (name === "verify_check_references") return undefined;
+		const dir = input.report_dir
+			? normalizeToolPath(String(input.report_dir), ctx.cwd)
+			: input.path
+				? join(dirname(normalizeToolPath(String(input.path), ctx.cwd)), "_starbuck")
+				: undefined;
+		if (!dir) return undefined;
+		const verdict = judgePath(dir, buildPolicy({ vault: cfg.vault, cwd: ctx.cwd, serverDir: cfg.serverDir, packageDir: PACKAGE_DIR }));
+		if (verdict.ok) return undefined;
+		if (benchOut) {
+			record({ kind: "path_blocked", tool: name, path: dir });
+			return { block: true, reason: `Model test: Starbuck reports only inside the vault or ${benchOut}.` };
+		}
+		if (!ctx.hasUI) return { block: true, reason: `Writing a Starbuck report to ${dir} needs ${user}'s approval: ${verdict.why}.` };
+		const ok = await ctx.ui.confirm(`Sub-Sub: write the Starbuck report to ${dir}?`, `Asking because ${verdict.why}.`);
+		return ok ? undefined : { block: true, reason: `${user} did not allow writing the report there. Ask where to put it (report_dir).` };
+	}
+
 	async function benchGate(name: string, input: Record<string, unknown>, kind: string, cwd: string, signal?: AbortSignal) {
 		if (kind === "path") {
 			const target = normalizeToolPath(String(input.path ?? ""), cwd);
+			const noteProblem = literatureNoteProblem(name, target, input);
+			if (noteProblem) {
+				record({ kind: "note_blocked", tool: name, path: target, reason: noteProblem });
+				return { block: true, reason: noteProblem };
+			}
 			if (within(target, realish(benchOut!))) return undefined;
 			record({ kind: "path_blocked", tool: name, path: target });
 			return { block: true, reason: `Model test: write only inside ${benchOut}.` };

package/src/web.ts

@@ -22,9 +22,9 @@ 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 { expand, loadConfig, saveConfig, type SubsubConfig } from "./config.ts";
+import { expand, loadConfig, saveConfig, type SubsubConfig, withStarbuck } from "./config.ts";
 import { TESTED_MODELS } from "./init.ts";
-import { within } from "./paths.ts";
+import { realish, within } from "./paths.ts";
 
 // ---------------------------------------------------------------- options
 
@@ -577,6 +577,15 @@ export async function startWeb(opts: WebOptions, env: NodeJS.ProcessEnv = proces
 					await restartAgent();
 					return send(res, 200, { ok: true });
 				}
+				case "POST /api/addons": {
+					// Turn an add-on on or off, then restart pi so the extension starts or stops its server.
+					if (busy) return send(res, 409, { error: "busy" });
+					const body = await readJson(req);
+					if (typeof body.starbuck !== "boolean") return send(res, 400, { error: "starbuck must be true or false" });
+					saveConfig({ addons: withStarbuck(loadConfig(env).addons, body.starbuck) }, env);
+					await restartAgent();
+					return send(res, 200, { ok: true });
+				}
 				case "POST /api/restart":
 					if (agent.proc) return send(res, 200, { ok: true });
 					agent.start();
@@ -595,7 +604,10 @@ export async function startWeb(opts: WebOptions, env: NodeJS.ProcessEnv = proces
 					const body = await readJson(req);
 					const target = resolve(cwd, expand(String(body.path ?? "")));
 					const vault = cfg.vault;
-					if (!(within(target, cwd) || (vault && within(target, vault))) || !existsSync(target)) return send(res, 404, { error: "not found in the notes folder" });
+					// Judge the real file, so a link inside the notes folder cannot open a document outside it.
+					const real = realish(target);
+					const inside = within(real, realish(cwd)) || Boolean(vault && within(real, realish(vault)));
+					if (!inside || !existsSync(target)) return send(res, 404, { error: "not found in the notes folder" });
 					// Documents only: a file that the model wrote must never be run.
 					if (!OPENABLE.has(extname(target).toLowerCase())) return send(res, 403, { error: "Sub-Sub opens only notes and documents (.md, .txt, .pdf, .bib, .csv, .qmd)." });
 					if (vault && within(target, vault) && existsSync(join(vault, ".obsidian"))) openExternal(`obsidian://open?path=${encodeURIComponent(target)}`);

package/templates/Zotero agent.md

@@ -40,6 +40,7 @@ Shared rules for the Sub-Sub librarian and researcher. Sub-Sub reads this file a
 - Folder: Literature/. File name: the citekey (smith2026.md).
 - Create a note only when the user asks. Ask before creating more than 10 notes.
 - Write from the full text (get_fulltext) when it exists. Otherwise use the abstract and the Zotero notes, and write "(from abstract)" after the summary.
+- Front matter field evidence: full text, abstract or metadata (what you read). Page numbers only with evidence: full text. Sub-Sub refuses a literature note without this field.
 - Do not copy the abstract in full. Give page numbers for quotes when the text shows them.
 - If a note for the citekey exists, do not overwrite it. Add a dated section or ask.
 - After the note is written, offer to link it in Zotero with attach_note.
@@ -58,6 +59,7 @@ item-type: journalArticle
 venue: Journal name
 doi: 10.xxxx/xxxxx
 zotero: zotero://select/library/items/ITEMKEY
+evidence: full text
 status: to-read
 tags:
   - topic/example

package/themes/subsub-glauca-dark.json

@@ -2,28 +2,28 @@
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "subsub-glauca-dark",
 	"vars": {
-		"bg": "#10161c",
-		"surface": "#171f26",
-		"raised": "#1f2932",
-		"text": "#e8eef2",
-		"muted": "#8c8c8c",
-		"line": "#2a3540",
-		"mark": "#3d97ff",
-		"markBright": "#6cb2ff",
-		"markDeep": "#007aff",
-		"toneDeep": "#142430",
-		"tone": "#2b4356",
-		"toneBright": "#4d7391",
-		"tonePale": "#93b7c9",
-		"green": "#62ba46",
-		"red": "#b85f5f",
-		"yellow": "#c79a3d",
-		"violet": "#b184db",
-		"link": "#4a9edb",
-		"dim": "#616365",
-		"select": "#2b4356",
-		"okBg": "#22352a",
-		"errBg": "#31292f"
+		"bg": "#121517",
+		"surface": "#181d20",
+		"raised": "#20272b",
+		"text": "#e5ebec",
+		"muted": "#8a9699",
+		"line": "#283236",
+		"mark": "#5d99be",
+		"markBright": "#78b4da",
+		"markDeep": "#41789c",
+		"toneDeep": "#0e181c",
+		"tone": "#263e48",
+		"toneBright": "#486e7e",
+		"tonePale": "#8cb6cb",
+		"green": "#68aa80",
+		"red": "#cf5c5c",
+		"yellow": "#c49a46",
+		"violet": "#9d82b3",
+		"link": "#78b4da",
+		"dim": "#5d6a6d",
+		"select": "#263e48",
+		"okBg": "#1b2920",
+		"errBg": "#331c19"
 	},
 	"colors": {
 		"accent": "mark",
@@ -65,15 +65,15 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "muted",
-		"syntaxComment": "#8c8c8c",
-		"syntaxKeyword": "#007aff",
-		"syntaxFunction": "#4a9edb",
-		"syntaxVariable": "#e8eef2",
-		"syntaxString": "#62ba46",
-		"syntaxNumber": "#b184db",
-		"syntaxType": "#45a3ad",
-		"syntaxOperator": "#a7b1b8",
-		"syntaxPunctuation": "#86929a",
+		"syntaxComment": "#5d6a6d",
+		"syntaxKeyword": "#78b4da",
+		"syntaxFunction": "#5d99be",
+		"syntaxVariable": "#e5ebec",
+		"syntaxString": "#68aa80",
+		"syntaxNumber": "#9d82b3",
+		"syntaxType": "#8cb6cb",
+		"syntaxOperator": "#8a9699",
+		"syntaxPunctuation": "#8a9699",
 		"thinkingOff": "line",
 		"thinkingMinimal": "dim",
 		"thinkingLow": "toneBright",
@@ -84,8 +84,8 @@
 		"bashMode": "mark"
 	},
 	"export": {
-		"pageBg": "#10161c",
-		"cardBg": "#171f26",
-		"infoBg": "#1f2932"
+		"pageBg": "#121517",
+		"cardBg": "#181d20",
+		"infoBg": "#20272b"
 	}
 }

package/themes/subsub-glauca-light.json

@@ -2,28 +2,28 @@
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "subsub-glauca-light",
 	"vars": {
-		"bg": "#f0f4f6",
-		"surface": "#f7fafb",
+		"bg": "#f8f6f0",
+		"surface": "#f2ede2",
 		"raised": "#ffffff",
-		"text": "#16222a",
-		"muted": "#55646d",
-		"line": "#cdd7dc",
-		"mark": "#0b62cf",
-		"markBright": "#007aff",
-		"markDeep": "#084b96",
-		"toneDeep": "#16303f",
-		"tone": "#35576b",
-		"toneBright": "#3e6d84",
-		"tonePale": "#b7cdd6",
-		"green": "#3c6e38",
-		"red": "#a55859",
-		"yellow": "#846c36",
-		"violet": "#6b588b",
-		"link": "#33668b",
-		"dim": "#8b969d",
-		"select": "#b7cdd6",
-		"okBg": "#dde6e0",
-		"errBg": "#eae0e1"
+		"text": "#211e1b",
+		"muted": "#5c554a",
+		"line": "#ded6c4",
+		"mark": "#234b6e",
+		"markBright": "#2f648e",
+		"markDeep": "#15344e",
+		"toneDeep": "#16222b",
+		"tone": "#2e4854",
+		"toneBright": "#436574",
+		"tonePale": "#b5cad6",
+		"green": "#205438",
+		"red": "#9c281b",
+		"yellow": "#8f6b28",
+		"violet": "#604e76",
+		"link": "#234b6e",
+		"dim": "#827768",
+		"select": "#ded6c4",
+		"okBg": "#dfebe3",
+		"errBg": "#f5e4e2"
 	},
 	"colors": {
 		"accent": "mark",
@@ -65,15 +65,15 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "muted",
-		"syntaxComment": "#55646d",
-		"syntaxKeyword": "#0b62cf",
-		"syntaxFunction": "#33668b",
-		"syntaxVariable": "#16222a",
-		"syntaxString": "#3c6e38",
-		"syntaxNumber": "#6b588b",
-		"syntaxType": "#306972",
-		"syntaxOperator": "#55646d",
-		"syntaxPunctuation": "#55646d",
+		"syntaxComment": "#827768",
+		"syntaxKeyword": "#234b6e",
+		"syntaxFunction": "#2e4854",
+		"syntaxVariable": "#211e1b",
+		"syntaxString": "#205438",
+		"syntaxNumber": "#604e76",
+		"syntaxType": "#436574",
+		"syntaxOperator": "#5c554a",
+		"syntaxPunctuation": "#5c554a",
 		"thinkingOff": "line",
 		"thinkingMinimal": "dim",
 		"thinkingLow": "toneBright",
@@ -84,8 +84,8 @@
 		"bashMode": "mark"
 	},
 	"export": {
-		"pageBg": "#f0f4f6",
-		"cardBg": "#f7fafb",
+		"pageBg": "#f8f6f0",
+		"cardBg": "#f2ede2",
 		"infoBg": "#ffffff"
 	}
 }

package/themes/subsub-try-works-dark.json

@@ -2,28 +2,28 @@
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "subsub-try-works-dark",
 	"vars": {
-		"bg": "#12161b",
-		"surface": "#1b2127",
-		"raised": "#232b32",
-		"text": "#f1efe9",
-		"muted": "#97a0a4",
-		"line": "#2c3640",
-		"mark": "#c9651d",
-		"markBright": "#e0832a",
-		"markDeep": "#9a4a16",
-		"toneDeep": "#14242c",
-		"tone": "#2c4953",
-		"toneBright": "#4d7680",
-		"tonePale": "#8fb6bd",
-		"green": "#86a87f",
-		"red": "#c05a3a",
-		"yellow": "#c9651d",
-		"violet": "#a487ba",
-		"link": "#5f93b0",
-		"dim": "#687074",
-		"select": "#2c4953",
-		"okBg": "#2a3433",
-		"errBg": "#352a2a"
+		"bg": "#141210",
+		"surface": "#1c1916",
+		"raised": "#24201c",
+		"text": "#eae4d5",
+		"muted": "#9e9585",
+		"line": "#2e2924",
+		"mark": "#cf663d",
+		"markBright": "#eb7c52",
+		"markDeep": "#ad4c24",
+		"toneDeep": "#0e0d0b",
+		"tone": "#5c4a3e",
+		"toneBright": "#8c7362",
+		"tonePale": "#b5a08d",
+		"green": "#68aa80",
+		"red": "#cf663d",
+		"yellow": "#cca047",
+		"violet": "#a88bb5",
+		"link": "#6ea3cc",
+		"dim": "#736b5e",
+		"select": "#332c25",
+		"okBg": "#1b2920",
+		"errBg": "#331c19"
 	},
 	"colors": {
 		"accent": "mark",
@@ -65,15 +65,15 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "muted",
-		"syntaxComment": "#97a0a4",
-		"syntaxKeyword": "#c9651d",
-		"syntaxFunction": "#5f93b0",
-		"syntaxVariable": "#f1efe9",
-		"syntaxString": "#86a87f",
-		"syntaxNumber": "#a487ba",
-		"syntaxType": "#5f97a0",
-		"syntaxOperator": "#aeb6b8",
-		"syntaxPunctuation": "#8a9296",
+		"syntaxComment": "#736b5e",
+		"syntaxKeyword": "#cf663d",
+		"syntaxFunction": "#6ea3cc",
+		"syntaxVariable": "#eae4d5",
+		"syntaxString": "#68aa80",
+		"syntaxNumber": "#a88bb5",
+		"syntaxType": "#8c7362",
+		"syntaxOperator": "#9e9585",
+		"syntaxPunctuation": "#9e9585",
 		"thinkingOff": "line",
 		"thinkingMinimal": "dim",
 		"thinkingLow": "toneBright",
@@ -84,8 +84,8 @@
 		"bashMode": "mark"
 	},
 	"export": {
-		"pageBg": "#12161b",
-		"cardBg": "#1b2127",
-		"infoBg": "#232b32"
+		"pageBg": "#141210",
+		"cardBg": "#1c1916",
+		"infoBg": "#24201c"
 	}
 }

package/themes/subsub-try-works-light.json

@@ -2,28 +2,28 @@
 	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
 	"name": "subsub-try-works-light",
 	"vars": {
-		"bg": "#dee7e4",
-		"surface": "#e7efeb",
-		"raised": "#f2f7f4",
-		"text": "#18272b",
-		"muted": "#52646a",
-		"line": "#c4d2cd",
-		"mark": "#9e5017",
-		"markBright": "#b85f1c",
-		"markDeep": "#7a3a10",
-		"toneDeep": "#16242b",
-		"tone": "#264852",
-		"toneBright": "#3d6b76",
-		"tonePale": "#b4ccc9",
-		"green": "#4f6855",
-		"red": "#c05a3a",
-		"yellow": "#c9651d",
-		"violet": "#655c7a",
-		"link": "#3f6274",
-		"dim": "#839295",
-		"select": "#b4ccc9",
-		"okBg": "#d2dcd6",
-		"errBg": "#e1d7cf"
+		"bg": "#f8f6f0",
+		"surface": "#f2ede2",
+		"raised": "#ffffff",
+		"text": "#211e1b",
+		"muted": "#5c554a",
+		"line": "#ded6c4",
+		"mark": "#8b2500",
+		"markBright": "#a83000",
+		"markDeep": "#6e1d00",
+		"toneDeep": "#1f1b18",
+		"tone": "#4a3b32",
+		"toneBright": "#6e594d",
+		"tonePale": "#c9baa7",
+		"green": "#205438",
+		"red": "#9c281b",
+		"yellow": "#9e6b18",
+		"violet": "#664b63",
+		"link": "#244662",
+		"dim": "#827768",
+		"select": "#ded6c4",
+		"okBg": "#e2ebe5",
+		"errBg": "#f5e4e2"
 	},
 	"colors": {
 		"accent": "mark",
@@ -65,15 +65,15 @@
 		"toolDiffAdded": "green",
 		"toolDiffRemoved": "red",
 		"toolDiffContext": "muted",
-		"syntaxComment": "#52646a",
-		"syntaxKeyword": "#9e5017",
-		"syntaxFunction": "#3f6274",
-		"syntaxVariable": "#18272b",
-		"syntaxString": "#4f6855",
-		"syntaxNumber": "#655c7a",
-		"syntaxType": "#3f656b",
-		"syntaxOperator": "#52646a",
-		"syntaxPunctuation": "#52646a",
+		"syntaxComment": "#827768",
+		"syntaxKeyword": "#8b2500",
+		"syntaxFunction": "#244662",
+		"syntaxVariable": "#211e1b",
+		"syntaxString": "#205438",
+		"syntaxNumber": "#664b63",
+		"syntaxType": "#6e594d",
+		"syntaxOperator": "#5c554a",
+		"syntaxPunctuation": "#5c554a",
 		"thinkingOff": "line",
 		"thinkingMinimal": "dim",
 		"thinkingLow": "toneBright",
@@ -84,8 +84,8 @@
 		"bashMode": "mark"
 	},
 	"export": {
-		"pageBg": "#dee7e4",
-		"cardBg": "#e7efeb",
-		"infoBg": "#f2f7f4"
+		"pageBg": "#f8f6f0",
+		"cardBg": "#f2ede2",
+		"infoBg": "#ffffff"
 	}
 }