Merge pull request #2402 from ThinkInAIXYZ/fix/beta5-release-checks

fix: resolve sync loading loop and composer focus

Author: yyhhyyyyyy

src/main/sync/host/index.ts

@@ -135,7 +135,7 @@ export class SyncHostService {
         state.hostId = state.hostId ?? created
       })
       this.pendingHostId = null
-    })
+    }, false)
   }
 
   getEnabled(): boolean {
@@ -436,8 +436,11 @@ export class SyncHostService {
     }
   }
 
-  private serialize<T>(step: () => Promise<T>): Promise<T> {
-    const next = this.lifecycle.then(step, step).finally(() => this.deps.changed?.())
+  private serialize<T>(step: () => Promise<T>, notify = true): Promise<T> {
+    const next = this.lifecycle.then(step, step).finally(() => {
+      // Status reads initialize state too; notifying here would trigger another status read.
+      if (notify) this.deps.changed?.()
+    })
     this.lifecycle = next.catch(() => undefined)
     return next
   }

src/renderer/src/components/chat/ChatInputBox.vue

@@ -48,7 +48,7 @@
       :files="files.selectedFiles.value"
       :editable="editable"
       @file-click="windowClient.previewFile"
-      @remove="files.deleteFile"
+      @remove="removeShelfFile"
       @update:representation="updateShelfFileRepresentation"
       @switch-vision-model="emit('switch-vision-model')"
     />
@@ -260,6 +260,12 @@ const files = useChatInputFiles(
 let isSyncingNodes = false
 let isSubmittingCommandForm = false
 
+function removeShelfFile(index: number) {
+  if (!props.editable) return
+  files.deleteFile(index)
+  focusInput()
+}
+
 function updateShelfFileRepresentation(
   index: number,
   requestedRepresentation: MessageFile['requestedRepresentation']

test/e2e/specs/36-chat-streaming.smoke.spec.ts

@@ -69,6 +69,9 @@ test('local streaming preserves an editable composer and completes the response
   const address = server.address() as { port: number }
   try {
     await waitForAppReady(app.page)
+    await app.page.evaluate(async () => {
+      await window.deepchat.invoke('config.setLanguage', { language: 'en-US' })
+    })
     const providerId = await app.page.evaluate(async (baseUrl) => {
       const id = `custom-${crypto.randomUUID()}`
       await window.deepchat.invoke('providers.add', {
@@ -130,7 +133,9 @@ test('local streaming preserves an editable composer and completes the response
       await app.page.getByRole('button', { name: /^(Attach|添加附件)$/ }).focus()
       await app.page.keyboard.press('Enter')
       await (await chooser).setFiles(attachmentPath)
-      const remove = editor.getByRole('button', { name: /keyboard-removal.txt/ })
+      const remove = shell
+        .getByTestId('attachment-shelf')
+        .getByRole('button', { name: 'Delete keyboard-removal.txt', exact: true })
       await remove.focus()
       await app.page.keyboard.press(key)
       await expect(remove).toHaveCount(0)

test/main/sync/host/hostEndpoint.test.ts

@@ -33,6 +33,7 @@ describe('SyncHostService endpoint', () => {
   let baseUrl: string
   let backupBytes: Buffer
   let publicationDir: string
+  let changed: ReturnType<typeof vi.fn>
 
   beforeEach(async () => {
     tempDir = await mkdtemp(path.join(os.tmpdir(), 'deepchat-sync-host-'))
@@ -52,7 +53,9 @@ describe('SyncHostService endpoint', () => {
     await writeFile(path.join(syncDir, BACKUP_FILE_NAME), backupBytes)
 
     publicationDir = path.join(tempDir, 'sync-host', 'snapshots')
+    changed = vi.fn()
     service = new SyncHostService({
+      changed,
       createBackup: async () => ({
         fileName: BACKUP_FILE_NAME,
         createdAt: 1_700_000_000_000,
@@ -690,6 +693,30 @@ describe('SyncHostService endpoint', () => {
     await expect(fetch(`${baseUrl}${SYNC_HOST_PATH_PREFIX}/handshake`)).rejects.toThrow()
   })
 
+  it('keeps status refreshes silent while notifying host lifecycle changes', async () => {
+    changed.mockClear()
+    await service.initialize()
+    const statuses = await Promise.all([service.getStatus(), service.getStatus()])
+    expect(statuses.map(({ running }) => running)).toEqual([true, true])
+    expect(changed).not.toHaveBeenCalled()
+
+    const disabled = await service.setEnabled(false)
+    expect(disabled.running).toBe(false)
+    expect(changed).toHaveBeenCalled()
+
+    changed.mockClear()
+    const enabled = await service.setEnabled(true, {
+      port: Number(new URL(baseUrl).port),
+      consent: true
+    })
+    expect(enabled.running).toBe(true)
+    expect(changed).toHaveBeenCalled()
+
+    changed.mockClear()
+    expect((await service.getStatus()).running).toBe(true)
+    expect(changed).not.toHaveBeenCalled()
+  })
+
   it('keeps the listener and the enabled flag consistent under interleaved enable/disable', async () => {
     await Promise.all([
       service.setEnabled(false),