v1.8.0: proactive log overhaul, Expanded Script rename, proactive view sizing

Server:
- Track all TERMINAL RESPONSEs (chain, TP, pySim auto-handler, menu-respond
  link to paused entry) with shared _build_tr/_record_tr
- Log entry ids + cmd_num; server-side decode of fetched commands and TRs
  (compact PLI port); Result CTLV extracted as tr_result/tr_result_name
- _LoggingApduTracer captures TR SW for pySim auto-handler responses
- _DefaultProactiveHandler answers PLI with editor data (no re-request)
- VERSION 1.8.0

Frontend:
- Expandable proactive log rows (click to expand, state survives re-render)
- Response section: Result name + hex, decoded fields, width-restrained
  readonly hex inputs; no SW display
- Rename Expanded Script tab/pill/button/docs; proactive UICC view font
  sizing increase; card reader pills text-sm

README.md

@@ -1,6 +1,6 @@
 # OTAMan — SIM OTA toolkit: PWA + local card server
 
-OTAMan is an offline HTML/JS PWA for building APDU commands (SIM, USIM, GlobalPlatform RAM), assembling SCP80 secured packets per ETSI TS 102 225, and constructing BER-TLV command scripts per ETSI TS 102 226. A bundled [`pysim-otaman-server`](pysim_otaman_server/) exposes a local HTTP API over pySim for live card operations: file manager, raw APDU, SIM Toolkit menu browsing, and OTA (SCP80) delivery.
+OTAMan is an offline HTML/JS PWA for building APDU commands (SIM, USIM, GlobalPlatform RAM), assembling SCP80 secured packets per ETSI TS 102 225, and constructing Expanded Remote Application data format APDU per ETSI TS 102 226. A bundled [`pysim-otaman-server`](pysim_otaman_server/) exposes a local HTTP API over pySim for live card operations: file manager, raw APDU, SIM Toolkit menu browsing, and OTA (SCP80) delivery.
 
 **Demo:** [otaman.atroshin.ru](https://otaman.atroshin.ru) — the PWA alone, for experimenting. Install the server (below) for card-reader functions.
 
@@ -93,7 +93,7 @@ CLA = `00` (ETSI TS 102 221). Same commands as SIM, but SELECT uses P1=09, P2=0C
 
 ---
 
-## BER-TLV Tab
+## Expanded Script Tab
 
 Builds Expanded Remote Application data format per ETSI TS 102 226 §5.2.1.
 

README_RUS.md

@@ -1,6 +1,6 @@
 # OTAMan — SIM OTA toolkit: PWA + локальный сервер карт
 
-OTAMan — автономный offline-PWA (HTML/JS) для создания APDU-команд (SIM, USIM, GlobalPlatform RAM), сборки защищённых пакетов SCP80 по ETSI TS 102 225 и построения BER-TLV скриптов по ETSI TS 102 226. В комплекте — [`pysim-otaman-server`](pysim_otaman_server/) — локальный HTTP-сервер поверх pySim для работы с картой: файловый менеджер, сырые APDU, меню SIM Toolkit и доставка OTA.
+OTAMan — автономный offline-PWA (HTML/JS) для создания APDU-команд (SIM, USIM, GlobalPlatform RAM), сборки защищённых пакетов SCP80 по ETSI TS 102 225 и построения Expanded Remote Application data format APDU по ETSI TS 102 226. В комплекте — [`pysim-otaman-server`](pysim_otaman_server/) — локальный HTTP-сервер поверх pySim для работы с картой: файловый менеджер, сырые APDU, меню SIM Toolkit и доставка OTA.
 
 **Демо:** [otaman.atroshin.ru](https://otaman.atroshin.ru) — только PWA, для экспериментов. Для функций картридера установите сервер (ниже).
 
@@ -93,7 +93,7 @@ CLA = `00` (ETSI TS 102 221). Те же команды, что и SIM, но SELE
 
 ---
 
-## Вкладка BER-TLV
+## Вкладка Expanded Script
 
 Построение Expanded Remote Application data format по ETSI TS 102 226 §5.2.1.
 

docs/api.md

@@ -54,7 +54,7 @@ Returns server version for compatibility checking.
 
 **Example response:**
 ```json
-{"version": "1.7.0"}
+{"version": "1.8.0"}
 ```
 
 ### `GET /api/status`

frontend/help-ru.html

@@ -87,7 +87,7 @@
 	<h3 id="usim-rfm" class="text-lg font-medium mb-2">2.2 USIM RFM</h3>
 	<p class="mb-2">CLA = <code class="font-mono text-sm">00</code> (ETSI TS 102 221). Те же команды, что и SIM, но SELECT использует P1=<code class="font-mono text-sm">09</code>, P2=<code class="font-mono text-sm">0C</code> (выбор по FID из текущего каталога).</p>
 
-	<h3 id="ber-tlv" class="text-lg font-medium mb-2">2.3 Expanded BER-TLV</h3>
+	<h3 id="ber-tlv" class="text-lg font-medium mb-2">2.3 Expanded Script</h3>
 	<p class="mb-2">Построение формата Expanded Remote Application data по ETSI TS 102 226 &sect;5.2.1.</p>
 	<h4 id="ber-format" class="font-medium mb-1">Формат</h4>
 	<ul class="list-disc list-inside text-sm space-y-1 mb-3">

frontend/help.html

@@ -87,7 +87,7 @@
 	<h3 id="usim-rfm" class="text-lg font-medium mb-2">2.2 USIM RFM</h3>
 	<p class="mb-2">CLA = <code class="font-mono text-sm">00</code> (ETSI TS 102 221). Same commands as SIM, but SELECT uses P1=<code class="font-mono text-sm">09</code>, P2=<code class="font-mono text-sm">0C</code> (select by FID from the current directory).</p>
 
-	<h3 id="ber-tlv" class="text-lg font-medium mb-2">2.3 Expanded BER-TLV</h3>
+	<h3 id="ber-tlv" class="text-lg font-medium mb-2">2.3 Expanded Script</h3>
 	<p class="mb-2">Builds the Expanded Remote Application data format per ETSI TS 102 226 &sect;5.2.1.</p>
 	<h4 id="ber-format" class="font-medium mb-1">Format</h4>
 	<ul class="list-disc list-inside text-sm space-y-1 mb-3">

frontend/index.html

@@ -17,7 +17,7 @@
 <div class="max-w-7xl mx-auto px-6 py-2">
 
 	<div class="flex items-center justify-between mb-3">
-		<h1 class="text-2xl font-bold text-heading">OTAMan <span id="slogan" class="text-sm font-normal text-gray-500 dark:text-slate-400 ml-2" data-l10n="SIM OTA with a Human Face">SIM OTA with a Human Face</span> <span class="text-xs text-gray-400 dark:text-slate-500 ml-1">v1.7.0</span></h1>
+		<h1 class="text-2xl font-bold text-heading">OTAMan <span id="slogan" class="text-sm font-normal text-gray-500 dark:text-slate-400 ml-2" data-l10n="SIM OTA with a Human Face">SIM OTA with a Human Face</span> <span class="text-xs text-gray-400 dark:text-slate-500 ml-1">v1.8.0</span></h1>
 		<div class="flex items-center gap-4">
 			<button id="install-btn" class="px-2 py-1 text-xs rounded border border-gray-300 dark:border-slate-600 hover:bg-gray-200 dark:hover:bg-slate-700" style="display:none">INSTALL PWA [for offline use]</button>
 			<a href="https://github.com/anttro/otaman" target="_blank" class="text-xs text-gray-400 hover:text-gray-600 dark:text-slate-500 dark:hover:text-slate-300">github</a>
@@ -41,7 +41,7 @@
 		<div class="flex justify-center gap-2 mb-3">
 			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-blue-600 text-white" data-sub="sim" onclick="cApduSwitchSubtab('sim')">SIM RFM</button>
 			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="usim" onclick="cApduSwitchSubtab('usim')">USIM RFM</button>
-			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ber" onclick="cApduSwitchSubtab('ber')">Expanded BER-TLV</button>
+			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ber" onclick="cApduSwitchSubtab('ber')">Expanded Script</button>
 			<button class="c-apdu-subtab px-4 py-1.5 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-sub="ram" onclick="cApduSwitchSubtab('ram')">RAM/GP</button>
 		</div>
 		<div id="c-apdu-sub-sim">
@@ -308,7 +308,7 @@
 			<div id="ber-rows" class="space-y-2"></div>
 		</div>
 
-		<button onclick="genBerTlv()" class="mb-3 px-5 py-2.5 bg-blue-600 text-white text-sm font-medium rounded hover:bg-blue-700" data-l10n="Generate BER-TLV">Generate BER-TLV</button>
+		<button onclick="genBerTlv()" class="mb-3 px-5 py-2.5 bg-blue-600 text-white text-sm font-medium rounded hover:bg-blue-700" data-l10n="Generate Expanded Script APDU">Generate Expanded Script APDU</button>
 		<textarea id="ber-result" rows="3" readonly class="w-full font-mono border border-gray-300 dark:border-slate-600 text-sm rounded px-3 py-1.5 bg-gray-100 dark:bg-slate-800 dark:text-slate-300"></textarea>
 		<button onclick="packToSp('ber-result')" id="ber-pack-btn" disabled class="mb-3 px-5 py-2.5 bg-emerald-600 text-white text-sm font-medium rounded hover:bg-emerald-700 disabled:opacity-40 disabled:cursor-not-allowed" data-l10n="Pack into Secured packet">Pack into Secured packet</button>
 	</div>
@@ -865,12 +865,12 @@
 		</div>
 		<div id="pysim-body" class="hidden">
 			<div class="flex gap-1 mb-2">
-				<button class="pysim-subtab px-3 py-1 text-xs rounded-full bg-blue-600 text-white" data-pysim-sub="files" data-l10n="File manager">File manager</button>
-				<button class="pysim-subtab px-3 py-1 text-xs rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="custom" data-l10n="Custom files">Custom files</button>
-			<button class="pysim-subtab px-3 py-1 text-xs rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="cmd" data-l10n="pySim command line">pySim command line</button>
-			<button class="pysim-subtab px-3 py-1 text-xs rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="apdu" data-l10n="Raw APDU">Raw APDU</button>
-			<button class="pysim-subtab px-3 py-1 text-xs rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="proactive">Proactive UICC</button>
-			<button id="stk-menu-btn" onclick="stkMenuOpen()" class="pysim-subtab px-3 py-1 text-xs rounded-full bg-emerald-600 text-white hover:bg-emerald-700" style="display:none">STK: <span id="stk-menu-title"></span></button>
+				<button class="pysim-subtab px-3 py-1 text-sm rounded-full bg-blue-600 text-white" data-pysim-sub="files" data-l10n="File manager">File manager</button>
+				<button class="pysim-subtab px-3 py-1 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="custom" data-l10n="Custom files">Custom files</button>
+			<button class="pysim-subtab px-3 py-1 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="cmd" data-l10n="pySim command line">pySim command line</button>
+			<button class="pysim-subtab px-3 py-1 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="apdu" data-l10n="Raw APDU">Raw APDU</button>
+			<button class="pysim-subtab px-3 py-1 text-sm rounded-full bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600" data-pysim-sub="proactive">Proactive UICC</button>
+			<button id="stk-menu-btn" onclick="stkMenuOpen()" class="pysim-subtab px-3 py-1 text-sm rounded-full bg-emerald-600 text-white hover:bg-emerald-700" style="display:none">STK: <span id="stk-menu-title"></span></button>
 		</div>
 
 		<div id="pysim-sub-files">
@@ -934,25 +934,25 @@
 		<div id="pysim-sub-proactive" class="hidden">
 			<div class="flex gap-6">
 				<div>
-					<div class="mb-1 text-xs text-gray-500 dark:text-slate-400" data-l10n="STATUS and Polling">STATUS and Polling</div>
+					<div class="mb-1 text-sm text-gray-500 dark:text-slate-400" data-l10n="STATUS and Polling">STATUS and Polling</div>
 					<div class="flex items-center gap-2 mb-3">
-						<button id="pli-status-btn" onclick="pysimStatusPoll()" class="px-2 py-0.5 text-xs rounded bg-gray-600 text-white hover:bg-gray-700" data-l10n="Send STATUS">Send STATUS</button>
-						<span class="text-[10px] text-gray-500 dark:text-slate-400">|</span>
-						<span class="text-[10px] text-gray-500 dark:text-slate-400" data-l10n="Polling">Polling</span>
-						<button id="pli-pause-btn" onclick="pysimPollToggle()" class="px-2 py-0.5 text-xs rounded bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600">OFF</button>
-						<span id="pli-poll-stat" class="text-[10px] text-gray-400"></span>
+						<button id="pli-status-btn" onclick="pysimStatusPoll()" class="px-2.5 py-1 text-sm rounded bg-gray-600 text-white hover:bg-gray-700" data-l10n="Send STATUS">Send STATUS</button>
+						<span class="text-xs text-gray-500 dark:text-slate-400">|</span>
+						<span class="text-xs text-gray-500 dark:text-slate-400" data-l10n="Polling">Polling</span>
+						<button id="pli-pause-btn" onclick="pysimPollToggle()" class="px-2.5 py-1 text-sm rounded bg-gray-200 dark:bg-slate-700 text-gray-700 dark:text-slate-300 hover:bg-gray-300 dark:hover:bg-slate-600">OFF</button>
+						<span id="pli-poll-stat" class="text-xs text-gray-400"></span>
 					</div>
-					<div class="mt-2 mb-2 text-xs text-gray-500 dark:text-slate-400" data-l10n="Events that the card monitors (SET UP EVENT LIST):">Events that the card monitors (SET UP EVENT LIST):</div>
-					<div id="pysim-event-list" class="text-xs font-mono text-gray-600 dark:text-slate-400"></div>
-					<div class="mt-4 mb-2 text-xs text-gray-500 dark:text-slate-400" data-l10n="Fetched proactive commands:">Fetched proactive commands:</div>
-					<div id="pysim-proactive-log" class="text-xs font-mono text-gray-600 dark:text-slate-400"></div>
+					<div class="mt-2 mb-2 text-sm text-gray-500 dark:text-slate-400" data-l10n="Events that the card monitors (SET UP EVENT LIST):">Events that the card monitors (SET UP EVENT LIST):</div>
+					<div id="pysim-event-list" class="text-sm font-mono text-gray-600 dark:text-slate-400"></div>
+					<div class="mt-4 mb-2 text-sm text-gray-500 dark:text-slate-400" data-l10n="Fetched proactive commands:">Fetched proactive commands:</div>
+					<div id="pysim-proactive-log" class="text-sm font-mono text-gray-600 dark:text-slate-400"></div>
 				</div>
 				<div>
 					<div class="flex justify-between items-center mb-2">
-						<span class="text-xs text-gray-500 dark:text-slate-400" data-l10n="PROVIDE LOCAL INFORMATION response data">PROVIDE LOCAL INFORMATION response data</span>
-						<button id="pli-save-btn" onclick="pysimPliSave()" class="px-2 py-0.5 text-xs rounded bg-emerald-600 text-white hover:bg-emerald-700" data-l10n="Save">Save</button>
+						<span class="text-sm text-gray-500 dark:text-slate-400" data-l10n="PROVIDE LOCAL INFORMATION response data">PROVIDE LOCAL INFORMATION response data</span>
+						<button id="pli-save-btn" onclick="pysimPliSave()" class="px-2.5 py-1 text-sm rounded bg-emerald-600 text-white hover:bg-emerald-700" data-l10n="Save">Save</button>
 					</div>
-					<div id="pysim-pli-dict" class="text-xs font-mono text-gray-600 dark:text-slate-400 max-h-[60vh] overflow-auto">
+					<div id="pysim-pli-dict" class="text-sm font-mono text-gray-600 dark:text-slate-400 max-h-[60vh] overflow-auto">
 						<span class="text-gray-400" data-l10n="Loading...">Loading...</span>
 					</div>
 				</div>
@@ -3909,7 +3909,7 @@ async function pysimEventsRender() {
 			html += '<div class="flex items-center gap-2 py-0.5"><span class="w-6 text-right text-gray-400">'
 				+ e.toString(16).padStart(2, '0').toUpperCase()
 				+ '</span> ' + esc(name)
-				+ '<button onclick="pysimEventSendForm(' + e + ')" class="ml-auto px-1.5 py-0.5 text-xs rounded bg-blue-600 text-white hover:bg-blue-700">' + t('Send') + '</button></div>';
+				+ '<button onclick="pysimEventSendForm(' + e + ')" class="ml-auto px-2 py-1 text-sm rounded bg-blue-600 text-white hover:bg-blue-700">' + t('Send') + '</button></div>';
 		});
 		el.innerHTML = html;
 	} catch (e) {
@@ -4148,6 +4148,32 @@ const CMD_QUALIFIER_SHORT = {
            0x16:'CAG', 0x17:'RejSlice'},
 };
 
