tsoft-cli 3.10.2 → 3.12.1

package/CHANGELOG.md

@@ -5,6 +5,44 @@ 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
+- Commands now take the store and theme from the directory you are standing in. Working on two stores at once meant one terminal quietly changing the other's store, because there was a single shared record of where you were. Inside `<store>/<theme>` that record is no longer consulted: each terminal follows its own directory, so several stores and themes can be open side by side. Nothing is written while doing this — the store you picked with `store use` stays as it was.
+- Store directories are matched against the stores you are signed in to, not against a name pattern, so an unrelated folder cannot be mistaken for one. Outside such a directory everything behaves as before and falls back to the store you last chose. `--store` still wins over the directory.
+
+### Fixed
+- `theme create` and `theme pull` no longer nest a second store directory inside the one you are already in. Theme directories are placed relative to the workspace containing the store directory rather than blindly under the current one, so running them from inside a theme puts the files where you would expect.
+
+## [3.11.0] - 2026-08-05
+
+### Added
+- `tsoft store use` sets the active store, and `tsoft store list` shows the ones you are signed in to. Sessions are kept per store and stay valid for a month, but until now the only way to move between two stores was to sign in again, because nothing else set the active store. Both commands show how long each session has left and say plainly which stores need a fresh sign-in.
+- `--store <domain>` runs a single command against another store without changing the one you are on: `tsoft --store shop.example.com theme push`.
+- Store and theme pickers become searchable once there are more than seven to choose from. Scrolling a list of twenty-five stores to find one was the slow part; typing a few letters of the domain now narrows it. Stores also match on the folder name and the signed-in email, themes on their folder and alias.
+
+### Fixed
+- Refreshing an expired session no longer changes which store you are on. Every command renews the access token when it has expired, and that renewal was also writing the active store — so running a command against one store, whether through `--store` or from another terminal, quietly moved everyone else to it. The active store now changes only when you sign in or run `store use`.
+- Signing out of one store no longer clears the active store when you were on a different one.
+
+### Changed
+- The active theme is now remembered per store, next to that store's credentials, instead of in one shared file. Switching stores no longer loses your place — each store comes back to the theme you were last working on. Your current theme is carried over the first time you use this version, so there is nothing to set up again.
+- `tsoft theme push` prints the store and theme it is about to push to, and `tsoft theme use` names the store whose themes it is listing. Neither asks anything; the line is there so working on the wrong store is visible before it matters rather than after. The theme picker gave no clue which store the list came from.
+
+## [3.10.3] - 2026-08-05
+
+### Fixed
+- `tsoft theme push` returned "theme not found" on some older themes while working normally on newer ones. The active theme was stored as a slug derived from the theme name, and that slug was sent to the server as the theme identifier. A theme can be identified by its folder or by its alias, and the alias is optional — themes installed through certain paths never received one, so there was nothing for the slug to match and the push was rejected. The active theme is now stored as the theme folder, which every theme always has.
+- Existing installations are migrated on first use: a stored slug is looked up once and the stored value is replaced with the folder, so there is no need to re-select a theme. Local theme directories keep their readable names.
+- `tsoft theme section` commands accept a stored theme folder as well as a slug, so they keep working through and after the migration.
+- Confirmation boxes drew a ragged right border. The "T-Soft" mark was positioned with a fixed number of spaces rather than measured against the box, so it drifted out of alignment whenever the content was wider or narrower than that fixed guess. It is now aligned to the actual content width.
+- Warning, input and stop symbols across all messages are replaced with plain geometric ones. The previous symbols carried a variation selector, which many terminals render one cell narrower than its measured width; any line containing one drifted, and inside a box it dragged the border with it. The clock in the default theme update prompt became an hourglass for the same reason. Spacing after the affected symbols was adjusted to match their real width.
+
 ## [3.10.2] - 2026-08-03
 
 ### Fixed

package/locales/en.json

