fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
1625567290 wants to merge 1 commit into from
Closed

fix(desktop): stop replaying session remove after a restore #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
send: async () => Promise.reject(new Error('Skill discovery failed')),
remove: async (sessionId: string) => {
removed.push(sessionId);
return { kind: 'removed' as const };
},
},
});
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
// and the rest of the happy path run after the cleanup window closes.
remove: async (sessionId: string) => {
removed.push(sessionId);
return { kind: 'removed' as const };
},
},
});
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
send: async () => Promise.reject(new Error('Skill discovery failed')),
remove: async (sessionId: string) => {
removed.push(sessionId);
return { kind: 'removed' as const };
},
},
});
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
},
send: async () =>
Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
remove: async () => undefined,
remove: async () => ({ kind: 'removed' as const }),
},
});

Expand Down
31 changes: 30 additions & 1 deletion apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
harness: SweepHarness,
options: {
rejectIds?: readonly string[];
restoreIds?: readonly string[];
surviving?: readonly SessionSummary[];
/** Runs after each accepted removal, to model what another client did meanwhile. */
onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
sessions: {
remove: async (id: string) => {
if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
harness.removed.push(id);
options.onRemove?.(id);
return { kind: 'removed' as const };
},
list: async () => {
harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

assert.deepEqual(h.removed, ['a-v2', 'b']);
assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
assert.deepEqual(outcome, {
removed: 2,
restored: 0,
remaining: [],
verified: true,
firstError: undefined,
});
// The family goes, not just the representative, and the open member of it
// stops being the active session.
assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

assert.deepEqual(h.removed, ['doomed']);
assert.equal(outcome.removed, 1);
assert.equal(outcome.restored, 0);
assert.deepEqual(outcome.remaining, []);
});

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

assert.deepEqual(h.removed, ['first']);
assert.equal(outcome.removed, 1);
assert.equal(outcome.restored, 0);
assert.deepEqual(outcome.remaining, []);
});

it('counts a Host-side restore separately from a failed delete', async () => {
const h = harness();
const sessions = [summary('kept'), summary('doomed')];
const restore = installWindow(h, { restoreIds: ['kept'] });
const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

assert.deepEqual(h.removed, ['doomed']);
assert.equal(outcome.removed, 1);
assert.equal(outcome.restored, 1);
assert.deepEqual(outcome.remaining, []);
assert.equal(outcome.firstError, undefined);
});

it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
assert.deepEqual(h.removed, ['free']);
assert.deepEqual(outcome.remaining, ['busy']);
assert.equal(outcome.removed, 1);
assert.equal(outcome.restored, 0);
});

it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
assert.equal(h.listCalls, 1);
assert.deepEqual(outcome.remaining, ['survivor']);
assert.equal(outcome.removed, 1);
assert.equal(outcome.restored, 0);
assert.equal((outcome.firstError as Error).message, 'busy:committed');
});

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
assert.equal(outcome.verified, false);
assert.deepEqual(outcome.remaining, []);
assert.equal(outcome.removed, 0);
assert.equal(outcome.restored, 0);
});
});
5 changes: 4 additions & 1 deletion apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
remove: async (id: string, options?: { revisionFamily?: boolean }) => {
calls.push(`remove:${id}:${options?.revisionFamily === true}`);
return { kind: 'removed' as const };
},
},
},
},
Expand Down
63 changes: 63 additions & 0 deletions apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
const { client, requests } = clientWithResponses([
{ kind: 'session', session: session('archived', 3, { isArchived: true }) },
{ kind: 'removed', sessionId: 'archived' },
]);

assert.equal(await client.removeSession('archived'), 'removed');
assert.deepEqual(
requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
[{ sessionId: 'archived', expectedRevision: 3 }],
);
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
const { client, requests } = clientWithResponses([
{ kind: 'session', session: session('archived', 3, { isArchived: true }) },
{ kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
{ kind: 'session', session: session('archived', 4, { isArchived: true }) },
{ kind: 'removed', sessionId: 'archived' },
]);

assert.equal(await client.removeSession('archived'), 'removed');
assert.deepEqual(
requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
[
{ sessionId: 'archived', expectedRevision: 3 },
{ sessionId: 'archived', expectedRevision: 4 },
],
);
});

