@symerian/symi 2.6.42 → 2.7.1

package/dist/{server-methods-CWcLut3F.js → server-methods-0ksPFnev.js}

@@ -6,13 +6,13 @@ import { C as ensureAgentWorkspace, S as DEFAULT_USER_FILENAME, T as isWorkspace
 import { i as loadWorkspaceSkillEntries } from "./skills-hAdgFdrv.js";
 import { t as buildWorkspaceSkillStatus } from "./skills-status-DKXJ-tbi.js";
 import { H as VERSION, N as applyMergePatch, P as applyLegacyMigrations, S as sensitive, U as resolveRuntimeServiceVersion, a as parseConfigJson5, c as resolveConfigSnapshotHash, d as SymiSchema, i as loadConfig, l as writeConfigFile, o as readConfigFileSnapshot, s as readConfigFileSnapshotForWrite, u as validateConfigObjectWithPlugins } from "./config-BNTB6qj8.js";
-import { $ as validateNodePairRejectParams, A as validateCronStatusParams, B as validateExecApprovalsGetParams, Bt as rejectDevicePairing, C as validateConfigSetParams, Ct as validateWakeParams, D as validateCronRemoveParams, Dt as validateWizardNextParams, E as validateCronListParams, Et as validateWizardCancelParams, F as validateDevicePairRemoveParams, G as validateModelsListParams, Gt as summarizeDeviceTokens, H as validateExecApprovalsNodeSetParams, I as validateDeviceTokenRevokeParams, It as approveDevicePairing, J as validateNodeInvokeParams, K as validateNodeDescribeParams, L as validateDeviceTokenRotateParams, M as validateDevicePairApproveParams, Mt as errorShape, N as validateDevicePairListParams, O as validateCronRunParams, Ot as validateWizardStartParams, P as validateDevicePairRejectParams, Pt as parseSessionLabel, Q as validateNodePairListParams, S as validateConfigSchemaParams, St as validateUpdateRunParams, T as validateCronAddParams, Tt as validateWebLoginWaitParams, U as validateExecApprovalsSetParams, Ut as revokeDeviceToken, V as validateExecApprovalsNodeGetParams, Vt as removePairedDevice, W as validateLogsTailParams, Wt as rotateDeviceToken, X as validateNodeListParams, Y as validateNodeInvokeResultParams, Z as validateNodePairApproveParams, _ as validateChatInjectParams, _t as validateSkillsInstallParams, a as validateAgentWaitParams, b as validateConfigGetParams, bt as validateTalkConfigParams, c as validateAgentsFilesGetParams, ct as validateSessionsDeleteParams, d as validateAgentsListParams, dt as validateSessionsPreviewParams, et as validateNodePairRequestParams, f as validateAgentsUpdateParams, ft as validateSessionsResetParams, g as validateChatHistoryParams, gt as validateSkillsBinsParams, h as validateChatAbortParams, ht as validateSessionsUsageParams, i as validateAgentParams, it as validatePushTestParams, j as validateCronUpdateParams, jt as ErrorCodes, k as validateCronRunsParams, kt as validateWizardStatusParams, l as validateAgentsFilesListParams, lt as validateSessionsListParams, m as validateChannelsStatusParams, mt as validateSessionsRestoreParams, n as formatValidationErrors, nt as validateNodeRenameParams, o as validateAgentsCreateParams, ot as validateSendParams, p as validateChannelsLogoutParams, pt as validateSessionsResolveParams, q as validateNodeEventParams, r as validateAgentIdentityParams, rt as validatePollParams, s as validateAgentsDeleteParams, st as validateSessionsCompactParams, tt as validateNodePairVerifyParams, u as validateAgentsFilesSetParams, ut as validateSessionsPatchParams, v as validateChatSendParams, vt as validateSkillsStatusParams, wt as validateWebLoginStartParams, x as validateConfigPatchParams, xt as validateTalkModeParams, y as validateConfigApplyParams, yt as validateSkillsUpdateParams, zt as listDevicePairing } from "./client-T3qcxXru.js";
-import { l as authorizeOperatorScopesForMethod, s as ADMIN_SCOPE$2, u as isNodeRoleMethod } from "./call-DKi-hnaF.js";
+import { $ as validateNodePairRejectParams, A as validateCronStatusParams, At as validateWizardNextParams, B as validateExecApprovalsGetParams, C as validateConfigSetParams, Ct as validateTalkConfigParams, D as validateCronRemoveParams, Dt as validateWebLoginStartParams, E as validateCronListParams, Et as validateWakeParams, F as validateDevicePairRemoveParams, Ft as errorShape, G as validateModelsListParams, H as validateExecApprovalsNodeSetParams, Ht as listDevicePairing, I as validateDeviceTokenRevokeParams, J as validateNodeInvokeParams, Jt as summarizeDeviceTokens, K as validateNodeDescribeParams, Kt as revokeDeviceToken, L as validateDeviceTokenRotateParams, Lt as parseSessionLabel, M as validateDevicePairApproveParams, Mt as validateWizardStatusParams, N as validateDevicePairListParams, O as validateCronRunParams, Ot as validateWebLoginWaitParams, P as validateDevicePairRejectParams, Pt as ErrorCodes, Q as validateNodePairListParams, S as validateConfigSchemaParams, St as validateSkillsUpdateParams, T as validateCronAddParams, Tt as validateUpdateRunParams, U as validateExecApprovalsSetParams, Ut as rejectDevicePairing, V as validateExecApprovalsNodeGetParams, W as validateLogsTailParams, Wt as removePairedDevice, X as validateNodeListParams, Y as validateNodeInvokeResultParams, Z as validateNodePairApproveParams, _ as validateChatInjectParams, _t as validateSessionsRestoreParams, a as validateAgentWaitParams, b as validateConfigGetParams, bt as validateSkillsInstallParams, c as validateAgentsFilesGetParams, ct as validateSessionsCompactParams, d as validateAgentsListParams, dt as validateSessionsFavoriteFileParams, et as validateNodePairRequestParams, f as validateAgentsUpdateParams, ft as validateSessionsListParams, g as validateChatHistoryParams, gt as validateSessionsResolveParams, h as validateChatAbortParams, ht as validateSessionsResetParams, i as validateAgentParams, it as validatePushTestParams, j as validateCronUpdateParams, jt as validateWizardStartParams, k as validateCronRunsParams, kt as validateWizardCancelParams, l as validateAgentsFilesListParams, lt as validateSessionsDeleteFileParams, m as validateChannelsStatusParams, mt as validateSessionsPreviewParams, n as formatValidationErrors, nt as validateNodeRenameParams, o as validateAgentsCreateParams, ot as validateSendParams, p as validateChannelsLogoutParams, pt as validateSessionsPatchParams, q as validateNodeEventParams, qt as rotateDeviceToken, r as validateAgentIdentityParams, rt as validatePollParams, s as validateAgentsDeleteParams, st as validateSessionsAdoptFileParams, tt as validateNodePairVerifyParams, u as validateAgentsFilesSetParams, ut as validateSessionsDeleteParams, v as validateChatSendParams, vt as validateSessionsUsageParams, wt as validateTalkModeParams, x as validateConfigPatchParams, xt as validateSkillsStatusParams, y as validateConfigApplyParams, yt as validateSkillsBinsParams, zt as approveDevicePairing } from "./client-qUlxXXVJ.js";
+import { l as authorizeOperatorScopesForMethod, s as ADMIN_SCOPE$2, u as isNodeRoleMethod } from "./call-DeCQ2DhS.js";
 import { f as GATEWAY_CLIENT_CAPS, g as hasGatewayClientCap, i as isGatewayMessageChannel, l as normalizeMessageChannel, n as isDeliverableMessageChannel, t as INTERNAL_MESSAGE_CHANNEL } from "./message-channel-C9dERklz.js";
 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-DQHg3jUV.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-DCoU9xIE.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";
@@ -30,21 +30,21 @@ import { t as getChannelActivity } from "./channel-activity-myOnmDZi.js";
 import { n as normalizePollInput } from "./polls-DXeUmcgz.js";
 import { n as createBrowserControlContext, r as startBrowserControlServiceFromConfig } from "./control-service-rbSHSlcd.js";
 import { i as parseAbsoluteTimeMs } from "./stagger-CQar2eKe.js";
-import { w as resolveAssistantAvatarUrl } from "./onboard-helpers-BBtPmJEe.js";
+import { w as resolveAssistantAvatarUrl } from "./onboard-helpers-PpGrZIGw.js";
 import { r as getLastHeartbeatEvent } from "./heartbeat-visibility-B8TDjqpW.js";
 import { t as buildChannelUiCatalog } from "./catalog-DLQFKucJ.js";
 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-DfPfMVNZ.js";
-import { c as setHeartbeatsEnabled } from "./health-cVvZdeDu.js";
+import { o as isNodeCommandAllowed, s as resolveNodeCommandAllowlist } from "./audit-xSagQWH8.js";
+import { r as getStatusSummary } from "./status-qkmUAeWo.js";
+import { c as setHeartbeatsEnabled } from "./health-CsTxt66a.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-CYC70eKy.js";
-import { a as pruneAgentConfig, i as loadAgentIdentity, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-BKCY6F2A.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-B5txhDVi.js";
+import { a as pruneAgentConfig, i as loadAgentIdentity, r as findAgentEntryIndex, t as applyAgentConfig } from "./agents.config-C951ocyh.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-DVa6cMqp.js";
+import { t as runGatewayUpdate } from "./update-runner-BhVsdpxm.js";
 import { spawnSync } from "node:child_process";
 import * as os$1 from "node:os";
 import os from "node:os";
@@ -1176,6 +1176,144 @@ function timestampOptsFromConfig(cfg) {
 	return { timezone: resolveUserTimezone(cfg.agents?.defaults?.userTimezone) };
 }
 
+//#endregion
+//#region src/config/sessions/favorites.ts
+/**
+* Session favourites sidecar.
+*
+* Stores a set of "favourited" session files at
+* `<sessionsDir>/favorites.json`. Keyed by **filename** (basename), not
+* sessionId, because archived files (`.reset.<ts>` / `.deleted.<ts>`) can
+* share a UUID with an active `<uuid>.jsonl`. Filename is the unique
+* reference that survives restore/adopt/rename operations — we explicitly
+* rename the entry in the sidecar when the underlying file is renamed.
+*
+* Writes go through a tmp-file + rename cycle to preserve the old contents
+* if a write fails mid-flight. Reads are synchronous and cheap (the file
+* is small); no in-memory cache is maintained because the list endpoint
+* re-reads on every HTTP request anyway.
+*
+* @module
+*/
+const FAVORITES_FILE_NAME = "favorites.json";
+const EMPTY_FILE = {
+	version: 1,
+	files: []
+};
+function resolveFavoritesPath(agentId) {
+	return path.join(resolveSessionTranscriptsDirForAgent(agentId), FAVORITES_FILE_NAME);
+}
+function readFavoritesFile(favPath) {
+	if (!fs.existsSync(favPath)) return { ...EMPTY_FILE };
+	try {
+		const raw = fs.readFileSync(favPath, "utf-8");
+		const parsed = JSON.parse(raw);
+		return {
+			version: 1,
+			files: Array.isArray(parsed?.files) ? parsed.files.filter((f) => typeof f === "string" && f.length > 0) : []
+		};
+	} catch {
+		return { ...EMPTY_FILE };
+	}
+}
+function writeFavoritesFileAtomic(favPath, file) {
+	fs.mkdirSync(path.dirname(favPath), { recursive: true });
+	const tmp = `${favPath}.${process.pid}.${randomUUID()}.tmp`;
+	try {
+		fs.writeFileSync(tmp, JSON.stringify(file, null, 2), {
+			mode: 384,
+			encoding: "utf-8"
+		});
+		fs.renameSync(tmp, favPath);
+	} catch (err) {
+		try {
+			fs.rmSync(tmp, { force: true });
+		} catch {}
+		throw err;
+	}
+}
+/**
+* Load the set of favourited filenames for an agent. Returns an empty set if
+* the sidecar file is missing or corrupt. Never throws.
+*/
+function loadFavoritesSet(agentId) {
+	try {
+		const file = readFavoritesFile(resolveFavoritesPath(agentId));
+		return new Set(file.files);
+	} catch {
+		return /* @__PURE__ */ new Set();
+	}
+}
+/**
+* Set the favourited flag for a file. If `favorited` is true and the file is
+* already present, or false and already absent, this is a no-op. Returns the
+* new favourited state (so callers can echo it back in an RPC response).
+*/
+function setFavorite(file, favorited, agentId) {
+	const favPath = resolveFavoritesPath(agentId);
+	const current = readFavoritesFile(favPath);
+	const set = new Set(current.files);
+	const had = set.has(file);
+	if (favorited && !had) set.add(file);
+	else if (!favorited && had) set.delete(file);
+	else return favorited;
+	writeFavoritesFileAtomic(favPath, {
+		version: 1,
+		files: [...set].toSorted()
+	});
+	return favorited;
+}
+/**
+* Rename a favourites entry. Called by adoptFile/restore when a file on disk
+* is renamed (e.g. `<uuid>.jsonl.reset.<ts>` → `<uuid>.jsonl`). If `oldFile`
+* wasn't favourited, this is a no-op. If both `oldFile` and `newFile` are
+* favourited (unlikely but possible), the `oldFile` entry is simply dropped.
+*/
+function renameFavoriteEntry(oldFile, newFile, agentId) {
+	const favPath = resolveFavoritesPath(agentId);
+	const current = readFavoritesFile(favPath);
+	const set = new Set(current.files);
+	if (!set.has(oldFile)) return;
+	set.delete(oldFile);
+	set.add(newFile);
+	writeFavoritesFileAtomic(favPath, {
+		version: 1,
+		files: [...set].toSorted()
+	});
+}
+/**
+* Drop an entry from the sidecar regardless of current state. Used when a
+* file is permanently deleted so we don't keep a stale favourite pointing at
+* something that no longer exists. No-op if absent.
+*/
+function dropFavoriteEntry(file, agentId) {
+	const favPath = resolveFavoritesPath(agentId);
+	const current = readFavoritesFile(favPath);
+	if (!current.files.includes(file)) return;
+	writeFavoritesFileAtomic(favPath, {
+		version: 1,
+		files: current.files.filter((f) => f !== file).toSorted()
+	});
+}
+/**
+* Reconcile the sidecar against an authoritative set of filenames that still
+* exist on disk. Drops any favourites whose files are missing. Safe to call
+* on every list operation — the write only happens when something changes.
+* Returns the reconciled set.
+*/
+function reconcileFavorites(existingFiles, agentId) {
+	const existingSet = new Set(existingFiles);
+	const favPath = resolveFavoritesPath(agentId);
+	const current = readFavoritesFile(favPath);
+	const keep = current.files.filter((f) => existingSet.has(f));
+	if (keep.length === current.files.length) return new Set(current.files);
+	writeFavoritesFileAtomic(favPath, {
+		version: 1,
+		files: keep.toSorted()
+	});
+	return new Set(keep);
+}
+
 //#endregion
 //#region src/gateway/sessions-patch.ts
 function invalid(message) {
@@ -1609,6 +1747,237 @@ async function emitSessionUnboundLifecycleEvent(params) {
 		outcome: params.reason === "session-reset" ? "reset" : "deleted"
 	}, { childSessionKey: params.targetSessionKey });
 }
+/**
+* Per-session in-flight lock shared by `sessions.restore` and
+* `sessions.adoptFile`. Prevents two concurrent adoption calls for the same
+* session key from corrupting each other (e.g. one archives the active
+* transcript while the other is mid-rename). Keyed by canonical session key.
+*/
+const restoreInFlight = /* @__PURE__ */ new Set();
+/**
+* Classify a target file basename into the adoption mode we need to take.
+* - `archived`: a `.reset.<ts>` / `.deleted.<ts>` transcript that must be
+*   renamed back to `<sessionId>.jsonl`.
+* - `active`: a plain `<sessionId>.jsonl` that may already be owned by
+*   another session key in the registry; we adopt it by dropping the other
+*   key's entry (if any) and pointing ours at it. No filesystem rename.
+*/
+function classifyTargetFile(basename) {
+	if (/\.jsonl\.reset\./.test(basename)) return {
+		kind: "archived",
+		reason: "reset"
+	};
+	if (/\.jsonl\.deleted\./.test(basename)) return {
+		kind: "archived",
+		reason: "deleted"
+	};
+	if (/^[A-Za-z0-9][\w.-]*\.jsonl$/.test(basename)) return { kind: "active" };
+	return null;
+}
+async function performAdoptFile(params) {
+	const { key } = params;
+	const targetBasename = path.basename(params.targetFile);
+	if (targetBasename !== params.targetFile || targetBasename.includes("..") || targetBasename.length === 0) return {
+		ok: false,
+		errorCode: "INVALID_REQUEST",
+		errorMessage: "Invalid target file name."
+	};
+	const classification = classifyTargetFile(targetBasename);
+	if (!classification) return {
+		ok: false,
+		errorCode: "INVALID_REQUEST",
+		errorMessage: "Target file is not a recognised session transcript."
+	};
+	const { cfg, target, storePath } = resolveGatewaySessionTargetFromKey(key);
+	const sessionsDir = path.dirname(storePath);
+	const targetPath = path.join(sessionsDir, targetBasename);
+	if (!fs.existsSync(targetPath)) return {
+		ok: false,
+		errorCode: "INVALID_REQUEST",
+		errorMessage: `Target file not found: ${targetBasename}`
+	};
+	let restoredSessionId;
+	try {
+		const firstLine = fs.readFileSync(targetPath, "utf8").split("\n")[0] ?? "";
+		const header = JSON.parse(firstLine);
+		if (!header.id || header.type !== "session") throw new Error("invalid session header");
+		restoredSessionId = header.id;
+	} catch {
+		return {
+			ok: false,
+			errorCode: "INVALID_REQUEST",
+			errorMessage: "Target file is not a valid session transcript."
+		};
+	}
+	const lockKey = target.canonicalKey ?? key;
+	if (restoreInFlight.has(lockKey)) return {
+		ok: false,
+		errorCode: "UNAVAILABLE",
+		errorMessage: `Adopt already in progress for session ${lockKey}; try again in a moment.`
+	};
+	restoreInFlight.add(lockKey);
+	const rollback = [];
+	try {
+		const { entry: currentEntry } = loadSessionEntry(key);
+		const cleanupError = await ensureSessionRuntimeCleanup({
+			cfg,
+			key,
+			target,
+			sessionId: currentEntry?.sessionId
+		});
+		if (cleanupError) return {
+			ok: false,
+			errorCode: "UNAVAILABLE",
+			errorMessage: cleanupError.message ?? "runtime cleanup failed"
+		};
+		if (currentEntry?.sessionId === restoredSessionId && classification.kind === "active") return {
+			ok: true,
+			sessionId: restoredSessionId,
+			canonicalKey: target.canonicalKey,
+			entry: currentEntry,
+			restoredFileName: targetBasename,
+			droppedSourceKeys: []
+		};
+		const archivedPaths = archiveSessionTranscriptsForSession({
+			sessionId: currentEntry?.sessionId,
+			storePath,
+			sessionFile: currentEntry?.sessionFile,
+			agentId: target.agentId,
+			reason: "reset"
+		});
+		for (const archived of archivedPaths) {
+			const archivedBasename = path.basename(archived);
+			const originalBasename = archivedBasename.replace(/\.reset\.[^/]+$/, "");
+			rollback.push({
+				desc: `un-archive ${archivedBasename}`,
+				fn: () => {
+					renameArchivedBackToOriginal(archived, "reset");
+					if (originalBasename && originalBasename !== archivedBasename) renameFavoriteEntry(archivedBasename, originalBasename, target.agentId);
+				}
+			});
+			if (originalBasename && originalBasename !== archivedBasename) renameFavoriteEntry(originalBasename, archivedBasename, target.agentId);
+		}
+		const restoredFileName = `${restoredSessionId}.jsonl`;
+		const restoredPath = path.join(sessionsDir, restoredFileName);
+		if (classification.kind === "archived" && 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.adoptFile] rollback: rename ${restoredPath} → ${targetPath} failed: ${String(err)}`);
+					}
+					renameFavoriteEntry(restoredFileName, targetBasename, target.agentId);
+				}
+			});
+			renameFavoriteEntry(targetBasename, restoredFileName, target.agentId);
+		}
+		const droppedSourceKeys = [];
+		let droppedSourceEntries = [];
+		const next = await updateSessionStore(storePath, (store) => {
+			const { primaryKey } = migrateAndPruneSessionStoreKey({
+				cfg,
+				key,
+				store
+			});
+			if (classification.kind === "active") for (const [otherKey, otherEntry] of Object.entries(store)) {
+				if (otherKey === primaryKey) continue;
+				if (otherEntry?.sessionId === restoredSessionId) {
+					droppedSourceEntries.push({
+						key: otherKey,
+						entry: otherEntry
+					});
+					droppedSourceKeys.push(otherKey);
+					delete store[otherKey];
+				}
+			}
+			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;
+		});
+		if (droppedSourceEntries.length > 0) {
+			const restoreEntries = droppedSourceEntries.slice();
+			rollback.push({
+				desc: `restore ${restoreEntries.length} source registry entry/entries`,
+				fn: () => {
+					updateSessionStore(storePath, (store) => {
+						for (const { key: k, entry: e } of restoreEntries) store[k] = e;
+					}).catch((err) => {
+						console.warn(`[sessions.adoptFile] rollback: could not restore source entries: ${String(err)}`);
+					});
+				}
+			});
+		}
+		rollback.length = 0;
+		return {
+			ok: true,
+			sessionId: restoredSessionId,
+			canonicalKey: target.canonicalKey,
+			entry: next,
+			restoredFileName,
+			droppedSourceKeys
+		};
+	} catch (err) {
+		console.warn(`[sessions.adoptFile] 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();
+		}
+		return {
+			ok: false,
+			errorCode: "UNAVAILABLE",
+			errorMessage: `Adopt failed: ${err instanceof Error ? err.message : String(err)}`
+		};
+	} finally {
+		restoreInFlight.delete(lockKey);
+	}
+}
+/**
+* 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);
@@ -1835,92 +2204,106 @@ const sessionsHandlers = {
 		const p = params;
 		const key = requireSessionKey(p.key, respond);
 		if (!key) return;
-		const targetBasename = path.basename(p.targetFile);
-		if (targetBasename !== p.targetFile || targetBasename.includes("..")) {
-			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Invalid target file name."));
-			return;
-		}
-		const { cfg, target, storePath } = resolveGatewaySessionTargetFromKey(key);
-		const sessionsDir = path.dirname(storePath);
-		const targetPath = path.join(sessionsDir, targetBasename);
-		if (!fs.existsSync(targetPath)) {
-			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, `Target file not found: ${targetBasename}`));
-			return;
-		}
-		let restoredSessionId;
-		try {
-			const firstLine = fs.readFileSync(targetPath, "utf8").split("\n")[0];
-			const header = JSON.parse(firstLine);
-			if (!header.id || header.type !== "session") throw new Error("invalid session header");
-			restoredSessionId = header.id;
-		} catch {
-			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Target file is not a valid session transcript."));
+		const outcome = await performAdoptFile({
+			key,
+			targetFile: p.targetFile
+		});
+		if (!outcome.ok) {
+			respond(false, void 0, errorShape(ErrorCodes[outcome.errorCode], outcome.errorMessage));
 			return;
 		}
-		const { entry } = loadSessionEntry(key);
-		const sessionId = entry?.sessionId;
-		const cleanupError = await ensureSessionRuntimeCleanup({
-			cfg,
+		respond(true, {
+			ok: true,
+			key: outcome.canonicalKey,
+			sessionId: outcome.sessionId,
+			entry: outcome.entry
+		}, void 0);
+	},
+	"sessions.adoptFile": async ({ params, respond }) => {
+		if (!assertValidParams(params, validateSessionsAdoptFileParams, "sessions.adoptFile", respond)) return;
+		const p = params;
+		const key = requireSessionKey(p.key, respond);
+		if (!key) return;
+		const outcome = await performAdoptFile({
 			key,
-			target,
-			sessionId
+			targetFile: p.targetFile
 		});
-		if (cleanupError) {
-			respond(false, void 0, cleanupError);
+		if (!outcome.ok) {
+			respond(false, void 0, errorShape(ErrorCodes[outcome.errorCode], outcome.errorMessage));
 			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({
-				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;
-		});
 		respond(true, {
 			ok: true,
-			key: target.canonicalKey,
-			sessionId: restoredSessionId,
-			entry: next
+			key: outcome.canonicalKey,
+			sessionId: outcome.sessionId,
+			entry: outcome.entry,
+			file: outcome.restoredFileName,
+			droppedSourceKeys: outcome.droppedSourceKeys
 		}, void 0);
 	},
+	"sessions.favoriteFile": ({ params, respond }) => {
+		if (!assertValidParams(params, validateSessionsFavoriteFileParams, "sessions.favoriteFile", respond)) return;
+		const p = params;
+		const file = path.basename(p.file);
+		if (file !== p.file || file.includes("..") || file.length === 0) {
+			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Invalid file name."));
+			return;
+		}
+		const agentId = resolveDefaultAgentId(loadConfig());
+		const sessionsDir = resolveSessionTranscriptsDirForAgent(agentId);
+		const abs = path.join(sessionsDir, file);
+		if (!fs.existsSync(abs)) {
+			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, `Session file not found: ${file}`));
+			return;
+		}
+		try {
+			respond(true, {
+				ok: true,
+				file,
+				favorited: setFavorite(file, p.favorited, agentId)
+			}, void 0);
+		} catch (err) {
+			respond(false, void 0, errorShape(ErrorCodes.UNAVAILABLE, `Favorite write failed: ${err instanceof Error ? err.message : String(err)}`));
+		}
+	},
+	"sessions.deleteFile": async ({ params, respond }) => {
+		if (!assertValidParams(params, validateSessionsDeleteFileParams, "sessions.deleteFile", respond)) return;
+		const p = params;
+		const file = path.basename(p.file);
+		if (file !== p.file || file.includes("..") || file.length === 0) {
+			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, "Invalid file name."));
+			return;
+		}
+		const cfg = loadConfig();
+		const agentId = resolveDefaultAgentId(cfg);
+		const sessionsDir = resolveSessionTranscriptsDirForAgent(agentId);
+		const abs = path.join(sessionsDir, file);
+		if (!fs.existsSync(abs)) {
+			respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, `Session file not found: ${file}`));
+			return;
+		}
+		const { store } = loadCombinedSessionStoreForGateway(cfg);
+		if (classifyTargetFile(file)?.kind === "active") {
+			const sessionId = file.match(/^(.+)\.jsonl$/)?.[1];
+			if (sessionId) {
+				const referrer = Object.entries(store).find(([, entry]) => entry?.sessionId === sessionId)?.[0];
+				if (referrer) {
+					respond(false, void 0, errorShape(ErrorCodes.INVALID_REQUEST, `File is still bound to session key ${referrer}; use sessions.delete on that key to archive it first.`));
+					return;
+				}
+			}
+		}
+		try {
+			fs.unlinkSync(abs);
+			dropFavoriteEntry(file, agentId);
+			respond(true, {
+				ok: true,
+				file
+			}, void 0);
+		} catch (err) {
+			respond(false, void 0, errorShape(ErrorCodes.UNAVAILABLE, `Delete failed: ${err instanceof Error ? err.message : String(err)}`));
+		}
+	},
 	"sessions.delete": async ({ params, respond, client, isWebchatConnect }) => {
 		if (!assertValidParams(params, validateSessionsDeleteParams, "sessions.delete", respond)) return;
 		const p = params;
@@ -6942,7 +7325,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-C2h9OPo7.js");
+			const { handleNodeEvent } = await import("./server-node-events-DCbzFyQF.js");
 			const nodeId = client?.connect?.device?.id ?? client?.connect?.client?.id ?? "node";
 			await handleNodeEvent({
 				deps: context.deps,
@@ -9007,4 +9390,4 @@ async function handleGatewayRequest(opts) {
 }
 
 //#endregion
-export { getHandshakeTimeoutMs as _, DEFAULT_ASSISTANT_IDENTITY as a, resolveCronRunLogPath as b, upsertPresence as c, DEDUPE_MAX as d, DEDUPE_TTL_MS as f, TICK_INTERVAL_MS as g, MAX_PAYLOAD_BYTES as h, safeParseJson as i, formatError as l, MAX_BUFFERED_BYTES as m, handleGatewayRequest as n, resolveAssistantIdentity as o, HEALTH_REFRESH_INTERVAL_MS as p, broadcastPresenceSnapshot as r, listSystemPresence as s, coreGatewayHandlers as t, loadVoiceWakeConfig as u, abortChatRunById as v, startGatewayConfigReloader as x, appendCronRunLog as y };
+export { startGatewayConfigReloader as C, resolveCronRunLogPath as S, MAX_PAYLOAD_BYTES as _, loadFavoritesSet as a, abortChatRunById as b, resolveAssistantIdentity as c, formatError as d, loadVoiceWakeConfig as f, MAX_BUFFERED_BYTES as g, HEALTH_REFRESH_INTERVAL_MS as h, safeParseJson as i, listSystemPresence as l, DEDUPE_TTL_MS as m, handleGatewayRequest as n, reconcileFavorites as o, DEDUPE_MAX as p, broadcastPresenceSnapshot as r, DEFAULT_ASSISTANT_IDENTITY as s, coreGatewayHandlers as t, upsertPresence as u, TICK_INTERVAL_MS as v, appendCronRunLog as x, getHandshakeTimeoutMs as y };