@@ -1,8 +1,8 @@
 {
   "ui.label.confirm": "❓ Confirm",
   "ui.label.select": "📋 Select",
-  "ui.label.input": "✏️  Input",
-  "ui.label.warning": "⚠️  Warning",
+  "ui.label.input": "✎ Input",
+  "ui.label.warning": "▲ Warning",
   "ui.label.error": "❌ Error",
   "ui.label.success": "✅ Success",
   "ui.label.info": "Info",
@@ -57,19 +57,19 @@
   "login.error_log": "Check log files for details.",
   "login.security_error": "State parameter mismatch! This may indicate a security issue.",
   "logout.starting": "🚪 Logging out...",
-  "logout.not_logged_in": "⚠️  You are not logged in.",
+  "logout.not_logged_in": "▲ You are not logged in.",
   "logout.revoking": "🔄 Revoking token...",
   "logout.revoked": "✓ Token revoked",
-  "logout.revoke_failed": "⚠️  Could not revoke token (may already be invalid)",
+  "logout.revoke_failed": "▲ Could not revoke token (may already be invalid)",
   "logout.credentials_cleared": "✓ Local credentials cleared",
   "logout.success": "👋 Successfully logged out!",
   "logout.relogin_tip": "To log in again, use the \"tsoft login\" command.",
-  "whoami.not_logged_in": "⚠️  You are not logged in.",
+  "whoami.not_logged_in": "▲ You are not logged in.",
   "whoami.not_logged_in_tip": "Use \"tsoft login\" to log in.",
   "whoami.not_logged_in.json.message": "Not logged in.",
   "whoami.not_logged_in.json.hint": "To log in: tsoft login --org",
   "whoami.token_refreshed": "🔄 Token automatically refreshed",
-  "whoami.session_expired": "⚠️  Session expired, logging in again...",
+  "whoami.session_expired": "▲ Session expired, logging in again...",
   "whoami.title": "👤 Identity Information",
   "whoami.user_label": "User:",
   "whoami.store_label": "Store:",
@@ -82,7 +82,7 @@
   "whoami.refresh_valid": "✓ Valid ({{days}} days remaining)",
   "whoami.relogin_tip": "Tip: Use tsoft login --org to log in again",
   "theme.listing": "📋 Listing themes...",
-  "theme.no_themes": "⚠️  No themes found yet.",
+  "theme.no_themes": "▲ No themes found yet.",
   "theme.count": "Total {{count}} themes found:",
   "theme.folder_label": "Folder:",
   "theme.login_required": "You must log in first. Run: tsoft login",
@@ -93,7 +93,7 @@
   "theme.author_prompt": "Developer:",
   "theme.minimal_prompt": "Start with a starter theme?\n\nStarter theme includes only basic blocks, suitable for building from scratch.",
   "theme.minimal_title": "🎨 Theme Type",
-  "theme.dir_exists_title": "⚠️  Directory Exists",
+  "theme.dir_exists_title": "▲ Directory Exists",
   "theme.dir_exists_prompt": "Directory already exists!\n\nLocation: {{path}}\n\nOverwrite?",
   "theme.dir_overwrite_prompt": "Directory already exists!\n\nLocation: {{path}}\n\nOverwrite?",
   "theme.cancelled": "Operation cancelled.",
@@ -114,7 +114,7 @@
   "theme.connection_check": "Check your internet connection and try again.",
   "theme.updating": "🔄 Creating theme...",
   "theme.update_failed_contact": "Tip: Please contact your system administrator.",
-  "theme.force_update_confirm": "The default theme will be automatically updated and your new theme will be created.\n\n🔸 This operation:\n  • Upgrades the default theme to the latest version\n  • Updates all layouts and sections\n  • Creates your new theme based on the updated default theme\n\n⏱️  This operation may take a few minutes.\n\nProceed?",
+  "theme.force_update_confirm": "The default theme will be automatically updated and your new theme will be created.\n\n🔸 This operation:\n  • Upgrades the default theme to the latest version\n  • Updates all layouts and sections\n  • Creates your new theme based on the updated default theme\n\n⏳ This operation may take a few minutes.\n\nProceed?",
   "theme.force_update_title": "🔄 Default Theme Update",
   "theme.force_updating": "⏳ Updating default theme and creating new theme...",
   "theme.force_update_success_1": "✓ Default theme successfully updated",
@@ -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>\".",
@@ -174,11 +176,11 @@
   "dev.lock_acquired": "✓ Lock successfully acquired",
   "dev.already_locked": "✓ You already have the lock",
   "dev.already_synced": "✓ Theme is synchronized",
-  "dev.not_synced": "⚠️  Lock exists but theme is not synchronized",
+  "dev.not_synced": "▲ Lock exists but theme is not synchronized",
   "dev.lock_by_other": "Theme is locked by another developer!\n\nDeveloper: {{dev}}\nLast access: {{last_access}}\n\nAre you sure you want to take the lock?",
   "dev.lock_warning_title": "🔒 Lock Warning",
   "dev.lock_override": "🔐 Acquiring lock (override)...",
-  "dev.stopping": "⏸️  Shutting down development environment...",
+  "dev.stopping": "■ Shutting down development environment...",
   "dev.watch_stopped": "✓ File watching stopped",
   "dev.keepalive_stopped": "✓ Keep-alive stopped",
   "dev.lock_kept": "(Lock kept active - you can continue next time)",
@@ -191,12 +193,12 @@
   "dev.lock_stolen_owner": "New lock owner: {{owner}}",
   "dev.lock_stolen_stopping": "Stopping development environment...",
   "dev.lock_lost": "❌ Theme was locked by another developer!",
-  "dev.not_synced_pulling": "⚠️  Theme is not synced! Pulling...",
+  "dev.not_synced_pulling": "▲ Theme is not synced! Pulling...",
   "dev.file_deleted": "🗑️  {{path}} → Deleted",
   "dev.file_delete_failed": "{{path}} → Could not delete: {{error}}",
   "dev.file_saved": "✓ {{path}} → Saved ({{duration}}ms)",
   "dev.file_error": "{{path}} → Error: {{error}}",
-  "dev.keepalive_error": "⚠️  Keep-alive error (will retry)",
+  "dev.keepalive_error": "▲ Keep-alive error (will retry)",
   "init.no_themes": "No themes found.",
   "init.select_prompt": "Which theme would you like to fork?",
   "init.select_title": "Theme Selection",
@@ -219,14 +221,14 @@
   "section.list.no_active_theme": "No active theme found. Please run \"tsoft theme use <theme-name>\" first.",
   "section.list.starting": "Listing sections...",
   "section.list.active_theme": "Active Theme: {{theme}}",
-  "section.list.no_blocks": "⚠️  No blocks found yet.",
+  "section.list.no_blocks": "▲ No blocks found yet.",
   "section.list.count": "Total {{count}} blocks found:",
   "section.list.id_label": "ID:",
   "section.list.folder_label": "Folder:",
   "section.list.sections_label": "Available sections ({{count}}):",
   "section.list.tags_label": "Tags:",
   "section.list.file_label": "File:",
-  "section.list.no_sections": "⚠️  No sections found for this block",
+  "section.list.no_sections": "▲ No sections found for this block",
   "section.add.no_active_theme": "No active theme found. Please run \"tsoft theme use <theme-name>\" first.",
   "section.add.starting": "🔧 Starting section add operation...",
   "section.add.active_theme": "Active Theme: {{theme}}",
@@ -247,7 +249,7 @@
   "section.add.cancelled": "Operation cancelled.",
   "section.add.adding": "🔄 Adding sections...",
   "section.add.added": "✓ {{name}} added",
-  "section.add.already_exists": "⚠️  {{name}} already exists.",
+  "section.add.already_exists": "▲ {{name}} already exists.",
   "section.add.overwrite_prompt": "What would you like to do?",
   "section.add.overwrite": "Overwrite",
   "section.add.overwrite_all": "Overwrite all",
@@ -266,7 +268,7 @@
   "section.add.files_updated": "✓ Theme files updated",
   "section.add.complete": "🎉 Operation completed!",
   "section.add.location": "Location: {{path}}",
-  "section.add.download_error": "⚠️  Error while updating theme files:",
+  "section.add.download_error": "▲ Error while updating theme files:",
   "section.add.manual_tip": "💡 Try downloading the theme manually:",
   "section.add.manual_command": "tsoft theme pull",
   "section.menu.title": "🧩 Section Operations",
@@ -337,5 +339,23 @@
   "dev.section_synced": "🧩 section updated: {{folder}}",
   "dev.status_section": "section",
   "dev.section_menu_opening": "Opening section menu...",
-  "dev.section_menu_resumed": "Resuming watch."
+  "dev.section_menu_resumed": "Resuming watch.",
+  "store.none": "No stores are saved yet.",
+  "store.login_hint": "Sign in first: tsoft login",
+  "store.count": "{{count}} saved stores",
+  "store.session_expired": "— session expired",
+  "store.session_days": "({{days}} days)",
+  "store.select_prompt": "Which store will you work on?",
+  "store.select_title": "Store Selection",
+  "store.selected": "Active store: {{store}}",
+  "store.selected_theme": "Theme: {{theme}}",
+  "store.expired_warning": "This store's session has expired. To continue: tsoft login",
+  "store.not_found": "No saved store matches: {{store}}",
+  "store.json_needs_argument": "A store name is required in JSON mode.",
+  "store.json_hint": "Usage: tsoft --json store use <domain>",
+  "context.line": "Store: {{store}} · Theme: {{theme}}",
+  "store.search_prompt": "Search or pick a store",
+  "theme.use.on_store": "Store: {{store}}",
+  "theme.use.search_prompt": "Search or pick a theme",
+  "context.workspace": "From this directory: {{store}} · {{theme}}"
 }

package/locales/tr.json

