From 4ff84ac6772df258bf1714dc64141aef2c6417ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E6=9C=94?= <565183519@qq.com> Date: Wed, 9 Sep 2026 13:49:35 +0800 Subject: [PATCH] fix: resolve publish lock in git worktree --- .../LAKE-LAMP-CURRENT-TCS-BINDING-ACCEPTANCE-20260909.json | 2 +- .../lake-lamp-continuity-guard/finalize-development.mjs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/receipts/LAKE-LAMP-CURRENT-TCS-BINDING-ACCEPTANCE-20260909.json b/deployment/receipts/LAKE-LAMP-CURRENT-TCS-BINDING-ACCEPTANCE-20260909.json index 65d6893..768135f 100644 --- a/deployment/receipts/LAKE-LAMP-CURRENT-TCS-BINDING-ACCEPTANCE-20260909.json +++ b/deployment/receipts/LAKE-LAMP-CURRENT-TCS-BINDING-ACCEPTANCE-20260909.json @@ -14,7 +14,7 @@ "verify": "PASS" }, "artifacts": { - "finalizer_sha256": "1868a1bd907cb5f90c3559f3e460572da666cd22fbe96ff305a36aa9a0a72474", + "finalizer_sha256": "7a115b47a564141f813b96861554d28e0270e7a305f3ff9be1bad46930729541", "reflection_advisor_sha256": "b6071f4a3bb3a482e30a60b6a1861bd263b45dd23256944291bcb1d354b45022", "tcs_sha256": "10780d36e71df32c4d11dc299550755ed5d191b9a4435638d5e1d283c40a3222" }, diff --git a/server-tools/lake-lamp-continuity-guard/finalize-development.mjs b/server-tools/lake-lamp-continuity-guard/finalize-development.mjs index 6c882a9..741f0f0 100644 --- a/server-tools/lake-lamp-continuity-guard/finalize-development.mjs +++ b/server-tools/lake-lamp-continuity-guard/finalize-development.mjs @@ -70,7 +70,8 @@ export function validateCurrentTcsBinding(stateDirectory, expectedSession = proc } function acquireCurrentPublishLock(worktree, developmentId, binding) { - const lockPath = path.join(worktree, ".git", "guanghu-current-tcs-publish.lock"); + const gitDirectory = path.resolve(worktree, git(worktree, ["rev-parse", "--git-dir"])); + const lockPath = path.join(gitDirectory, "guanghu-current-tcs-publish.lock"); const descriptor = fs.openSync(lockPath, "wx", 0o600); fs.writeFileSync(descriptor, `${JSON.stringify({ development_id: developmentId, binding, created_at: new Date().toISOString() })}\n`); return { descriptor, lockPath };