@symerian/symi 2.6.41 → 2.7.0

package/dist/{send-CQVnyJyF.js → send-BVBCh27_.js}

@@ -1,19 +1,19 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
 import { X as resolvePreferredSymiTmpDir } from "./utils-B-0b9bGM.js";
-import { i as loadConfig } from "./config-Dz95lSBW.js";
-import { _ as maxBytesForKind, l as extensionForMime } from "./image-ops-1OJMSAUX.js";
-import { v as resolveDiscordAccount, y as normalizeDiscordToken } from "./plugins-DKDeQZF0.js";
+import { i as loadConfig } from "./config-tNauHpdq.js";
+import { _ as maxBytesForKind, l as extensionForMime } from "./image-ops-DYbDWaIA.js";
+import { v as resolveDiscordAccount, y as normalizeDiscordToken } from "./plugins-BAyxWQSz.js";
 import { a as requireTargetKind, i as parseTargetPrefixes, n as ensureTargetId, r as parseTargetMention, t as buildMessagingTarget } from "./targets-bG1Q8FzV.js";
 import { n as retryAsync, t as resolveRetryConfig } from "./retry-BoS4e4X_.js";
 import { c as resolveChunkMode, i as chunkMarkdownTextWithMode } from "./chunk-1dhPX1NK.js";
-import { n as resolveMarkdownTableMode } from "./markdown-tables-CEbN0fEm.js";
-import { a as loadWebMedia, o as loadWebMediaRaw } from "./ir-DZam9q5M.js";
+import { n as resolveMarkdownTableMode } from "./markdown-tables-ZwP14ydw.js";
+import { a as loadWebMedia, o as loadWebMediaRaw } from "./ir-Dt4hOzxG.js";
 import { n as normalizePollInput, t as normalizePollDurationHours } from "./polls-DhH5YkzN.js";
 import { n as recordChannelActivity, r as createDiscordRetryRunner } from "./channel-activity-BOiuJS3t.js";
 import { t as resolveFetch } from "./fetch-DTNGXEzX.js";
-import { t as convertMarkdownTables } from "./tables-BEzT0Da4.js";
+import { t as convertMarkdownTables } from "./tables-C38rzF6E.js";
 import path from "node:path";
-import fs from "node:fs/promises";
+import fsPromises from "node:fs/promises";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import crypto from "node:crypto";
@@ -1524,7 +1524,7 @@ async function generateWaveformFromPcm(filePath) {
 			"8000",
 			tempPcm
 		]);
-		const pcmData = await fs.readFile(tempPcm);
+		const pcmData = await fsPromises.readFile(tempPcm);
 		const samples = new Int16Array(pcmData.buffer, pcmData.byteOffset, pcmData.byteLength / 2);
 		const step = Math.max(1, Math.floor(samples.length / WAVEFORM_SAMPLES));
 		const waveform = [];
@@ -1543,7 +1543,7 @@ async function generateWaveformFromPcm(filePath) {
 		return Buffer.from(waveform).toString("base64");
 	} finally {
 		try {
-			await fs.unlink(tempPcm);
+			await fsPromises.unlink(tempPcm);
 		} catch {}
 	}
 }
