tsoft-cli 3.12.0 → 3.12.2

package/CHANGELOG.md

@@ -5,6 +5,17 @@ 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.2] - 2026-08-11
+
+### Fixed
+- `theme dev` no longer reports the theme you are working on as missing. Downloading a theme records which one is active, and `theme dev` then looked that record up by the theme's name — but what gets recorded is the theme's folder, so the lookup could never match and every run ended in "theme not found". Re-downloading the theme did not help, because the failure was in the lookup rather than in the files on disk. Both spellings are now accepted, so the record written by `theme pull`, `theme use` and `theme dev` resolves the same way. `theme use` also accepts a theme folder as its argument.
+- Theme lists no longer stop at the first page. `theme list`, `theme pull`, `theme use`, `theme init` and `theme section` asked the store for its themes and read only the first page of the answer, so on a store with many themes the rest were invisible: pickers showed a fraction of what was there and looking a theme up by name failed for anything further down. Every page is now read before the list is used.
+
+## [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.2",
   "description": "Command-line tool for tsoft360 theme development and management",
   "type": "module",
   "main": "src/index.js",

package/src/commands/theme-dev.js

@@ -7,8 +7,10 @@ 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 {fetchAllThemes} from '../theme-list.js';
 import { t } from '../i18n.js';
 
 function resolveSectionFolder(relativePath) {
@@ -28,32 +30,11 @@ function resolveSectionFolder(relativePath) {
     return folder.includes('.') ? null : folder;
 }
 
-async function fetchAllThemes() {
-    const apiClient = await createApiClient();
-    const all = [];
-    let page = 1;
-
-    // Server ignores per_page; we walk every page until last_page is reached.
-    // Hard cap at 20 pages to avoid accidental infinite loops.
-    for (let i = 0; i < 20; i++) {
-        const response = await apiClient.get(`/theme?per_page=500&page=${page}`);
-        const batch = response.data || [];
-        all.push(...batch);
-
-        // Laravel paginator puts last_page at the top level (not under meta).
-        // Some envelopes wrap it under meta — support both.
-        const lastPage = response.last_page ?? response.meta?.last_page ?? 1;
-        if (page >= lastPage || batch.length === 0) break;
-        page++;
-    }
-
-    return all;
-}
-
 async function getThemeUuid(themeSlug) {
-    const themes = await fetchAllThemes();
+    const { themes } = await fetchAllThemes();
 
-    const theme = themes.find(t => slugify(t.name) === themeSlug);
+    const theme = themes.find(t => t.theme_folder === themeSlug)
+        ?? themes.find(t => slugify(t.name) === themeSlug);
 
     if (!theme) {
         throw new Error(`Tema bulunamadı: ${themeSlug}`);
@@ -376,9 +357,8 @@ export async function themeDevCommand(themeName) {
         if (themeSlug && !themeName) {
             console.log(chalk.cyan(t('dev.active_site')) + ' ' + chalk.white(store));
 
-            const apiClient = await createApiClient();
             const tempThemeInfo = await getThemeUuid(themeSlug);
-            console.log(chalk.cyan(t('dev.active_theme')) + ' ' + chalk.white(`${themeSlug} (${tempThemeInfo.name} v${tempThemeInfo.version})`));
+            console.log(chalk.cyan(t('dev.active_theme')) + ' ' + chalk.white(`${slugify(tempThemeInfo.name)} (${tempThemeInfo.name} v${tempThemeInfo.version})`));
             console.log();
 
             const continueWithActive = await brandedConfirm({
@@ -387,8 +367,7 @@ export async function themeDevCommand(themeName) {
             }, t('dev.continue_title'));
 
             if (!continueWithActive) {
-                const response = await apiClient.get('/theme');
-                const themes = response.data || [];
+                const { themes } = await fetchAllThemes();
 
                 if (themes.length === 0) {
                     showWarning(t('dev.no_themes'));
@@ -397,7 +376,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}`
                 }));
@@ -406,12 +385,12 @@ export async function themeDevCommand(themeName) {
                     message: t('dev.select_theme_prompt'), choices: themeChoices
                 }, t('dev.select_theme_title'));
 
-                themeSlug = slugify(selectedTheme.name);
+                themeSlug = selectedTheme.theme_folder;
                 themeInfo = {
                     uuid: selectedTheme.theme_folder, name: selectedTheme.name, version: selectedTheme.version
                 };
 
-                await setActiveTheme(themeSlug);
+                await setActiveTheme(selectedTheme.theme_folder);
                 console.log();
             } else {
                 themeInfo = tempThemeInfo;
@@ -419,9 +398,7 @@ export async function themeDevCommand(themeName) {
         }
 
         if (!themeSlug) {
-            const apiClient = await createApiClient();
-            const response = await apiClient.get('/theme');
-            const themes = response.data || [];
+            const { themes } = await fetchAllThemes();
 
             if (themes.length === 0) {
                 showWarning(t('dev.no_themes'));
@@ -441,21 +418,23 @@ export async function themeDevCommand(themeName) {
                 uuid: selectedTheme.theme_folder, name: selectedTheme.name, version: selectedTheme.version
             };
 
-            await setActiveTheme(themeSlug);
+            await setActiveTheme(selectedTheme.theme_folder);
         } else if (!themeInfo) {
             themeInfo = await getThemeUuid(themeSlug);
         }
 
-        console.log(chalk.green(t('dev.active_theme_set', { slug: themeSlug })));
+        const themeDir = slugify(themeInfo.name);
 
-        let themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
-        console.log(chalk.green(t('dev.working_dir', { path: `${storeSlug}/${themeSlug}/` }) + '\n'));
+        console.log(chalk.green(t('dev.active_theme_set', { slug: themeDir })));
+
+        let themePath = path.join(getWorkspaceRoot(), storeSlug, themeDir);
+        console.log(chalk.green(t('dev.working_dir', { path: `${storeSlug}/${themeDir}/` }) + '\n'));
 
         // Fork check: foreign-org themes need fork before development
         {
             const apiClient = await createApiClient();
-            const orgResponse = await apiClient.get('/theme');
-            const currentTheme = (orgResponse.data || []).find(t => t.theme_folder === themeInfo.uuid);
+            const { themes: orgThemes, envelope: orgResponse } = await fetchAllThemes();
+            const currentTheme = orgThemes.find(t => t.theme_folder === themeInfo.uuid);
             const userOrg = orgResponse.user_organization;
 
             if (currentTheme && currentTheme.organization_id != null && userOrg && !userOrg.is_system && currentTheme.organization_id !== userOrg.id) {
@@ -479,8 +458,9 @@ export async function themeDevCommand(themeName) {
                 const forkedData = forkResult.data;
 
                 themeInfo = { uuid: forkedData.uuid, name: forkedData.name, version: forkedData.version };
-                themeSlug = slugify(forkedData.name);
-                themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
+                themePath = path.join(getWorkspaceRoot(), storeSlug, slugify(forkedData.name));
+
+                await setActiveTheme(forkedData.uuid);
 
                 console.log(chalk.green(t('dev.fork_success', { name: forkedData.name })));
                 console.log(chalk.gray('  ' + t('dev.fork_source', { source: forkedData.source.name, version: forkedData.source.version })));

package/src/commands/theme-init.js

@@ -6,6 +6,7 @@ import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
 import {slugify, getActiveStore, getWorkspaceRoot} from '../storage.js';
 import {brandedConfirm, brandedSelect, showWarning, showInfo, showError} from '../ui/prompt-wrapper.js';
+import {fetchAllThemes} from '../theme-list.js';
 import {normalizeStoreDomain} from '../storage.js';
 import {isJsonMode, jsonOut} from '../output-mode.js';
 import {mapError} from '../errors/error-mapper.js';
@@ -14,8 +15,7 @@ import { t } from '../i18n.js';
 export async function themeInitCommand(fromSlug) {
     try {
         const apiClient = await createApiClient();
-        const response = await apiClient.get('/theme');
-        const themes = response.data || [];
+        const { themes } = await fetchAllThemes(apiClient);
 
         let sourceTheme;
 

package/src/commands/theme.js

@@ -5,8 +5,10 @@ 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 {fetchAllThemes} from '../theme-list.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';
@@ -19,10 +21,7 @@ export async function themeListCommand() {
             console.log(chalk.cyan(t('theme.listing') + '\n'));
         }
 
-        const apiClient = await createApiClient();
-        const response = await apiClient.get('/theme');
-
-        const themes = response.data || [];
+        const { themes } = await fetchAllThemes();
 
         if (isJsonMode()) {
             jsonOut({
@@ -48,13 +47,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();
         });
@@ -340,17 +342,17 @@ export async function themePullCommand() {
         console.log(chalk.cyan(t('theme.pull.starting') + '\n'));
 
         const apiClient = await createApiClient();
-        const response = await apiClient.get('/theme');
-
-        const themes = response.data || [];
+        const { themes } = await fetchAllThemes(apiClient);
 
         if (themes.length === 0) {
             showWarning(t('theme.pull.no_themes'));
             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}`
         }));
@@ -439,9 +441,7 @@ export async function themeUseCommand(themeName = null) {
             console.log(chalk.gray(t('theme.use.on_store', { store })) + '\n');
         }
 
-        const apiClient = await createApiClient();
-        const response = await apiClient.get('/theme');
-        const themes = response.data || [];
+        const { themes } = await fetchAllThemes();
 
         if (themes.length === 0) {
             showWarning(t('theme.use.no_themes'));
@@ -452,7 +452,8 @@ export async function themeUseCommand(themeName = null) {
 
         if (themeName) {
             const themeSlug = slugify(themeName);
-            selectedTheme = themes.find(t => slugify(t.name) === themeSlug);
+            selectedTheme = themes.find(t => t.theme_folder === themeName)
+                ?? themes.find(t => slugify(t.name) === themeSlug);
 
             if (!selectedTheme) {
                 console.error(chalk.red('\n' + t('theme.use.not_found', { name: themeName })));
@@ -463,8 +464,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/storage.js

@@ -735,10 +735,8 @@ export async function resolveActiveThemeUuid() {
  * @returns {Promise<Object>} {uuid, name, version, active}
  */
 export async function getThemeUuidBySlug(themeSlug) {
-    const { createApiClient } = await import('./api-client.js');
-    const apiClient = await createApiClient();
-    const response = await apiClient.get('/theme');
-    const themes = response.data || [];
+    const { fetchAllThemes } = await import('./theme-list.js');
+    const { themes } = await fetchAllThemes();
 
     const theme = themes.find(t => t.theme_folder === themeSlug)
         ?? themes.find(t => slugify(t.name) === themeSlug);

package/src/theme-list.js

@@ -0,0 +1,25 @@
+import { createApiClient } from './api-client.js';
+
+export async function fetchAllThemes(client = null) {
+    const apiClient = client ?? await createApiClient();
+    const all = [];
+    let envelope = {};
+    let page = 1;
+
+    // Server ignores per_page; we walk every page until last_page is reached.
+    // Hard cap at 20 pages to avoid accidental infinite loops.
+    for (let i = 0; i < 20; i++) {
+        const response = await apiClient.get(`/theme?per_page=500&page=${page}`);
+        const batch = response.data || [];
+        all.push(...batch);
+        envelope = response;
+
+        // Laravel paginator puts last_page at the top level (not under meta).
+        // Some envelopes wrap it under meta — support both.
+        const lastPage = response.last_page ?? response.meta?.last_page ?? 1;
+        if (page >= lastPage || batch.length === 0) break;
+        page++;
+    }
+
+    return { themes: all, envelope };
+}

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(' ');
+}