@@ -1,8 +1,8 @@
 {
   "ui.label.confirm": "❓ Onay",
   "ui.label.select": "📋 Seçim",
-  "ui.label.input": "✏️  Giriş",
-  "ui.label.warning": "⚠️  Uyarı",
+  "ui.label.input": "✎ Giriş",
+  "ui.label.warning": "▲ Uyarı",
   "ui.label.error": "❌ Hata",
   "ui.label.success": "✅ Başarılı",
   "ui.label.info": "Bilgi",
@@ -57,19 +57,19 @@
   "login.error_log": "Detaylar için log dosyalarını kontrol edin.",
   "login.security_error": "State parametresi eşleşmiyor! Güvenlik hatası olabilir.",
   "logout.starting": "🚪 Çıkış yapılıyor...",
-  "logout.not_logged_in": "⚠️  Zaten giriş yapmamışsınız.",
+  "logout.not_logged_in": "▲ Zaten giriş yapmamışsınız.",
   "logout.revoking": "🔄 Token iptal ediliyor...",
   "logout.revoked": "✓ Token iptal edildi",
-  "logout.revoke_failed": "⚠️  Token iptal edilemedi (zaten geçersiz olabilir)",
+  "logout.revoke_failed": "▲ Token iptal edilemedi (zaten geçersiz olabilir)",
   "logout.credentials_cleared": "✓ Yerel kimlik bilgileri temizlendi",
   "logout.success": "👋 Başarıyla çıkış yapıldı!",
   "logout.relogin_tip": "Tekrar giriş yapmak için \"tsoft login\" komutunu kullanın.",
-  "whoami.not_logged_in": "⚠️  Giriş yapmamışsınız.",
+  "whoami.not_logged_in": "▲ Giriş yapmamışsınız.",
   "whoami.not_logged_in_tip": "Giriş yapmak için \"tsoft login\" komutunu kullanın.",
   "whoami.not_logged_in.json.message": "Giriş yapılmamış.",
   "whoami.not_logged_in.json.hint": "Giriş yapmak için: tsoft login --org",
   "whoami.token_refreshed": "🔄 Token otomatik olarak yenilendi",
-  "whoami.session_expired": "⚠️  Oturum süresi dolmuş, yeniden giriş yapılıyor...",
+  "whoami.session_expired": "▲ Oturum süresi dolmuş, yeniden giriş yapılıyor...",
   "whoami.title": "👤 Kimlik Bilgileri",
   "whoami.user_label": "Kullanıcı:",
   "whoami.store_label": "Store:",
@@ -82,7 +82,7 @@
   "whoami.refresh_valid": "✓ Geçerli ({{days}} gün kaldı)",
   "whoami.relogin_tip": "İpucu: tsoft login --org ile tekrar giriş yapın",
   "theme.listing": "📋 Temalar listeleniyor...",
-  "theme.no_themes": "⚠️  Henüz tema bulunmuyor.",
+  "theme.no_themes": "▲ Henüz tema bulunmuyor.",
   "theme.count": "Toplam {{count}} tema bulundu:",
   "theme.folder_label": "Klasör:",
   "theme.login_required": "Önce giriş yapmalısınız. Çalıştırın: tsoft login",
@@ -93,7 +93,7 @@
   "theme.author_prompt": "Geliştirici:",
   "theme.minimal_prompt": "Starter tema ile başlansın mı?\n\nStarter tema sadece temel blokları içerir, sıfırdan geliştirmeye uygundur.",
   "theme.minimal_title": "🎨 Tema Tipi",
-  "theme.dir_exists_title": "⚠️  Dizin Mevcut",
+  "theme.dir_exists_title": "▲ Dizin Mevcut",
   "theme.dir_exists_prompt": "Dizin zaten mevcut!\n\nKonum: {{path}}\n\nÜzerine yazılsın mı?",
   "theme.dir_overwrite_prompt": "Dizin zaten mevcut!\n\nKonum: {{path}}\n\nUzerine yazilsin mi?",
   "theme.cancelled": "İşlem iptal edildi.",
@@ -114,7 +114,7 @@
   "theme.connection_check": "İnternet bağlantınızı kontrol edip tekrar deneyin.",
   "theme.updating": "🔄 Tema oluşturuluyor...",
   "theme.update_failed_contact": "İpucu: Lütfen sistem yöneticinizle iletişime geçin.",
-  "theme.force_update_confirm": "Default tema otomatik olarak güncellenecek ve yeni temanız oluşturulacak.\n\n🔸 Bu işlem:\n  • Default temayı en güncel versiyona yükseltir\n  • Tüm layout ve section'ları günceller\n  • Yeni temanızı güncel default tema üzerinden oluşturur\n\n⏱️  Bu işlem birkaç dakika sürebilir.\n\nDevam edilsin mi?",
+  "theme.force_update_confirm": "Default tema otomatik olarak güncellenecek ve yeni temanız oluşturulacak.\n\n🔸 Bu işlem:\n  • Default temayı en güncel versiyona yükseltir\n  • Tüm layout ve section'ları günceller\n  • Yeni temanızı güncel default tema üzerinden oluşturur\n\n⏳ Bu işlem birkaç dakika sürebilir.\n\nDevam edilsin mi?",
   "theme.force_update_title": "🔄 Default Tema Güncellemesi",
   "theme.force_updating": "⏳ Default tema güncelleniyor ve yeni tema oluşturuluyor...",
   "theme.force_update_success_1": "✓ Default tema başarıyla güncellendi",
@@ -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.",
@@ -174,11 +176,11 @@
   "dev.lock_acquired": "✓ Kilit başarıyla alındı",
   "dev.already_locked": "✓ Zaten sizin kiliniz var",
   "dev.already_synced": "✓ Tema senkronize",
-  "dev.not_synced": "⚠️  Kilit var ama tema senkronize değil",
+  "dev.not_synced": "▲ Kilit var ama tema senkronize değil",
   "dev.lock_by_other": "Tema başka bir developer tarafından kilitli!\n\nDeveloper: {{dev}}\nSon erişim: {{last_access}}\n\nKilidi almak istediğinizden emin misiniz?",
   "dev.lock_warning_title": "🔒 Kilit Uyarısı",
   "dev.lock_override": "🔐 Kilit alınıyor (override)...",
-  "dev.stopping": "⏸️  Geliştirme ortamı kapatılıyor...",
+  "dev.stopping": "■ Geliştirme ortamı kapatılıyor...",
   "dev.watch_stopped": "✓ Dosya izleme durduruldu",
   "dev.keepalive_stopped": "✓ Keep-alive durduruldu",
   "dev.lock_kept": "(Lock aktif bırakıldı - sonraki sefer devam edebilirsiniz)",
@@ -191,12 +193,12 @@
   "dev.lock_stolen_owner": "Yeni kilit sahibi: {{owner}}",
   "dev.lock_stolen_stopping": "Geliştirme ortamı durduruluyor...",
   "dev.lock_lost": "❌ Tema başka bir developer tarafından kilitlendi!",
-  "dev.not_synced_pulling": "⚠️  Tema senkronize değil! Pull yapılıyor...",
+  "dev.not_synced_pulling": "▲ Tema senkronize değil! Pull yapılıyor...",
   "dev.file_deleted": "🗑️  {{path}} → Silindi",
   "dev.file_delete_failed": "{{path}} → Silinemedi: {{error}}",
   "dev.file_saved": "✓ {{path}} → Kaydedildi ({{duration}}ms)",
   "dev.file_error": "{{path}} → Hata: {{error}}",
-  "dev.keepalive_error": "⚠️  Keep-alive hatası (yeniden denenecek)",
+  "dev.keepalive_error": "▲ Keep-alive hatası (yeniden denenecek)",
   "init.no_themes": "Tema bulunamadı.",
   "init.select_prompt": "Hangi temayi fork etmek istiyorsunuz?",
   "init.select_title": "Tema Seçimi",
@@ -219,14 +221,14 @@
   "section.list.no_active_theme": "Aktif tema bulunamadı. Lütfen önce \"tsoft theme use <tema-adı>\" komutunu çalıştırın.",
   "section.list.starting": "Section'lar listeleniyor...",
   "section.list.active_theme": "Aktif Tema: {{theme}}",
-  "section.list.no_blocks": "⚠️  Henüz block bulunmuyor.",
+  "section.list.no_blocks": "▲ Henüz block bulunmuyor.",
   "section.list.count": "Toplam {{count}} block bulundu:",
   "section.list.id_label": "ID:",
   "section.list.folder_label": "Klasör:",
   "section.list.sections_label": "Mevcut section'lar ({{count}}):",
   "section.list.tags_label": "Etiketler:",
   "section.list.file_label": "Dosya:",
-  "section.list.no_sections": "⚠️  Bu block için section bulunmuyor",
+  "section.list.no_sections": "▲ Bu block için section bulunmuyor",
   "section.add.no_active_theme": "Aktif tema bulunamadı. Lütfen önce \"tsoft theme use <tema-adı>\" komutunu çalıştırın.",
   "section.add.starting": "🔧 Section ekleme işlemi başlatılıyor...",
   "section.add.active_theme": "Aktif Tema: {{theme}}",
@@ -247,7 +249,7 @@
   "section.add.cancelled": "İşlem iptal edildi.",
   "section.add.adding": "🔄 Section'lar ekleniyor...",
   "section.add.added": "✓ {{name}} eklendi",
-  "section.add.already_exists": "⚠️  {{name}} zaten mevcut.",
+  "section.add.already_exists": "▲ {{name}} zaten mevcut.",
   "section.add.overwrite_prompt": "Ne yapmak istersiniz?",
   "section.add.overwrite": "Üzerine yaz",
   "section.add.overwrite_all": "Tümünün üzerine yaz",
@@ -266,7 +268,7 @@
   "section.add.files_updated": "✓ Tema dosyaları güncellendi",
   "section.add.complete": "🎉 İşlem tamamlandı!",
   "section.add.location": "Konum: {{path}}",
-  "section.add.download_error": "⚠️  Tema dosyaları güncellenirken hata oluştu:",
+  "section.add.download_error": "▲ Tema dosyaları güncellenirken hata oluştu:",
   "section.add.manual_tip": "💡 Manuel olarak temayı tekrar indirmeyi deneyin:",
   "section.add.manual_command": "tsoft theme pull",
   "section.menu.title": "🧩 Section İşlemleri",
@@ -337,5 +339,23 @@
   "dev.section_synced": "🧩 section güncellendi: {{folder}}",
   "dev.status_section": "section",
   "dev.section_menu_opening": "Section menüsü açılıyor...",
-  "dev.section_menu_resumed": "İzlemeye devam ediliyor."
+  "dev.section_menu_resumed": "İzlemeye devam ediliyor.",
+  "store.none": "Kayıtlı mağaza yok.",
+  "store.login_hint": "Önce giriş yapın: tsoft login",
+  "store.count": "{{count}} kayıtlı mağaza",
+  "store.session_expired": "— oturum bitti",
+  "store.session_days": "({{days}} gün)",
+  "store.select_prompt": "Hangi mağazada çalışacaksınız?",
+  "store.select_title": "Mağaza Seçimi",
+  "store.selected": "Aktif mağaza: {{store}}",
+  "store.selected_theme": "Tema: {{theme}}",
+  "store.expired_warning": "Bu mağazanın oturumu bitmiş. Devam etmek için: tsoft login",
+  "store.not_found": "Kayıtlı mağaza bulunamadı: {{store}}",
+  "store.json_needs_argument": "JSON modunda mağaza adı gerekir.",
+  "store.json_hint": "Kullanım: tsoft --json store use <domain>",
+  "context.line": "Mağaza: {{store}} · Tema: {{theme}}",
+  "store.search_prompt": "Mağaza arayın veya seçin",
+  "theme.use.on_store": "Mağaza: {{store}}",
+  "theme.use.search_prompt": "Tema arayın veya seçin",
+  "context.workspace": "Bulunduğunuz dizin: {{store}} · {{theme}}"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsoft-cli",
-  "version": "3.10.2",
+  "version": "3.12.1",
   "description": "Command-line tool for tsoft360 theme development and management",
   "type": "module",
   "main": "src/index.js",
@@ -47,6 +47,7 @@
     "gradient-string": "^3.0.0",
     "open": "^10.1.0",
     "ora": "^9.3.0",
+    "string-width": "^7.2.0",
     "strip-ansi": "^7.1.2"
   },
   "homepage": "https://github.com/tekrom/tsoft-cli",

