@@ -3131,6 +3299,7 @@ let keyValidationData = {};
let solVoiceData = null;
let solVoiceThrottledTimer = null;
let transcribeResource = null;
+const iconSvgCache = new Map();
const escapeHtml = (value) => window.AppServices.escapeHtml(value);
const solVoiceCopy = {
autoMutedFormat: {{ sol_voice_copy.SOL_VOICE_SETTINGS_CATEGORY_CAP_AUTO_MUTED_FORMAT | tojson }},
@@ -3165,14 +3334,20 @@ function setTabAttention(section, on) {
}
// ========== MODAL ACCESSIBILITY ==========
+const MODAL_FOCUSABLE_SELECTOR = 'input:not([disabled]):not([type="hidden"]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex]:not([tabindex="-1"])';
+
+function refreshModalFocusables(modal) {
+ const focusable = modal.querySelectorAll(MODAL_FOCUSABLE_SELECTOR);
+ modal._focusableEls = Array.from(focusable);
+}
+
function setupModalAccessibility(modalId) {
const modal = document.getElementById(modalId);
if (!modal) return;
modal._openAccessible = function(triggerEl) {
this._triggerEl = triggerEl || document.activeElement;
- const focusable = this.querySelectorAll('input:not([disabled]):not([type="hidden"]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [tabindex]:not([tabindex="-1"])');
- this._focusableEls = Array.from(focusable);
+ refreshModalFocusables(this);
if (this._focusableEls.length) {
requestAnimationFrame(() => this._focusableEls[0].focus());
}
@@ -3211,6 +3386,7 @@ function setupModalAccessibility(modalId) {
}
setupModalAccessibility('colorPickerModal');
+setupModalAccessibility('iconPickerModal');
setupModalAccessibility('customActivityModal');
setupModalAccessibility('cleanupModal');
@@ -4254,6 +4430,10 @@ function populateFacetForm(facetName, config) {
document.getElementById('facetDescInput').value = config.description || '';
document.getElementById('emojiDisplay').textContent = config.emoji || '\uD83D\uDCE6';
+ updateIconDisplay(config.icon || '', null);
+ if (config.icon) {
+ loadIconDisplaySvg(config.icon);
+ }
const color = config.color || '#667eea';
document.getElementById('colorPreview').style.backgroundColor = color;
@@ -4268,6 +4448,7 @@ function setupFacetEditing() {
setupDoubleTapEdit('facetTitleField', 'facetTitleDisplay', 'facetTitleInput', 'title');
setupDoubleTapEdit('facetDescField', 'facetDescDisplay', 'facetDescInput', 'description');
setupEmojiPicker();
+ setupIconPicker();
setupColorPicker();
setupMutedToggle();
}
@@ -4349,6 +4530,227 @@ function setupEmojiPicker() {
};
}
+function setIconSvg(element, svg) {
+ element.innerHTML = svg;
+ const svgEl = element.querySelector('svg');
+ if (svgEl) {
+ svgEl.setAttribute('stroke-width', '1.5');
+ svgEl.setAttribute('aria-hidden', 'true');
+ svgEl.style.color = 'currentColor';
+ }
+}
+
+function updateIconDisplay(iconName, svg) {
+ const preview = document.getElementById('iconPreview');
+ const nameDisplay = document.getElementById('iconNameDisplay');
+ if (!preview || !nameDisplay) return;
+
+ if (iconName && svg) {
+ setIconSvg(preview, svg);
+ nameDisplay.textContent = iconName;
+ } else if (iconName) {
+ preview.textContent = '?';
+ nameDisplay.textContent = iconName;
+ } else {
+ preview.textContent = '—';
+ nameDisplay.textContent = 'use emoji';
+ }
+}
+
+async function loadIconDisplaySvg(iconName) {
+ if (!iconName) return;
+ if (iconSvgCache.has(iconName)) {
+ updateIconDisplay(iconName, iconSvgCache.get(iconName));
+ return;
+ }
+
+ try {
+ const response = await fetch(`/app/settings/api/icons?q=${encodeURIComponent(iconName)}&limit=80`);
+ const data = await response.json();
+ if (!response.ok || data.error) throw new Error(data.error || 'icon lookup failed');
+ const match = (data.icons || []).find(icon => icon.name === iconName);
+ if (match) {
+ iconSvgCache.set(match.name, match.svg);
+ if (facetConfig?.icon === iconName) {
+ updateIconDisplay(iconName, match.svg);
+ }
+ }
+ } catch (err) {
+ console.error('Icon lookup error:', err);
+ }
+}
+
+function setupIconPicker() {
+ const modal = document.getElementById('iconPickerModal');
+ const trigger = document.getElementById('iconTrigger');
+ const closeBtn = document.getElementById('iconPickerClose');
+ const searchInput = document.getElementById('iconSearchInput');
+ const grid = document.getElementById('iconResultsGrid');
+ const message = document.getElementById('iconPickerMessage');
+ const applyBtn = document.getElementById('applyIconBtn');
+ const clearBtn = document.getElementById('clearIconBtn');
+ const previewGlyph = document.getElementById('iconModalPreviewGlyph');
+ const previewTitle = document.getElementById('iconModalPreviewTitle');
+ const previewPill = document.getElementById('iconModalPreview');
+ if (!modal || !trigger || !closeBtn || !searchInput || !grid || !message || !applyBtn || !clearBtn || !previewGlyph || !previewTitle || !previewPill) return;
+
+ let selectedIcon = '';
+ let selectedSvg = null;
+ let searchTimer = null;
+ let searchRequestId = 0;
+
+ function clearIconMessage() {
+ message.style.display = 'none';
+ message.classList.remove('error');
+ message.replaceChildren();
+ }
+
+ function showIconMessage(text, isError = false, retryQuery = null) {
+ message.replaceChildren();
+ const span = document.createElement('span');
+ span.textContent = text;
+ message.appendChild(span);
+ if (retryQuery !== null) {
+ const retry = document.createElement('button');
+ retry.type = 'button';
+ retry.className = 'icon-clear-btn';
+ retry.textContent = 'retry';
+ retry.style.marginTop = '0.75em';
+ retry.addEventListener('click', () => fetchIcons(retryQuery));
+ message.appendChild(retry);
+ }
+ message.style.display = 'block';
+ message.classList.toggle('error', isError);
+ refreshModalFocusables(modal);
+ }
+
+ function updateIconPreview() {
+ const color = facetConfig?.color || '#667eea';
+ previewPill.style.borderColor = color;
+ previewPill.style.backgroundColor = color + '1a';
+ previewGlyph.style.setProperty('--pill-color', color);
+ previewTitle.style.color = color;
+ previewTitle.textContent = document.getElementById('facetTitleDisplay').textContent;
+ if (selectedIcon && selectedSvg) {
+ setIconSvg(previewGlyph, selectedSvg);
+ } else {
+ previewGlyph.textContent = document.getElementById('emojiDisplay').textContent || '—';
+ }
+ applyBtn.disabled = !selectedIcon;
+ refreshModalFocusables(modal);
+ }
+
+ function setSelectedIcon(name, svg) {
+ selectedIcon = name;
+ selectedSvg = svg;
+ grid.querySelectorAll('.icon-result-btn').forEach(btn => {
+ btn.classList.toggle('selected', btn.dataset.iconName === name);
+ });
+ updateIconPreview();
+ }
+
+ function renderIconResults(icons, query) {
+ grid.replaceChildren();
+ if (!icons.length) {
+ showIconMessage(query ? 'no icons match' : 'no icons available');
+ return;
+ }
+
+ clearIconMessage();
+ icons.forEach(icon => {
+ iconSvgCache.set(icon.name, icon.svg);
+ const button = document.createElement('button');
+ button.type = 'button';
+ button.className = 'icon-result-btn';
+ button.dataset.iconName = icon.name;
+ button.setAttribute('aria-label', icon.name);
+ button.title = icon.name;
+ setIconSvg(button, icon.svg);
+ if (icon.name === selectedIcon) {
+ button.classList.add('selected');
+ }
+ button.addEventListener('click', () => setSelectedIcon(icon.name, icon.svg));
+ grid.appendChild(button);
+ });
+ refreshModalFocusables(modal);
+ }
+
+ async function fetchIcons(query) {
+ const requestId = ++searchRequestId;
+ showIconMessage('loading icons...');
+ try {
+ const response = await fetch(`/app/settings/api/icons?q=${encodeURIComponent(query)}`);
+ const data = await response.json();
+ if (requestId !== searchRequestId) return;
+ if (!response.ok || data.error) throw new Error(data.error || 'icon search failed');
+ renderIconResults(data.icons || [], query);
+ if (selectedIcon && !selectedSvg && iconSvgCache.has(selectedIcon)) {
+ selectedSvg = iconSvgCache.get(selectedIcon);
+ updateIconPreview();
+ }
+ } catch (err) {
+ if (requestId !== searchRequestId) return;
+ console.error('Icon search error:', err);
+ showIconMessage('icon search failed', true, query);
+ }
+ }
+
+ function queueIconSearch() {
+ clearTimeout(searchTimer);
+ searchTimer = setTimeout(() => fetchIcons(searchInput.value), 200);
+ }
+
+ grid.onkeydown = (e) => {
+ const target = e.target.closest('.icon-result-btn');
+ if (!target) return;
+ if (e.key === 'Enter' || e.key === ' ') {
+ e.preventDefault();
+ target.click();
+ }
+ if (['ArrowLeft','ArrowRight','ArrowUp','ArrowDown'].includes(e.key)) {
+ e.preventDefault();
+ const all = [...grid.querySelectorAll('.icon-result-btn')];
+ const idx = all.indexOf(target);
+ const cols = Math.floor(grid.clientWidth / all[0].offsetWidth) || 4;
+ let next = idx;
+ if (e.key === 'ArrowRight') next = Math.min(idx + 1, all.length - 1);
+ if (e.key === 'ArrowLeft') next = Math.max(idx - 1, 0);
+ if (e.key === 'ArrowDown') next = Math.min(idx + cols, all.length - 1);
+ if (e.key === 'ArrowUp') next = Math.max(idx - cols, 0);
+ all[next].focus();
+ }
+ };
+
+ trigger.onclick = () => {
+ selectedIcon = facetConfig?.icon || '';
+ selectedSvg = selectedIcon && iconSvgCache.has(selectedIcon) ? iconSvgCache.get(selectedIcon) : null;
+ searchInput.value = selectedIcon;
+ updateIconPreview();
+ modal.style.display = 'block';
+ modal._openAccessible(trigger);
+ fetchIcons(searchInput.value);
+ };
+
+ closeBtn.onclick = () => modal._closeAccessible();
+ modal.onclick = (e) => { if (e.target === modal) modal._closeAccessible(); };
+ searchInput.oninput = queueIconSearch;
+
+ applyBtn.onclick = () => {
+ if (!selectedIcon) return;
+ updateIconDisplay(selectedIcon, selectedSvg);
+ saveFacetField('icon', selectedIcon, null);
+ modal._closeAccessible();
+ };
+
+ clearBtn.onclick = () => {
+ selectedIcon = '';
+ selectedSvg = null;
+ updateIconDisplay('', null);
+ saveFacetField('icon', '', null);
+ modal._closeAccessible();
+ };
+}
+
function colorName(hex) {
const names = {
'#007bff': 'Blue', '#28a745': 'Green', '#17a2b8': 'Teal',
@@ -4476,7 +4878,7 @@ async function saveFacetField(field, value, triggerEl) {
showFieldStatus(triggerEl, 'saved');
}
// Prompt reload for changes that affect the facet bar
- if (field === 'title' || field === 'emoji' || field === 'color' || field === 'muted') {
+ if (field === 'title' || field === 'emoji' || field === 'icon' || field === 'color' || field === 'muted') {
promptReload();
}
} else {
diff --git a/solstone/convey/apps.py b/solstone/convey/apps.py
index 7f66f7c16..76cfa4054 100644
--- a/solstone/convey/apps.py
+++ b/solstone/convey/apps.py
@@ -14,7 +14,7 @@ from solstone.apps import AppRegistry
from solstone.convey.provider_readiness import is_blocking_reason, present_for_reason
from solstone.think.talent_runs import AgentFailure, read_unresolved_agent_failures
-from .icons import APP_LUCIDE_MAP, lucide_svg, lucide_svg_for_emoji
+from .icons import APP_LUCIDE_MAP, lucide_svg, resolve_facet_icon_svg
def _get_facets_data() -> list[dict]:
@@ -36,7 +36,10 @@ def _get_facets_data() -> list[dict]:
"title": data.get("title", name),
"color": data.get("color", ""),
"emoji": data.get("emoji", ""),
- "icon_svg": lucide_svg_for_emoji(data.get("emoji", "")),
+ "icon": data.get("icon", ""),
+ "icon_svg": resolve_facet_icon_svg(
+ data.get("icon"), data.get("emoji", "")
+ ),
}
)
diff --git a/solstone/convey/icons.py b/solstone/convey/icons.py
index fe64939c7..a124a7ed8 100644
--- a/solstone/convey/icons.py
+++ b/solstone/convey/icons.py
@@ -42,6 +42,13 @@ def _lucide_icons() -> dict[str, str]:
return json.load(handle)
+@functools.lru_cache(maxsize=1)
+def _lucide_tags() -> dict[str, list[str]]:
+ path = Path(__file__).parent / "static" / "icons" / "lucide-tags.json"
+ with path.open(encoding="utf-8") as handle:
+ return json.load(handle)
+
+
@functools.lru_cache(maxsize=1)
def _emoji_lucide_map() -> dict[str, str]:
path = Path(__file__).parent / "static" / "icons" / "emoji-lucide.json"
@@ -54,6 +61,11 @@ def lucide_svg(name: str) -> str | None:
return _lucide_icons().get(name)
+def is_lucide_icon(name: str) -> bool:
+ """Return whether name is a vendored Lucide icon."""
+ return bool(name) and lucide_svg(name) is not None
+
+
def emoji_to_lucide(emoji: str, default: str | None = None) -> str | None:
"""Translate an emoji to a Lucide icon name."""
if not isinstance(emoji, str):
@@ -89,3 +101,35 @@ def lucide_svg_for_emoji(emoji: str) -> str | None:
if icon_name is None:
return None
return lucide_svg(icon_name)
+
+
+def resolve_facet_icon_svg(icon: str | None, emoji: str) -> str | None:
+ """Resolve a facet icon override, falling back to the emoji mapping."""
+ if icon:
+ svg = lucide_svg(icon)
+ if svg is not None:
+ return svg
+ return lucide_svg_for_emoji(emoji)
+
+
+def search_lucide_icons(query: str, limit: int = 80) -> list[dict[str, str]]:
+ """Search vendored Lucide icons by name first, then tags."""
+ q = (query or "").strip().lower()
+ names = sorted(_lucide_icons())
+ if q:
+ name_matches = [name for name in names if q in name]
+ tag_matches = [
+ name
+ for name in names
+ if q not in name and any(q in tag for tag in _lucide_tags().get(name, []))
+ ]
+ chosen = (name_matches + tag_matches)[:limit]
+ else:
+ chosen = names[:limit]
+
+ results: list[dict[str, str]] = []
+ for name in chosen:
+ svg = lucide_svg(name)
+ if svg is not None:
+ results.append({"name": name, "svg": svg})
+ return results
diff --git a/solstone/talent/journal/references/cli.md b/solstone/talent/journal/references/cli.md
index 4ae0ddc9e..232105e07 100644
--- a/solstone/talent/journal/references/cli.md
+++ b/solstone/talent/journal/references/cli.md
@@ -65,13 +65,14 @@ sol call journal facet show # uses SOL_FACET
## facet create
```bash
-sol call journal facet create
[--emoji EMOJI] [--color COLOR] [--description DESC] [--consent]
+sol call journal facet create <title> [--emoji EMOJI] [--icon ICON] [--color COLOR] [--description DESC] [--consent]
```
Create a new facet directory and initial `facet.json`.
- `title`: display title used for the facet.
- `--emoji`: optional icon emoji (default: `📦`).
+- `--icon`: optional Lucide icon name that overrides the emoji-derived interface icon.
- `--color`: optional hex color (default: `#667eea`).
- `--description`: optional description text.
- `--consent`: asserts that the agent has received a direct owner request or explicit owner approval before calling this command. Pass when acting proactively (cogitate, suggestion flows) rather than in direct response to an owner instruction. Adds `"consent": true` to the audit log entry.
@@ -81,12 +82,13 @@ Examples:
```bash
sol call journal facet create "Acme Project"
sol call journal facet create "Personal" --emoji "🏠" --color "#ff6f61" --description "Life admin"
+sol call journal facet create "Research" --emoji "📚" --icon library
```
## facet update
```bash
-sol call journal facet update <name> [--title T] [--description D] [--emoji E] [--color C]
+sol call journal facet update <name> [--title T] [--description D] [--emoji E] [--icon ICON] [--color C]
```
Update facet metadata fields.
@@ -95,12 +97,14 @@ Update facet metadata fields.
- `--title`: optional new display title.
- `--description`: optional new description.
- `--emoji`: optional new icon emoji.
+- `--icon`: optional Lucide icon name; pass an empty string to clear and use the emoji-derived icon.
- `--color`: optional new hex color.
Example:
```bash
sol call journal facet update work --description "Client work and planning" --emoji "🛠"
+sol call journal facet update work --icon brain
```
## facet rename
diff --git a/solstone/think/facets.py b/solstone/think/facets.py
index fde3d431a..d756c4699 100644
--- a/solstone/think/facets.py
+++ b/solstone/think/facets.py
@@ -12,6 +12,7 @@ from datetime import datetime, timedelta, timezone
from pathlib import Path
from typing import Any, Optional
+from solstone.convey.icons import is_lucide_icon
from solstone.think.journal_io import append_text, atomic_replace, hold_lock
from solstone.think.utils import day_dirs, day_path, get_journal, iter_segments
@@ -245,6 +246,13 @@ def _write_facet_json(path: Path, data: dict[str, Any]) -> None:
atomic_replace(path, json.dumps(data, indent=2, ensure_ascii=False) + "\n")
+def _validate_icon(icon: str) -> None:
+ if not is_lucide_icon(icon):
+ raise ValueError(
+ f"unknown Lucide icon '{icon}' — open the picker or see lucide.dev/icons"
+ )
+
+
def ensure_facet(slug: str) -> bool:
"""Ensure a facet directory has facet metadata."""
facet_path = Path(get_journal()) / "facets" / slug
@@ -328,6 +336,8 @@ def get_facets() -> dict[str, dict[str, object]]:
"emoji": facet_data.get("emoji", ""),
"muted": facet_data.get("muted", False),
}
+ if "icon" in facet_data:
+ facet_info["icon"] = facet_data["icon"]
facets[facet_name] = facet_info
except (
@@ -759,6 +769,7 @@ def create_facet(
color: str = "#667eea",
description: str = "",
*,
+ icon: str = "",
consent: bool = False,
) -> str:
"""Create a new facet directory with facet.json.
@@ -768,6 +779,7 @@ def create_facet(
emoji: Icon emoji (default: "📦")
color: Hex color (default: "#667eea")
description: Facet description
+ icon: Lucide icon name override
Returns:
The generated slug name for the facet
@@ -789,6 +801,9 @@ def create_facet(
if slug in get_facets():
raise ValueError(f"Facet '{slug}' already exists")
+ if icon:
+ _validate_icon(icon)
+
facet_path = Path(get_journal()) / "facets" / slug
facet_path.mkdir(parents=True, exist_ok=True)
facet_json_path = facet_path / "facet.json"
@@ -799,6 +814,8 @@ def create_facet(
"color": color,
"emoji": emoji,
}
+ if icon:
+ facet_data["icon"] = icon
_write_facet_json(facet_json_path, facet_data)
@@ -808,6 +825,8 @@ def create_facet(
"color": color,
"description": description,
}
+ if icon:
+ log_params["icon"] = icon
if consent:
log_params["consent"] = True
log_call_action(
@@ -823,7 +842,7 @@ def update_facet(name: str, **kwargs: Any) -> dict[str, Any]:
Args:
name: Facet name
- **kwargs: Fields to update (title, description, emoji, color)
+ **kwargs: Fields to update (title, description, emoji, color, icon)
Returns:
Dict of changed fields {field: {"old": ..., "new": ...}}
@@ -846,7 +865,8 @@ def update_facet(name: str, **kwargs: Any) -> dict[str, Any]:
allowed_fields = {"title", "description", "color", "emoji"}
changed_fields: dict[str, Any] = {}
filtered = {k: v for k, v in kwargs.items() if k in allowed_fields}
- if not filtered:
+ icon_provided = "icon" in kwargs
+ if not filtered and not icon_provided:
raise ValueError("No valid fields to update")
for field, new_value in filtered.items():
@@ -855,6 +875,19 @@ def update_facet(name: str, **kwargs: Any) -> dict[str, Any]:
changed_fields[field] = {"old": old_value, "new": new_value}
facet_data[field] = new_value
+ if icon_provided:
+ new_icon = kwargs["icon"]
+ old_icon = facet_data.get("icon")
+ if new_icon:
+ _validate_icon(new_icon)
+ if old_icon != new_icon:
+ changed_fields["icon"] = {"old": old_icon, "new": new_icon}
+ facet_data["icon"] = new_icon
+ else:
+ if "icon" in facet_data:
+ changed_fields["icon"] = {"old": old_icon, "new": None}
+ facet_data.pop("icon")
+
_write_facet_json(facet_json_path, facet_data)
if changed_fields:
diff --git a/solstone/think/tools/call.py b/solstone/think/tools/call.py
index 26cb19103..a671f6a22 100644
--- a/solstone/think/tools/call.py
+++ b/solstone/think/tools/call.py
@@ -246,6 +246,9 @@ def create(
emoji: str = typer.Option("📦", "--emoji", help="Icon emoji."),
color: str = typer.Option("#667eea", "--color", help="Hex color."),
description: str = typer.Option("", "--description", help="Facet description."),
+ icon: str = typer.Option(
+ "", "--icon", help="Lucide icon name (overrides the emoji-derived icon)."
+ ),
consent: bool = typer.Option(
False,
"--consent",
@@ -259,6 +262,7 @@ def create(
emoji=emoji,
color=color,
description=description,
+ icon=icon,
consent=consent,
)
except ValueError as e:
@@ -276,6 +280,9 @@ def update(
),
emoji: str | None = typer.Option(None, "--emoji", help="New icon emoji."),
color: str | None = typer.Option(None, "--color", help="New hex color."),
+ icon: str | None = typer.Option(
+ None, "--icon", help="Lucide icon name; pass empty string to clear."
+ ),
) -> None:
"""Update facet configuration."""
kwargs = {}
@@ -287,10 +294,12 @@ def update(
kwargs["emoji"] = emoji
if color is not None:
kwargs["color"] = color
+ if icon is not None:
+ kwargs["icon"] = icon
if not kwargs:
typer.echo(
- "Error: No fields to update. Use --title, --description, --emoji, or --color.",
+ "Error: No fields to update. Use --title, --description, --emoji, --color, or --icon.",
err=True,
)
raise typer.Exit(1)
diff --git a/tests/test_call.py b/tests/test_call.py
index 39dabb54b..8f98fb412 100644
--- a/tests/test_call.py
+++ b/tests/test_call.py
@@ -483,6 +483,17 @@ class TestFacetCRUD:
assert payload["color"] == "#ff0000"
assert payload["description"] == "A cool project"
+ def test_facet_create_with_icon(self, facet_journal):
+ """Create persists a Lucide icon override."""
+ result = runner.invoke(
+ call_app,
+ ["journal", "facet", "create", "Icon Project", "--icon", "coins"],
+ )
+ assert result.exit_code == 0
+ facet_file = facet_journal / "facets" / "icon-project" / "facet.json"
+ payload = json.loads(facet_file.read_text(encoding="utf-8"))
+ assert payload["icon"] == "coins"
+
def test_facet_create_duplicate(self, facet_journal):
"""Create rejects duplicate slugs."""
result = runner.invoke(call_app, ["journal", "facet", "create", "Test Facet"])
@@ -511,6 +522,55 @@ class TestFacetCRUD:
assert payload["description"] == "New desc"
assert payload["emoji"] == "🎯"
+ def test_facet_update_with_icon_and_emoji(self, facet_journal):
+ """Update persists an icon override without mutating emoji behavior."""
+ result = runner.invoke(
+ call_app,
+ [
+ "journal",
+ "facet",
+ "update",
+ "test-facet",
+ "--emoji",
+ "🎯",
+ "--icon",
+ "brain",
+ ],
+ )
+ assert result.exit_code == 0
+ facet_file = facet_journal / "facets" / "test-facet" / "facet.json"
+ payload = json.loads(facet_file.read_text(encoding="utf-8"))
+ assert payload["emoji"] == "🎯"
+ assert payload["icon"] == "brain"
+
+ def test_facet_update_icon_clear(self, facet_journal):
+ """Update --icon '' clears the icon override."""
+ facet_file = facet_journal / "facets" / "test-facet" / "facet.json"
+ payload = json.loads(facet_file.read_text(encoding="utf-8"))
+ payload["icon"] = "brain"
+ facet_file.write_text(json.dumps(payload, indent=2) + "\n", encoding="utf-8")
+
+ result = runner.invoke(
+ call_app,
+ ["journal", "facet", "update", "test-facet", "--icon", ""],
+ )
+ assert result.exit_code == 0
+ payload = json.loads(facet_file.read_text(encoding="utf-8"))
+ assert "icon" not in payload
+
+ def test_facet_update_invalid_icon(self, facet_journal):
+ """Invalid icon names fail with the guiding validation message."""
+ facet_file = facet_journal / "facets" / "test-facet" / "facet.json"
+ before = facet_file.read_text(encoding="utf-8")
+
+ result = runner.invoke(
+ call_app,
+ ["journal", "facet", "update", "test-facet", "--icon", "bogus"],
+ )
+ assert result.exit_code == 1
+ assert "open the picker or see lucide.dev/icons" in result.output
+ assert facet_file.read_text(encoding="utf-8") == before
+
def test_facet_update_not_found(self, facet_journal):
"""Update fails when facet does not exist."""
result = runner.invoke(
diff --git a/tests/test_convey_apps.py b/tests/test_convey_apps.py
index 006a6b2f4..f91fa5a8d 100644
--- a/tests/test_convey_apps.py
+++ b/tests/test_convey_apps.py
@@ -12,6 +12,7 @@ from jinja2 import ChoiceLoader, FileSystemLoader
from solstone.apps import AppRegistry
from solstone.convey.apps import register_app_context
from solstone.convey.chat_stream import append_chat_event
+from solstone.convey.icons import lucide_svg
from solstone.convey.sol_initiated.copy import CATEGORIES, KIND_SOL_CHAT_REQUEST
REPO_ROOT = Path(__file__).resolve().parents[1]
@@ -137,6 +138,18 @@ def test_get_facets_data_adds_icon_svg_and_preserves_emoji(monkeypatch):
"color": "#654321",
"emoji": "🪮",
},
+ "override": {
+ "title": "Override",
+ "color": "#abcdef",
+ "emoji": "📚",
+ "icon": "brain",
+ },
+ "dangling": {
+ "title": "Dangling",
+ "color": "#fedcba",
+ "emoji": "📚",
+ "icon": "definitely-not-an-icon",
+ },
},
)
monkeypatch.setattr("solstone.convey.config.load_convey_config", lambda: {})
@@ -145,9 +158,16 @@ def test_get_facets_data_adds_icon_svg_and_preserves_emoji(monkeypatch):
by_name = {facet["name"]: facet for facet in facets}
assert by_name["library"]["emoji"] == "📚"
+ assert by_name["library"]["icon"] == ""
assert "<svg" in by_name["library"]["icon_svg"]
assert by_name["comb"]["emoji"] == "🪮"
+ assert by_name["comb"]["icon"] == ""
assert by_name["comb"]["icon_svg"] is None
+ assert by_name["override"]["icon"] == "brain"
+ assert by_name["override"]["icon_svg"] == lucide_svg("brain")
+ assert by_name["override"]["icon_svg"] != lucide_svg("library")
+ assert by_name["dangling"]["icon"] == "definitely-not-an-icon"
+ assert by_name["dangling"]["icon_svg"] == lucide_svg("library")
# --- Placeholder resolution ---
diff --git a/tests/test_facets.py b/tests/test_facets.py
index 797d2b890..4205fda1d 100644
--- a/tests/test_facets.py
+++ b/tests/test_facets.py
@@ -16,12 +16,14 @@ from solstone.think.facets import (
_get_principal_display_name,
_rank_entities_by_signal,
aggregate_speculative_facets,
+ create_facet,
ensure_facet,
facet_summaries,
facet_summary,
find_orphan_facets,
get_active_facets,
get_facets,
+ update_facet,
)
# Use the permanent fixtures in tests/fixtures/journal/facets/
@@ -86,6 +88,93 @@ def setup_facet(
return facet_dir
+def _facet_json_bytes(payload: dict[str, object]) -> str:
+ return json.dumps(payload, indent=2, ensure_ascii=False) + "\n"
+
+
+def test_create_facet_with_icon_persists_icon(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+
+ slug = create_facet("Treasury", icon="coins")
+
+ payload = json.loads(
+ (tmp_path / "facets" / slug / "facet.json").read_text(encoding="utf-8")
+ )
+ assert payload["icon"] == "coins"
+
+
+def test_create_facet_without_icon_omits_icon_key(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+
+ slug = create_facet("No Icon")
+
+ expected = {
+ "title": "No Icon",
+ "description": "",
+ "color": "#667eea",
+ "emoji": "📦",
+ }
+ assert (tmp_path / "facets" / slug / "facet.json").read_text(
+ encoding="utf-8"
+ ) == _facet_json_bytes(expected)
+
+
+def test_update_facet_icon_set_persists(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+ slug = create_facet("Thinking")
+
+ changed = update_facet(slug, icon="brain")
+
+ payload = json.loads(
+ (tmp_path / "facets" / slug / "facet.json").read_text(encoding="utf-8")
+ )
+ assert changed["icon"] == {"old": None, "new": "brain"}
+ assert payload["icon"] == "brain"
+
+
+def test_update_facet_invalid_icon_writes_nothing(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+ slug = create_facet("Stable")
+ facet_path = tmp_path / "facets" / slug / "facet.json"
+ before = facet_path.read_text(encoding="utf-8")
+
+ with pytest.raises(ValueError, match="open the picker or see lucide.dev/icons"):
+ update_facet(slug, title="Changed", icon="not-a-real-icon")
+
+ assert facet_path.read_text(encoding="utf-8") == before
+ assert "icon" not in json.loads(before)
+
+
+def test_update_facet_icon_clear_removes_key(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+ slug = create_facet("Clearable", icon="brain")
+
+ changed = update_facet(slug, icon="")
+
+ payload = json.loads(
+ (tmp_path / "facets" / slug / "facet.json").read_text(encoding="utf-8")
+ )
+ assert changed["icon"] == {"old": "brain", "new": None}
+ assert "icon" not in payload
+
+
+def test_update_facet_icon_clear_when_absent_is_observable_noop(tmp_path, monkeypatch):
+ monkeypatch.setenv("SOLSTONE_JOURNAL", str(tmp_path))
+ slug = create_facet("Already Emoji")
+ facet_path = tmp_path / "facets" / slug / "facet.json"
+ before = facet_path.read_text(encoding="utf-8")
+ today = datetime.now().strftime("%Y%m%d")
+ log_path = tmp_path / "facets" / slug / "logs" / f"{today}.jsonl"
+ before_log = log_path.read_text(encoding="utf-8")
+
+ changed = update_facet(slug, icon="")
+
+ assert changed == {}
+ assert facet_path.read_text(encoding="utf-8") == before
+ assert "icon" not in json.loads(before)
+ assert log_path.read_text(encoding="utf-8") == before_log
+
+
def write_identity_config(
journal_path: Path,
*,
diff --git a/tests/test_icons.py b/tests/test_icons.py
index 219931ba5..261a5fd51 100644
--- a/tests/test_icons.py
+++ b/tests/test_icons.py
@@ -12,9 +12,13 @@ from pathlib import Path
from solstone.apps import AppRegistry
from solstone.convey.icons import (
APP_LUCIDE_MAP,
+ _lucide_tags,
emoji_to_lucide,
+ is_lucide_icon,
lucide_svg,
lucide_svg_for_emoji,
+ resolve_facet_icon_svg,
+ search_lucide_icons,
)
REPO_ROOT = Path(__file__).resolve().parents[1]
@@ -25,6 +29,12 @@ def test_lucide_svg_hit_and_miss() -> None:
assert lucide_svg("not-a-lucide-icon") is None
+def test_is_lucide_icon() -> None:
+ assert is_lucide_icon("house") is True
+ assert is_lucide_icon("not-a-lucide-icon") is False
+ assert is_lucide_icon("") is False
+
+
def test_emoji_to_lucide_required_cases() -> None:
assert emoji_to_lucide("📚") == "library"
assert emoji_to_lucide("🤝") == "handshake"
@@ -44,6 +54,50 @@ def test_lucide_svg_for_emoji_hit_and_miss() -> None:
assert lucide_svg_for_emoji("🪮") is None
+def test_resolve_facet_icon_svg_precedence_and_fallback() -> None:
+ assert resolve_facet_icon_svg("brain", "📚") == lucide_svg("brain")
+ assert resolve_facet_icon_svg(None, "📚") == lucide_svg("library")
+ assert resolve_facet_icon_svg("", "📚") == lucide_svg("library")
+ assert resolve_facet_icon_svg("definitely-not-an-icon", "📚") == lucide_svg(
+ "library"
+ )
+ assert resolve_facet_icon_svg("coins", "🪮") == lucide_svg("coins")
+
+
+def test_search_lucide_icons_lock_matches_name_or_tag() -> None:
+ tags = _lucide_tags()
+ results = search_lucide_icons("lock")
+
+ assert results
+ assert all(
+ "lock" in result["name"]
+ or any("lock" in tag for tag in tags.get(result["name"], []))
+ for result in results
+ )
+
+
+def test_search_lucide_icons_empty_is_alphabetical_and_limited() -> None:
+ results = search_lucide_icons("", limit=7)
+ names = [result["name"] for result in results]
+
+ assert len(results) == 7
+ assert names == sorted(names)
+
+
+def test_search_lucide_icons_respects_limit() -> None:
+ assert len(search_lucide_icons("lock", limit=5)) <= 5
+
+
+def test_search_lucide_icons_orders_name_matches_before_tag_only() -> None:
+ results = search_lucide_icons("brain", limit=20)
+ names = [result["name"] for result in results]
+ tag_only_start = next(i for i, name in enumerate(names) if "brain" not in name)
+
+ assert tag_only_start > 0
+ assert all("brain" in name for name in names[:tag_only_start])
+ assert all("brain" not in name for name in names[tag_only_start:])
+
+
def test_lucide_loading_is_package_relative(tmp_path: Path) -> None:
env = os.environ.copy()
pythonpath = env.get("PYTHONPATH")