mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-10 16:21:22 +00:00
4c82424adf
* feat: open saved session logs from terminal toolbar Add one-click access to the current automatic or manual session log, flush before opening, and reuse application selection with a remembered log preference. Preserve recording controls and current-session ownership across worker routing and reconnects. Refs #3807 * fix(logging): preserve saved logs on failed reconnect and localize failures Address both Codex review findings with generation- and identity-checked replacement cleanup and localized user-facing error handling. * fix(logging): guard successful main-process session replacement Add shared inactive-log cleanup to fallback start handlers with regression coverage. Registration activation follows separately. * fix(logging): enable log lifecycle cleanup for main-process fallback * fix(terminal): keep log cleanup and tuck open-log into More actions Always end a raw session-log write stream on finalize, including when a flush already disabled it. Keep immediate snapshot retries, and pause them only while prepare is waiting so a disk error can be reported. Show open, reveal, and open-with in the toolbar overflow menu when logging is active, instead of a default toolbar button. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(logging): back off failed snapshot writes and drop retired log actions Persistent snapshot failures retry on a growing delay instead of a tight loop, and still flush immediately when new output arrives. Hide open-log actions after a successful reconnect retires a stopped manual log. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(terminal): keep open-log actions after automatic logging is turned off The current automatic log keeps recording until reconnect, so the menu stays available for that connection and clears on the next successful connect. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(terminal): derive log menu availability from saved session logs * fix(terminal): nest session log actions in one More actions submenu Collapse Open, Show in folder, and the two open-with actions into a Session log submenu that follows the Terminal Encoding menu, and drop the remembered-application hint. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
49 lines
2.6 KiB
TypeScript
49 lines
2.6 KiB
TypeScript
import { STORAGE_KEY_SESSION_LOG_APPLICATION } from '../../infrastructure/config/storageKeys';
|
|
import { localStorageAdapter } from '../../infrastructure/persistence/localStorageAdapter';
|
|
import { netcattyBridge } from '../../infrastructure/services/netcattyBridge';
|
|
|
|
export type SessionLogAction = 'open' | 'reveal' | 'chooseApplication' | 'systemDefault';
|
|
type LogApplication = { path: string; name: string };
|
|
|
|
/** Resolve the session's actual log in its owning process before opening it. */
|
|
export async function performSessionLogAction(sessionId: string, action: SessionLogAction): Promise<void> {
|
|
const bridge = netcattyBridge.get();
|
|
if (!bridge?.prepareSessionLog) throw new Error('Session log bridge unavailable');
|
|
if (action === 'reveal') {
|
|
const result = await bridge.revealSessionLog?.({ sessionId });
|
|
if (!result?.success) throw new Error(result?.error || 'Failed to reveal session log');
|
|
return;
|
|
}
|
|
|
|
// Check availability before presenting an application picker. Resolve again
|
|
// afterwards so any output received while the picker was open is flushed.
|
|
let result = await bridge.prepareSessionLog({ sessionId });
|
|
if (!result.success || !result.filePath) throw new Error(result.error || 'No saved log for this session');
|
|
let application = localStorageAdapter.read<LogApplication>(STORAGE_KEY_SESSION_LOG_APPLICATION);
|
|
if (action === 'chooseApplication') {
|
|
if (!bridge.selectApplication) throw new Error('Application picker unavailable');
|
|
application = await bridge.selectApplication();
|
|
if (!application) return;
|
|
result = await bridge.prepareSessionLog({ sessionId });
|
|
if (!result.success || !result.filePath) throw new Error(result.error || 'No saved log for this session');
|
|
} else if (action === 'systemDefault') {
|
|
application = null;
|
|
}
|
|
|
|
if (application?.path) {
|
|
if (!bridge.openWithApplication) throw new Error('Application opening unavailable');
|
|
const opened = await bridge.openWithApplication(result.filePath, application.path);
|
|
if (!opened) throw new Error('Failed to open session log');
|
|
} else {
|
|
const opened = await bridge.openWithSystemDefault?.(result.filePath);
|
|
if (!opened?.success) throw new Error(opened?.error || 'Failed to open session log');
|
|
}
|
|
// Only remember a choice after a successful launch; failed launches leave
|
|
// the previous preference intact and can be retried or reset from the menu.
|
|
if (action === 'chooseApplication') {
|
|
localStorageAdapter.write(STORAGE_KEY_SESSION_LOG_APPLICATION, application);
|
|
} else if (action === 'systemDefault') {
|
|
localStorageAdapter.remove(STORAGE_KEY_SESSION_LOG_APPLICATION);
|
|
}
|
|
}
|