test('does not replay a remove after the Session is restored', async () => {
const { client, requests } = clientWithResponses([
{ kind: 'session', session: session('archived', 3, { isArchived: true }) },
{ kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
{ kind: 'session', session: session('archived', 4, { isArchived: false }) },
]);

assert.equal(await client.removeSession('archived'), 'restored');
assert.deepEqual(
requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
[{ sessionId: 'archived', expectedRevision: 3 }],
);
});

test('still retries an active Session remove after a rename conflict', async () => {
const { client, requests } = clientWithResponses([
{ kind: 'session', session: session('live', 3) },
{ kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
{ kind: 'session', session: session('live', 4) },
{ kind: 'removed', sessionId: 'live' },
]);

assert.equal(await client.removeSession('live'), 'removed');
assert.deepEqual(
requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
[
{ sessionId: 'live', expectedRevision: 3 },
{ sessionId: 'live', expectedRevision: 4 },
],
);
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
const { client } = clientWithResponses([
{
Expand Down
11 changes: 7 additions & 4 deletions apps/desktop/src/main/runtime-host-client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
);
}

async removeSession(sessionId: string): Promise<void> {
async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
let requiredArchived: boolean | undefined;
for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
const current = await this.#requireSession(sessionId);
if (requiredArchived === undefined) requiredArchived = current.isArchived;
else if (requiredArchived && !current.isArchived) return 'restored';
const result = await this.request("session.remove", {
sessionId,
expectedRevision: current.revision,
});
if (result.kind === "removed") return;
if (result.kind === "removed") return 'removed';
}
throw revisionConflict("remove", sessionId);
}
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
});
return result.kind === 'abandoned' ? 'removed' : 'retained';
}
await this.removeSession(sessionId);
return 'removed';
const removed = await this.removeSession(sessionId);
return removed === 'removed' ? 'removed' : 'retained';
} catch (error) {
if (isMissingSessionError(error)) return 'removed';
throw error;
Expand Down
4 changes: 3 additions & 1 deletion apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
requestsRevisionFamily(options);
const ids = await actionIds(sessionId, { revisionFamily: true });
await deps.client.removeSession(sessionId);
const outcome = await deps.client.removeSession(sessionId);
if (outcome === 'restored') return { kind: 'restored' as const };
await finishSessionRetirement(deps, ids, 'deleted');
return { kind: 'removed' as const };
});
}

Expand Down
5 changes: 4 additions & 1 deletion apps/desktop/src/preload/bridge-contract.d.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
remove(
sessionId: string,
options?: { revisionFamily?: boolean },
): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
cleanupSessionCopy(sessionId: string): Promise<void>;
abandonSessionCopy(sessionId: string): Promise<void>;
};
Expand Down
30 changes: 21 additions & 9 deletions apps/desktop/src/renderer/app-shell-session-row-actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
/** Tasks confirmed gone. */
removed: number;
/** Tasks left alone because they were restored while the sweep ran. */
restored: number;
/** Tasks the catalog still reports. Empty when `verified` is false. */
remaining: string[];
verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
destructive: true,
});
if (!ok) return;
await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
await refreshSessions();
toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
});
}

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
* deletion and released those resources, so the cleanup below is only ever
* reached for a task that is really gone.
*/
async function removeSessionFamily(sessionId: string): Promise<void> {
async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
// Read before the write: the family comes off the live catalog, which no
// longer lists it afterwards.
const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
await window.maka.sessions.remove(sessionId, { revisionFamily: true });
const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
if (outcome.kind === 'restored') return 'restored';
if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
setActiveId(undefined);
setMessages([]);
}
for (const id of familyIds) clearSessionRendererState(id);
return 'removed';
}