+let _pysimLogExpanded = new Set();
+
+function pysimLogToggle(id) {
+	const panel = document.querySelector('[data-log-panel="' + id + '"]');
+	const tog = document.querySelector('[data-log-tog="' + id + '"]');
+	if (_pysimLogExpanded.has(id)) {
+		_pysimLogExpanded.delete(id);
+		if (panel) panel.classList.add('hidden');
+		if (tog) tog.textContent = '▶';
+	} else {
+		_pysimLogExpanded.add(id);
+		if (panel) panel.classList.remove('hidden');
+		if (tog) tog.textContent = '▼';
+	}
+}
+
+function pysimLogFields(decoded) {
+	if (!decoded || !decoded.length) return '';
+	let html = '';
+	decoded.forEach(f => {
+		html += '<div class="flex gap-1"><span class="text-gray-500 dark:text-slate-400 shrink-0">'
+			+ esc(f.label) + ':</span><span class="break-all">' + esc(f.value) + '</span></div>';
+	});
+	return html;
+}
+
 async function pysimProactiveLogRender() {
     const el = document.getElementById('pysim-proactive-log');
     el.innerHTML = '<span class="text-gray-400">' + t('Loading...') + '</span>';
@@ -4168,37 +4194,33 @@ async function pysimProactiveLogRender() {
                     if (qv) qual = ' [' + qv + ']';
                 }
             }
