@tiagojct/subsub 0.19.0 → 0.21.0

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

@@ -0,0 +1,80 @@
+{
+	"$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
+	"name": "subsub-try-works-light-256",
+	"vars": {
+		"ink": 234,
+		"muted": 239,
+		"faint": 241,
+		"prussian": 24,
+		"madder": 94,
+		"sap": 58,
+		"gamboge": 94,
+		"mark": 102,
+		"rule": 251,
+		"accent": 94,
+		"wash": 224
+	},
+	"colors": {
+		"text": "ink",
+		"userMessageText": "ink",
+		"customMessageText": "ink",
+		"toolTitle": "ink",
+		"mdHeading": "ink",
+		"mdCode": "ink",
+		"mdCodeBlock": "ink",
+		"error": "ink",
+		"muted": "muted",
+		"toolOutput": "muted",
+		"mdQuote": "muted",
+		"toolDiffContext": "muted",
+		"thinkingText": "muted",
+		"toolDiffRemoved": "muted",
+		"dim": "faint",
+		"mdLinkUrl": "faint",
+		"syntaxComment": "faint",
+		"border": "mark",
+		"mdQuoteBorder": "mark",
+		"mdListBullet": "mark",
+		"borderMuted": "rule",
+		"mdHr": "rule",
+		"mdCodeBlockBorder": "rule",
+		"scrollbarTrack": "rule",
+		"thinkingOff": "rule",
+		"scrollbarThumb": "faint",
+		"accent": "accent",
+		"borderAccent": "accent",
+		"bashMode": "accent",
+		"customMessageLabel": "accent",
+		"thinkingXhigh": "accent",
+		"thinkingMax": "accent",
+		"mdLink": "prussian",
+		"thinkingHigh": "prussian",
+		"success": "sap",
+		"toolDiffAdded": "sap",
+		"warning": "gamboge",
+		"selectedBg": "wash",
+		"searchMatchBg": "",
+		"searchMatchText": "ink",
+		"userMessageBg": "",
+		"toolSuccessBg": "",
+		"customMessageBg": "",
+		"toolErrorBg": "",
+		"toolPendingBg": "",
+		"syntaxKeyword": "prussian",
+		"syntaxNumber": "prussian",
+		"syntaxFunction": "ink",
+		"syntaxVariable": "ink",
+		"syntaxType": "ink",
+		"syntaxString": "muted",
+		"syntaxOperator": "muted",
+		"syntaxPunctuation": "faint",
+		"thinkingMinimal": "faint",
+		"thinkingLow": "mark",
+		"thinkingMedium": "muted"
+	},
+	"export": {
+		"pageBg": "#e9ece6",
+		"cardBg": "#f4f5f1",
+		"infoBg": "#dfe3dc"
+	}
+}

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

@@ -2,90 +2,86 @@
 	"$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": "#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"