/**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
const unsettled: string[] = [];
let firstError: unknown;
let removed = 0;
let restored = 0;
for (const sessionId of sessionIds) {
// Read the catalog as the sweep reaches each task, not once up front. A
// sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
}
pendingSessionRowActionsRef.current.add(key);
try {
await removeSessionFamily(sessionId);
removed += 1;
const outcome = await removeSessionFamily(sessionId);
if (outcome === 'restored') restored += 1;
else removed += 1;
} catch (error) {
unsettled.push(sessionId);
firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
}
if (unsettled.length === 0) {
await refreshSessions();
return { removed, remaining: [], verified: true, firstError };
return { removed, restored, remaining: [], verified: true, firstError };
}
let listed: SessionSummary[] | undefined;
try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
listed = undefined;
}
await refreshSessions();
if (!listed) return { removed, remaining: [], verified: false, firstError };
if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
const present = new Set(listed.map((session) => session.id));
const remaining = unsettled.filter((sessionId) => present.has(sessionId));
return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
return {
removed: removed + (unsettled.length - remaining.length),
restored,
remaining,
verified: true,
firstError,
};
}

return {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(desktop): stop replaying session remove after a restore#3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

1625567290
wants to merge
1
commit into

from

 Closed


fix(desktop): stop replaying session remove after a restore
#3068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-first-send-cleanup.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -231,6 +232,7 @@ describe('composer first-send cleanup', () => {
 // and the rest of the happy path run after the cleanup window closes.
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand All@@ -256,6 +258,7 @@ describe('composer first-send cleanup', () => {
 send: async () => Promise.reject(new Error('Skill discovery failed')),
 remove: async (sessionId: string) => {
 removed.push(sessionId);
 return { kind: 'removed' as const };
 },
 },
 });
Expand DownExpand Up@@ -342,7 +345,7 @@ describe('composer send failure feedback', () => {
 },
 send: async () =>
 Promise.reject(new Error('NO_REAL_CONNECTION:missing_api_key: no ready connection')),
 remove: async () => undefined,
 remove: async () => ({ kind: 'removed' as const }),
 },
 });

Expand Down

31 changes: 30 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-purge.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,6 +37,7 @@ function installWindow(
 harness: SweepHarness,
 options: {
 rejectIds?: readonly string[];
 restoreIds?: readonly string[];
 surviving?: readonly SessionSummary[];
 /** Runs after each accepted removal, to model what another client did meanwhile. */
 onRemove?: (sessionId: string) => void;