package/src/commands/login.js

@@ -2,7 +2,7 @@ import open from 'open';
 import chalk from 'chalk';
 import {generateCodeVerifier, generateCodeChallenge} from '../pkce.js';
 import {startCallbackServer} from '../server.js';
-import {exchangeToken, saveTokens} from '../storage.js';
+import {exchangeToken, saveTokens, setActiveStore} from '../storage.js';
 import * as config from '../config.js';
 import { isJsonMode, jsonOut } from '../output-mode.js';
 import { t } from '../i18n.js';
@@ -74,6 +74,7 @@ export async function loginCommand() {
 
         // 8. Token'ları kaydet
         await saveTokens(tokens, store);
+        await setActiveStore(store);
 
         console.log(chalk.green(t('login.credentials_saved') + '\n'));
 

package/src/commands/store.js

@@ -0,0 +1,144 @@
+import chalk from 'chalk';
+import { listKnownStores, setActiveStore, getActiveTheme } from '../storage.js';
+import { brandedSelect, brandedSearch, showSuccess, showError, showInfo } from '../ui/prompt-wrapper.js';
+import { isJsonMode, jsonOut } from '../output-mode.js';
+import { t } from '../i18n.js';
+
+const SEARCH_THRESHOLD = 7;
+
+function sessionLabel(entry) {
+    if (!entry.usable) {
+        return chalk.gray(t('store.session_expired'));
+    }
+
+    return chalk.gray(t('store.session_days', { days: entry.daysLeft }));
+}
+
+function toJsonEntry(entry) {
+    return {
+        store: entry.store,
+        active: entry.active,
+        session_valid: entry.usable,
+        session_days_left: entry.daysLeft,
+        user: entry.user?.email ?? null,
+    };
+}
+
+export async function storeListCommand() {
+    const stores = await listKnownStores();
+
+    if (isJsonMode()) {
+        jsonOut({
+            status: 'success',
+            command: 'store list',
+            data: { stores: stores.map(toJsonEntry) },
+        });
+        return;
+    }
+
+    if (stores.length === 0) {
+        showInfo(t('store.none'));
+        return;
+    }
+
+    console.log(chalk.bold.cyan(t('store.count', { count: stores.length }) + '\n'));
+
+    for (const entry of stores) {
+        const marker = entry.active ? chalk.green('●') : chalk.gray('○');
+        const name = entry.active ? chalk.bold.green(entry.store) : chalk.white(entry.store);
+        console.log(`${marker} ${name} ${sessionLabel(entry)}`);
+    }
+
+    console.log();
+}
+
+export async function storeUseCommand(storeName) {
+    const stores = await listKnownStores();
+
+    if (stores.length === 0) {
+        if (isJsonMode()) {
+            jsonOut({
+                status: 'error',
+                command: 'store use',
+                error: { message: t('store.none'), hint: t('store.login_hint') },
+            });
+            process.exit(1);
+        }
+        showInfo(t('store.none'));
+        console.log(chalk.gray('  ' + t('store.login_hint') + '\n'));
+        return;
+    }
+
+    let selected;
+
+    if (storeName) {
+        selected = stores.find(entry => entry.store === storeName);
+
+        if (!selected) {
+            const message = t('store.not_found', { store: storeName });
+
+            if (isJsonMode()) {
+                jsonOut({
+                    status: 'error',
+                    command: 'store use',
+                    error: { message, hint: t('store.login_hint') },
+                });
+                process.exit(1);
+            }
+
+            showError(message);
+            return;
+        }
+    } else {
+        if (isJsonMode()) {
+            jsonOut({
+                status: 'error',
+                command: 'store use',
+                error: { message: t('store.json_needs_argument'), hint: t('store.json_hint') },
+            });
+            process.exit(1);
+        }
+
+        const choices = stores.map(entry => ({
+            name: `${entry.store} ${sessionLabel(entry)}`,
+            value: entry,
+            keywords: [entry.slug, entry.user?.email].filter(Boolean),
+        }));
+
+        selected = stores.length > SEARCH_THRESHOLD
+            ? await brandedSearch({
+                message: t('store.search_prompt'),
+                choices,
+            }, t('store.select_title'))
+            : await brandedSelect({
+                message: t('store.select_prompt'),
+                choices,
+                default: stores.find(entry => entry.active) ?? stores[0],
+            }, t('store.select_title'));
+    }
+
+    await setActiveStore(selected.store);
+
+    const theme = await getActiveTheme(selected.store);
+
+    if (isJsonMode()) {
+        jsonOut({
+            status: 'success',
+            command: 'store use',
+            data: { ...toJsonEntry(selected), active: true, theme },
+        });
+        return;
+    }
+
+    showSuccess(t('store.selected', { store: selected.store }));
+
+    if (theme) {
+        console.log(chalk.gray('  ' + t('store.selected_theme', { theme })));
+    }
+
+    if (!selected.usable) {
+        console.log(chalk.yellow('  ' + t('store.expired_warning')));
+    }
+
+    console.log();
+}

package/src/commands/theme-dev.js

@@ -6,7 +6,8 @@ import AdmZip from 'adm-zip';
 import chokidar from 'chokidar';
 import {createApiClient} from '../api-client.js';
 import open from 'open';
-import {normalizeStoreDomain, slugify, setActiveTheme, getActiveTheme, getActiveStore} from '../storage.js';
+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}`
                 }));
@@ -448,7 +449,7 @@ export async function themeDevCommand(themeName) {
 
         console.log(chalk.green(t('dev.active_theme_set', { slug: themeSlug })));
 
-        let themePath = path.join(process.cwd(), storeSlug, themeSlug);
+        let themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
         console.log(chalk.green(t('dev.working_dir', { path: `${storeSlug}/${themeSlug}/` }) + '\n'));
 
         // Fork check: foreign-org themes need fork before development
@@ -480,7 +481,7 @@ export async function themeDevCommand(themeName) {
 
                 themeInfo = { uuid: forkedData.uuid, name: forkedData.name, version: forkedData.version };
                 themeSlug = slugify(forkedData.name);
-                themePath = path.join(process.cwd(), storeSlug, themeSlug);
+                themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
 
                 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

@@ -4,7 +4,7 @@ import {createWriteStream} from 'fs';
 import path from 'path';
 import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
-import {slugify, getActiveStore} from '../storage.js';
+import {slugify, getActiveStore, getWorkspaceRoot} from '../storage.js';
 import {brandedConfirm, brandedSelect, showWarning, showInfo, showError} from '../ui/prompt-wrapper.js';
 import {normalizeStoreDomain} from '../storage.js';
 import {isJsonMode, jsonOut} from '../output-mode.js';
@@ -79,7 +79,7 @@ export async function themeInitCommand(fromSlug) {
         const store = await getActiveStore();
         const storeSlug = normalizeStoreDomain(store);
         const forkedSlug = slugify(forkedData.name);
-        const themePath = path.join(process.cwd(), storeSlug, forkedSlug);
+        const themePath = path.join(getWorkspaceRoot(), storeSlug, forkedSlug);
 
         // Check if directory exists
         const exists = await fs.access(themePath).then(() => true).catch(() => false);

package/src/commands/theme-push.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import ora from 'ora';
 import { createApiClient } from '../api-client.js';
-import { getActiveTheme } from '../storage.js';
+import { resolveActiveThemeUuid, getActiveStore } from '../storage.js';
 import { mapPushError } from '../errors/error-mapper.js';
 import { isJsonMode, jsonOut } from '../output-mode.js';
 import { t } from '../i18n.js';
@@ -91,7 +91,13 @@ export async function themePushCommand(themeName, options = {}) {
     if (themeName) {
         themeUuid = themeName;
     } else {
-        themeUuid = await getActiveTheme();
+        themeUuid = await resolveActiveThemeUuid();
+        if (themeUuid && !isJsonMode()) {
+            const store = await getActiveStore();
+            if (store) {
+                console.log(chalk.gray(t('context.line', { store, theme: themeUuid })));
+            }
+        }
         if (!themeUuid) {
             console.error(chalk.red(t('push.no_active_theme')));
             console.log(chalk.gray(t('push.usage')));

package/src/commands/theme-section.js

@@ -5,7 +5,7 @@ import {createWriteStream} from 'fs';
 import path from 'path';
 import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
-import {getActiveTheme, getThemeUuidBySlug, normalizeStoreDomain, getActiveStore} from '../storage.js';
+import {getActiveTheme, getThemeUuidBySlug, normalizeStoreDomain, getActiveStore, getWorkspaceRoot} from '../storage.js';
 import {brandedConfirm, brandedSelect, brandedSearch, brandedInput, showWarning, showSuccess, showInfo} from '../ui/prompt-wrapper.js';
 import { t } from '../i18n.js';
 
@@ -291,7 +291,7 @@ export async function themeSectionAddCommand() {
 
             const store = await getActiveStore();
             const storeSlug = normalizeStoreDomain(store);
-            const themePath = path.join(process.cwd(), storeSlug, activeTheme);
+            const themePath = path.join(getWorkspaceRoot(), storeSlug, activeTheme);
 
             try {
                 // Tema klasörü henüz lokalde yoksa (theme dev/pull yapılmamışsa)
@@ -418,7 +418,7 @@ export async function themeSectionCreateCommand() {
 
         const store = await getActiveStore();
         const storeSlug = normalizeStoreDomain(store);
-        const themePath = path.join(process.cwd(), storeSlug, activeTheme);
+        const themePath = path.join(getWorkspaceRoot(), storeSlug, activeTheme);
 
         try {
             await downloadThemeFiles(apiClient, themeInfo.uuid, themePath);
@@ -509,7 +509,7 @@ export async function themeSectionForkCommand() {
 
         const store = await getActiveStore();
         const storeSlug = normalizeStoreDomain(store);
-        const themePath = path.join(process.cwd(), storeSlug, activeTheme);
+        const themePath = path.join(getWorkspaceRoot(), storeSlug, activeTheme);
 
         try {
             await downloadThemeFiles(apiClient, themeInfo.uuid, themePath);

package/src/commands/theme.js

@@ -5,12 +5,15 @@ import {createWriteStream} from 'fs';
 import path from 'path';
 import AdmZip from 'adm-zip';
 import {createApiClient} from '../api-client.js';
-import {normalizeStoreDomain, slugify, setActiveTheme, getActiveStore} from '../storage.js';
-import {brandedConfirm, brandedSelect, showWarning} from '../ui/prompt-wrapper.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';
 
+const THEME_SEARCH_THRESHOLD = 7;
+
 export async function themeListCommand() {
     try {
         if (!isJsonMode()) {
@@ -46,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();
         });
@@ -103,7 +109,7 @@ export async function themeCreateCommand(themeName) {
 
         const themeSlug = slugify(name);
         const storeSlug = normalizeStoreDomain(store);
-        const themePath = path.join(process.cwd(), storeSlug, themeSlug);
+        const themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
 
         const exists = await fs.access(themePath).then(() => true).catch(() => false);
         if (exists) {
@@ -174,7 +180,7 @@ export async function themeCreateCommand(themeName) {
                             impact: 'Yeni tema güvenli bir şekilde oluşturulamaz.'
                         },
                         'default_theme_not_installed': {
-                            title: '⚠️  Default Tema Yüklenmemiş',
+                            title: '▲ Default Tema Yüklenmemiş',
                             description: 'Sisteminizde default tema bulunamadı.',
                             impact: 'Default tema olmadan yeni tema geliştirilemez.'
                         },
@@ -184,7 +190,7 @@ export async function themeCreateCommand(themeName) {
                             impact: 'Güncel özellikler ve düzeltmeler yeni temanızda eksik olacak.'
                         },
                         'check_failed': {
-                            title: '⚠️  Default Tema Kontrolü Başarısız',
+                            title: '▲ Default Tema Kontrolü Başarısız',
                             description: 'Default tema güncellik kontrolü yapılamadı.',
                             impact: 'Güvenlik nedeniyle default tema güncellenmelidir.'
                         },
@@ -196,7 +202,7 @@ export async function themeCreateCommand(themeName) {
                     };
 
                     const reasonInfo = reasonDetails[errorData.reason] || {
-                        title: '⚠️  Default Tema Güncelleme Gerekli',
+                        title: '▲ Default Tema Güncelleme Gerekli',
                         description: errorData.reason || 'Bilinmeyen bir durum tespit edildi.',
                         impact: 'Devam etmek için default tema güncellenmelidir.'
                     };
@@ -236,7 +242,7 @@ export async function themeCreateCommand(themeName) {
                     console.log(chalk.gray('🔹 Layout ve section\'lar import ediliyor...'));
                     console.log(chalk.gray('🔹 Yeni tema bootstrap ediliyor...'));
                     console.log(chalk.gray('━'.repeat(60)));
-                    console.log(chalk.yellow('\n⏱️  Lütfen bekleyin, bu işlem birkaç dakika sürebilir...\n'));
+                    console.log(chalk.yellow('\n⏳  Lütfen bekleyin, bu işlem birkaç dakika sürebilir...\n'));
 
                     // forceUpdate: true ile tekrar dene
                     themeData.forceUpdate = true;
@@ -347,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}`
         }));