+		"sheet": "#e9ece6",
+		"sunk": "#dfe3dc",
+		"field": "#f4f5f1",
+		"ink": "#16202a",
+		"muted": "#44505b",
+		"faint": "#5d6870",
+		"rule": "#c6ccc6",
+		"mark": "#7d878e",
+		"prussian": "#2c5d87",
+		"prussianWash": "#d8e2eb",
+		"madder": "#a8432d",
+		"madderWash": "#f0ddd6",
+		"sap": "#4f6a2e",
+		"sapWash": "#dfe7d2",
+		"gamboge": "#86601a",
+		"gambogeWash": "#f2e5c6",
+		"accent": "#a8432d",
+		"wash": "#f0ddd6"
 	},
 	"colors": {
-		"accent": "mark",
-		"border": "toneBright",
-		"borderAccent": "mark",
-		"borderMuted": "line",
-		"success": "green",
-		"error": "red",
-		"warning": "yellow",
+		"text": "ink",
+		"userMessageText": "ink",
+		"customMessageText": "ink",
+		"toolTitle": "ink",
+		"mdHeading": "ink",
+		"mdCode": "ink",
+		"mdCodeBlock": "ink",
+		"error": "ink",
 		"muted": "muted",
-		"dim": "dim",
-		"text": "text",
-		"thinkingText": "muted",
-		"selectedBg": "select",
-		"scrollbarTrack": "line",
-		"scrollbarThumb": "muted",
-		"searchMatchBg": "select",
-		"searchMatchText": "text",
-		"userMessageBg": "raised",
-		"userMessageText": "text",
-		"customMessageBg": "surface",
-		"customMessageText": "text",
-		"customMessageLabel": "tone",
-		"toolPendingBg": "surface",
-		"toolSuccessBg": "okBg",
-		"toolErrorBg": "errBg",
-		"toolTitle": "text",
 		"toolOutput": "muted",
-		"mdHeading": "tone",
-		"mdLink": "link",
-		"mdLinkUrl": "dim",
-		"mdCode": "green",
-		"mdCodeBlock": "text",
-		"mdCodeBlockBorder": "line",
 		"mdQuote": "muted",
-		"mdQuoteBorder": "toneBright",
-		"mdHr": "line",
-		"mdListBullet": "toneBright",
-		"toolDiffAdded": "green",
-		"toolDiffRemoved": "red",
 		"toolDiffContext": "muted",
-		"syntaxComment": "#827768",
-		"syntaxKeyword": "#8b2500",
-		"syntaxFunction": "#244662",
-		"syntaxVariable": "#211e1b",
-		"syntaxString": "#205438",
-		"syntaxNumber": "#664b63",
-		"syntaxType": "#6e594d",
-		"syntaxOperator": "#5c554a",
-		"syntaxPunctuation": "#5c554a",
-		"thinkingOff": "line",
-		"thinkingMinimal": "dim",
-		"thinkingLow": "toneBright",
-		"thinkingMedium": "tone",
-		"thinkingHigh": "violet",
-		"thinkingXhigh": "markBright",
-		"thinkingMax": "mark",
-		"bashMode": "mark"
+		"thinkingText": "muted",
+		"toolDiffRemoved": "muted",
+		"dim": "faint",
+		"mdLinkUrl": "faint",
+		"syntaxComment": "faint",
+		"border": "mark",
+		"mdQuoteBorder": "mark",
+		"mdListBullet": "mark",
+		"borderMuted": "rule",
+		"mdHr": "rule",
+		"mdCodeBlockBorder": "rule",
+		"scrollbarTrack": "rule",
+		"thinkingOff": "rule",
+		"scrollbarThumb": "faint",
+		"accent": "accent",
+		"borderAccent": "accent",
+		"bashMode": "accent",
+		"customMessageLabel": "accent",
+		"thinkingXhigh": "accent",
+		"thinkingMax": "accent",
+		"mdLink": "prussian",
+		"thinkingHigh": "prussian",
+		"success": "sap",
+		"toolDiffAdded": "sap",
+		"warning": "gamboge",
+		"selectedBg": "wash",
+		"searchMatchBg": "gambogeWash",
+		"searchMatchText": "ink",
+		"userMessageBg": "field",
+		"toolSuccessBg": "field",
+		"customMessageBg": "sunk",
+		"toolErrorBg": "sunk",
+		"toolPendingBg": "gambogeWash",
+		"syntaxKeyword": "prussian",
+		"syntaxNumber": "prussian",
+		"syntaxFunction": "ink",
+		"syntaxVariable": "ink",
+		"syntaxType": "ink",
+		"syntaxString": "muted",
+		"syntaxOperator": "muted",
+		"syntaxPunctuation": "faint",
+		"thinkingMinimal": "faint",
+		"thinkingLow": "mark",
+		"thinkingMedium": "muted"
 	},
 	"export": {
-		"pageBg": "#f8f6f0",
-		"cardBg": "#f2ede2",
-		"infoBg": "#ffffff"
+		"pageBg": "#e9ece6",
+		"cardBg": "#f4f5f1",
+		"infoBg": "#dfe3dc"
 	}
 }

package/scripts/make-themes.py