-            html += '<div>'
-                + '<div class="flex items-center gap-2 py-0.5">'
+            const expanded = _pysimLogExpanded.has(e.id);
+            html += '<div data-log-id="' + e.id + '" class="border-b border-gray-100 dark:border-slate-700/50">'
+                + '<div class="flex items-center gap-2 py-0.5 cursor-pointer select-none" onclick="pysimLogToggle(' + e.id + ')">'
                 + '<span class="w-12 text-right text-gray-400">' + e.elapsed + 's</span>'
                 + '<span class="font-mono text-gray-400">0x' + e.type_hex.toUpperCase() + '</span>'
                 + '<span class="truncate">' + esc(name) + '</span>'
-                + (qual ? '<span class="text-[10px] text-gray-500 dark:text-slate-400">' + esc(qual) + '</span>' : '')
-                + '</div>';
+                + (qual ? '<span class="text-xs text-gray-500 dark:text-slate-400">' + esc(qual) + '</span>' : '')
+                + '<span class="ml-auto text-gray-400" data-log-tog="' + e.id + '">' + (expanded ? '▼' : '▶') + '</span>'
+                + '</div>'
+                + '<div data-log-panel="' + e.id + '" class="' + (expanded ? '' : 'hidden') + ' ml-8 pl-2 border-l border-gray-300 dark:border-slate-600 mb-1 text-xs space-y-0.5">'
+                + '<div class="text-gray-500 dark:text-slate-400">' + t('Command') + ':</div>'
+                + pysimLogFields(e.cmd_decoded);
+            if (e.raw) html += '<input type="text" readonly value="' + esc(e.raw) + '" class="w-full max-w-md font-mono text-xs rounded border border-gray-300 dark:border-slate-600 px-2 py-1 bg-gray-100 dark:bg-slate-800 text-gray-600 dark:text-slate-400">';
+            html += '<div class="text-gray-500 dark:text-slate-400 mt-1">' + t('Response') + ':</div>';
+            if (e.tr_hex !== undefined) {
+                if (e.tr_result !== undefined) {
+                    html += '<div class="flex gap-1"><span class="text-gray-500 dark:text-slate-400 shrink-0">' + t('Result') + ':</span>'
+                        + '<span class="break-all">' + (e.tr_result_name ? esc(e.tr_result_name) + ' (' + esc(e.tr_result) + ')' : esc(e.tr_result)) + '</span></div>';
+                }
                 if (e.tr_hex) {
-                html += '<div class="text-[10px] pl-[5.5rem] text-gray-400 dark:text-slate-500">Response: ';
-                if (e.type_hex === '26' && e.qualifier) {
-                    const codec = PLI_CODECS[e.qualifier];
-                    if (codec && codec.decode) {
-                        const vals = codec.decode(e.tr_hex);
-                        if (vals) {
-                            const parts = [];
-                            codec.fields.forEach(f => {
-                                if (vals[f.id] !== undefined) parts.push(f.label + ': ' + vals[f.id]);
-                            });
-                            html += esc(parts.length ? parts.join(', ') : e.tr_hex);
-                        } else {
-                            html += esc(e.tr_hex);
+                    html += pysimLogFields(e.tr_decoded);
+                    html += '<input type="text" readonly value="' + esc(e.tr_hex) + '" class="w-full max-w-md font-mono text-xs rounded border border-gray-300 dark:border-slate-600 px-2 py-1 bg-gray-100 dark:bg-slate-800 text-gray-600 dark:text-slate-400">';
                 }
             } else {
-                        html += esc(e.tr_hex);
+                html += '<div class="text-gray-400">' + t('No response yet') + '</div>';
             }
-                } else {
-                    html += esc(e.tr_hex);
-                }
-                html += '</div>';
-            }
-            html += '</div>';
+            html += '</div></div>';
         });
         el.innerHTML = html;
     } catch (err) {
@@ -4405,12 +4427,12 @@ async function pysimPliRender() {
 			const hasCodec = !!PLI_CODECS[q.code];
 			html += '<div data-pli-row="' + q.code + '" class="py-0.5 border-b border-gray-200 dark:border-slate-700">'
 				+ '<div class="flex items-baseline gap-1.5">'
-				+ '<span class="w-6 shrink-0 text-right text-gray-400 text-[10px]">' + q.code + '</span>'
-				+ '<span class="flex-1 min-w-0 text-[11px] leading-snug">' + esc(q.name) + '</span>'
+				+ '<span class="w-6 shrink-0 text-right text-gray-400 text-xs">' + q.code + '</span>'
+				+ '<span class="flex-1 min-w-0 text-[13px] leading-snug">' + esc(q.name) + '</span>'
 				+ '</div>'
 				+ '<div class="flex items-center gap-1 mt-0.5 ml-8">'
 				+ '<input type="text" id="pli-v-' + q.code + '" value="' + esc(val) + '" placeholder="hex"'
-				+ ' class="flex-1 min-w-0 border border-gray-300 dark:border-slate-600 text-[10px] rounded px-1 py-0.5 dark:bg-slate-800 font-mono">';
+				+ ' class="flex-1 min-w-0 border border-gray-300 dark:border-slate-600 text-xs rounded px-1.5 py-1 dark:bg-slate-800 font-mono">';
 			if (hasCodec) {
 				html += '<span onclick="pysimPliDecodeRow(\'' + q.code + '\')" id="pli-tog-' + q.code + '"'
 					+ ' class="cursor-pointer select-none text-gray-400 hover:text-gray-600 dark:hover:text-gray-300">▶</span>';
@@ -4443,7 +4465,7 @@ function pysimPliDecodeRow(code) {
 	if (hex) {
 		values = codec.decode(hex);
 		if (!values) {
-			panel.innerHTML = '<span class="text-[10px] text-red-500">Invalid hex</span>';
+			panel.innerHTML = '<span class="text-xs text-red-500">Invalid hex</span>';
 			panel.classList.remove('hidden');
 			const tog = document.getElementById('pli-tog-' + code);
 			if (tog) tog.textContent = '▼';
@@ -4454,9 +4476,9 @@ function pysimPliDecodeRow(code) {
 	let html = '<div class="space-y-1 mb-1">';
 	codec.fields.forEach(f => {
 		html += '<div class="flex items-center gap-1">'
-			+ '<span class="text-[10px] w-12 text-gray-500 dark:text-slate-400 truncate" title="' + esc(f.label) + '">' + esc(f.label) + '</span>';
+			+ '<span class="text-xs w-12 text-gray-500 dark:text-slate-400 truncate" title="' + esc(f.label) + '">' + esc(f.label) + '</span>';
 		if (f.type === 'select') {
-			html += '<select id="pli-d-' + code + '-' + f.id + '" class="text-[10px] border border-gray-300 dark:border-slate-600 rounded px-1 py-0.5 dark:bg-slate-800 w-36">';
+			html += '<select id="pli-d-' + code + '-' + f.id + '" class="text-xs border border-gray-300 dark:border-slate-600 rounded px-1.5 py-1 dark:bg-slate-800 w-40">';
 			f.opts.forEach(o => html += '<option value="' + o.v + '"' + (String(values[f.id]) === String(o.v) ? ' selected' : '') + '>' + esc(o.l) + '</option>');
 			html += '</select>';
 		} else {
@@ -4465,14 +4487,14 @@ function pysimPliDecodeRow(code) {
 				+ (f.pattern ? ' pattern="' + f.pattern + '"' : '')
 				+ (f.placeholder ? ' placeholder="' + f.placeholder + '"' : '')
 				+ (f.min !== undefined ? ' min="' + f.min + '" max="' + f.max + '"' : '')
-				+ ' class="text-[10px] border border-gray-300 dark:border-slate-600 rounded px-1 py-0.5 dark:bg-slate-800 w-32 font-mono">';
+				+ ' class="text-xs border border-gray-300 dark:border-slate-600 rounded px-1.5 py-1 dark:bg-slate-800 w-40 font-mono">';
 		}
 		html += '</div>';
 	});
 	html += '</div>';
 	html += '<div class="flex gap-1">'
-		+ '<button onclick="pysimPliApplyRow(\'' + code + '\')" class="text-[10px] px-1.5 py-0.5 rounded bg-emerald-600 text-white hover:bg-emerald-700">Apply</button>'
-		+ '<button onclick="var p=document.querySelector(\'[data-pli-panel=\\\'' + code + '\\\']\');p.classList.add(\'hidden\');p.innerHTML=\'\';var t=document.getElementById(\'pli-tog-' + code + '\');if(t)t.textContent=\'▶\'" class="text-[10px] px-1.5 py-0.5 rounded border border-gray-300 dark:border-slate-600">Cancel</button>'
+		+ '<button onclick="pysimPliApplyRow(\'' + code + '\')" class="text-xs px-2 py-1 rounded bg-emerald-600 text-white hover:bg-emerald-700">Apply</button>'
+		+ '<button onclick="var p=document.querySelector(\'[data-pli-panel=\\\'' + code + '\\\']\');p.classList.add(\'hidden\');p.innerHTML=\'\';var t=document.getElementById(\'pli-tog-' + code + '\');if(t)t.textContent=\'▶\'" class="text-xs px-2 py-1 rounded border border-gray-300 dark:border-slate-600">Cancel</button>'
 		+ '</div>';
 	panel.innerHTML = html;
 	panel.classList.remove('hidden');
@@ -4630,10 +4652,13 @@ const LANG_RU = {
 	'Pack into Secured packet': 'Упаковать в Secured packet',
 	'Convert': 'Конвертировать',
 	'Decode': 'Декодировать',
-	'Generate BER-TLV': 'Сгенерировать BER-TLV',
+	'Generate Expanded Script APDU': 'Сгенерировать Expanded Script APDU',
 	'Generate Secure Packet': 'Сгенерировать Secure Packet',
 	'Conversion': 'Конвертация',
 	'Command': 'Команда',
+	'Response': 'Ответ',
+	'Result': 'Результат',
+	'No response yet': 'Ответа пока нет',
 	'Start with SELECT': 'Начать с SELECT',
 	'SELECT method': 'Метод SELECT',
 	'Path (hex)': 'Путь (hex)',

frontend/style.css

@@ -764,14 +764,6 @@ video {
   width: 6rem;
 }
 
-.w-32 {
-  width: 8rem;
-}
-
-.w-36 {
-  width: 9rem;
-}
-
 .w-40 {
   width: 10rem;
 }
@@ -1248,12 +1240,8 @@ video {
   line-height: 2rem;
 }
 
-.text-\[10px\] {
-  font-size: 10px;
-}
-
-.text-\[11px\] {
-  font-size: 11px;
+.text-\[13px\] {
+  font-size: 13px;
 }
 
 .text-lg {

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pysim-otaman-server"
-version = "1.7.0"
+version = "1.8.0"
 description = "HTTP REST server wrapping pysim for the OTAMan PWA"
 requires-python = ">=3.8"
 # pysim is a git-only dependency installed explicitly by setup.bat/setup.sh.

pysim_otaman_server/__main__.py

@@ -11,7 +11,7 @@ from pySim.log import PySimLogger
 from pySim.cards import UiccCardBase
 
 from .shell import load_pysim_app
-from .server import PysimHandler, StderrApduTracer, VERSION, _send_terminal_profile, _DefaultProactiveHandler, _handle_proactive_chain, _send_status, _init_proactive_session
+from .server import PysimHandler, StderrApduTracer, _LoggingApduTracer, VERSION, _send_terminal_profile, _DefaultProactiveHandler, _handle_proactive_chain, _send_status, _init_proactive_session
 
 
 _server_start = 0
@@ -59,7 +59,7 @@ def main():
     try:
         kwargs = {}
         if opts.apdu_trace:
-            kwargs['apdu_tracer'] = StderrApduTracer()
+            kwargs['apdu_tracer'] = _LoggingApduTracer()
         sl = mod.init_reader(opts, **kwargs)
         scc = SimCardCommands(sl)
         scc.cat_cla = '80'  # UICC CLA default; overridden for SIM after init_card
@@ -78,7 +78,7 @@ def main():
         traceback.print_exc()
         app = None
     if scc and hasattr(scc, '_tp'):
-        scc._tp.apdu_tracer = StderrApduTracer()
+        scc._tp.apdu_tracer = _LoggingApduTracer()
         try:
             _init_proactive_session()
             sys.stderr.write('INIT: sending TERMINAL PROFILE %s (CLA=%s)\n' % (opts.terminal_profile, scc.cat_cla))
@@ -104,7 +104,7 @@ def main():
         # PysimApp.__init__ and every `equip` wipe the transport apdu_tracer
         # (_onchange_apdu_trace sets it to None). Re-attach our tracer and make
         # sure it stays attached across equip/re-equip.
-        tracer = StderrApduTracer()
+        tracer = _LoggingApduTracer()
         def _reattach_tracer():
             if app.card:
                 app.card._scc._tp.apdu_tracer = tracer

pysim_otaman_server/server.py

@@ -15,9 +15,10 @@ from pySim.cards import UiccCardBase
 import gsm0338  # registers 'gsm03.38' codec
 from construct import GreedyBytes
 from osmocom.construct import GsmOrUcs2Adapter
+from osmocom.tlv import BER_TLV_IE
 
 
-VERSION = '1.7.0'
+VERSION = '1.8.0'
 
 
 # Static file serving (the PWA lives in <repo>/frontend, served by this server
@@ -54,6 +55,20 @@ class StderrApduTracer(ApduTracer):
         os.write(2, (msg + '\n').encode())
 
 
+class _LoggingApduTracer(StderrApduTracer):
+    """StderrApduTracer that additionally records the SW of TERMINAL RESPONSE
+    APDUs sent by pySim's auto-handler (which happen outside our own chain code)
+    onto the most recent log entry that is still missing its tr_sw."""
+
+    def trace_response(self, cmd, sw, resp):
+        super().trace_response(cmd, sw, resp)
+        if len(cmd) >= 4 and cmd[2:4] == '14':
+            for entry in reversed(_PROACTIVE_LOG):
+                if 'tr_hex' in entry and 'tr_sw' not in entry:
+                    entry['tr_sw'] = sw
+                    break
+
+
 ERROR_MSGS = {
     'en': {
         'app_not_init': 'Server not initialized',
@@ -341,16 +356,51 @@ class PoRSubmitHandler(ProactiveHandler):
 
 
 class _DefaultProactiveHandler(ProactiveHandler):
-    """Catch-all for any proactive command not explicitly handled. Responds
-    with 'performed_successfully' so pySim's auto-fetch never crashes."""
+    """Catch-all for any proactive command not explicitly handled. Logs the
+    fetch and its TERMINAL RESPONSE into _PROACTIVE_LOG and answers
+    PROVIDE LOCAL INFORMATION (0x26) with data from the PLI dictionary,
+    so the card does not re-request."""
+
     def receive_fetch_raw(self, pcmd, parsed):
-        return self.prepare_response(pcmd, 'performed_successfully')
+        cmd_num, cmd_type, dev_src, dev_dst, cmd_qual = 1, 0, 0x83, 0x81, None
+        entry = None
+        try:
+            raw = bytes.fromhex(parsed) if parsed else None
+            if raw:
+                cmd_num, cmd_type, dev_src, dev_dst, cmd_qual = _parse_proactive_header(raw)
+            entry = _log_proactive(cmd_type, raw, cmd_qual, cmd_num)
+        except Exception:
+            pass
+        ti_list = self.prepare_response(pcmd, 'performed_successfully')
+        if cmd_type == 0x26 and cmd_qual is not None:
+            pli_hex = _PLI_DATA.get(cmd_qual, '')
+            if pli_hex:
+                try:
+                    ti_list.insert(2, _RawBerTlv(pli_hex))
+                except Exception:
+                    pass
+        if entry:
+            _record_tr(entry, b''.join(x.to_tlv() for x in ti_list))
+        return ti_list
+
+
+class _RawBerTlv(BER_TLV_IE):
+    """Emits pre-encoded TLV bytes verbatim (used to inject PLI data TLVs
+    into the TERMINAL RESPONSE built by pySim's auto-handler)."""
+
+    def __init__(self, data_hex):
+        super().__init__()
+        self._raw = bytes.fromhex(data_hex)
+
+    def to_bytes(self, context={}):
+        return self._raw
 
 
 _STK_DECODE = GsmOrUcs2Adapter(GreedyBytes)
 
 _PROACTIVE_LOG = []
 _PROACTIVE_SESSION_START = None
+_PROACTIVE_ENTRY_ID = 0
 
 PROACTIVE_TYPE_NAMES = {
     0x03: 'POLL INTERVAL', 0x05: 'SET UP EVENT LIST',
@@ -457,6 +507,273 @@ def _tr_data_only(tr_tlv):
     return bytes(data)
 
 
+EVENT_NAMES = {
+    0x00: 'MT call', 0x01: 'Call connected', 0x02: 'Call disconnected',
+    0x03: 'Location status', 0x04: 'User activity', 0x05: 'Idle screen available',
+    0x06: 'Card reader status', 0x07: 'Language selection',
+    0x08: 'Browser termination', 0x09: 'Data available',
+    0x0A: 'Channel status', 0x0B: 'Access Technology Change',
+    0x0C: 'Display parameters changed', 0x0D: 'Local connection',
+    0x0E: 'Network Search Mode Change', 0x0F: 'Browsing status',
+    0x10: 'Frames Information Change', 0x11: 'I-WLAN Access Status',
+    0x12: 'Network Rejection', 0x13: 'HCI Connectivity',
+    0x14: 'Change of UICC Access', 0x15: 'CSG Cell Change',
+    0x16: 'Contactless state request', 0x17: 'Profile Container',
+    0x18: 'LTE D2D Discovery Monitoring', 0x19: 'LTE D2D Communication Monitoring',
+    0x1A: 'LTE D2D Announcement Response', 0x1B: 'LTE D2D Revocation',
+    0x1C: 'LTE D2D Application Port', 0x1D: 'LTE D2D Security Recovery',
+    0x1E: 'Off-net Emergency Call', 0x1F: 'ECall Over IMS',
+    0x20: 'EARFCN Update', 0x21: 'SCEF Channel Status',
+}
+
+ACCESSTECH_NAMES = {
+    0: 'GSM', 1: 'GSM Compact', 2: 'TIA/EIA-533', 3: 'UTRAN',
+    4: 'TETRA', 5: 'TIA/EIA-95-B', 6: 'CDMA2000 1x', 7: 'CDMA2000 HRPD',
+    8: 'E-UTRAN', 9: 'eHRPD', 10: 'NG-RAN', 11: 'Satellite NG-RAN',
+    12: 'Satellite E-UTRAN',
+}
+
+PLI_QUALIFIER_SHORT = {
+    0x00: 'Loc', 0x01: 'IMEI', 0x02: 'NMR', 0x03: 'Time', 0x04: 'Lang',
+    0x05: 'TA', 0x06: 'AccTech', 0x08: 'IMEISV', 0x09: 'Search', 0x0A: 'Batt',
+    0x0C: 'WSID', 0x0D: 'BCInfo', 0x0E: 'MultiAT', 0x0F: 'MultiLoc',
+    0x10: 'MultiNMR', 0x11: 'CSG', 0x12: 'HNB-IP', 0x13: 'HNB-Macro',
+    0x14: 'WLAN', 0x15: 'Slices', 0x16: 'CAG', 0x17: 'RejSlice',
+}
+
+
+def _dec_plmn(hex6):
+    """Decode 3-byte MCC/MNC nibble-swapped PLMN, e.g. '25001' from 'F50010'."""
+    h = re.sub(r'\s', '', hex6)[:6]
+    if len(h) < 6:
+        return '250', '01'
+    b1, b2, b3 = int(h[0:2], 16), int(h[2:4], 16), int(h[4:6], 16)
+    mcc = '%d%d%d' % (b1 & 0xF, (b1 >> 4) & 0xF, b2 & 0xF)
+    mnc = '%d' % (b3 & 0xF)
+    if (b2 >> 4) != 0xF:
+        mnc += '%d' % ((b2 >> 4) & 0xF)
+    return mcc, mnc
+
+
+def _dec_imei(hex8):
+    """Decode 8-byte IMEI (nibble-swapped, 15 digits)."""
+    h = re.sub(r'\s', '', hex8)[:16]
+    if len(h) < 16:
+        return ''
+    s = ''
+    for i in range(0, 15, 2):
+        b = int(h[i:i + 2], 16)
+        s += '%d%d' % (b & 0xF, (b >> 4) & 0xF)
+    return s[:15]
+
+
+def _decode_cmd(cmd_type, raw, qualifier):
+    """Decode a fetched proactive command into [{label, value}] pairs."""
+    if not raw:
+        return []
+    if cmd_type == 0x03:
+        idx = raw.find(b'\x84\x02\x01')
+        if idx >= 0 and idx + 3 < len(raw):
+            return [{'label': 'Interval', 'value': '%d s' % raw[idx + 3]}]
+        return []
+    if cmd_type == 0x05:
+        for tag in (0x99, 0x19):
+            idx = raw.find(bytes([tag]))
+            if idx >= 0 and idx + 1 < len(raw):
+                tlen = raw[idx + 1]
+                names = [EVENT_NAMES.get(b, 'Event 0x%02X' % b) for b in raw[idx + 2: idx + 2 + tlen]]
+                return [{'label': 'Events', 'value': ', '.join(names)}]
+        return []
+    if cmd_type == 0x13:
+        idx = raw.find(b'\x8b')
+        if idx >= 0 and idx + 1 < len(raw):
+            tlen = raw[idx + 1]
+            return [{'label': 'SMS TPDU', 'value': raw[idx + 2: idx + 2 + tlen].hex()}]
+        return []
+    if cmd_type == 0x21:
+        text = _parse_display_text(raw)
+        return [{'label': 'Text', 'value': text}] if text else []
+    if cmd_type == 0x24:
+        items = _parse_select_item(raw)
+        if items:
+            return [{'label': 'Items', 'value': ', '.join('%s. %s' % (it['id'], it['text']) for it in items)}]
+        return []
+    if cmd_type == 0x25:
+        items = _parse_setup_menu_items(raw)
+        if items:
+            return [{'label': 'Items', 'value': ', '.join('%s. %s' % (it['id'], it['text']) for it in items)}]
+        return []
+    if cmd_type == 0x26 and qualifier is not None:
+        name = PLI_QUALIFIER_NAMES.get(qualifier, 'Unknown')
+        return [{'label': 'Qualifier', 'value': '%s (0x%02X)' % (name, qualifier)}]
+    return [{'label': 'Data', 'value': raw.hex()}]
+
+
+def _decode_tr(type_hex, qual_hex, tr_hex):
+    """Decode the command-specific payload of a TERMINAL RESPONSE into
+    [{label, value}] pairs (empty list when the TR carried no data)."""
+    if not tr_hex:
+        return []
+    h = re.sub(r'\s', '', tr_hex)
+    try:
+        cmd_type = int(type_hex, 16) if type_hex else None
+    except ValueError:
+        return [{'label': 'Data', 'value': h}]
+    if cmd_type == 0x03 and len(h) >= 8 and h[0:2] == '84':
+        return [{'label': 'Interval', 'value': '%d s' % int(h[6:8], 16)}]
+    if cmd_type == 0x26 and qual_hex:
+        try:
+            qual = int(qual_hex, 16)
+        except ValueError:
+            qual = None
+        if qual in (0x00, 0x01, 0x03, 0x04, 0x05, 0x06, 0x08, 0x09, 0x0A, 0x0E):
+            v = h[4:] if len(h) >= 4 else ''
+            if qual == 0x00 and len(v) >= 10:
+                mcc, mnc = _dec_plmn(v[:6])
+                return [{'label': 'MCC', 'value': mcc}, {'label': 'MNC', 'value': mnc},
+                        {'label': 'LAC/TAC', 'value': v[6:10].upper()}]
+            if qual == 0x01 and len(v) >= 16:
+                return [{'label': 'IMEI', 'value': _dec_imei(v[:16])}]
+            if qual == 0x03 and len(v) >= 14:
+                yr = 2000 + int(v[0:2]) if int(v[0:2]) < 70 else 1900 + int(v[0:2])
+                mo, dy = int(v[2:4]), int(v[4:6])
+                hh, mm, ss = int(v[6:8]), int(v[8:10]), int(v[10:12])
+                tz = int(v[12:14], 16)
+                tz_sign = '-' if tz & 0x80 else '+'
+                tz_q = (tz & 0x3F) or 0
+                return [{'label': 'Date', 'value': '%04d-%02d-%02d' % (yr, mo, dy)},
+                        {'label': 'Time', 'value': '%02d:%02d:%02d' % (hh, mm, ss)},
+                        {'label': 'TZ offset', 'value': '%s%02d:%02d' % (tz_sign, tz_q // 4, (tz_q % 4) * 15)}]
+            if qual == 0x04 and len(v) >= 4:
+                try:
+                    lang = bytes.fromhex(v[:4]).decode('ascii')
+                except Exception:
+                    lang = v[:4]
+                return [{'label': 'Language', 'value': lang}]
+            if qual == 0x05 and len(v) >= 4:
+                return [{'label': 'ME Status', 'value': str(int(v[0:2], 16))},
+                        {'label': 'Timing Advance', 'value': str(int(v[2:4], 16))}]
+            if qual == 0x06 and len(v) >= 2:
+                tech = int(v[0:2], 16)
+                return [{'label': 'Access Technology',
+                         'value': '%s (%d)' % (ACCESSTECH_NAMES.get(tech, 'Unknown'), tech)}]
+            if qual == 0x08 and len(v) >= 16:
+                return [{'label': 'IMEISV', 'value': _dec_imei(v[:16]) + v[14:16].upper()}]
+            if qual == 0x09 and len(v) >= 2:
+                mode = int(v[0:2], 16)
+                return [{'label': 'Search Mode', 'value': 'Manual' if mode == 1 else ('Automatic' if mode == 0 else str(mode))}]
+            if qual == 0x0A and len(v) >= 2:
+                return [{'label': 'Charge state (%)', 'value': str(int(v[0:2], 16))}]
+            if qual == 0x0E:
+                techs = [int(v[i:i + 2], 16) for i in range(0, len(v), 2)]
+                return [{'label': 'Access Technologies',
+                         'value': ', '.join(ACCESSTECH_NAMES.get(t, 'Unknown') for t in techs)}]
+            return [{'label': 'Data', 'value': h}]
+    return [{'label': 'Data', 'value': h}]
+
+
+def _build_tr(scc, cmd_num, cmd_type, dev_src, dev_dst, cmd_qual):
+    """Build the TERMINAL RESPONSE TLV payload for a fetched command
+    (includes PLI dictionary data for PROVIDE LOCAL INFORMATION)."""
+    if cmd_type == 0x03:
+        return bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
+                      0x82, 0x02, dev_dst, dev_src,
+                      0x84, 0x02, 0x01, _POLL_INTERVAL,
+                      0x03, 0x01, 0x00])
+    base = bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
+                  0x82, 0x02, dev_dst, dev_src])
+    if cmd_type == 0x26 and cmd_qual is not None:
+        pli_hex = _PLI_DATA.get(cmd_qual, '')
+        if pli_hex:
+            base += bytes.fromhex(pli_hex)
+    return base + bytes([0x03, 0x01, 0x00])
+
+
+_RESULT_NAMES_BASIC = {
+    0x00: 'Command performed successfully',
+    0x01: 'Command performed with partial comprehension',
+    0x02: 'Command performed, with missing information',
+    0x03: 'REFUSED BY THE ME',
+    0x04: 'Command not understood by the ME',
+    0x05: 'Command not permitted by the user',
+    0x06: 'Command performed with modification',
+    0x20: 'Proactive SIM session terminated by the user',
+    0x21: 'Backward move in the proactive SIM session requested by the user',
+    0x22: 'No response from user',
+    0x23: 'Help information required by the user',
+    0x24: 'USSD or SS transaction terminated by the user',
+    0x25: 'Proactive SIM session terminated by the user',
+    0x26: 'Backward move in the proactive SIM session requested by the user',
+}
+
+_RESULT_NAMES_GENERAL = {
+    0x10: 'Command performed with additional information',
+    0x20: 'ME currently unable to process command',
+    0x21: 'Network currently unable to process command',
+    0x22: 'User did not accept the proactive command',
+    0x23: 'User cleared down call before connection or network release',
+    0x24: 'Action in contradiction with the current enforcement state',
+    0x25: 'Action in contradiction with the current timer state',
+    0x26: 'ME currently unable to process command',
+    0x27: 'User did not accept the proactive command',
+    0x28: 'User cleared down call before connection or network release',
+    0x29: 'Action in contradiction with the current enforcement state',
+    0x2A: 'Action in contradiction with the current timer state',
+    0x30: 'Command performed but partial understanding',
+    0x31: 'Command performed, with missing information',
+    0x32: 'REFUSED BY THE ME',
+    0x33: 'Command not understood by the ME',
+    0x34: 'Command not permitted by the user',
+    0x35: 'Command performed with modification',
+}
+
+def _tr_result_name(b, is_general):
+    table = _RESULT_NAMES_GENERAL if is_general else _RESULT_NAMES_BASIC
+    if b in table:
+        return table[b]
+    if 0x40 <= b <= 0x4F or 0x70 <= b <= 0x7F:
+        return 'Command performed with modification'
+    if 0x60 <= b <= 0x6F:
+        return 'Command performed with limited understanding'
+    return None
+
+
+def _extract_tr_result(tr_tlv):
+    """Return (tag, value) of the Result CTLV (tag 0x03 basic or 0x83 general)
+    from a TERMINAL RESPONSE payload, or None if absent."""
+    if not tr_tlv:
+        return None
+    off = 0
+    while off < len(tr_tlv) - 1:
+        tag, tlen = tr_tlv[off], tr_tlv[off + 1]
+        if tag in (0x03, 0x83) and off + 2 + tlen <= len(tr_tlv):
+            return (tag, tr_tlv[off + 2: off + 2 + tlen])
+        off += 2 + tlen
+    return None
+
+
+def _record_tr(entry, tr_tlv, tr_sw=None):
+    """Attach a sent TERMINAL RESPONSE to a log entry: payload hex, SW and
+    server-side decode. tr_sw may be omitted (pySim auto-handler) and filled
+    later by _LoggingApduTracer."""
+    if entry is None:
+        return
+    entry['tr_hex'] = _tr_data_only(tr_tlv).hex()
+    if tr_sw is not None:
+        entry['tr_sw'] = tr_sw
+    try:
+        result = _extract_tr_result(tr_tlv)
+        if result is not None:
+            tag, val = result
+            entry['tr_result'] = val.hex()
+            name = _tr_result_name(val[0], tag == 0x83)
+            if name:
+                entry['tr_result_name'] = name
+        entry['tr_decoded'] = _decode_tr(entry.get('type_hex'), entry.get('qualifier'), entry['tr_hex'])
+    except Exception:
+        entry['tr_decoded'] = []
+
+
 def _handle_card_disconnect():
     global _CARD_CONNECTED
     _poll_disable()
@@ -476,18 +793,27 @@ def _init_proactive_session():
     _PROACTIVE_SESSION_START = time.time()
 
 
-def _log_proactive(cmd_type, raw, qualifier=None):
+def _log_proactive(cmd_type, raw, qualifier=None, cmd_num=None):
+    global _PROACTIVE_ENTRY_ID
     if _PROACTIVE_SESSION_START is None:
         return
+    _PROACTIVE_ENTRY_ID += 1
     entry = {
+        'id': _PROACTIVE_ENTRY_ID,
         'type_hex': '%02x' % cmd_type,
         'type_name': PROACTIVE_TYPE_NAMES.get(cmd_type, 'UNKNOWN'),
         'elapsed': round(time.time() - _PROACTIVE_SESSION_START, 1),
         'bytes': len(raw) if raw else 0,
         'raw': raw.hex() if raw else None,
     }
+    if cmd_num is not None:
+        entry['cmd_num'] = cmd_num
     if qualifier is not None:
         entry['qualifier'] = '%02x' % qualifier
+    try:
+        entry['cmd_decoded'] = _decode_cmd(cmd_type, raw, qualifier)
+    except Exception:
+        entry['cmd_decoded'] = []
     _PROACTIVE_LOG.append(entry)
     return entry
 
@@ -635,31 +961,17 @@ def _handle_proactive_chain(scc, sw91, on_fetch=None):
         action = None
         if raw:
             cmd_num, cmd_type, dev_src, dev_dst, cmd_qual = _parse_proactive_header(raw)
-            entry = _log_proactive(cmd_type, raw, cmd_qual)
+            entry = _log_proactive(cmd_type, raw, cmd_qual, cmd_num)
         else:
             cmd_num, cmd_type, dev_src, dev_dst, cmd_qual = 1, 0, 0x83, 0x81, None
             entry = None
         if on_fetch:
             action = on_fetch(raw, cmd_num, cmd_type, dev_src, dev_dst)
         if action != 'pause':
-            if cmd_type == 0x03:
-                tr_tlv = bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
-                                0x82, 0x02, dev_dst, dev_src,
-                                0x84, 0x02, 0x01, _POLL_INTERVAL,
-                                0x03, 0x01, 0x00])
-            else:
-                base = bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
-                              0x82, 0x02, dev_dst, dev_src])
-                if cmd_type == 0x26 and cmd_qual is not None:
-                    pli_hex = _PLI_DATA.get(cmd_qual, '')
-                    if pli_hex:
-                        base += bytes.fromhex(pli_hex)
-                tr_tlv = base + bytes([0x03, 0x01, 0x00])
+            tr_tlv = _build_tr(scc, cmd_num, cmd_type, dev_src, dev_dst, cmd_qual)
             tr_rv = scc._tp.send_apdu('%s140000%02x%s' % (scc.cat_cla, len(tr_tlv), tr_tlv.hex()))
             sys.stderr.write('TR: cmd=%02x type=%02x -> %s %s\n' % (cmd_num, cmd_type, tr_rv[1], ('(%d bytes)' % len(tr_tlv))))
-            if entry:
-                entry['tr_hex'] = _tr_data_only(tr_tlv).hex()
-                entry['tr_sw'] = tr_rv[1]
+            _record_tr(entry, tr_tlv, tr_rv[1])
             sw = tr_rv[1]
             if sw == '9000':
                 sys.stderr.write('STATUS poll (chain ended)\n')
@@ -716,27 +1028,13 @@ def _send_terminal_profile(scc, tp_hex):
                     if menu:
                         sim_menu = menu
             if fdata and cmd_type:
-                entry = _log_proactive(cmd_type, raw, cmd_qual)
+                entry = _log_proactive(cmd_type, raw, cmd_qual, cmd_num)
             else:
                 entry = None
-            if cmd_type == 0x03:
-                tr_tlv = bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
-                                0x82, 0x02, dev_dst, dev_src,
-                                0x84, 0x02, 0x01, _POLL_INTERVAL,
-                                0x03, 0x01, 0x00])
-            else:
-                base = bytes([0x81, 0x03, cmd_num, cmd_type, 0x00,
-                              0x82, 0x02, dev_dst, dev_src])
-                if cmd_type == 0x26 and cmd_qual is not None:
-                    pli_hex = _PLI_DATA.get(cmd_qual, '')
-                    if pli_hex:
-                        base += bytes.fromhex(pli_hex)
-                tr_tlv = base + bytes([0x03, 0x01, 0x00])
+            tr_tlv = _build_tr(scc, cmd_num, cmd_type, dev_src, dev_dst, cmd_qual)
             tr_rv = scc._tp.send_apdu('%s140000%02x%s' % (scc.cat_cla, len(tr_tlv), tr_tlv.hex()))
             sys.stderr.write('TR(tp): cmd=%02x type=%02x -> %s\n' % (cmd_num, cmd_type, tr_rv[1]))
-            if entry:
-                entry['tr_hex'] = _tr_data_only(tr_tlv).hex()
-                entry['tr_sw'] = tr_rv[1]
+            _record_tr(entry, tr_tlv, tr_rv[1])
             sw = tr_rv[1]
             if sw == '9000':
                 sys.stderr.write('STATUS poll (tp chain ended)\n')
@@ -1348,6 +1646,12 @@ class PysimHandler(BaseHTTPRequestHandler):
             tr_hex = '%s140000%02x%s' % (scc.cat_cla, len(tr_data), tr_data.hex())
             tr_rv = scc._tp.send_apdu(tr_hex)
             sys.stderr.write('TR(menu): cmd=%02x type=%02x result=%02x -> %s\n' % (pd['cmd_num'], pd['cmd_type'], gr, tr_rv[1]))
+            for entry in reversed(_PROACTIVE_LOG):
+                if (entry.get('cmd_num') == pd['cmd_num']
+                        and entry.get('type_hex') == '%02x' % pd['cmd_type']
+                        and 'tr_hex' not in entry):
+                    _record_tr(entry, tr_data, tr_rv[1])
+                    break
             sw = tr_rv[1]
             resp = {'sw': sw}
             if result == 'cancel':

tests/test_ota_helpers.py

@@ -20,9 +20,15 @@ if str(PY_SIM) not in sys.path:
 
 from pysim_otaman_server.server import (
     _build_sms_tpdu,
+    _build_tr,
+    _decode_cmd,
     _decode_por,
+    _decode_tr,
+    _log_proactive,
     _ota_reference,
+    _record_tr,
     _spi_from_bytes,
+    _tr_data_only,
 )
 
 # Synthetic dummy key material (no real card keys).
@@ -214,5 +220,121 @@ class TestDecodePor(unittest.TestCase):
                 msg='expected None for %r' % bad)
 
 
+class TestProactiveDecode(unittest.TestCase):
+    """Server-side proactive command/TR decode helpers (v1.8.0 log feature)."""
+
+    def setUp(self):
+        import pysim_otaman_server.server as srv
+        srv._PROACTIVE_SESSION_START = 1234.0
+        srv._PLI_DATA[0x00] = '93055210011000'
+
+    def test_decode_cmd_poll_interval(self):
+        r = _decode_cmd(0x03, bytes.fromhex('d00d8103010300820283818402011e'), None)
+        self.assertEqual(r, [{'label': 'Interval', 'value': '30 s'}])
+
+    def test_decode_cmd_setup_event_list(self):
+        r = _decode_cmd(0x05, bytes.fromhex('d00c810301050082028381990101'), None)
+        self.assertEqual(r, [{'label': 'Events', 'value': 'Call connected'}])
+
+    def test_decode_cmd_send_short_message(self):
+        r = _decode_cmd(0x13, bytes.fromhex('d0158103011300820283818b0b916106152670f900a35f020101'), None)
+        self.assertEqual(r, [{'label': 'SMS TPDU', 'value': '916106152670f900a35f02'}])
+
+    def test_decode_cmd_pli_qualifier_name(self):
+        r = _decode_cmd(0x26, b'\xd0', 0x00)
+        self.assertTrue(r[0]['value'].startswith('Location Information (MCC, MNC, LAC/TAC, Cell ID)'))
+
+    def test_decode_cmd_empty_raw(self):
+        self.assertEqual(_decode_cmd(0x26, b'', None), [])
+        self.assertEqual(_decode_cmd(0x03, None, None), [])
+
+    def test_decode_tr_pli_location(self):
+        r = _decode_tr('26', '00', '93055210011000')
+        self.assertEqual(r, [
+            {'label': 'MCC', 'value': '250'},
+            {'label': 'MNC', 'value': '11'},
+            {'label': 'LAC/TAC', 'value': '1000'},
+        ])
+
+    def test_decode_tr_pli_imei(self):
+        r = _decode_tr('26', '01', '94082143658709214305')
+        self.assertEqual(r[0], {'label': 'IMEI', 'value': '123456789012345'})
+
+    def test_decode_tr_pli_access_technology(self):
+        r = _decode_tr('26', '06', 'bf0103')
+        self.assertEqual(r, [{'label': 'Access Technology', 'value': 'UTRAN (3)'}])
+
+    def test_decode_tr_pli_search_mode(self):
+        r = _decode_tr('26', '09', 'ad0101')
+        self.assertEqual(r, [{'label': 'Search Mode', 'value': 'Manual'}])
+
+    def test_decode_tr_poll_interval(self):
+        r = _decode_tr('03', None, '8402011e')
+        self.assertEqual(r, [{'label': 'Interval', 'value': '30 s'}])
+
+    def test_decode_tr_empty(self):
+        self.assertEqual(_decode_tr('26', '00', ''), [])
+
+    def test_tr_data_only_strips_boilerplate(self):
+        tr = bytes.fromhex('81030326008202818393055210011000030100')
+        self.assertEqual(_tr_data_only(tr).hex(), '93055210011000')
+
+    def test_build_and_record_tr(self):
+        entry = {'type_hex': '26', 'qualifier': '00'}
+        tr = _build_tr(None, 3, 0x26, 0x83, 0x81, 0x00)
+        _record_tr(entry, tr, '9000')
+        self.assertEqual(entry['tr_hex'], '93055210011000')
+        self.assertEqual(entry['tr_sw'], '9000')
+        self.assertEqual([f['label'] for f in entry['tr_decoded']], ['MCC', 'MNC', 'LAC/TAC'])
+
+    def test_record_tr_without_sw(self):
+        entry = {'type_hex': '26', 'qualifier': '00'}
+        _record_tr(entry, bytes.fromhex('93055210011000'))
+        self.assertNotIn('tr_sw', entry)
+        self.assertEqual(entry['tr_hex'], '93055210011000')
+
+    def test_log_proactive_fields(self):
+        entry = _log_proactive(0x26, b'\xd0', 0x00, 7)
+        self.assertEqual(entry['cmd_num'], 7)
+        self.assertEqual(entry['type_hex'], '26')
+        self.assertEqual(entry['qualifier'], '00')
+        self.assertEqual(entry['raw'], 'd0')
+        self.assertEqual(entry['cmd_decoded'][0]['label'], 'Qualifier')
+        self.assertIn('id', entry)
+
+    def test_log_proactive_malformed_raw(self):
+        entry = _log_proactive(0x21, bytes([0xD0, 0xFF]), 0x00)
+        self.assertEqual(entry['cmd_decoded'], [])
+
+    def test_log_proactive_no_cmd_num(self):
+        entry = _log_proactive(0x05, bytes.fromhex('990101'), None)
+        self.assertNotIn('cmd_num', entry)
+
+    def test_record_tr_basic_result(self):
+        entry = {'type_hex': '03', 'qualifier': None}
+        _record_tr(entry, bytes.fromhex('8103010300820281838402011e030100'))
+        self.assertEqual(entry['tr_result'], '00')
+        self.assertEqual(entry['tr_result_name'], 'Command performed successfully')
+        self.assertEqual(entry['tr_hex'], '8402011e')
+
+    def test_record_tr_general_result(self):
+        entry = {'type_hex': '26', 'qualifier': '00'}
+        _record_tr(entry, bytes.fromhex('8103032600820281839305521001100083022001'))
+        self.assertEqual(entry['tr_result'], '2001')
+        self.assertEqual(entry['tr_result_name'], 'ME currently unable to process command')
+        self.assertEqual(entry['tr_hex'], '93055210011000')
+
+    def test_record_tr_unknown_result(self):
+        entry = {'type_hex': '26', 'qualifier': '00'}
+        _record_tr(entry, bytes.fromhex('810303260082028181030107'))
+        self.assertEqual(entry['tr_result'], '07')
+        self.assertNotIn('tr_result_name', entry)
+
+    def test_record_tr_no_result_tlv(self):
+        entry = {'type_hex': '26', 'qualifier': '00'}
+        _record_tr(entry, bytes.fromhex('810303260082028181'))
+        self.assertNotIn('tr_result', entry)
+
+
 if __name__ == '__main__':
     unittest.main()