threadwell 0.0.6 → 0.0.7

package/dist/modes/interactive/interactive-mode.js

@@ -62,7 +62,8 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { configureVisualProfile, getVisualTokens } from "./theme/visual-profile.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -241,9 +242,10 @@ export class InteractiveMode {
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
-        // Register themes from resource loader and initialize
-        setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-        initTheme(this.settingsManager.getTheme(), true);
+        configureVisualProfile(this.settingsManager.getVisualProfileSetting());
+        // Theme customization is frozen; keep the built-in dark theme active for stable rendering.
+        setRegisteredThemes([]);
+        initTheme("dark", false);
     }
     getAutocompleteSourceTag(sourceInfo) {
         if (!sourceInfo) {
@@ -364,7 +366,13 @@ export class InteractiveMode {
         return await checkForNewThreadwellVersion(this.version, { timeoutMs: 1500 });
     }
     getStartupWhatsNewLines() {
-        const whatsNewLines = ["• context usage bar", "• startup interface toggles", "• cleaner visual cards"];
+        const visual = getVisualTokens();
+        const bullet = visual.glyphs.bullet;
+        const whatsNewLines = [
+            `${bullet} context usage bar`,
+            `${bullet} startup interface toggles`,
+            `${bullet} cleaner visual cards`,
+        ];
         if (!this.changelogMarkdown)
             return [theme.fg("muted", `v${this.version}`), ...whatsNewLines];
         const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
@@ -373,7 +381,7 @@ export class InteractiveMode {
             .split("\n")
             .map((line) => line.trim())
             .filter((line) => /^[-*•]\s+/.test(line))
-            .map((line) => line.replace(/^[-*•]\s+/, "• "))
+            .map((line) => line.replace(/^[-*•]\s+/, `${bullet} `))
             .slice(0, 2);
         return [
             ...whatsNewLines,
@@ -386,10 +394,12 @@ export class InteractiveMode {
     getStartupUpdateLines() {
         if (!this.startupUpdateVersion)
             return [""];
+        const visual = getVisualTokens();
+        const warning = visual.glyphs.warning;
         return [
-            `${theme.fg("warning", "update")}     ${theme.fg("warning", `v${this.startupUpdateVersion} available`)}`,
-            `${theme.fg("dim", "run")}        ${theme.fg("accent", `${APP_NAME} update`)}`,
-            `${theme.fg("dim", "inside")}     ${theme.fg("accent", "/update")} for details`,
+            `${theme.fg("warning", warning)} ${theme.fg("warning", `v${this.startupUpdateVersion} available`)}`,
+            `${theme.fg("dim", "run")} ${theme.fg("accent", `${APP_NAME} update`)}`,
+            `${theme.fg("dim", "or")}  ${theme.fg("accent", "/update")} for details`,
             "",
         ];
     }
@@ -439,11 +449,41 @@ export class InteractiveMode {
         this.ui.addChild(this.headerContainer);
         // Add header with keybindings from config (unless silenced)
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
-            const title = theme.bold(theme.fg("accent", DISTRO_IDENTITY.name)) + theme.fg("dim", ` v${this.version}`);
+            const visual = getVisualTokens();
+            const glyphs = visual.glyphs;
+            const title = theme.bold(theme.fg("accent", `${visual.enhanced ? `${glyphs.threadwell} ` : ""}${DISTRO_IDENTITY.name}`)) +
+                theme.fg("dim", ` v${this.version}`);
             const cwd = this.sessionManager.getCwd();
+            const cwdLabel = path.basename(cwd) || cwd;
             const model = this.session.state.model;
             const modelText = model ? `${model.provider}/${model.id}` : "no model selected";
-            const continuityText = this.settingsManager.getContinuityEnabled() ? "active" : "disabled";
+            const continuityEnabled = this.settingsManager.getContinuityEnabled();
+            const continuityText = continuityEnabled ? "active" : "disabled";
+            const memorySettings = this.settingsManager.getMemorySettings();
+            const memoryText = memorySettings.enabled ? (memorySettings.inject ? "injecting" : "enabled") : "off";
+            const statusPill = (label, value, active = true) => {
+                const valueColor = active ? "accent" : "dim";
+                return `${theme.fg("dim", label)} ${theme.fg(valueColor, value)}`;
+            };
+            const gitStatus = this.footerDataProvider.getGitStatus();
+            const formatEnhancedGitStatus = () => {
+                if (!gitStatus)
+                    return undefined;
+                const parts = [`${theme.fg("dim", "git")} ${theme.fg("accent", gitStatus.branch)}`];
+                if (gitStatus.staged > 0)
+                    parts.push(theme.fg("success", `+${gitStatus.staged}`));
+                if (gitStatus.unstaged > 0)
+                    parts.push(theme.fg("error", `-${gitStatus.unstaged}`));
+                if (gitStatus.untracked > 0)
+                    parts.push(theme.fg("warning", `?${gitStatus.untracked}`));
+                if (gitStatus.conflicts > 0)
+                    parts.push(theme.fg("error", `!${gitStatus.conflicts}`));
+                if (gitStatus.ahead > 0)
+                    parts.push(theme.fg("accent", `↑${gitStatus.ahead}`));
+                if (gitStatus.behind > 0)
+                    parts.push(theme.fg("warning", `↓${gitStatus.behind}`));
+                return parts.join(theme.fg("muted", " "));
+            };
             const startupSummary = [
                 `${title} ${theme.fg("dim", `(${APP_NAME})`)}`,
                 theme.fg("muted", DISTRO_IDENTITY.tagline),
@@ -451,6 +491,7 @@ export class InteractiveMode {
                 `${theme.fg("dim", "cwd")}        ${cwd}`,
                 `${theme.fg("dim", "model")}      ${modelText}`,
                 `${theme.fg("dim", "continuity")} ${continuityText}`,
+                `${theme.fg("dim", "memory")}     ${memoryText}`,
             ].join("\n");
             // Build startup instructions using keybinding hint helpers
             const hint = (keybinding, description) => keyHint(keybinding, description);
@@ -481,20 +522,40 @@ export class InteractiveMode {
                 rawKeyHint("/", "commands"),
                 rawKeyHint("!", "bash"),
                 hint("app.tools.expand", "more"),
-            ].join(theme.fg("muted", " · "));
+            ].join(theme.fg("muted", ` ${glyphs.separator} `));
             const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
             const onboarding = theme.fg("dim", `${DISTRO_IDENTITY.name} keeps project continuity in context. Ask it what remains or where you left off.`);
+            const enhancedPrimaryStatusLine = [
+                statusPill(glyphs.folder, cwdLabel),
+                statusPill(glyphs.model, modelText),
+            ].join(theme.fg("muted", ` ${glyphs.separator} `));
+            const enhancedRuntimeStatusLine = [
+                statusPill("continuity", continuityText, continuityEnabled),
+                statusPill("memory", memoryText, memorySettings.enabled),
+            ].join(theme.fg("muted", ` ${glyphs.separator} `));
+            const enhancedGitStatusLine = formatEnhancedGitStatus();
+            const leftLines = visual.enhanced
+                ? [
+                    theme.fg("muted", DISTRO_IDENTITY.tagline),
+                    enhancedPrimaryStatusLine,
+                    enhancedRuntimeStatusLine,
+                    ...(enhancedGitStatusLine ? [enhancedGitStatusLine] : []),
+                    ...this.getStartupUpdateLines(),
+                ]
+                : [
+                    theme.fg("muted", DISTRO_IDENTITY.tagline),
+                    `${theme.fg("dim", "cwd")}        ${cwd}`,
+                    `${theme.fg("dim", "model")}      ${modelText}`,
+                    `${theme.fg("dim", "continuity")} ${continuityText}`,
+                    ...this.getStartupUpdateLines(),
+                ];
             this.builtInHeader = interfaceSettings.showStartupCard
                 ? new SplitInfoCard({
-                    leftTitle: `${DISTRO_IDENTITY.name} ${this.version}`,
-                    rightTitle: "What's new",
-                    leftLines: [
-                        theme.fg("muted", DISTRO_IDENTITY.tagline),
-                        `${theme.fg("dim", "cwd")}        ${cwd}`,
-                        `${theme.fg("dim", "model")}      ${modelText}`,
-                        `${theme.fg("dim", "continuity")} ${continuityText}`,
-                        ...this.getStartupUpdateLines(),
-                    ],
+                    leftTitle: visual.enhanced
+                        ? `${glyphs.threadwell} ${DISTRO_IDENTITY.name} ${this.version}`
+                        : `${DISTRO_IDENTITY.name} ${this.version}`,
+                    rightTitle: visual.enhanced ? `${glyphs.info} What's new` : "What's new",
+                    leftLines,
                     rightLines: this.getStartupWhatsNewLines(),
                     footerLines: [
                         compactInstructions,
@@ -1035,7 +1096,6 @@ export class InteractiveMode {
         };
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
-        const themesResult = this.session.resourceLoader.getThemes();
         const extensions = options?.extensions ??
             this.session.resourceLoader.getExtensions().extensions.map((extension) => ({
                 path: extension.path,
@@ -1057,11 +1117,6 @@ export class InteractiveMode {
                 sourceInfos.set(prompt.filePath, prompt.sourceInfo);
             }
         }
-        for (const loadedTheme of themesResult.themes) {
-            if (loadedTheme.sourcePath && loadedTheme.sourceInfo) {
-                sourceInfos.set(loadedTheme.sourcePath, loadedTheme.sourceInfo);
-            }
-        }
         if (showListing) {
             const interfaceSettings = this.settingsManager.getInterfaceSettings();
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
@@ -1109,21 +1164,6 @@ export class InteractiveMode {
                 const extensionCompactList = formatCompactList(this.getCompactExtensionLabels(extensions));
                 addLoadedSection("Extensions", extensionCompactList, extList, "mdHeading");
             }
-            // Show loaded themes (excluding built-in)
-            const loadedThemes = themesResult.themes;
-            const customThemes = loadedThemes.filter((t) => t.sourcePath);
-            if (customThemes.length > 0) {
-                const groups = this.buildScopeGroups(customThemes.map((loadedTheme) => ({
-                    path: loadedTheme.sourcePath,
-                    sourceInfo: loadedTheme.sourceInfo,
-                })));
-                const themeList = this.formatScopeGroups(groups, {
-                    formatPath: (item) => this.formatDisplayPath(item.path),
-                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
-                });
-                const themeCompactList = formatCompactList(customThemes.map((loadedTheme) => loadedTheme.name ?? this.getCompactPathLabel(loadedTheme.sourcePath, loadedTheme.sourceInfo)));
-                addLoadedSection("Themes", themeCompactList, themeList);
-            }
         }
         if (showDiagnostics) {
             const skillDiagnostics = skillsResult.diagnostics;
@@ -1155,12 +1195,6 @@ export class InteractiveMode {
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
-            const themeDiagnostics = themesResult.diagnostics;
-            if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
         }
     }
     /**
@@ -3423,8 +3457,6 @@ export class InteractiveMode {
                 transport: this.settingsManager.getTransport(),
                 thinkingLevel: this.session.thinkingLevel,
                 availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-                currentTheme: this.settingsManager.getTheme() || "dark",
-                availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
                 enableInstallTelemetry: this.settingsManager.getEnableInstallTelemetry(),
@@ -3492,21 +3524,6 @@ export class InteractiveMode {
                     this.footer.invalidate();
                     this.updateEditorBorderColor();
                 },
-                onThemeChange: (themeName) => {
-                    const result = setTheme(themeName, true);
-                    this.settingsManager.setTheme(themeName);
-                    this.ui.invalidate();
-                    if (!result.success) {
-                        this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
-                    }
-                },
-                onThemePreview: (themeName) => {
-                    const result = setTheme(themeName, true);
-                    if (result.success) {
-                        this.ui.invalidate();
-                        this.ui.requestRender();
-                    }
-                },
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
@@ -4290,7 +4307,7 @@ export class InteractiveMode {
         const borderColor = (s) => theme.fg("border", s);
         reloadBox.addChild(new DynamicBorder(borderColor));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes..."), 1, 0));
+        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts..."), 1, 0));
         reloadBox.addChild(new Spacer(1));
         reloadBox.addChild(new DynamicBorder(borderColor));
         const previousEditor = this.editor;
@@ -4312,13 +4329,9 @@ export class InteractiveMode {
             if (isExpandable(activeHeader)) {
                 activeHeader.setExpanded(this.toolOutputExpanded);
             }
-            setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
+            setRegisteredThemes([]);
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
-            const themeName = this.settingsManager.getTheme();
-            const themeResult = themeName ? setTheme(themeName, true) : { success: true };
-            if (!themeResult.success) {
-                this.showError(`Failed to load theme "${themeName}": ${themeResult.error}\nFell back to dark theme.`);
-            }
+            setTheme("dark", false);
             const editorPaddingX = this.settingsManager.getEditorPaddingX();
             const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
             this.defaultEditor.setPaddingX(editorPaddingX);
@@ -4342,7 +4355,7 @@ export class InteractiveMode {
             if (modelsJsonError) {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
-            this.showStatus("Reloaded keybindings, extensions, skills, prompts, themes");
+            this.showStatus("Reloaded keybindings, extensions, skills, prompts");
         }
         catch (error) {
             dismissReloadBox(previousEditor);