Keep restored session ids and ACP agents

Co-authored-by: Gao Yu <gaoyu06@users.noreply.github.com>

Author: cursoragent

src/lib/session.svelte.ts

@@ -25,7 +25,15 @@ export interface SavedProject {
 	id: string;
 	name: string;
 	path: string;
-	tabs?: ({ id?: string; sid?: string; title: string; backend?: string; archived?: boolean } & SavedTabChrome)[];
+	tabs?: ({
+		id?: string;
+		sid?: string;
+		title: string;
+		backend?: string;
+		/** backend 为 'acp' 时：驱动该会话的 registry agent（重启动/恢复时必需）。 */
+		acpAgent?: { id: string; name: string };
+		archived?: boolean;
+	} & SavedTabChrome)[];
 	/** 并行任务 worktree 项目的元数据（isWorktree/mainRepoPath/branch/baseBranch/slug）。 */
 	worktree?: WorktreeMeta;
 	/** 本项目最近一次新建会话所用的引擎后端（缺省 = jucode）。 */
@@ -287,9 +295,10 @@ export class SessionStore {
 		backend: BackendId = 'jucode',
 		archived = false,
 		chrome?: SavedTabChrome,
-		reuseId?: string
+		reuseId?: string,
+		acpAgent?: { id: string; name: string }
 	) {
-		const s = this.#newSession(backend, undefined, reuseId);
+		const s = this.#newSession(backend, backend === 'acp' ? acpAgent : undefined, reuseId);
 		if (title) s.chat.title = title;
 		s.archived = archived;
 		if (chrome?.color) s.color = chrome.color;
@@ -321,9 +330,10 @@ export class SessionStore {
 		title: string,
 		backend: BackendId = 'jucode',
 		archived = false,
-		chrome?: SavedTabChrome
+		chrome?: SavedTabChrome,
+		acpAgent?: { id: string; name: string }
 	) {
-		const s = this.#newSession(backend, undefined, reuseId);
+		const s = this.#newSession(backend, backend === 'acp' ? acpAgent : undefined, reuseId);
 		if (title) s.chat.title = title;
 		s.archived = archived;
 		if (chrome?.color) s.color = chrome.color;
@@ -561,8 +571,11 @@ export class SessionStore {
 	/** Snapshot of the layout + open tabs for persistence. Every session is
 	 *  written (empty windows survive a workspace switch under their desktop
 	 *  id); `sid` only when the engine actually persisted the conversation —
-	 *  never `/resume` one it didn't. The backend id is only written when it
-	 *  isn't the default, so pre-existing layouts stay byte-identical. */
+	 *  never `/resume` one it didn't. A restored session keeps its `sid` even
+	 *  while its replayed transcript is still empty (replay is async and may
+	 *  fail; the engine-side conversation exists regardless). The backend id
+	 *  is only written when it isn't the default, so pre-existing layouts stay
+	 *  byte-identical; 'acp' tabs also carry their agent so restore can respawn. */
 	serialize(): SavedProject[] {
 		return this.projects.map((p) => ({
 			id: p.id,
@@ -574,9 +587,10 @@ export class SessionStore {
 			tabs: p.sessions
 				.map((s) => ({
 					id: s.id,
-					...(s.chat.resumable ? { sid: s.chat.sessionId } : {}),
+					...(s.chat.sessionId && (s.chat.resumable || s.restored) ? { sid: s.chat.sessionId } : {}),
 					title: s.chat.title,
 					...(s.backendId !== 'jucode' ? { backend: s.backendId } : {}),
+					...(s.backendId === 'acp' && s.acpAgent ? { acpAgent: s.acpAgent } : {}),
 					...(s.archived ? { archived: true } : {}),
 					...(s.color ? { color: s.color } : {}),
 					...(s.icon ? { icon: s.icon } : {}),
@@ -619,7 +633,19 @@ export class SessionStore {
 					// Tabs saved before multi-backend support carry no backend field →
 					// jucode (normalizeBackendId maps unknown/missing to the default).
 					// Chrome fields are re-validated here (the file is user-editable).
-					const backend = normalizeBackendId(t.backend);
+					let backend = normalizeBackendId(t.backend);
+					// An 'acp' tab needs its agent back to respawn; older files carry
+					// none on the tab → fall back to the project's last agent. Without
+					// any, never spawn a bare 'acp' (create_session rejects it).
+					const savedAgent =
+						t.acpAgent && typeof t.acpAgent.id === 'string' && typeof t.acpAgent.name === 'string'
+							? { id: t.acpAgent.id, name: t.acpAgent.name }
+							: undefined;
+					let acpAgent = backend === 'acp' ? (savedAgent ?? proj.lastAcpAgent) : undefined;
+					if (backend === 'acp' && !acpAgent) {
+						backend = 'jucode';
+						acpAgent = undefined;
+					}
 					const chrome = {
 						color: normalizeColor(t.color),
 						icon: parseTabIcon(t.icon),
@@ -628,8 +654,8 @@ export class SessionStore {
 					// With a conversation to resume, resume it; an empty window spawns
 					// fresh. Both keep the saved desktop id (pre-id files mint anew).
 					const id = t.sid
-						? this.restoreSession(proj, t.sid, t.title, backend, !!t.archived, chrome, t.id)
-						: this.#spawnSaved(proj, t.id!, t.title, backend, !!t.archived, chrome);
+						? this.restoreSession(proj, t.sid, t.title, backend, !!t.archived, chrome, t.id, acpAgent)
+						: this.#spawnSaved(proj, t.id!, t.title, backend, !!t.archived, chrome, acpAgent);
 					if (!first && !t.archived) first = id;
 				}
 			}

src/lib/session.test.ts

@@ -7,7 +7,8 @@ vi.mock('./protocol', () => ({
 	sendOp: vi.fn(() => Promise.resolve()),
 	projectRoot: vi.fn(() => Promise.resolve('/tmp/demo')),
 	writeConfig: vi.fn(() => Promise.resolve()),
-	git: vi.fn(() => Promise.resolve(''))
+	git: vi.fn(() => Promise.resolve('')),
+	claudeSessionTranscript: vi.fn(() => Promise.resolve([]))
 }));
 
 import { SessionStore } from './session.svelte';
@@ -177,6 +178,61 @@ describe('SessionStore lifecycle', () => {
 		]);
 	});
 
+	it('a restored session serializes its sid even before the replay lands', () => {
+		const store = new SessionStore();
+		const p = proj();
+		store.projects.push(p);
+		// claude restore pins chat.sessionId immediately; the transcript replay is
+		// async (and may fail), so messages are still empty here.
+		const id = store.restoreSession(p, 'sid-r', 'old', 'claude');
+		const s = p.sessions[0];
+		expect(s.restored).toBe(true);
+		expect(s.chat.sessionId).toBe('sid-r');
+		expect(s.chat.messages.some((m) => m.kind === 'user')).toBe(false);
+		expect(s.chat.resumable).toBe(false);
+		const tab = store.serialize()[0].tabs![0];
+		expect(tab).toEqual({ id, sid: 'sid-r', title: 'old', backend: 'claude' });
+	});
+
+	it('serialize includes the acp agent and restore reapplies it on the session', async () => {
+		const store = new SessionStore();
+		const p = proj();
+		store.projects.push(p);
+		const agent = { id: 'gemini', name: 'Gemini CLI' };
+		const id = store.addSession(p, undefined, 'acp', agent);
+		const snap = store.serialize();
+		expect(snap[0].tabs).toEqual([{ id, title: 'New session', backend: 'acp', acpAgent: agent }]);
+
+		const store2 = new SessionStore();
+		await store2.restore(snap);
+		const s = store2.projects[0].sessions[0];
+		expect(s.backendId).toBe('acp');
+		expect(s.acpAgent).toEqual(agent);
+		expect(s.chat.acpAgentId).toBe('gemini');
+		expect(s.chat.acpAgentName).toBe('Gemini CLI');
+		// The spawn carried the agent option so create_session can look it up.
+		const call = (createSession as unknown as { mock: { calls: unknown[][] } }).mock.calls.at(-1)!;
+		expect(call[2]).toBe('acp');
+		expect((call[3] as { agent?: string }).agent).toBe('gemini');
+	});
+
+	it('acp tabs without a saved agent fall back to the project lastAcpAgent', async () => {
+		const agent = { id: 'g', name: 'G' };
+		const store = new SessionStore();
+		await store.restore([
+			{
+				id: 'p1',
+				name: 'p1',
+				path: '/tmp/p1',
+				lastBackend: 'acp',
+				lastAcpAgent: agent,
+				tabs: [{ id: 't1', title: 'A', backend: 'acp' }]
+			}
+		]);
+		expect(store.projects[0].sessions[0].acpAgent).toEqual(agent);
+		expect(store.projects[0].sessions[0].backendId).toBe('acp');
+	});
+
 	it('restore seeds a default project when nothing is saved', async () => {
 		const store = new SessionStore();
 		await store.restore([]);

src/lib/workbench/tabChrome.test.ts

@@ -38,6 +38,13 @@ describe('sanitizeSvg', () => {
 		expect(sanitizeSvg('<svg><rect x="0" y="0" stroke="URL(http://evil)"/></svg>')).toBeNull();
 	});
 
+	it('rejects entity-encoded attribute values (url&#40; bypass)', () => {
+		expect(sanitizeSvg('<svg><path fill="url&#40;https://evil#p&#41;" d="M0 0"/></svg>')).toBeNull();
+		expect(sanitizeSvg('<svg><path fill="url&#x28;#x&#x29;" d="M0 0"/></svg>')).toBeNull();
+		expect(sanitizeSvg('<svg><path fill="url&lpar;#x&rpar;" d="M0 0"/></svg>')).toBeNull();
+		expect(sanitizeSvg('<svg><path fill="a&amp;b" d="M0 0"/></svg>')).toBeNull();
+	});
+
 	it('rejects non-svg roots, comments and oversized markup', () => {
 		expect(sanitizeSvg('<div>hi</div>')).toBeNull();
 		expect(sanitizeSvg('<svg><!-- sneaky --><path d="M0 0"/></svg>')).toBeNull();

src/lib/workbench/tabChrome.ts

@@ -63,6 +63,10 @@ export function sanitizeSvg(markup: string): string | null {
 			const name = a[1].toLowerCase();
 			if (name.startsWith('on') || !SVG_ATTRS.has(name)) return null;
 			const value = (a[2] ?? a[3] ?? a[4] ?? '').toLowerCase();
+			// Entity sequences (( → '(', ( …) decode in the browser and
+			// would smuggle url(...) past the raw-string checks below. No allowed
+			// attribute legitimately needs '&', so reject it outright — never repair.
+			if (value.includes('&')) return null;
 			// url(...) paint servers can reference external resources.
 			if (value.includes('javascript:') || value.includes('data:') || value.includes('url(')) return null;
 		}