fix(desktop): wait for cancel IPC ack + version generate payload

Major #1: cancelGeneration now waits for the IPC round-trip before
clearing isGenerating/activeGenerationId. If main rejects the cancel
(bad id, already aborted) the error becomes visible via toast instead
of being silently swallowed. Updated store test to reflect async cancel
and drain microtasks between cancel and the follow-up sendPrompt.

Major #2: add GeneratePayloadV1 (schemaVersion: 1, generationId required)
to @open-codesign/shared and rename the IPC channel to codesign:v1:generate,
matching the pattern established by codesign:v1:cancel-generation. Preload
builds the v1 envelope with satisfies check; main validates with
GeneratePayloadV1.parse(). Add 5 schema tests for missing/wrong schemaVersion
and empty generationId. Add notifications.cancellationFailed i18n key.

Signed-off-by: hqhq1025 <1506751656@qq.com>

Author: hqhq1025

apps/desktop/src/main/index.ts

@@ -8,7 +8,7 @@ import {
   BRAND,
   CancelGenerationPayloadV1,
   CodesignError,
-  GeneratePayload,
+  GeneratePayloadV1,
 } from '@open-codesign/shared';
 import type { BrowserWindow as ElectronBrowserWindow } from 'electron';
 import { autoUpdater } from 'electron-updater';
@@ -129,10 +129,10 @@ function registerIpcHandlers(): void {
     return nextState;
   });
 