Expand All@@ -52,8 +53,10 @@ function installWindow(
 sessions: {
 remove: async (id: string) => {
 if (options.rejectIds?.includes(id)) throw new Error(`busy:${id}`);
 if (options.restoreIds?.includes(id)) return { kind: 'restored' as const };
 harness.removed.push(id);
 options.onRemove?.(id);
 return { kind: 'removed' as const };
 },
 list: async () => {
 harness.listCalls += 1;
Expand DownExpand Up@@ -114,7 +117,13 @@ describe('purgeSessions', () => {
 const outcome = await actions.purgeSessions(['a-v2', 'b']).finally(restore);

 assert.deepEqual(h.removed, ['a-v2', 'b']);
 assert.deepEqual(outcome, { removed: 2, remaining: [], verified: true, firstError: undefined });
 assert.deepEqual(outcome, {
 removed: 2,
 restored: 0,
 remaining: [],
 verified: true,
 firstError: undefined,
 });
 // The family goes, not just the representative, and the open member of it
 // stops being the active session.
 assert.deepEqual(h.cleared.sort(), ['a', 'a-v2', 'b']);
Expand All@@ -136,6 +145,7 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

Expand All@@ -157,7 +167,23 @@ describe('purgeSessions', () => {

 assert.deepEqual(h.removed, ['first']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.deepEqual(outcome.remaining, []);
 });

 it('counts a Host-side restore separately from a failed delete', async () => {
 const h = harness();
 const sessions = [summary('kept'), summary('doomed')];
 const restore = installWindow(h, { restoreIds: ['kept'] });
 const actions = createActions({ harness: h, sessions, activeIdRef: { current: undefined } });

 const outcome = await actions.purgeSessions(['kept', 'doomed']).finally(restore);

 assert.deepEqual(h.removed, ['doomed']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 1);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.firstError, undefined);
 });

 it('skips an id whose row action is already in flight instead of racing it', async () => {
Expand All@@ -176,6 +202,7 @@ describe('purgeSessions', () => {
 assert.deepEqual(h.removed, ['free']);
 assert.deepEqual(outcome.remaining, ['busy']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 });

 it('counts a rejected delete that the catalog no longer lists as removed', async () => {
Expand All@@ -195,6 +222,7 @@ describe('purgeSessions', () => {
 assert.equal(h.listCalls, 1);
 assert.deepEqual(outcome.remaining, ['survivor']);
 assert.equal(outcome.removed, 1);
 assert.equal(outcome.restored, 0);
 assert.equal((outcome.firstError as Error).message, 'busy:committed');
 });

Expand All@@ -216,5 +244,6 @@ describe('purgeSessions', () => {
 assert.equal(outcome.verified, false);
 assert.deepEqual(outcome.remaining, []);
 assert.equal(outcome.removed, 0);
 assert.equal(outcome.restored, 0);
 });
});

5 changes: 4 additions & 1 deletion
apps/desktop/src/main/__tests__/app-shell-session-row-actions-revisions.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,10 @@ function installWindow(calls: string[]): () => void {
 archive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`archive:${id}:${options?.revisionFamily === true}`); },
 unarchive: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`unarchive:${id}:${options?.revisionFamily === true}`); },
 rename: async (id: string, name: string, options?: { revisionFamily?: boolean }) => { calls.push(`rename:${id}:${name}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => { calls.push(`remove:${id}:${options?.revisionFamily === true}`); },
 remove: async (id: string, options?: { revisionFamily?: boolean }) => {
 calls.push(`remove:${id}:${options?.revisionFamily === true}`);
 return { kind: 'removed' as const };
 },
 },
 },
 },
Expand Down

63 changes: 63 additions & 0 deletions
apps/desktop/src/main/__tests__/runtime-host-client-operations.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,6 +133,69 @@ test('settles branch cleanup when its target disappears between catalog reads',
 assert.equal(await client.removeSessionCopy('branch-copy'), 'removed');
});

test('removes an archived Session on the first matching revision', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('retries an archived remove after a same-lifecycle revision conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: true }) },
 { kind: 'removed', sessionId: 'archived' },
 ]);

 assert.equal(await client.removeSession('archived'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'archived', expectedRevision: 3 },
 { sessionId: 'archived', expectedRevision: 4 },
 ],
 );
});

test('does not replay a remove after the Session is restored', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('archived', 3, { isArchived: true }) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('archived', 4, { isArchived: false }) },
 ]);

 assert.equal(await client.removeSession('archived'), 'restored');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [{ sessionId: 'archived', expectedRevision: 3 }],
 );
});

test('still retries an active Session remove after a rename conflict', async () => {
 const { client, requests } = clientWithResponses([
 { kind: 'session', session: session('live', 3) },
 { kind: 'revision_conflict', expectedRevision: 3, actualRevision: 4 },
 { kind: 'session', session: session('live', 4) },
 { kind: 'removed', sessionId: 'live' },
 ]);

 assert.equal(await client.removeSession('live'), 'removed');
 assert.deepEqual(
 requests.filter(({ operation }) => operation === 'session.remove').map(({ input }) => input),
 [
 { sessionId: 'live', expectedRevision: 3 },
 { sessionId: 'live', expectedRevision: 4 },
 ],
 );
});

test('settles revision cleanup when abandon observes an already absent target', async () => {
 const { client } = clientWithResponses([
 {
Expand Down

11 changes: 7 additions & 4 deletions
apps/desktop/src/main/runtime-host-client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -838,14 +838,17 @@ export class DesktopRuntimeHostClient {
 );
 }

 async removeSession(sessionId: string): Promise<void> {
 async removeSession(sessionId: string): Promise<'removed' | 'restored'> {
 let requiredArchived: boolean | undefined;
 for (let attempt = 0; attempt < MAX_SESSION_REVISION_ATTEMPTS; attempt += 1) {
 const current = await this.#requireSession(sessionId);
 if (requiredArchived === undefined) requiredArchived = current.isArchived;
 else if (requiredArchived && !current.isArchived) return 'restored';
 const result = await this.request("session.remove", {
 sessionId,
 expectedRevision: current.revision,
 });
 if (result.kind === "removed") return;
 if (result.kind === "removed") return 'removed';
 }
 throw revisionConflict("remove", sessionId);
 }
Expand All@@ -859,8 +862,8 @@ export class DesktopRuntimeHostClient {
 });
 return result.kind === 'abandoned' ? 'removed' : 'retained';
 }
 await this.removeSession(sessionId);
 return 'removed';
const removed = await this.removeSession(sessionId);
 return removed === 'removed' ? 'removed' : 'retained';
 } catch (error) {
 if (isMissingSessionError(error)) return 'removed';
 throw error;
Expand Down

4 changes: 3 additions & 1 deletion
apps/desktop/src/main/runtime-host-session-catalog-ipc-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,8 +191,10 @@ export function registerRuntimeHostSessionCatalogIpc(
 ipcMain.handle('sessions:remove', async (_event, sessionId: string, options?: unknown) => {
 requestsRevisionFamily(options);
 const ids = await actionIds(sessionId, { revisionFamily: true });
 await deps.client.removeSession(sessionId);
 const outcome = await deps.client.removeSession(sessionId);
 if (outcome === 'restored') return { kind: 'restored' as const };
 await finishSessionRetirement(deps, ids, 'deleted');
 return { kind: 'removed' as const };
 });
}

Expand Down

5 changes: 4 additions & 1 deletion
apps/desktop/src/preload/bridge-contract.d.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -492,7 +492,10 @@ export interface MakaBridge {
 abandonPlanExecution(sessionId: string, executionId: string): Promise<PlanSessionState>;
 setModel(sessionId: string, input: { llmConnectionSlug: string; model: string }): Promise<SessionSummary>;
 setThinkingLevel(sessionId: string, level: ThinkingLevel | undefined | null): Promise<SessionSummary>;
 remove(sessionId: string, options?: { revisionFamily?: boolean }): Promise<void>;
 remove(
 sessionId: string,
 options?: { revisionFamily?: boolean },
 ): Promise<{ kind: 'removed' } | { kind: 'restored' }>;
 cleanupSessionCopy(sessionId: string): Promise<void>;
 abandonSessionCopy(sessionId: string): Promise<void>;
 };
Expand Down

30 changes: 21 additions & 9 deletions
apps/desktop/src/renderer/app-shell-session-row-actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ type ToastApi = {
export interface SessionPurgeOutcome {
 /** Tasks confirmed gone. */
 removed: number;
 /** Tasks left alone because they were restored while the sweep ran. */
 restored: number;
 /** Tasks the catalog still reports. Empty when `verified` is false. */
 remaining: string[];
 verified: boolean;
Expand DownExpand Up@@ -129,9 +131,9 @@ export function createAppShellSessionRowActions(deps: {
 destructive: true,
 });
 if (!ok) return;
 await removeSessionFamily(sessionId);
const outcome = await removeSessionFamily(sessionId);
 await refreshSessions();
 toastApi.success(copy.deletedTitle(name));
if (outcome === 'removed') toastApi.success(copy.deletedTitle(name));
 });
 }

Expand All@@ -141,16 +143,18 @@ export function createAppShellSessionRowActions(deps: {
 * deletion and released those resources, so the cleanup below is only ever
 * reached for a task that is really gone.
 */
 async function removeSessionFamily(sessionId: string): Promise<void> {
 async function removeSessionFamily(sessionId: string): Promise<'removed' | 'restored'> {
 // Read before the write: the family comes off the live catalog, which no
 // longer lists it afterwards.
 const familyIds = revisionFamilySessionIds(sessionsRef.current, sessionId);
 await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 const outcome = await window.maka.sessions.remove(sessionId, { revisionFamily: true });
 if (outcome.kind === 'restored') return 'restored';
 if (activeIdRef.current && familyIds.includes(activeIdRef.current)) {
 setActiveId(undefined);
 setMessages([]);
 }
 for (const id of familyIds) clearSessionRendererState(id);
 return 'removed';
 }

 /**
Expand All@@ -175,6 +179,7 @@ export function createAppShellSessionRowActions(deps: {
 const unsettled: string[] = [];
 let firstError: unknown;
 let removed = 0;
 let restored = 0;
 for (const sessionId of sessionIds) {
 // Read the catalog as the sweep reaches each task, not once up front. A
 // sweep is serial, and a task restored from another window while it runs
Expand All@@ -198,8 +203,9 @@ export function createAppShellSessionRowActions(deps: {
 }
 pendingSessionRowActionsRef.current.add(key);
 try {
 await removeSessionFamily(sessionId);
 removed += 1;
 const outcome = await removeSessionFamily(sessionId);
 if (outcome === 'restored') restored += 1;
 else removed += 1;
 } catch (error) {
 unsettled.push(sessionId);
 firstError ??= error;
Expand All@@ -209,7 +215,7 @@ export function createAppShellSessionRowActions(deps: {
 }
 if (unsettled.length === 0) {
 await refreshSessions();
 return { removed, remaining: [], verified: true, firstError };
 return { removed, restored, remaining: [], verified: true, firstError };
 }
 let listed: SessionSummary[] | undefined;
 try {
Expand All@@ -218,10 +224,16 @@ export function createAppShellSessionRowActions(deps: {
 listed = undefined;
 }
 await refreshSessions();
 if (!listed) return { removed, remaining: [], verified: false, firstError };
 if (!listed) return { removed, restored, remaining: [], verified: false, firstError };
 const present = new Set(listed.map((session) => session.id));
 const remaining = unsettled.filter((sessionId) => present.has(sessionId));
 return { removed: removed + (unsettled.length - remaining.length), remaining, verified: true, firstError };
 return {
 removed: removed + (unsettled.length - remaining.length),
 restored,
 remaining,
 verified: true,
 firstError,
 };
 }

 return {
Expand Down
Loading