tsoft-cli 3.12.0 → 3.12.1

package/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to T-Soft CLI will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.12.1] - 2026-08-08
+
+### Fixed
+- Theme lists no longer call two different things "active". Standing inside a theme directory and running `tsoft theme use` named that theme on one line and then marked a different one as active in the list below it. The mark was reading which theme is published on the storefront, while the line above was reading the theme you are working on — both were correct, and both were called active. The theme you are working on is now marked `(Selected)` and the one your customers see is marked `(Published)`, so a list can show both without the two contradicting each other. `theme list`, `theme pull` and `theme dev` use the same two marks.
+
 ## [3.12.0] - 2026-08-05
 
 ### Added

package/locales/en.json

@@ -133,6 +133,8 @@
   "theme.use.select_title": "🎯 Theme Selection",
   "theme.use.set": "✓ Active theme set: {{name}}",
   "theme.use.folder": "Folder: {{folder}}",
+  "theme.mark.selected": "(Selected)",
+  "theme.mark.published": "(Published)",
   "push.no_active_theme": "No active theme found.",
   "push.usage": "Usage: tsoft theme push <theme-name>",
   "push.use_tip": "Or set an active theme with \"tsoft theme use <theme-name>\".",

package/locales/tr.json

@@ -133,6 +133,8 @@
   "theme.use.select_title": "🎯 Tema Seçimi",
   "theme.use.set": "✓ Aktif tema ayarlandı: {{name}}",
   "theme.use.folder": "Klasör: {{folder}}",
+  "theme.mark.selected": "(Seçili)",
+  "theme.mark.published": "(Yayında)",
   "push.no_active_theme": "Aktif tema bulunamadı.",
   "push.usage": "Kullanim: tsoft theme push <theme-name>",
   "push.use_tip": "veya \"tsoft theme use <theme-name>\" ile aktif tema ayarlayın.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsoft-cli",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "Command-line tool for tsoft360 theme development and management",
   "type": "module",
   "main": "src/index.js",

package/src/commands/theme-dev.js

@@ -7,6 +7,7 @@ import chokidar from 'chokidar';
 import {createApiClient} from '../api-client.js';
 import open from 'open';
 import {normalizeStoreDomain, slugify, setActiveTheme, getActiveTheme, getActiveStore, getWorkspaceRoot} from '../storage.js';
+import {decorateThemeName} from '../ui/theme-choice.js';
 import {brandedConfirm, brandedSelect, showWarning, showError, showInfo} from '../ui/prompt-wrapper.js';
 import {themeSectionMenuCommand} from './theme-section.js';
 import { t } from '../i18n.js';
@@ -397,7 +398,7 @@ export async function themeDevCommand(themeName) {
 
                 console.log();
                 const themeChoices = themes.map(theme => ({
-                    name: `${theme.name} ${chalk.gray(`v${theme.version}`)} ${theme.active ? chalk.green('(Aktif)') : ''}`,
+                    name: decorateThemeName(theme, themeSlug),
                     value: theme,
                     description: theme.description || `Klasör: ${theme.theme_folder}`
                 }));

package/src/commands/theme.js

@@ -5,8 +5,9 @@ import {createWriteStream} from 'fs';
 import path from 'path';
 import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
-import {normalizeStoreDomain, slugify, setActiveTheme, getActiveStore, getWorkspaceRoot, getWorkspaceContext} from '../storage.js';
+import {normalizeStoreDomain, slugify, setActiveTheme, getActiveTheme, getActiveStore, getWorkspaceRoot, getWorkspaceContext} from '../storage.js';
 import {brandedConfirm, brandedSelect, brandedSearch, showWarning} from '../ui/prompt-wrapper.js';
+import {themeLabels, decorateThemeName} from '../ui/theme-choice.js';
 import { isJsonMode, jsonOut } from '../output-mode.js';
 import { mapError } from '../errors/error-mapper.js';
 import { t } from '../i18n.js';
@@ -48,13 +49,16 @@ export async function themeListCommand() {
 
         console.log(chalk.bold.cyan(t('theme.count', { count: themes.length }) + '\n'));
 
+        const localTheme = await getActiveTheme();
+
         themes.forEach((theme) => {
-            const activeIndicator = theme.active ? chalk.green('●') : chalk.gray('○');
-            const name = theme.active ? chalk.bold.green(theme.name) : chalk.white(theme.name);
-            const version = chalk.gray(`v${theme.version}`);
+            const labels = themeLabels(theme, localTheme);
+            const indicator = labels.includes('selected')
+                ? chalk.cyan('●')
+                : (labels.includes('published') ? chalk.green('●') : chalk.gray('○'));
             const description = theme.description ? chalk.gray(` - ${theme.description}`) : '';
 
-            console.log(`${activeIndicator} ${name} ${version}${description}`);
+            console.log(`${indicator} ${decorateThemeName(theme, localTheme)}${description}`);
             console.log(chalk.gray(`   ${t('theme.folder_label')} ${theme.theme_folder || theme.alias}`));
             console.log();
         });
@@ -349,8 +353,10 @@ export async function themePullCommand() {
             return;
         }
 
+        const localTheme = await getActiveTheme();
+
         const themeChoices = themes.map(theme => ({
-            name: `${theme.name} ${chalk.gray(`v${theme.version}`)} ${theme.active ? chalk.green('(Aktif)') : ''}`,
+            name: decorateThemeName(theme, localTheme),
             value: theme,
             description: theme.description || `${t('theme.folder_label')} ${theme.theme_folder}`
         }));
@@ -463,8 +469,10 @@ export async function themeUseCommand(themeName = null) {
                 process.exit(1);
             }
         } else {
+            const localTheme = await getActiveTheme();
+
             const themeChoices = themes.map(theme => ({
-                name: `${theme.name} ${chalk.gray(`v${theme.version}`)} ${theme.active ? chalk.green('(Şu an aktif)') : ''}`,
+                name: decorateThemeName(theme, localTheme),
                 value: theme,
                 description: theme.description || `${t('theme.folder_label')} ${theme.theme_folder}`,
                 keywords: [theme.theme_folder, theme.alias].filter(Boolean),

package/src/ui/theme-choice.js

@@ -0,0 +1,33 @@
+import chalk from 'chalk';
+import { slugify } from '../storage.js';
+import { t } from '../i18n.js';
+
+export function themeLabels(theme, selectedTheme) {
+    const labels = [];
+
+    const folder = theme.theme_folder || theme.alias;
+
+    if (selectedTheme && (folder === selectedTheme || slugify(theme.name) === selectedTheme)) {
+        labels.push('selected');
+    }
+
+    if (theme.active) {
+        labels.push('published');
+    }
+
+    return labels;
+}
+
+export function decorateThemeName(theme, selectedTheme) {
+    const labels = themeLabels(theme, selectedTheme);
+
+    const name = labels.includes('selected')
+        ? chalk.bold.cyan(theme.name)
+        : chalk.white(theme.name);
+
+    const marks = labels.map(label => label === 'selected'
+        ? chalk.cyan(t('theme.mark.selected'))
+        : chalk.green(t('theme.mark.published')));
+
+    return [name, chalk.gray(`v${theme.version}`), ...marks].join(' ');
+}