-  ipcMain.handle('codesign:generate', async (_e, raw: unknown) => {
-    const payload = GeneratePayload.parse(raw);
+  ipcMain.handle('codesign:v1:generate', async (_e, raw: unknown) => {
+    const payload = GeneratePayloadV1.parse(raw);
     const controller = new AbortController();
-    const id = payload.generationId ?? `gen-${Date.now()}`;
+    const id = payload.generationId;
     inFlight.set(id, controller);
 
     const apiKey = getApiKeyForProvider(payload.model.provider);

apps/desktop/src/preload/index.ts

@@ -1,6 +1,7 @@
 import type {
   CancelGenerationPayloadV1,
   ChatMessage,
+  GeneratePayloadV1,
   LocalInputFile,
   ModelRef,
   OnboardingState,
@@ -35,9 +36,13 @@ const api = {
     model: ModelRef;
     baseUrl?: string;
     referenceUrl?: string;
-    attachments?: LocalInputFile[];
-    generationId?: string;
-  }) => ipcRenderer.invoke('codesign:generate', payload),
+    attachments: LocalInputFile[];
+    generationId: string;
+  }) =>
+    ipcRenderer.invoke('codesign:v1:generate', {
+      schemaVersion: 1,
+      ...payload,
+    } satisfies GeneratePayloadV1),
   cancelGeneration: (generationId: string) =>
     ipcRenderer.invoke('codesign:v1:cancel-generation', {
       schemaVersion: 1,

apps/desktop/src/renderer/src/store.test.ts

@@ -51,7 +51,7 @@ describe('useCodesignStore generation cancellation', () => {
       string,
       ReturnType<typeof deferred<{ artifacts: Array<{ content: string }>; message: string }>>
     >();
-    const cancelGeneration = vi.fn();
+    const cancelGeneration = vi.fn(() => Promise.resolve());
     const generate = vi.fn((payload: { generationId?: string }) => {
       if (!payload.generationId) throw new Error('missing generationId');
       const task = deferred<{ artifacts: Array<{ content: string }>; message: string }>();
@@ -73,6 +73,9 @@ describe('useCodesignStore generation cancellation', () => {
 
     useCodesignStore.getState().cancelGeneration();
 
+    // Drain microtasks so the cancel IPC promise resolves and clears state
+    await Promise.resolve();
+
     const secondRun = useCodesignStore.getState().sendPrompt({ prompt: 'second prompt' });
     const secondId = useCodesignStore.getState().activeGenerationId;
     if (!secondId) throw new Error('expected second generation id');
@@ -117,7 +120,7 @@ describe('useCodesignStore generation cancellation', () => {
     vi.stubGlobal('window', {
       codesign: {
         generate,
-        cancelGeneration: vi.fn(),
+        cancelGeneration: vi.fn(() => Promise.resolve()),
       },
       setTimeout,
     });

apps/desktop/src/renderer/src/store.ts

@@ -365,8 +365,21 @@ export const useCodesignStore = create<CodesignState>((set, get) => ({
   cancelGeneration() {
     const id = get().activeGenerationId;
     if (!id || !window.codesign) return;
-    window.codesign.cancelGeneration(id);
-    set({ isGenerating: false, activeGenerationId: null });
+
+    void window.codesign
+      .cancelGeneration(id)
+      .then(() => {
+        finishIfCurrent(set, id, () => ({ isGenerating: false, activeGenerationId: null }));
+      })
+      .catch((err) => {
+        const msg = err instanceof Error ? err.message : tr('errors.unknown');
+        set({ errorMessage: msg, lastError: msg });
+        get().pushToast({
+          variant: 'error',
+          title: tr('notifications.cancellationFailed'),
+          description: msg,
+        });
+      });
   },
 
   async retryLastPrompt() {

packages/i18n/src/locales/en.json

@@ -165,6 +165,7 @@
     "designSystemCleared": "Design system cleared",
     "clearDesignSystemFailed": "Unable to clear design system",
     "generationFailed": "Generation failed",
+    "cancellationFailed": "Cancellation failed",
     "inlineCommentFailed": "Inline comment failed",
     "noDesignToExport": "No design to export yet.",
     "exportedTo": "Exported to {{path}}"

packages/i18n/src/locales/zh-CN.json

@@ -165,6 +165,7 @@
     "designSystemCleared": "设计系统已清除",
     "clearDesignSystemFailed": "无法清除设计系统",
     "generationFailed": "生成失败",
+    "cancellationFailed": "取消失败",
     "inlineCommentFailed": "局部修改失败",
     "noDesignToExport": "当前还没有可导出的设计。",
     "exportedTo": "已导出到 {{path}}"

packages/shared/src/generate-payload.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it } from 'vitest';
+import { GeneratePayloadV1 } from './index';
+
+const BASE_VALID = {
+  schemaVersion: 1 as const,
+  prompt: 'Design a landing page',
+  history: [],
+  model: { provider: 'anthropic' as const, modelId: 'claude-sonnet-4-6' },
+  generationId: 'gen-abc123',
+};
+
+describe('GeneratePayloadV1', () => {
+  it('accepts a valid v1 payload', () => {
+    const result = GeneratePayloadV1.parse(BASE_VALID);
+    expect(result.schemaVersion).toBe(1);
+    expect(result.generationId).toBe('gen-abc123');
+    expect(result.attachments).toEqual([]);
+  });
+
+  it('rejects a payload missing schemaVersion', () => {
+    const { schemaVersion: _, ...noVersion } = BASE_VALID;
+    expect(() => GeneratePayloadV1.parse(noVersion)).toThrow();
+  });
+
+  it('rejects a payload with a future schemaVersion (forward incompat)', () => {
+    expect(() => GeneratePayloadV1.parse({ ...BASE_VALID, schemaVersion: 2 })).toThrow();
+  });
+
+  it('rejects a payload with an empty generationId', () => {
+    expect(() => GeneratePayloadV1.parse({ ...BASE_VALID, generationId: '' })).toThrow();
+  });
+
+  it('rejects a payload missing generationId', () => {
+    const { generationId: _, ...noId } = BASE_VALID;
+    expect(() => GeneratePayloadV1.parse(noId)).toThrow();
+  });
+});

packages/shared/src/index.ts

@@ -114,6 +114,21 @@ export const GeneratePayload = z.object({
 });
 export type GeneratePayload = z.infer<typeof GeneratePayload>;
 
+/** @deprecated Use GeneratePayloadV1. */
+export type LegacyGeneratePayload = GeneratePayload;
+
+export const GeneratePayloadV1 = z.object({
+  schemaVersion: z.literal(1),
+  prompt: z.string().min(1).max(32_000),
+  history: z.array(ChatMessage).max(200),
+  model: ModelRef,
+  baseUrl: z.string().url().optional(),
+  referenceUrl: z.string().url().optional(),
+  attachments: z.array(LocalInputFile).max(12).default([]),
+  generationId: z.string().min(1),
+});
+export type GeneratePayloadV1 = z.infer<typeof GeneratePayloadV1>;
+
 export const ApplyCommentPayload = z.object({
   html: z.string().min(1).max(500_000),
   comment: z.string().min(1).max(4_000),