@@ -1855,7 +1855,7 @@ async function materializeVoiceMessageInput(mediaUrl) {
 	const ext = extFromName || extFromMime || ".bin";
 	const tempDir = resolvePreferredSymiTmpDir();
 	const filePath = path.join(tempDir, `voice-src-${crypto.randomUUID()}${ext}`);
-	await fs.writeFile(filePath, media.buffer, { mode: 384 });
+	await fsPromises.writeFile(filePath, media.buffer, { mode: 384 });
 	return { filePath };
 }
 /**
@@ -1891,7 +1891,7 @@ async function sendVoiceMessageDiscord(to, audioPath, opts = {}) {
 		oggPath = ogg.path;
 		oggCleanup = ogg.cleanup;
 		const metadata = await getVoiceMessageMetadata(oggPath);
-		const audioBuffer = await fs.readFile(oggPath);
+		const audioBuffer = await fsPromises.readFile(oggPath);
 		const result = await sendDiscordVoiceMessage(rest, channelId, audioBuffer, metadata, opts.replyTo, request, opts.silent);
 		recordChannelActivity({
 			channel: "discord",
@@ -1909,10 +1909,10 @@ async function sendVoiceMessageDiscord(to, audioPath, opts = {}) {
 		throw err;
 	} finally {
 		if (oggCleanup && oggPath) try {
-			await fs.unlink(oggPath);
+			await fsPromises.unlink(oggPath);
 		} catch {}
 		try {
-			await fs.unlink(localInputPath);
+			await fsPromises.unlink(localInputPath);
 		} catch {}
 	}
 }

package/dist/{send-DVm0du0_.js → send-CXFTeD_J.js}

@@ -1,11 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
 import { M as logVerbose } from "./utils-B-0b9bGM.js";
-import { i as loadConfig } from "./config-Dz95lSBW.js";
-import { f as resolveSlackAccount, h as resolveSlackBotToken } from "./plugins-DKDeQZF0.js";
+import { i as loadConfig } from "./config-tNauHpdq.js";
+import { f as resolveSlackAccount, h as resolveSlackBotToken } from "./plugins-BAyxWQSz.js";
 import { a as requireTargetKind, i as parseTargetPrefixes, n as ensureTargetId, r as parseTargetMention, t as buildMessagingTarget } from "./targets-bG1Q8FzV.js";
 import { c as resolveChunkMode, i as chunkMarkdownTextWithMode, l as resolveTextChunkLimit } from "./chunk-1dhPX1NK.js";
-import { n as resolveMarkdownTableMode } from "./markdown-tables-CEbN0fEm.js";
-import { a as loadWebMedia, n as markdownToIR, t as chunkMarkdownIR } from "./ir-DZam9q5M.js";
+import { n as resolveMarkdownTableMode } from "./markdown-tables-ZwP14ydw.js";
+import { a as loadWebMedia, n as markdownToIR, t as chunkMarkdownIR } from "./ir-Dt4hOzxG.js";
 import { t as renderMarkdownWithMarkers } from "./render-CXDO_kgw.js";
 import { WebClient } from "@slack/web-api";
 

package/dist/{send-B3RdXvjC.js → send-DT-5buW5.js}

@@ -2,18 +2,18 @@ import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
 import { M as logVerbose, O as danger } from "./utils-B-0b9bGM.js";
 import { t as createSubsystemLogger } from "./subsystem-D9vIQve0.js";
 import { t as isTruthyEnvValue } from "./env-DPCHYPeH.js";
-import { i as loadConfig } from "./config-Dz95lSBW.js";
+import { i as loadConfig } from "./config-tNauHpdq.js";
 import { n as redactSensitiveText } from "./redact-f-Q-hFt_.js";
 import { n as formatErrorMessage, r as formatUncaughtError, t as extractErrorCode } from "./errors-BF3TeRH2.js";
-import { h as normalizeMimeType, p as isGifMedia, u as getFileExtension, v as mediaKindFromMime } from "./image-ops-1OJMSAUX.js";
-import { u as resolveTelegramAccount } from "./plugins-DKDeQZF0.js";
-import { n as resolveMarkdownTableMode } from "./markdown-tables-CEbN0fEm.js";
-import { a as loadWebMedia, n as markdownToIR, t as chunkMarkdownIR } from "./ir-DZam9q5M.js";
+import { h as normalizeMimeType, p as isGifMedia, u as getFileExtension, v as mediaKindFromMime } from "./image-ops-DYbDWaIA.js";
+import { u as resolveTelegramAccount } from "./plugins-BAyxWQSz.js";
+import { n as resolveMarkdownTableMode } from "./markdown-tables-ZwP14ydw.js";
+import { a as loadWebMedia, n as markdownToIR, t as chunkMarkdownIR } from "./ir-Dt4hOzxG.js";
 import { t as renderMarkdownWithMarkers } from "./render-CXDO_kgw.js";
 import { n as normalizePollInput } from "./polls-DhH5YkzN.js";
 import { i as createTelegramRetryRunner, n as recordChannelActivity } from "./channel-activity-BOiuJS3t.js";
 import { t as resolveFetch } from "./fetch-DTNGXEzX.js";
-import { i as readChannelAllowFromStore } from "./pairing-store-CK726Dzq.js";
+import { i as readChannelAllowFromStore } from "./pairing-store-B8ktu-6j.js";
 import { t as makeProxyFetch } from "./proxy-DU7W9XSc.js";
 import process$1 from "node:process";
 import * as net$1 from "node:net";

package/dist/{send-9SapUCg7.js → send-DsSI8z3F.js}

@@ -1,11 +1,11 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
 import { m as normalizeE164, y as resolveUserPath } from "./utils-B-0b9bGM.js";
-import { i as loadConfig } from "./config-Dz95lSBW.js";
-import { v as mediaKindFromMime } from "./image-ops-1OJMSAUX.js";
-import { t as resolveIMessageAccount } from "./accounts-bK-Yqdwx.js";
-import { n as resolveMarkdownTableMode } from "./markdown-tables-CEbN0fEm.js";
-import { t as convertMarkdownTables } from "./tables-BEzT0Da4.js";
-import { t as resolveOutboundAttachmentFromUrl } from "./outbound-attachment-Bw-c5Cdp.js";
+import { i as loadConfig } from "./config-tNauHpdq.js";
+import { v as mediaKindFromMime } from "./image-ops-DYbDWaIA.js";
+import { t as resolveIMessageAccount } from "./accounts-CokRskCl.js";
+import { n as resolveMarkdownTableMode } from "./markdown-tables-ZwP14ydw.js";
+import { t as convertMarkdownTables } from "./tables-C38rzF6E.js";
+import { t as resolveOutboundAttachmentFromUrl } from "./outbound-attachment-Qfh5dlsg.js";
 import { spawn } from "node:child_process";
 import { createInterface } from "node:readline";
 

package/dist/{send-Bm4ULEzh.js → send-JWV62VbW.js}

@@ -1,12 +1,12 @@
 import { t as __exportAll } from "./rolldown-runtime-Cbj13DAv.js";
-import { i as loadConfig } from "./config-Dz95lSBW.js";
-import { v as mediaKindFromMime } from "./image-ops-1OJMSAUX.js";
-import { n as resolveSignalAccount } from "./accounts-DyJN4_vR.js";
+import { i as loadConfig } from "./config-tNauHpdq.js";
+import { v as mediaKindFromMime } from "./image-ops-DYbDWaIA.js";
+import { n as resolveSignalAccount } from "./accounts-mN_EcgxC.js";
 import { n as fetchWithTimeout } from "./fetch-timeout-Db3da8yR.js";
-import { n as resolveMarkdownTableMode } from "./markdown-tables-CEbN0fEm.js";
-import { n as markdownToIR, t as chunkMarkdownIR } from "./ir-DZam9q5M.js";
+import { n as resolveMarkdownTableMode } from "./markdown-tables-ZwP14ydw.js";
+import { n as markdownToIR, t as chunkMarkdownIR } from "./ir-Dt4hOzxG.js";
 import { t as resolveFetch } from "./fetch-DTNGXEzX.js";
-import { t as resolveOutboundAttachmentFromUrl } from "./outbound-attachment-Bw-c5Cdp.js";
+import { t as resolveOutboundAttachmentFromUrl } from "./outbound-attachment-Qfh5dlsg.js";
 import { randomUUID } from "node:crypto";
 
 //#region src/signal/client.ts

package/dist/{server-context-CCBZN8a0.js → server-context-VlF1_hYj.js}

@@ -1,6 +1,6 @@
 import { u as resolveGatewayPort } from "./paths-Cqn-zk3M.js";
-import { i as loadConfig, l as writeConfigFile, r as createConfigIO } from "./config-Dz95lSBW.js";
-import { A as DEFAULT_SYMI_BROWSER_PROFILE_NAME, D as DEFAULT_BROWSER_EVALUATE_ENABLED, E as DEFAULT_BROWSER_DEFAULT_PROFILE_NAME, O as DEFAULT_SYMI_BROWSER_COLOR, S as stopChromeExtensionRelayServer, _ as fetchJson, a as resolveSymiUserDataDir, d as normalizeCdpWsUrl, g as appendCdpPath, h as withBrowserNavigationPolicy, i as launchSymiChrome, k as DEFAULT_SYMI_BROWSER_ENABLED, l as createTargetViaCdp, m as assertBrowserNavigationAllowed, n as isChromeCdpReady, o as stopSymiChrome, p as InvalidBrowserNavigationUrlError, r as isChromeReachable, v as fetchOk, x as ensureChromeExtensionRelayServer } from "./chrome-DU2ZysN3.js";
+import { i as loadConfig, l as writeConfigFile, r as createConfigIO } from "./config-tNauHpdq.js";
+import { A as DEFAULT_SYMI_BROWSER_PROFILE_NAME, D as DEFAULT_BROWSER_EVALUATE_ENABLED, E as DEFAULT_BROWSER_DEFAULT_PROFILE_NAME, O as DEFAULT_SYMI_BROWSER_COLOR, S as stopChromeExtensionRelayServer, _ as fetchJson, a as resolveSymiUserDataDir, d as normalizeCdpWsUrl, g as appendCdpPath, h as withBrowserNavigationPolicy, i as launchSymiChrome, k as DEFAULT_SYMI_BROWSER_ENABLED, l as createTargetViaCdp, m as assertBrowserNavigationAllowed, n as isChromeCdpReady, o as stopSymiChrome, p as InvalidBrowserNavigationUrlError, r as isChromeReachable, v as fetchOk, x as ensureChromeExtensionRelayServer } from "./chrome-CSJzpT9Z.js";
 import { r as isLoopbackHost } from "./ws-C7EXRv8z.js";
 import { a as resolveGatewayAuth } from "./auth-B741uFtk.js";
 import { n as formatErrorMessage, t as extractErrorCode } from "./errors-BF3TeRH2.js";
@@ -152,7 +152,7 @@ function isModuleNotFoundError(err) {
 }
 async function loadPwAiModule(mode) {
 	try {
-		return await import("./pw-ai-DQohWnzT.js");
+		return await import("./pw-ai-CfrnAHwA.js");
 	} catch (err) {
 		if (mode === "soft") return null;
 		if (isModuleNotFoundError(err)) return null;
@@ -775,11 +775,11 @@ function createProfileContext(opts, profile) {
 		const userDataDir = resolveSymiUserDataDir(profile.name);
 		const profileState = getProfileState();
 		if (await isHttpReachable(300) && !profileState.running) try {
-			await (await import("./pw-ai-DQohWnzT.js")).closePlaywrightBrowserConnection();
+			await (await import("./pw-ai-CfrnAHwA.js")).closePlaywrightBrowserConnection();
 		} catch {}
 		if (profileState.running) await stopRunningBrowser();
 		try {
-			await (await import("./pw-ai-DQohWnzT.js")).closePlaywrightBrowserConnection();
+			await (await import("./pw-ai-CfrnAHwA.js")).closePlaywrightBrowserConnection();
 		} catch {}
 		if (!fs.existsSync(userDataDir)) return {
 			moved: false,

package/dist/{server-methods-VimYvcpY.js → server-methods-B0pdetGJ.js}

@@ -12,7 +12,7 @@ import { f as GATEWAY_CLIENT_CAPS, g as hasGatewayClientCap, i as isGatewayMessa
 import { c as writeJsonAtomic, o as createAsyncLock, s as readJsonFile } from "./pairing-token-Byh6drgn.js";
 import { s as pickPrimaryLanIPv4 } from "./net-DZ5Ayk-W.js";
 import { i as normalizeInputProvenance } from "./input-provenance-D0lNkCf6.js";
-import { $n as resolveTtsAutoMode, B as dispatchInboundMessage, C as resolveAgentDeliveryPlan, Cn as enqueueSystemEvent, Cr as onAgentEvent, D as createOutboundSendDeps, Dt as normalizeCronJobPatch, Et as normalizeCronJobCreate, G as BARE_SESSION_RESET_PROMPT, Gn as stopSubagentsForRequester, Gt as persistBrowserProxyFiles, In as resolveAgentTimeoutMs, Jn as resolveUserTimezone, Qn as resolveTtsApiKey, Sn as parseVerboseOverride, V as createReplyDispatcher, Vn as formatZonedTimestamp, Wn as isAbortTrigger, Wt as applyBrowserProxyPaths, Xn as isTtsEnabled, Y as abortEmbeddedPiRun, Yn as getTtsProvider, Z as waitForEmbeddedPiRunEnd, Zn as isTtsProviderConfigured, Zt as scheduleGatewaySigusr1Restart, a as listSubagentRunsForRequester, ar as textToSpeech, bn as applyModelOverrideToSessionEntry, c as clearSessionQueues, ct as resolveOutboundSessionRoute, dt as resolveOutboundTarget, en as unbindThreadBindingsBySessionKey, er as resolveTtsConfig, hn as resolveSendPolicy, i as listDescendantRunsForRequester, ir as setTtsProvider, m as loadSymiPlugins, mn as normalizeSendPolicy, nr as resolveTtsProviderOrder, or as OPENAI_TTS_MODELS, rn as loadProviderUsageSummary, rr as setTtsEnabled, sr as OPENAI_TTS_VOICES, st as ensureOutboundSessionEntry, tn as normalizeGroupActivation, tr as resolveTtsPrefsPath, w as resolveAgentOutboundTarget, wn as isSystemEventContextChanged, wr as registerAgentRunContext, wt as writeRestartSentinel, x as agentCommand, xn as applyVerboseOverride, yt as formatDoctorNonInteractiveHint } from "./subagent-registry-BPwn3Qm7.js";
+import { $n as resolveTtsAutoMode, B as dispatchInboundMessage, C as resolveAgentDeliveryPlan, Cn as enqueueSystemEvent, Cr as onAgentEvent, D as createOutboundSendDeps, Dt as normalizeCronJobPatch, Et as normalizeCronJobCreate, G as BARE_SESSION_RESET_PROMPT, Gn as stopSubagentsForRequester, Gt as persistBrowserProxyFiles, In as resolveAgentTimeoutMs, Jn as resolveUserTimezone, Qn as resolveTtsApiKey, Sn as parseVerboseOverride, V as createReplyDispatcher, Vn as formatZonedTimestamp, Wn as isAbortTrigger, Wt as applyBrowserProxyPaths, Xn as isTtsEnabled, Y as abortEmbeddedPiRun, Yn as getTtsProvider, Z as waitForEmbeddedPiRunEnd, Zn as isTtsProviderConfigured, Zt as scheduleGatewaySigusr1Restart, a as listSubagentRunsForRequester, ar as textToSpeech, bn as applyModelOverrideToSessionEntry, c as clearSessionQueues, ct as resolveOutboundSessionRoute, dt as resolveOutboundTarget, en as unbindThreadBindingsBySessionKey, er as resolveTtsConfig, hn as resolveSendPolicy, i as listDescendantRunsForRequester, ir as setTtsProvider, m as loadSymiPlugins, mn as normalizeSendPolicy, nr as resolveTtsProviderOrder, or as OPENAI_TTS_MODELS, rn as loadProviderUsageSummary, rr as setTtsEnabled, sr as OPENAI_TTS_VOICES, st as ensureOutboundSessionEntry, tn as normalizeGroupActivation, tr as resolveTtsPrefsPath, w as resolveAgentOutboundTarget, wn as isSystemEventContextChanged, wr as registerAgentRunContext, wt as writeRestartSentinel, x as agentCommand, xn as applyVerboseOverride, yt as formatDoctorNonInteractiveHint } from "./subagent-registry-CzS4CfnV.js";
 import { F as resolveMainSessionKey, I as resolveMainSessionKeyFromConfig, J as normalizeSessionDeliveryFields, N as resolveAgentMainSessionKey, P as resolveExplicitAgentSessionKey, R as snapshotSessionOrigin, S as stripEnvelopeFromMessages, _ as capArrayByJsonBytes, d as updateSessionStore, g as archiveSessionTranscripts, h as archiveFileOnDisk, o as loadSessionStore, t as extractDeliveryInfo, v as readSessionMessages, x as resolveSessionTranscriptCandidates, y as readSessionPreviewItemsFromTranscript } from "./sessions-Cfa6JEB3.js";
 import { n as listChannelPlugins, r as normalizeChannelId, t as getChannelPlugin } from "./plugins-CwSlLxM8.js";
 import { n as createBrowserRouteDispatcher } from "./with-timeout-Cgi3TwWN.js";
@@ -37,14 +37,14 @@ import { t as WizardCancelledError } from "./prompts-m1IJwIAx.js";
 import { t as resolveChannelDefaultAccountId } from "./helpers-cLP5YLeQ.js";
 import { t as buildChannelAccountSnapshot } from "./status-BUedPCLb.js";
 import { o as isNodeCommandAllowed, s as resolveNodeCommandAllowlist } from "./audit-BjI_Yyr5.js";
-import { r as getStatusSummary } from "./status-DxhtJtzE.js";
-import { c as setHeartbeatsEnabled } from "./health-q7706M36.js";
+import { r as getStatusSummary } from "./status-BJtbD-cG.js";
+import { c as setHeartbeatsEnabled } from "./health-DQEqLYg1.js";
 import { m as normalizeUpdateChannel } from "./update-check-ZdimP1aU.js";
-import { a as sendApnsAlert, c as parseMessageWithAttachments, i as resolveApnsAuthConfigFromEnv, l as formatForLog, n as normalizeApnsEnvironment, o as sendApnsBackgroundWake, s as normalizeRpcAttachmentsToChatAttachments, t as loadApnsRegistration } from "./push-apns-giplY7u-.js";
-import { a as pruneAgentConfig, i as loadAgentIdentity, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-CA31c0kN.js";
+import { a as sendApnsAlert, c as parseMessageWithAttachments, i as resolveApnsAuthConfigFromEnv, l as formatForLog, n as normalizeApnsEnvironment, o as sendApnsBackgroundWake, s as normalizeRpcAttachmentsToChatAttachments, t as loadApnsRegistration } from "./push-apns-BylbQyP9.js";
+import { a as pruneAgentConfig, i as loadAgentIdentity, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-5PTwsijs.js";
 import { t as resolveSystemRunCommand } from "./system-run-command-ByVa3txU.js";
 import { t as installSkill } from "./skills-install-1ZdwGTnh.js";
-import { t as runGatewayUpdate } from "./update-runner-CG_kbbGR.js";
+import { t as runGatewayUpdate } from "./update-runner-JcdOHr71.js";
 import { spawnSync } from "node:child_process";
 import * as os$1 from "node:os";
 import os from "node:os";
@@ -1609,6 +1609,33 @@ async function emitSessionUnboundLifecycleEvent(params) {
 		outcome: params.reason === "session-reset" ? "reset" : "deleted"
 	}, { childSessionKey: params.targetSessionKey });
 }
+/**
+* Per-session in-flight lock for sessions.restore. Prevents two concurrent
+* restore calls for the same session from corrupting each other (e.g. one
+* archives the active transcript while the other is mid-rename).
+*/
+const restoreInFlight = /* @__PURE__ */ new Set();
+/**
+* Best-effort inverse of `archiveFileOnDisk(file, "reset")` — renames
+* `<file>.reset.<timestamp>` back to `<file>`. Used by the sessions.restore
+* rollback path when a later step fails after the current transcript was
+* archived. Swallows all errors and logs; the goal is to recover as much
+* state as possible, not to guarantee success.
+*/
+function renameArchivedBackToOriginal(archivedPath, reason) {
+	const marker = `.${reason}.`;
+	const idx = archivedPath.lastIndexOf(marker);
+	if (idx <= 0) {
+		console.warn(`[sessions.restore] cannot parse archived path for rollback: ${archivedPath}`);
+		return;
+	}
+	const originalPath = archivedPath.slice(0, idx);
+	try {
+		fs.renameSync(archivedPath, originalPath);
+	} catch (err) {
+		console.warn(`[sessions.restore] rollback failed: could not rename ${archivedPath} back to ${originalPath}: ${String(err)}`);
+	}
+}
 async function ensureSessionRuntimeCleanup(params) {
 	const queueKeys = new Set(params.target.storeKeys);
 	queueKeys.add(params.target.canonicalKey);
@@ -1857,69 +1884,108 @@ const sessionsHandlers = {
 			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Target file is not a valid session transcript."));
 			return;
 		}
-		const { entry } = loadSessionEntry(key);
-		const sessionId = entry?.sessionId;
-		const cleanupError = await ensureSessionRuntimeCleanup({
-			cfg,
-			key,
-			target,
-			sessionId
-		});
-		if (cleanupError) {
-			respond(false, void 0, cleanupError);
+		const lockKey = target.canonicalKey ?? key;
+		if (restoreInFlight.has(lockKey)) {
+			respond(false, void 0, errorShape(ErrorCodes.UNAVAILABLE, `Restore already in progress for session ${lockKey}; try again in a moment.`));
 			return;
 		}
-		const oldSessionId = entry?.sessionId;
-		const oldSessionFile = entry?.sessionFile;
-		archiveSessionTranscriptsForSession({
-			sessionId: oldSessionId,
-			storePath,
-			sessionFile: oldSessionFile,
-			agentId: target.agentId,
-			reason: "reset"
-		});
-		const restoredFileName = `${restoredSessionId}.jsonl`;
-		const restoredPath = path.join(sessionsDir, restoredFileName);
-		if (targetPath !== restoredPath) fs.renameSync(targetPath, restoredPath);
-		const next = await updateSessionStore(storePath, (store) => {
-			const { primaryKey } = migrateAndPruneSessionStoreKey({
+		restoreInFlight.add(lockKey);
+		const rollback = [];
+		let responded = false;
+		try {
+			const { entry } = loadSessionEntry(key);
+			const sessionId = entry?.sessionId;
+			const cleanupError = await ensureSessionRuntimeCleanup({
 				cfg,
 				key,
-				store
+				target,
+				sessionId
 			});
-			const existingEntry = store[primaryKey];
-			const nextEntry = {
+			if (cleanupError) {
+				respond(false, void 0, cleanupError);
+				responded = true;
+				return;
+			}
+			const archivedPaths = archiveSessionTranscriptsForSession({
+				sessionId: entry?.sessionId,
+				storePath,
+				sessionFile: entry?.sessionFile,
+				agentId: target.agentId,
+				reason: "reset"
+			});
+			for (const archived of archivedPaths) rollback.push({
+				desc: `un-archive ${archived}`,
+				fn: () => renameArchivedBackToOriginal(archived, "reset")
+			});
+			const restoredFileName = `${restoredSessionId}.jsonl`;
+			const restoredPath = path.join(sessionsDir, restoredFileName);
+			if (targetPath !== restoredPath) {
+				fs.renameSync(targetPath, restoredPath);
+				rollback.push({
+					desc: `re-archive ${restoredPath} to ${targetPath}`,
+					fn: () => {
+						try {
+							fs.renameSync(restoredPath, targetPath);
+						} catch (err) {
+							console.warn(`[sessions.restore] rollback failed: could not rename ${restoredPath} back to ${targetPath}: ${String(err)}`);
+						}
+					}
+				});
+			}
+			const next = await updateSessionStore(storePath, (store) => {
+				const { primaryKey } = migrateAndPruneSessionStoreKey({
+					cfg,
+					key,
+					store
+				});
+				const existingEntry = store[primaryKey];
+				const nextEntry = {
+					sessionId: restoredSessionId,
+					sessionFile: restoredPath,
+					updatedAt: Date.now(),
+					systemSent: false,
+					abortedLastRun: false,
+					thinkingLevel: existingEntry?.thinkingLevel,
+					verboseLevel: existingEntry?.verboseLevel,
+					reasoningLevel: existingEntry?.reasoningLevel,
+					responseUsage: existingEntry?.responseUsage,
+					model: existingEntry?.model,
+					contextTokens: existingEntry?.contextTokens,
+					sendPolicy: existingEntry?.sendPolicy,
+					label: existingEntry?.label,
+					origin: snapshotSessionOrigin(existingEntry),
+					lastChannel: existingEntry?.lastChannel,
+					lastTo: existingEntry?.lastTo,
+					skillsSnapshot: existingEntry?.skillsSnapshot,
+					inputTokens: 0,
+					outputTokens: 0,
+					totalTokens: 0,
+					totalTokensFresh: true
+				};
+				store[primaryKey] = nextEntry;
+				return nextEntry;
+			});
+			rollback.length = 0;
+			respond(true, {
+				ok: true,
+				key: target.canonicalKey,
 				sessionId: restoredSessionId,
-				sessionFile: restoredPath,
-				updatedAt: Date.now(),
-				systemSent: false,
-				abortedLastRun: false,
-				thinkingLevel: existingEntry?.thinkingLevel,
-				verboseLevel: existingEntry?.verboseLevel,
-				reasoningLevel: existingEntry?.reasoningLevel,
-				responseUsage: existingEntry?.responseUsage,
-				model: existingEntry?.model,
-				contextTokens: existingEntry?.contextTokens,
-				sendPolicy: existingEntry?.sendPolicy,
-				label: existingEntry?.label,
-				origin: snapshotSessionOrigin(existingEntry),
-				lastChannel: existingEntry?.lastChannel,
-				lastTo: existingEntry?.lastTo,
-				skillsSnapshot: existingEntry?.skillsSnapshot,
-				inputTokens: 0,
-				outputTokens: 0,
-				totalTokens: 0,
-				totalTokensFresh: true
-			};
-			store[primaryKey] = nextEntry;
-			return nextEntry;
-		});
-		respond(true, {
-			ok: true,
-			key: target.canonicalKey,
-			sessionId: restoredSessionId,
-			entry: next
-		}, void 0);
+				entry: next
+			}, void 0);
+			responded = true;
+		} catch (err) {
+			console.warn(`[sessions.restore] failed for ${lockKey}; running ${rollback.length} rollback step(s): ${String(err)}`);
+			for (let i = rollback.length - 1; i >= 0; i--) {
+				const step = rollback[i];
+				if (step) step.fn();
+			}
+			if (!responded) {
+				respond(false, void 0, errorShape(ErrorCodes.UNAVAILABLE, `Restore failed: ${err instanceof Error ? err.message : String(err)}`));
+				responded = true;
+			}
+		} finally {
+			restoreInFlight.delete(lockKey);
+		}
 	},
 	"sessions.delete": async ({ params, respond, client, isWebchatConnect }) => {
 		if (!assertValidParams(params, validateSessionsDeleteParams, "sessions.delete", respond)) return;
@@ -6942,7 +7008,7 @@ const nodeHandlers = {
 		const p = params;
 		const payloadJSON = typeof p.payloadJSON === "string" ? p.payloadJSON : p.payload !== void 0 ? JSON.stringify(p.payload) : null;
 		await respondUnavailableOnThrow(respond, async () => {
-			const { handleNodeEvent } = await import("./server-node-events-CHmLiFNV.js");
+			const { handleNodeEvent } = await import("./server-node-events-CyDj7Txd.js");
 			const nodeId = client?.connect?.device?.id ?? client?.connect?.client?.id ?? "node";
 			await handleNodeEvent({
 				deps: context.deps,