An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Recover desktop startup after failed exit sync https://github.com/siyuan-note/siyuan/issues/20599
Daniele187addcc065
diff --git a/app/electron/kernelBoot.test.js b/app/electron/kernelBoot.test.jsindex e29d54cfef..683f3b026b 100644--- a/app/electron/kernelBoot.test.js+++ b/app/electron/kernelBoot.test.js@@ -73,8 +73,8 @@ const setup = (progress, options = {}) => {createBootWindow: () => events.push("create-boot"), showLocalBootWindow: () => events.push("show-boot"),showAppleSiliconWarning: async () => true,waitForPreviousWorkspaceExit: options.previousExit || (async () => true),- requestWorkspaceExitRecovery: async (workspace, marker, signal) => {- events.push(["recover-exit", workspace, marker.pid, signal]);+ requestWorkspaceExitRecovery: async (workspace, marker, signal, _fetch, _readFile, force) => {+ events.push(["recover-exit", workspace, marker.pid, signal, force]);return 1;},dialog: {showMessageBox: async (_window, message) => {@@ -348,12 +348,33 @@ test("boot recovery reports sync failure and cancel closes only the waiting windassert.ok(state.events.some(event => Array.isArray(event) && event[0] === "recover-exit" && event[3] === signal));const prompt = state.events.find(event => Array.isArray(event) && event[0] === "recovery-dialog")[1];assert.match(prompt.message, /Synchronization failed/);- assert.deepEqual(Array.from(prompt.buttons), ["Retry", "Cancel"]);+ assert.deepEqual(Array.from(prompt.buttons), ["Retry", "Cancel", "Force exit"]);assert.equal(state.window.destroyed, true);assert.equal(state.versionRequests(), 0);assert.equal(exits(state).length, 0);});+test("boot recovery forwards an explicit forced exit before starting a replacement kernel", async () => {+ const signal = new AbortController().signal;+ const state = setup(() => 100, {recoveryResponse: 2, previousExit: async (_workspace, options) => {+ assert.equal(await options.onRecoveryFailed(true), "force");+ await options.recover({pid: 123}, signal, true);+ return true;+ }});+ assert.equal(await state.run(), 6806);+ const recovered = state.events.findIndex(event => Array.isArray(event) && event[0] === "recover-exit" && event[4] === true);+ const spawned = state.events.findIndex(event => Array.isArray(event) && event[0] === "spawn-args");+ assert.ok(recovered >= 0 && spawned > recovered);+ assert.equal(state.window.destroyed, false);+});++test("boot recovery offers only retry and cancel after a transport failure", async () => {+ const state = setup(() => 100, {previousExit: async (_workspace, options) => options.onRecoveryFailed(false)});+ assert.equal(await state.run(), false);+ const prompt = state.events.find(event => Array.isArray(event) && event[0] === "recovery-dialog")[1];+ assert.deepEqual(Array.from(prompt.buttons), ["Retry", "Cancel"]);+});+test("boot progress recovers from certificate and network changes without exiting the kernel", async () => {for (const error of ["CERT_DATABASE_CHANGED", "CERT_VERIFIER_CHANGED", "NETWORK_CHANGED"]) {const fixture = setup(request => request === 1 ? new Error("net::ERR_" + error) : 100);diff --git a/app/electron/main.js b/app/electron/main.jsindex cb7fae16b2..1e50302931 100644--- a/app/electron/main.js+++ b/app/electron/main.js@@ -2726,17 +2726,20 @@ const initKernelAttempt = (workspace, port, lang, safeMode, preparedBoot, startucanceled: bootCanceled,hasActiveWindow: () => workspaces.some(item => item.workspaceDir === currentWorkspace &&item.browserWindow && !item.browserWindow.isDestroyed()),- recover: (marker, signal) => requestWorkspaceExitRecovery(currentWorkspace, marker, signal, net.fetch),+ recover: (marker, signal, force) => requestWorkspaceExitRecovery(currentWorkspace, marker, signal, net.fetch,+ undefined, force),onRecoveryFailed: async syncFailed => {if (bootCanceled()) return false;const {response} = await dialog.showMessageBox(currentBootWindow, {type: "warning",message: syncFailed ? languages._kernel[96] : languages.previousExitWaitFailed,- buttons: [languages.retry, languages.cancel],+ buttons: syncFailed ? [languages.retry, languages.cancel, languages._kernel[97]] :+ [languages.retry, languages.cancel],defaultId: 0,cancelId: 1,});- return response === 0 && !bootCanceled();+ if (bootCanceled()) return false;+ return response === 2 && syncFailed ? "force" : response === 0;},onWaiting: async () => {waiting = true;diff --git a/app/electron/workspaceExit.js b/app/electron/workspaceExit.jsindex ad7aa111aa..22bc066773 100644--- a/app/electron/workspaceExit.js+++ b/app/electron/workspaceExit.js@@ -8,7 +8,7 @@ const validMarker = (marker, now) => marker && [1, 2].includes(marker.version) &marker.startedAt > 0 && marker.startedAt <= now && (marker.version === 2 || now - marker.startedAt <= exitWaitTimeout);// 认证材料只发送到标记中的本机端口;内核还会核对进程、退出批次及活动会话。-const requestWorkspaceExitRecovery = async (workspace, marker, signal, fetch, readFile = fs.readFileSync) => {+const requestWorkspaceExitRecovery = async (workspace, marker, signal, fetch, readFile = fs.readFileSync, force = false) => {if (marker.version !== 2 || !/^\d{1,5}$/.test(marker.port) || Number(marker.port) < 1 || Number(marker.port) > 65535) {throw new Error("Invalid workspace exit port");}@@ -21,7 +21,7 @@ const requestWorkspaceExitRecovery = async (workspace, marker, signal, fetch, re}const response = await fetch(`https://127.0.0.1:${Number(marker.port)}/api/system/exit`, {method: "POST", headers, signal, credentials: headers.Authorization ? "omit" : "include", redirect: "error",- body: JSON.stringify({recoverExit: {pid: marker.pid, startedAt: marker.startedAt}}),+ body: JSON.stringify({recoverExit: {pid: marker.pid, startedAt: marker.startedAt, ...(force ? {force: true} : {})}}),});if (!response.ok) {throw new Error("Workspace exit recovery request rejected");@@ -83,6 +83,7 @@ const waitForPreviousWorkspaceExit = async (workspace, {let result;let nextRecovery = now() + 1000;let completedBatch;+ let forcedBatch;try {// 持续读取同一进程的退出阶段,接管不再有窗口处理的更新确认或同步失败。while (alive(marker.pid)) {@@ -100,9 +101,11 @@ const waitForPreviousWorkspaceExit = async (workspace, {if (finished.code === 0) {completedBatch = finished.startedAt;} else if (finished.error || finished.code === 1) {- if (!await onRecoveryFailed(finished.code === 1)) {+ const action = await onRecoveryFailed(finished.code === 1);+ if (!action) {return false;}+ forcedBatch = action === "force" && finished.code === 1 ? finished.startedAt : undefined;started = now();}}@@ -118,7 +121,8 @@ const waitForPreviousWorkspaceExit = async (workspace, {}if (current?.version === 2 && current.phase === "waiting" && current.startedAt !== completedBatch &&!canceled() && alive(marker.pid)) {- pending = Promise.resolve().then(() => recover(current, controller.signal)).then(code => {+ pending = Promise.resolve().then(() => recover(current, controller.signal,+ current.startedAt === forcedBatch)).then(code => {result = {code, startedAt: current.startedAt};}, () => { result = {error: true}; });}diff --git a/app/electron/workspaceExit.test.js b/app/electron/workspaceExit.test.jsindex cfb2e7cc56..546f4244f1 100644--- a/app/electron/workspaceExit.test.js+++ b/app/electron/workspaceExit.test.js@@ -160,6 +160,67 @@ test("a stalled recovery is aborted when startup is closed or times out", async}});+test("forced recovery requires a sync failure and an explicit choice for the same batch", async () => {+ for (const changed of [false, true]) {+ const state = recoveryFixture();+ const calls = [];+ let batch = 1000;+ state.options.readFile = () => JSON.stringify({version: 2, pid: 123, startedAt: batch, phase: "waiting", port: "6806"});+ state.options.recover = async (_marker, _signal, force) => {+ calls.push(force);+ if (calls.length === 1) return 1;+ state.stop();+ return 0;+ };+ state.options.onRecoveryFailed = async syncFailed => {+ assert.equal(syncFailed, true);+ if (changed) batch++;+ return "force";+ };+ assert.equal(await state.run(), true);+ assert.deepEqual(calls, [false, !changed]);+ }+});++test("transport failures cannot authorize skipping exit sync", async () => {+ const state = recoveryFixture();+ let calls = 0;+ state.options.recover = async (_marker, _signal, force) => {+ assert.equal(force, false);+ if (++calls === 1) throw new Error("offline");+ state.stop();+ return 0;+ };+ state.options.onRecoveryFailed = async () => "force";+ assert.equal(await state.run(), true);+ assert.equal(calls, 2);+});++test("retry after a failed forced request restores normal sync recovery", async () => {+ const state = recoveryFixture();+ const calls = [];+ state.options.recover = async (_marker, _signal, force) => {+ calls.push(force);+ if (calls.length === 1) return 1;+ if (calls.length === 2) throw new Error("offline");+ state.stop();+ return 0;+ };+ state.options.onRecoveryFailed = async syncFailed => syncFailed ? "force" : true;+ assert.equal(await state.run(), true);+ assert.deepEqual(calls, [false, true, false]);+});++test("forced recovery sends its choice inside the guarded exit request", async () => {+ const marker = {version: 2, pid: 123, startedAt: 1000, port: "6806"};+ const result = await requestWorkspaceExitRecovery("workspace", marker, new AbortController().signal,+ async (_url, options) => {+ assert.deepEqual(JSON.parse(options.body), {recoverExit: {pid: 123, startedAt: 1000, force: true}});+ return {ok: true, json: async () => ({code: 0})};+ }, () => "{}", true);+ assert.equal(result, 0);+});+test("recovery does not repeat a successful exit while the process finishes", async () => {const state = recoveryFixture();let calls = 0;diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex 079c265ef3..91d746dd3e 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -2320,7 +2320,7 @@ export type SystemPathData = { "path": string; };export type SystemPathRequestInput = { "path": string; };-export type SystemRecoverExitInput = { "pid": number; "startedAt": number; };+export type SystemRecoverExitInput = { "force"?: boolean | null; "pid": number; "startedAt": number; };export type SystemRemoveCustomFontData = { "appearance": SettingAppearance | null; "editor": SettingEditor | null; "font": SystemCustomFont | null; };@@ -7342,7 +7342,8 @@ export interface APIPOSTRoutes {/*** 默认保留退出同步及更新选择,返回 0 表示完成、1 表示同步失败、2 表示等待更新选择。* 可选 recoverExit 绑定当前进程和退出批次,只接管没有活动会话的桌面退出;不匹配返回 -1,有会话返回 3。- * 接管固定使用正常同步、跳过安装提示且不修改工作空间顺序,忽略 force、execInstallPkg、setCurrentWorkspace。+ * 接管默认正常同步,recoverExit.force 为 true 时跳过同步但仍执行数据清理;跳过安装提示且不修改工作空间顺序。+ * 顶层 force、execInstallPkg、setCurrentWorkspace 在接管时忽略;省略 recoverExit.force 保持正常同步。* 省略或传入 null 时保持原行为及数字截断规则,认证、管理员权限及加密笔记本关闭流程不变。*/"/api/system/exit": {diff --git a/kernel/api/contract_system_test.go b/kernel/api/contract_system_test.goindex d8300f4bfd..e5fdb153f7 100644--- a/kernel/api/contract_system_test.go+++ b/kernel/api/contract_system_test.go@@ -171,27 +171,33 @@ func TestAPIContractSystemExitRecovery(t *testing.T) {})model.Conf = model.NewAppConf()closeSystem = func(bool, bool, int) (int, string) { t.Fatal("recovery bypassed guards"); return 0, "" }- for _, code := range []int{-1, 0, 1, 3} {- called := false- finished := false- finishSystemExit = func() { finished = true }- recoverSystemExit = func(pid int, startedAt int64) (int, string) {- called = true- if pid != 123 || startedAt != 456 {- t.Fatalf("wrong recovery identity: %d %d", pid, startedAt)+ for _, forced := range []bool{false, true} {+ for _, code := range []int{-1, 0, 1, 3} {+ called := false+ finished := false+ finishSystemExit = func() { finished = true }+ recoverSystemExit = func(pid int, startedAt int64, force bool) (int, string) {+ called = true+ if pid != 123 || startedAt != 456 || force != forced {+ t.Fatalf("wrong recovery identity: %d %d", pid, startedAt)+ }+ return code, ""+ }+ body := `{"force":true,"execInstallPkg":2,"recoverExit":{"pid":123,"startedAt":456}}`+ if forced {+ body = `{"force":false,"execInstallPkg":2,"recoverExit":{"pid":123,"startedAt":456,"force":true}}`+ }+ recorder := systemContractRequest(t, "POST", "exit", exit, strings.NewReader(body))+ var result struct {+ Code int `json:"code"`+ }+ if err := json.Unmarshal(recorder.Body.Bytes(), &result); err != nil || !called || result.Code != code {+ t.Fatalf("unexpected recovery response: %s", recorder.Body.String())+ }+ requireAPIContract(t, "POST", "/api/system/exit", recorder)+ if finished != (code == 0) {+ t.Fatalf("server shutdown changed for recovery code %d: %v", code, finished)}- return code, ""- }- recorder := systemContractRequest(t, "POST", "exit", exit, strings.NewReader(`{"force":true,"execInstallPkg":2,"recoverExit":{"pid":123,"startedAt":456}}`))- var result struct {- Code int `json:"code"`- }- if err := json.Unmarshal(recorder.Body.Bytes(), &result); err != nil || !called || result.Code != code {- t.Fatalf("unexpected recovery response: %s", recorder.Body.String())- }- requireAPIContract(t, "POST", "/api/system/exit", recorder)- if finished != (code == 0) {- t.Fatalf("server shutdown changed for recovery code %d: %v", code, finished)}}}diff --git a/kernel/api/system.go b/kernel/api/system.goindex edf151e8eb..3ab7481d23 100644--- a/kernel/api/system.go+++ b/kernel/api/system.go@@ -1376,7 +1376,7 @@ func exitSystem(c *gin.Context, request apicontract.SystemExitRequest) apicontravar exitCode intvar installPkgPath stringif request.RecoverExit != nil {- exitCode, installPkgPath = recoverSystemExit(request.RecoverExit.PID, request.RecoverExit.StartedAt)+ exitCode, installPkgPath = recoverSystemExit(request.RecoverExit.PID, request.RecoverExit.StartedAt, request.RecoverExit.Force)} else {exitCode, installPkgPath = closeSystem(request.Force, setCurrentWorkspace, int(request.ExecInstallPkg))}diff --git a/kernel/apicontract/contracts.go b/kernel/apicontract/contracts.goindex 981598728f..147befd3c1 100644--- a/kernel/apicontract/contracts.go+++ b/kernel/apicontract/contracts.go@@ -1366,7 +1366,8 @@ var SystemEnsureOnboarding = define[EmptyRequest, *SystemOnboarding]("ensureOnbo// SystemExit 默认保留退出同步及更新选择,返回 0 表示完成、1 表示同步失败、2 表示等待更新选择。// 可选 recoverExit 绑定当前进程和退出批次,只接管没有活动会话的桌面退出;不匹配返回 -1,有会话返回 3。-// 接管固定使用正常同步、跳过安装提示且不修改工作空间顺序,忽略 force、execInstallPkg、setCurrentWorkspace。+// 接管默认正常同步,recoverExit.force 为 true 时跳过同步但仍执行数据清理;跳过安装提示且不修改工作空间顺序。+// 顶层 force、execInstallPkg、setCurrentWorkspace 在接管时忽略;省略 recoverExit.force 保持正常同步。// 省略或传入 null 时保持原行为及数字截断规则,认证、管理员权限及加密笔记本关闭流程不变。var SystemExit = define[SystemExitRequest, SystemExitData]("exit", "/api/system/exit", AuthenticatedAccess|AdminAccess, JSONBody, ResponseOptions{AdditionalCodes: []int{1, 2, 3}, DataOnError: true}, "POST")var SystemExportConf = define[EmptyRequest, SystemExportConfData]("exportConf", "/api/system/exportConf", AuthenticatedAccess|AdminAccess, NoBody, ResponseOptions{}, "POST")diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex 617fe91949..81f670c437 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -52152,6 +52152,16 @@"SystemRecoverExitInput": {"type": "object","properties": {+ "force": {+ "anyOf": [+ {+ "type": "boolean"+ },+ {+ "type": "null"+ }+ ]+ },"pid": {"type": "integer"},diff --git a/kernel/apicontract/system.go b/kernel/apicontract/system.goindex 20960886eb..953d97dd59 100644--- a/kernel/apicontract/system.go+++ b/kernel/apicontract/system.go@@ -124,6 +124,7 @@ type SystemExitRequest struct {type SystemRecoverExit struct {PID int `json:"pid"`StartedAt int64 `json:"startedAt"`+ Force bool `json:"force" api:"optional,nullable"`}type SystemExitData struct {CloseTimeout int `json:"closeTimeout"`diff --git a/kernel/model/conf.go b/kernel/model/conf.goindex 4ae4b8b305..fbfbc31e75 100644--- a/kernel/model/conf.go+++ b/kernel/model/conf.go@@ -692,9 +692,9 @@ func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int, ireturn closeKernel(force, setCurrentWorkspace, execInstallPkg, nil)}-// RecoverWorkspaceExit 仅接管指定批次且没有活动会话的桌面退出,不跳过同步或触发安装更新。-func RecoverWorkspaceExit(pid int, startedAt int64) (int, string) {- return closeKernel(false, false, 1, &util.WorkspaceExitState{PID: pid, StartedAt: startedAt})+// RecoverWorkspaceExit 仅接管指定批次且没有活动会话的桌面退出,允许用户确认后跳过同步,不触发安装更新。+func RecoverWorkspaceExit(pid int, startedAt int64, force bool) (int, string) {+ return closeKernel(force, false, 1, &util.WorkspaceExitState{PID: pid, StartedAt: startedAt})}func workspaceExitRecoveryCode(expected *util.WorkspaceExitState) int {@@ -708,6 +708,14 @@ func workspaceExitRecoveryCode(expected *util.WorkspaceExitState) int {return 0}+func markPendingWorkspaceExit() {+ if pendingWorkspaceExit == nil {+ pendingWorkspaceExit = util.MarkWorkspaceExiting()+ } else {+ pendingWorkspaceExit.SetPhase("exiting")+ }+}+func closeKernel(force, setCurrentWorkspace bool, execInstallPkg int, recovery *util.WorkspaceExitState) (exitCode int, installPkgPath string) {diagnostic := util.WatchOperationWithTiming("exit kernel", "wait for exit lock")defer diagnostic.Finish()@@ -722,11 +730,7 @@ func closeKernel(force, setCurrentWorkspace bool, execInstallPkg int, recovery *return}confSyncSnapshot := Conf.LoadSync()- if recovery == nil {- pendingWorkspaceExit = util.MarkWorkspaceExiting()- } else {- pendingWorkspaceExit.SetPhase("exiting")- }+ markPendingWorkspaceExit()defer func() {if exitCode == 1 || exitCode == 2 || exitCode == 3 {pendingWorkspaceExit.SetPhase("waiting")@@ -755,8 +759,7 @@ func closeKernel(force, setCurrentWorkspace bool, execInstallPkg int, recovery *if confSyncSnapshot.Enabled && 3 != confSyncSnapshot.Mode &&((IsSubscriber() && conf.ProviderSiYuan == confSyncSnapshot.Provider) || conf.ProviderSiYuan != confSyncSnapshot.Provider) {diagnostic.Stage("exit sync")- syncData(true, false)- if 0 != ExitSyncSucc {+ if err := syncData(true, false); err != nil {exitCode = 1if 1 != execInstallPkg && !skipNewVerInstallPkg() {installPkgPath = getNewVerInstallPkgPath(false)diff --git a/kernel/model/exit_retry_test.go b/kernel/model/exit_retry_test.goindex 8faf0f90ff..19b441ed32 100644--- a/kernel/model/exit_retry_test.go+++ b/kernel/model/exit_retry_test.go@@ -1,17 +1,72 @@package modelimport (+ "encoding/json""io""net/http""net/http/httptest""os"+ "path/filepath""testing""time""github.com/olahol/melody"+ "github.com/siyuan-note/siyuan/kernel/conf""github.com/siyuan-note/siyuan/kernel/util")+func TestWorkspaceExitRetryPreservesBatch(t *testing.T) {+ previous, temp := pendingWorkspaceExit, util.TempDir+ t.Cleanup(func() { pendingWorkspaceExit, util.TempDir = previous, temp })+ util.TempDir = t.TempDir()+ pendingWorkspaceExit = nil+ markPendingWorkspaceExit()+ batch := pendingWorkspaceExit+ batch.SetPhase("waiting")+ time.Sleep(2 * time.Millisecond)+ markPendingWorkspaceExit()+ if pendingWorkspaceExit != batch {+ t.Fatal("background retry replaced the recoverable exit batch")+ }+ data, err := os.ReadFile(filepath.Join(util.TempDir, "kernel-exit.json"))+ if err != nil {+ t.Fatal(err)+ }+ var marker util.WorkspaceExitState+ if err = json.Unmarshal(data, &marker); err != nil || marker.StartedAt != batch.StartedAt || marker.Phase != "exiting" {+ t.Fatalf("retry marker changed identity: %s (%v)", data, err)+ }+}++func TestExitSyncSkippedAndFailed(t *testing.T) {+ prepareSyncDirectoryTest(t)+ previousErrors := autoSyncErrCount+ t.Cleanup(func() { autoSyncErrCount = previousErrors })+ for _, mode := range []int{0, 3} {+ Conf.Sync.Load().Enabled = mode != 0+ Conf.Sync.Load().Mode = mode+ if err := syncData(true, false); err != nil {+ t.Fatalf("skipped exit sync reported a failure: %v", err)+ }+ }+ Conf.Sync.Load().Mode = 1+ Conf.Sync.Load().Enabled = true+ Conf.SetUser(&conf.User{UserId: "sync-test", UserSiYuanOneTimePayStatus: 1})+ Conf.Repo.Load().Key = nil+ Conf.Sync.Load().Perception = false+ autoSyncErrCount = 8+ if !checkSync(false, true, false) {+ t.Fatal("exit retry was blocked by automatic sync backoff")+ }+ if err := syncData(true, false); err == nil {+ t.Fatal("repository initialization failure was reported as successful exit sync")+ }+ Conf.Sync.Load().Enabled = false+ if err := syncData(true, false); err != nil {+ t.Fatalf("previous sync failure leaked into a skipped sync: %v", err)+ }+}+func TestWorkspaceExitRecoveryGuards(t *testing.T) {previous, previousFinished := pendingWorkspaceExit, exitFinishedcontainer, attached := util.Container, util.AttachUI@@ -23,14 +78,14 @@ func TestWorkspaceExitRecoveryGuards(t *testing.T) {exitFinished = falsependingWorkspaceExit = &util.WorkspaceExitState{PID: os.Getpid(), StartedAt: 123, Phase: "waiting"}for _, expected := range []*util.WorkspaceExitState{{PID: os.Getpid() + 1, StartedAt: 123}, {PID: os.Getpid(), StartedAt: 124}} {- if code, _ := RecoverWorkspaceExit(expected.PID, expected.StartedAt); code != -1 {+ if code, _ := RecoverWorkspaceExit(expected.PID, expected.StartedAt, true); code != -1 {t.Fatalf("mismatched exit accepted: %d", code)}}session := &melody.Session{Request: httptest.NewRequest("GET", "/ws?app=exit-recovery-test&id=main&type=main", nil)}util.AddPushChan(session)t.Cleanup(func() { util.RemovePushChan(session) })- if code, _ := RecoverWorkspaceExit(os.Getpid(), 123); code != 3 {+ if code, _ := RecoverWorkspaceExit(os.Getpid(), 123, true); code != 3 {t.Fatalf("active window lost its exit: %d", code)}util.RemovePushChan(session)@@ -43,7 +98,7 @@ func TestWorkspaceExitRecoveryGuards(t *testing.T) {}util.AttachUI = trueexitFinished = true- if code, _ := RecoverWorkspaceExit(os.Getpid(), 123); code != 0 {+ if code, _ := RecoverWorkspaceExit(os.Getpid(), 123, true); code != 0 {t.Fatalf("completed recovery was not idempotent: %d", code)}}diff --git a/kernel/model/repository.go b/kernel/model/repository.goindex 2904510ad0..f8590a3963 100644--- a/kernel/model/repository.go+++ b/kernel/model/repository.go@@ -2348,9 +2348,6 @@ func syncRepo(exit, byHand bool) (cloudPublished bool, err error) {if 1 > autoSyncErrCount || byHand {util.PushErrMsg(msg, 0)}- if exit {- ExitSyncSucc = 1- }return}@@ -2386,9 +2383,6 @@ func syncIndexedRepo(repo *dejavu.Repo, exit, byHand bool, start time.Time, indeif 1 > autoSyncErrCount || byHand {util.PushErrMsg(msg, 0)}- if exit {- ExitSyncSucc = 1- }return}if nil != prefetchTraffic {diff --git a/kernel/model/sync.go b/kernel/model/sync.goindex 74e26630d7..8f2d956ab9 100644--- a/kernel/model/sync.go+++ b/kernel/model/sync.go@@ -159,7 +159,6 @@ var (syncPlanTime = time.Now().Add(fixSyncInterval)BootSyncSucc atomic.Int32 // -1:未执行,0:执行成功,1:执行失败- ExitSyncSucc = -1)func init() {@@ -305,11 +304,12 @@ func lockSyncRequest(state *syncRequestState) (unlock func(), ok bool) {return unlock, true}-func syncData(exit, byHand bool) {+func syncData(exit, byHand bool) (err error) {+ err = errors.New("sync did not complete")defer logging.Recover()if !checkSync(false, exit, byHand) {- return+ return nil}requests := &syncAutoRequests@@ -320,17 +320,16 @@ func syncData(exit, byHand bool) {}unlock, ok := lockSyncRequest(requests)if !ok {- return+ return nil}defer unlock()- _ = syncDataLocked(exit, byHand)+ return syncDataLocked(exit, byHand)}func syncDataLocked(exit, byHand bool) error {revision := pendingSync.begin()util.BroadcastByType("main", "syncing", 0, Conf.Language(81), nil)if exit {- ExitSyncSucc = 0logging.LogInfof("sync before exit")msgId := util.PushMsg(Conf.Language(81), 1000*60*15)defer func() {@@ -421,7 +420,7 @@ func checkSync(boot, exit, byHand bool) bool {}}- if 7 < autoSyncErrCount && !byHand {+ if 7 < autoSyncErrCount && !byHand && !exit {logging.LogErrorf("failed to auto-sync too many times, delay auto-sync 64 minutes")util.PushErrMsg(Conf.Language(125), 1000*60*60)planSyncAfter(64 * time.Minute)