@@ -1,116 +0,0 @@
-#!/usr/bin/env python3
-"""Write pi themes for Sub-Sub from Gam design-system sources.
-
-    python3 scripts/make-themes.py NAME SOURCE.json VSCODE-DARK.json VSCODE-LIGHT.json
-
-SOURCE.json is the design system's single source (modes, palette). The VS Code
-themes that Gam generates supply the syntax colours per mode. Output:
-themes/subsub-NAME-dark.json and themes/subsub-NAME-light.json.
-
-The accent (the design system's one mark) is kept for the few places that need a
-mark: the banner, the active border, bash mode and the highest thinking level.
-Headings, bullets and borders use the cool tones.
-"""
-
-import json
-import sys
-from pathlib import Path
-
-OUT = Path(__file__).resolve().parent.parent / "themes"
-
-
-def hexrgb(h):
-    h = h.lstrip("#")
-    return tuple(int(h[i:i + 2], 16) for i in (0, 2, 4))
-
-
-def mix(a, b, t):
-    """t = 0 gives a, t = 1 gives b."""
-    ra, rb = hexrgb(a), hexrgb(b)
-    return "#" + "".join(f"{round(x + (y - x) * t):02x}" for x, y in zip(ra, rb))
-
-
-def token(vs, scope):
-    for tc in vs.get("tokenColors", []):
-        sc = tc.get("scope")
-        scopes = [sc] if isinstance(sc, str) else sc
-        if scope in scopes:
-            return tc["settings"]["foreground"].lower()
-    raise KeyError(scope)
-
-
-def tone(m, part):
-    """try-works calls the cool tones sea-*, Glauca tint-*."""
-    for prefix in ("sea", "tint"):
-        k = f"{prefix}{'-' + part if part else ''}"
-        if k in m:
-            return m[k].lower()
-    raise KeyError(part)
-
-
-def theme(name, scheme, m, vs):
-    dark = scheme == "dark"
-    c = vs["colors"]
-    v = {
-        "bg": m["bg"], "surface": m["surface"], "raised": m["surface-raised"],
-        "text": m["text"], "muted": m["text-muted"], "line": m["border"],
-        "mark": m["accent"], "markBright": m["accent-bright"], "markDeep": m["accent-deep"],
-        "toneDeep": tone(m, "deep"), "tone": tone(m, ""), "toneBright": tone(m, "bright"), "tonePale": tone(m, "pale"),
-        "green": token(vs, "markup.inserted"), "red": c["terminal.ansiRed"].lower(),
-        "yellow": c["terminal.ansiYellow"].lower(), "violet": token(vs, "constant.numeric"),
-        "link": token(vs, "entity.name.function"),
-    }
-    v = {k: val.lower() for k, val in v.items()}
-    v["dim"] = mix(v["muted"], v["bg"], 0.35)
-    v["select"] = c["list.activeSelectionBackground"].lower()
-    v["okBg"] = mix(v["surface"], v["green"], 0.14)
-    v["errBg"] = mix(v["surface"], v["red"], 0.16)
-    heading = "tonePale" if dark else "tone"
-    colors = {
-        "accent": "mark", "border": "toneBright", "borderAccent": "mark", "borderMuted": "line",
-        "success": "green", "error": "red", "warning": "yellow",
-        "muted": "muted", "dim": "dim", "text": "text", "thinkingText": "muted",
-        "selectedBg": "select", "scrollbarTrack": "line", "scrollbarThumb": "muted",
-        "searchMatchBg": "select", "searchMatchText": "text",
-        "userMessageBg": "raised", "userMessageText": "text",
-        "customMessageBg": "surface", "customMessageText": "text", "customMessageLabel": heading,
-        "toolPendingBg": "surface", "toolSuccessBg": "okBg", "toolErrorBg": "errBg",
-        "toolTitle": "text", "toolOutput": "muted",
-        "mdHeading": heading, "mdLink": "link", "mdLinkUrl": "dim", "mdCode": "green",
-        "mdCodeBlock": "text", "mdCodeBlockBorder": "line", "mdQuote": "muted", "mdQuoteBorder": "toneBright",
-        "mdHr": "line", "mdListBullet": "toneBright",
-        "toolDiffAdded": "green", "toolDiffRemoved": "red", "toolDiffContext": "muted",
-        "syntaxComment": token(vs, "comment"), "syntaxKeyword": token(vs, "keyword"),
-        "syntaxFunction": token(vs, "entity.name.function"), "syntaxVariable": token(vs, "variable"),
-        "syntaxString": token(vs, "string"), "syntaxNumber": token(vs, "constant.numeric"),
-        "syntaxType": token(vs, "entity.name.type"), "syntaxOperator": token(vs, "keyword.operator"),
-        "syntaxPunctuation": token(vs, "punctuation"),
-        "thinkingOff": "line", "thinkingMinimal": "dim", "thinkingLow": "toneBright", "thinkingMedium": heading,
-        "thinkingHigh": "violet", "thinkingXhigh": "markBright", "thinkingMax": "mark",
-        "bashMode": "mark",
-    }
-    return {
-        "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json",
-        "name": name,
-        "vars": v,
-        "colors": colors,
-        "export": {"pageBg": v["bg"], "cardBg": v["surface"], "infoBg": v["raised"]},
-    }
-
-
-def main():
-    name, source, vs_dark, vs_light = sys.argv[1:5]
-    src = json.loads(Path(source).read_text())
-    modes = src["modes"]
-    by_scheme = {m["scheme"]: m for m in modes.values()}
-    OUT.mkdir(exist_ok=True)
-    for scheme, vs_path in (("dark", vs_dark), ("light", vs_light)):
-        vs = json.loads(Path(vs_path).read_text())
-        tname = f"subsub-{name}-{scheme}"
-        t = theme(tname, scheme, by_scheme[scheme], vs)
-        (OUT / f"{tname}.json").write_text(json.dumps(t, indent="\t") + "\n")
-        print(OUT / f"{tname}.json", f"({by_scheme[scheme].get('label', scheme)})")
-
-
-if __name__ == "__main__":
-    main()