@@ -369,7 +377,7 @@ export async function themePullCommand() {
         const themeUuid = selectedTheme.theme_folder;
         const store = await getActiveStore();
         const storeSlug = normalizeStoreDomain(store);
-        const themePath = path.join(process.cwd(), storeSlug, themeSlug);
+        const themePath = path.join(getWorkspaceRoot(), storeSlug, themeSlug);
 
         const exists = await fs.access(themePath).then(() => true).catch(() => false);
         if (exists) {
@@ -411,7 +419,7 @@ export async function themePullCommand() {
 
         console.log(chalk.green(t('theme.extracted', { path: `${storeSlug}/${themeSlug}/` })));
 
-        await setActiveTheme(themeSlug);
+        await setActiveTheme(themeUuid);
         console.log(chalk.green(t('theme.active_set') + '\n'));
 
         console.log(chalk.bold.green(t('theme.pull.success')));
@@ -429,6 +437,14 @@ export async function themeUseCommand(themeName = null) {
     try {
         console.log(chalk.cyan(t('theme.use.starting') + '\n'));
 
+        const store = await getActiveStore();
+        const context = getWorkspaceContext();
+        if (context?.store === store && context.theme) {
+            console.log(chalk.gray(t('context.workspace', { store, theme: context.theme })) + '\n');
+        } else if (store) {
+            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 || [];
@@ -453,21 +469,29 @@ 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}`
+                description: theme.description || `${t('theme.folder_label')} ${theme.theme_folder}`,
+                keywords: [theme.theme_folder, theme.alias].filter(Boolean),
             }));
 
-            selectedTheme = await brandedSelect({
-                message: t('theme.use.select_prompt'),
-                choices: themeChoices,
-            }, t('theme.use.select_title'));
+            selectedTheme = themes.length > THEME_SEARCH_THRESHOLD
+                ? await brandedSearch({
+                    message: t('theme.use.search_prompt'),
+                    choices: themeChoices,
+                }, t('theme.use.select_title'))
+                : await brandedSelect({
+                    message: t('theme.use.select_prompt'),
+                    choices: themeChoices,
+                }, t('theme.use.select_title'));
         }
 
         const themeSlug = slugify(selectedTheme.name);
 
-        await setActiveTheme(themeSlug);
+        await setActiveTheme(selectedTheme.theme_folder);
 
         console.log(chalk.green('\n' + t('theme.use.set', { name: chalk.bold(selectedTheme.name) })));
         console.log(chalk.gray('  ' + t('theme.use.folder', { folder: themeSlug }) + '\n'));

package/src/index.js

@@ -17,6 +17,8 @@ import { themePushCommand } from './commands/theme-push.js';
 import { themeSubmitCommand } from './commands/theme-submit.js';
 import { themeInitCommand } from './commands/theme-init.js';
 import { orgSwitchCommand } from './commands/org-switch.js';
+import { storeListCommand, storeUseCommand } from './commands/store.js';
+import { setStoreOverride, applyWorkspaceContext } from './storage.js';
 
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json');
@@ -33,9 +35,10 @@ program
 // Global flags
 program.option('--json', 'Machine-readable JSON output for CI/CD');
 program.option('--verbose', 'Verbose debug output');
+program.option('--store <domain>', 'Run this command against a specific store');
 
 // preAction hook: runs before every command
-program.hook('preAction', (thisCommand) => {
+program.hook('preAction', async (thisCommand) => {
   const opts = thisCommand.opts();
   if (opts.json) {
     setJsonMode(true);
@@ -44,6 +47,10 @@ program.hook('preAction', (thisCommand) => {
   if (opts.verbose) {
     setVerboseMode(true);
   }
+  if (opts.store) {
+    setStoreOverride(opts.store);
+  }
+  await applyWorkspaceContext();
 });
 
 // Show branded help when no arguments provided
@@ -153,6 +160,25 @@ theme
     await themeInitCommand(options.from);
   });
 
+// store commands
+const store = program
+  .command('store')
+  .description('Store selection commands');
+
+store
+  .command('list')
+  .description('List the stores you are signed in to')
+  .action(async () => {
+    await storeListCommand();
+  });
+
+store
+  .command('use [store-domain]')
+  .description('Set the active store')
+  .action(async (storeDomain) => {
+    await storeUseCommand(storeDomain);
+  });
+
 // org commands
 const org = program
   .command('org')

package/src/storage.js

@@ -10,6 +10,12 @@ import * as config from './config.js';
  */
 const GLOBAL_CONFIG_DIR = path.join(os.homedir(), '.tsoft-cli');
 
+const DEFAULT_THEME_FOLDER = 'default';
+
+const ACTIVE_THEME_FILE = 'active-theme';
+
+const LEGACY_ACTIVE_THEME_FILE = 'active-theme.txt';
+
 /**
  * Store domain'i dizin adına uygun formata çevirir
  * @param {string} domain - Store domain (örn: birtan.1isim.com)
@@ -55,23 +61,201 @@ export function getStoreEnvFile(store) {
 export async function setActiveStore(store) {
     const activeStoreFile = path.join(GLOBAL_CONFIG_DIR, 'active-store.txt');
     await fs.mkdir(GLOBAL_CONFIG_DIR, { recursive: true });
+
+    const previous = await readTrimmed(activeStoreFile);
+
+    if (previous && previous !== store) {
+        await claimLegacyThemeFor(previous);
+    }
+
     await fs.writeFile(activeStoreFile, store, 'utf-8');
 }
 
+/**
+ * Global tema dosyasını sahibi olan mağazanın dizinine taşır.
+ *
+ * Aktif mağaza değişmeden önce çağrılır; global dosya yalnızca o ana kadar
+ * aktif olan mağazaya aittir ve yeni mağaza tarafından devralınamaz.
+ */
+async function claimLegacyThemeFor(store) {
+    const legacyFile = path.join(GLOBAL_CONFIG_DIR, LEGACY_ACTIVE_THEME_FILE);
+    const legacy = await readTrimmed(legacyFile);
+
+    if (!legacy) {
+        return;
+    }
+
+    const storeThemeFile = path.join(getStoreConfigDir(store), ACTIVE_THEME_FILE);
+
+    if (await readTrimmed(storeThemeFile) === null) {
+        await fs.mkdir(getStoreConfigDir(store), { recursive: true });
+        await fs.writeFile(storeThemeFile, legacy, 'utf-8');
+    }
+
+    await fs.rm(legacyFile, { force: true });
+}
+
 /**
  * Aktif store'u okur
  * @returns {Promise<string|null>} Store domain veya null
  */
 export async function getActiveStore() {
+    if (storeOverride) {
+        return storeOverride;
+    }
+
+    if (workspaceContext) {
+        return workspaceContext.store;
+    }
+
+    return await readTrimmed(path.join(GLOBAL_CONFIG_DIR, 'active-store.txt'));
+}
+
+let storeOverride = null;
+
+let workspaceContext = null;
+
+/**
+ * Tek komutluk mağaza geçişi. Kayıtlı aktif mağazayı değiştirmez.
+ * @param {string|null} store - Mağaza domain'i
+ */
+export function setStoreOverride(store) {
+    storeOverride = store || null;
+}
+
+/**
+ * Çalışma dizininden mağaza ve tema bağlamını çözer.
+ *
+ * Yukarı yürürken dizin adı rastgele bir desene değil, kayıtlı mağaza
+ * envanterine eşlenir. Eşleşen en dıştaki atadizin mağaza köküdür; gerçek
+ * domain o mağazanın config dosyasından okunur.
+ *
+ * @param {string} [fromDir] - Başlangıç dizini (verilmezse çalışma dizini)
+ * @returns {Promise<{store: string, theme: string|null, root: string, storeDir: string}|null>}
+ */
+export async function detectWorkspaceContext(fromDir = process.cwd()) {
+    const known = await listKnownStores();
+
+    if (known.length === 0) {
+        return null;
+    }
+
+    const bySlug = new Map(known.map(entry => [entry.slug.toLowerCase(), entry.store]));
+    const segments = path.resolve(fromDir).split(path.sep);
+
+    let matchIndex = -1;
+
+    for (let i = 1; i < segments.length; i++) {
+        if (bySlug.has(segments[i].toLowerCase())) {
+            matchIndex = i;
+            break;
+        }
+    }
+
+    if (matchIndex === -1) {
+        return null;
+    }
+
+    return {
+        store: bySlug.get(segments[matchIndex].toLowerCase()),
+        theme: segments[matchIndex + 1] ?? null,
+        root: segments.slice(0, matchIndex).join(path.sep) || path.sep,
+        storeDir: segments.slice(0, matchIndex + 1).join(path.sep) || path.sep,
+    };
+}
+
+/**
+ * Çalışma dizini bağlamını komut süresince etkin kılar. Kayıtlı duruma yazmaz.
+ *
+ * @param {string} [fromDir] - Başlangıç dizini
+ * @returns {Promise<object|null>} Bulunan bağlam veya null
+ */
+export async function applyWorkspaceContext(fromDir = process.cwd()) {
+    workspaceContext = await detectWorkspaceContext(fromDir);
+
+    return workspaceContext;
+}
+
+/**
+ * Etkin çalışma dizini bağlamını döner
+ * @returns {object|null}
+ */
+export function getWorkspaceContext() {
+    return workspaceContext;
+}
+
+/**
+ * Tema dizinlerinin altına açılacağı kök.
+ *
+ * Bağlam varsa mağaza dizininin üstü, yoksa çalışma dizini. Kullanıcı bir tema
+ * dizininin içindeyken komut çalıştırdığında dizinlerin iç içe açılmasını önler.
+ *
+ * @param {string} [fallbackDir] - Bağlam yoksa kullanılacak dizin
+ * @returns {string}
+ */
+export function getWorkspaceRoot(fallbackDir = process.cwd()) {
+    return workspaceContext?.root ?? fallbackDir;
+}
+
+/**
+ * Kayıtlı mağazaları oturum durumuyla birlikte listeler
+ * @returns {Promise<Array<{store: string, slug: string, usable: boolean, daysLeft: number, active: boolean, user: object|null}>>}
+ */
+export async function listKnownStores() {
+    let entries;
     try {
-        const activeStoreFile = path.join(GLOBAL_CONFIG_DIR, 'active-store.txt');
-        return (await fs.readFile(activeStoreFile, 'utf-8')).trim();
+        entries = await fs.readdir(GLOBAL_CONFIG_DIR, { withFileTypes: true });
     } catch (error) {
         if (error.code === 'ENOENT') {
-            return null;
+            return [];
         }
         throw error;
     }
+
+    const activeStore = await getActiveStore();
+    const now = Date.now();
+    const stores = [];
+
+    for (const entry of entries) {
+        if (!entry.isDirectory()) {
+            continue;
+        }
+
+        let tokens;
+        try {
+            const raw = await fs.readFile(
+                path.join(GLOBAL_CONFIG_DIR, entry.name, 'config.json'),
+                'utf-8'
+            );
+            tokens = JSON.parse(raw);
+        } catch {
+            continue;
+        }
+
+        const store = tokens.store ?? entry.name;
+        const expiresAt = tokens.refreshTokenExpiresAt
+            ? new Date(tokens.refreshTokenExpiresAt).getTime()
+            : NaN;
+        const daysLeft = Number.isNaN(expiresAt)
+            ? 0
+            : Math.round((expiresAt - now) / 86400000);
+
+        stores.push({
+            store,
+            slug: entry.name,
+            usable: !Number.isNaN(expiresAt) && expiresAt > now,
+            daysLeft,
+            active: store === activeStore,
+            user: tokens.user ?? null,
+        });
+    }
+
+    return stores.sort((a, b) => {
+        if (a.usable !== b.usable) {
+            return a.usable ? -1 : 1;
+        }
+        return a.store.localeCompare(b.store);
+    });
 }
 
 /**
@@ -266,9 +450,6 @@ export async function saveTokens(tokens, store) {
 
     // .env dosyasını da oluştur
     await writeEnvFile(tokens, store);
-
-    // Aktif store'u ayarla
-    await setActiveStore(store);
 }
 
 /**
@@ -374,9 +555,11 @@ export async function deleteConfig(store = null) {
         const configDir = getStoreConfigDir(store);
         await fs.rm(configDir, { recursive: true, force: true });
 
-        // Active store dosyasını da sil
         const activeStoreFile = path.join(GLOBAL_CONFIG_DIR, 'active-store.txt');
-        await fs.unlink(activeStoreFile).catch(() => {}); // Hata varsa sessizce yoksay
+
+        if (await readTrimmed(activeStoreFile) === store) {
+            await fs.unlink(activeStoreFile).catch(() => {});
+        }
     } catch (error) {
         if (error.code !== 'ENOENT') {
             throw error;
@@ -442,20 +625,64 @@ export function slugify(text) {
  * @param {string} theme - Tema adı
  * @returns {Promise<void>}
  */
-export async function setActiveTheme(theme) {
-    const activeThemeFile = path.join(GLOBAL_CONFIG_DIR, 'active-theme.txt');
-    await fs.mkdir(GLOBAL_CONFIG_DIR, { recursive: true });
-    await fs.writeFile(activeThemeFile, theme, 'utf-8');
+export async function setActiveTheme(theme, store = null) {
+    const target = store ?? await getActiveStore();
+
+    if (!target) {
+        const legacyFile = path.join(GLOBAL_CONFIG_DIR, LEGACY_ACTIVE_THEME_FILE);
+        await fs.mkdir(GLOBAL_CONFIG_DIR, { recursive: true });
+        await fs.writeFile(legacyFile, theme, 'utf-8');
+        return;
+    }
+
+    const configDir = getStoreConfigDir(target);
+    await fs.mkdir(configDir, { recursive: true });
+    await fs.writeFile(path.join(configDir, ACTIVE_THEME_FILE), theme, 'utf-8');
 }
 
 /**
- * Aktif temayı okur
+ * Aktif mağazanın temasını okur.
+ *
+ * Tema bilgisi mağaza dizininde tutulur. Eski kurulumlarda global dosyada
+ * duruyor olabilir; o değer yalnızca global aktif mağaza ile eşleşen mağaza
+ * için devralınır ve mağaza dizinine yazılır.
+ *
+ * @param {string} [store] - Mağaza domain'i (verilmezse aktif mağaza)
  * @returns {Promise<string|null>} Tema adı veya null
  */
-export async function getActiveTheme() {
+export async function getActiveTheme(store = null) {
+    const target = store ?? await getActiveStore();
+
+    if (!store && !storeOverride && workspaceContext?.theme && workspaceContext.store === target) {
+        return workspaceContext.theme;
+    }
+
+    if (target) {
+        const stored = await readTrimmed(
+            path.join(getStoreConfigDir(target), ACTIVE_THEME_FILE)
+        );
+
+        if (stored) {
+            return stored;
+        }
+    }
+
+    const legacy = await readTrimmed(
+        path.join(GLOBAL_CONFIG_DIR, LEGACY_ACTIVE_THEME_FILE)
+    );
+
+    if (!legacy || !target) {
+        return legacy;
+    }
+
+    await claimLegacyThemeFor(target);
+
+    return legacy;
+}
+
+async function readTrimmed(file) {
     try {
-        const activeThemeFile = path.join(GLOBAL_CONFIG_DIR, 'active-theme.txt');
-        return (await fs.readFile(activeThemeFile, 'utf-8')).trim();
+        return (await fs.readFile(file, 'utf-8')).trim() || null;
     } catch (error) {
         if (error.code === 'ENOENT') {
             return null;
@@ -464,6 +691,44 @@ export async function getActiveTheme() {
     }
 }
 
+const THEME_UUID_PATTERN =
+    /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+
+/**
+ * Değerin tema folder UUID'si olup olmadığını söyler
+ * @param {string|null|undefined} value
+ * @returns {boolean}
+ */
+export function isThemeUuid(value) {
+    return typeof value === 'string' && THEME_UUID_PATTERN.test(value);
+}
+
+/**
+ * Aktif temanın theme_folder değerini döner.
+ *
+ * Dosyada UUID varsa doğrudan kullanılır. Eski kurulumlarda slug yazılı
+ * olabilir; slug bir kez API üzerinden çözülür ve dosya UUID'ye güncellenir.
+ *
+ * @returns {Promise<string|null>} theme_folder veya aktif tema yoksa null
+ */
+export async function resolveActiveThemeUuid() {
+    const stored = await getActiveTheme();
+
+    if (!stored) {
+        return null;
+    }
+
+    if (isThemeUuid(stored) || stored === DEFAULT_THEME_FOLDER) {
+        return stored;
+    }
+
+    const { uuid } = await getThemeUuidBySlug(stored);
+
+    await setActiveTheme(uuid);
+
+    return uuid;
+}
+
 /**
  * Tema slug'ından UUID/folder adını bulur
  * @param {string} themeSlug - Tema slug (örn: 'my-theme')
@@ -475,7 +740,8 @@ export async function getThemeUuidBySlug(themeSlug) {
     const response = await apiClient.get('/theme');
     const themes = response.data || [];
 
-    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}`);

package/src/ui/prompt-wrapper.js

@@ -1,5 +1,6 @@
 import boxen from 'boxen';
 import gradient from 'gradient-string';
+import stringWidth from 'string-width';
 import chalk from 'chalk';
 import {input as inquirerInput, confirm as inquirerConfirm, select as inquirerSelect, search as inquirerSearch} from '@inquirer/prompts';
 import { t } from '../i18n.js';
@@ -29,9 +30,14 @@ export function createTSoftGradient(text) {
  */
 export function showBrandedBox(message, title = '', options = {}) {
     // T-Soft branding'ini mesajın sonuna sağa hizalanmış olarak ekle
-    const tsoftBranding = createTSoftGradient('T-Soft');
-    const brandingPadding = ' '.repeat(50); // Sağa hizalama için boşluk
-    const messageWithBranding = `${message}\n\n${brandingPadding}${tsoftBranding}`;
+    const brandingText = 'T-Soft';
+    const contentWidth = Math.max(
+        ...message.split('\n').map(stringWidth),
+        stringWidth(title) + 2,
+        stringWidth(brandingText)
+    );
+    const brandingPadding = ' '.repeat(Math.max(0, contentWidth - stringWidth(brandingText)));
+    const messageWithBranding = `${message}\n\n${brandingPadding}${createTSoftGradient(brandingText)}`;
 
     const defaultOptions = {
         padding: 1,

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