Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Versions follow the merge of a `*_release-v*` branch; CI publishes to npm on tag

### Fixed
- 块区间边界在重存时不再回退:折叠后客户端重发的视图不含已覆盖原文,重入库时该批次无法重新解析区间(-1/-1),旧逻辑会把已解析的真实区间抹掉。现在区间证据一旦解析即持久(入库 `CASE` 保留;sqlite/mysql 双后端),未知块保持诚实缺口(#4608)。
- 优雅停机(SIGTERM → dispose)的 writer 标记现在记录 `stoppedAt`:重启流程(杀旧进程→立即重绑)不再对已确认死亡的前任实例误报 [split-brain]——30s 新鲜度回退从此只覆盖无法证明死亡的崩溃场景(#3923;release-gate lane A 代理重启时观察到误报)。
- Claude Code 子代理的 bili 调用不再路由到父会话:Task 子代理与父线程共用一个 MCP shim,启动时抓的绑定只指向父会话;子代理压缩错对象或永久 409。现在 shim 把 host 盖在每次 tools/call 上的 `_meta["claudecode/toolUseId"]` 转发为 body `toolCallId`,代理用它出站时记下的 id→会话映射直接路由到子代理自己的 lane(10 分钟 TTL);id 未知时行为与从前完全一致(#4580)。

### Added
Expand Down
25 changes: 21 additions & 4 deletions src/served-markers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ interface WriterMarkerFile {
origin: string;
version: string;
lane?: string;
/** Set only by a graceful dispose(): this instance recorded its FINAL
* marker and will never commit again. Peers skip such markers outright —
* a positively-known dead predecessor is not a concurrent writer, even
* while its file is fresh (restart flows kill + immediately rebind).
* Markers from older builds carry none and stay valid. */
stoppedAt?: number;
/** sessionId → last commit time (ms epoch). */
servedAt: Record<string, number>;
}
Expand Down Expand Up @@ -68,7 +74,8 @@ const MAX_TRACKED_SESSIONS = 128;
const VERDICT_TTL_MS = 60_000;
/** A peer counts as live when its pid is alive OR its marker was written
* within this window (covers platforms where the pid check cannot see the
* peer process). */
* peer process). Gracefully-stopped peers are excluded upstream via
* stoppedAt — this fallback only ever rescues CRASHED peers. */
const PEER_FILE_FRESH_MS = 30_000;
/** reapStaleWriterMarkers removes files whose pid is dead AND whose mtime is
* older than this. */
Expand Down Expand Up @@ -113,6 +120,7 @@ export function createServedMarkerWriter(identity: WriterIdentity, dir: string,
let flushTimer: ReturnType<typeof setTimeout> | undefined;
let lastFlushAt = 0;
let disposed = false;
let stoppedAt: number | undefined;

const prune = (now: number): void => {
for (const [id, at] of [...servedAt]) {
Expand All @@ -137,6 +145,7 @@ export function createServedMarkerWriter(identity: WriterIdentity, dir: string,
origin: identity.origin,
version: identity.version,
...(identity.lane === undefined || identity.lane === "" ? {} : { lane: identity.lane }),
...(stoppedAt === undefined ? {} : { stoppedAt }),
servedAt: Object.fromEntries(servedAt),
};
try {
Expand Down Expand Up @@ -189,7 +198,11 @@ export function createServedMarkerWriter(identity: WriterIdentity, dir: string,
disposed = true;
if (flushTimer !== undefined) clearTimeout(flushTimer);
// final write (bypasses the disposed guard): peers should still be
// able to attribute this instance's last commits after shutdown
// able to attribute this instance's last commits after shutdown.
// stoppedAt marks the stop as GRACEFUL so peers never flag this
// predecessor in a split-brain contest — the freshness fallback
// must only rescue crashed peers whose death we cannot prove.
stoppedAt = Date.now();
writeMarker();
},
__flushForTest(): void {
Expand All @@ -202,8 +215,11 @@ export function createServedMarkerWriter(identity: WriterIdentity, dir: string,
}

/** Peer marker files that record a commit of `sessionId` inside the contest
* window by a LIVE foreign instance (pid alive or file fresh). Malformed or
* tearing files are skipped silently — a marker is observability, not data. */
* window by a LIVE foreign instance (pid alive or file fresh). Markers
* carrying stoppedAt (graceful shutdown) are skipped unconditionally — a
* restart flow's predecessor died seconds ago and must not raise an alarm.
* Malformed or tearing files are skipped silently — a marker is
* observability, not data. */
export function findContestedWriters(dir: string, selfInstanceId: string, sessionId: string, now: number): Array<WriterIdentity & { servedAt: number }> {
let entries: fs.Dirent[];
try {
Expand All @@ -218,6 +234,7 @@ export function findContestedWriters(dir: string, selfInstanceId: string, sessio
try {
const raw = JSON.parse(fs.readFileSync(file, "utf8")) as Partial<WriterMarkerFile>;
if (raw.v !== 1 || typeof raw.instanceId !== "string" || raw.instanceId === selfInstanceId) continue;
if (typeof raw.stoppedAt === "number") continue;
const at = raw.servedAt !== null && typeof raw.servedAt === "object" ? (raw.servedAt as Record<string, unknown>)[sessionId] : undefined;
if (typeof at !== "number" || now - at > CONTEST_WINDOW_MS) continue;
const mtimeMs = fs.statSync(file).mtimeMs;
Expand Down
28 changes: 28 additions & 0 deletions tests/served-markers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,34 @@ test("dead-pid peer counts while its marker is fresh, stops counting once stale"
assert.equal(found.length, 0, "dead pid + stale mtime = gone");
});

test("graceful dispose records stoppedAt and never contests a fresh predecessor (#4982 gate restart)", () => {
const dir = writerMarkerDir(freshDir("bili-3923-stop-"));
const logs: Array<[string, string]> = [];
// predecessor committed sess-a, then shut down gracefully (SIGTERM → dispose)
const pred = createServedMarkerWriter({ ...PEER }, dir, () => {});
pred.noteServed("sess-a");
pred.__flushForTest();
pred.dispose();
const body = JSON.parse(fs.readFileSync(path.join(dir, "peer-1.json"), "utf8")) as Record<string, unknown>;
assert.equal(typeof body.stoppedAt, "number", "dispose records a graceful stop");
// successor rebinds seconds later and commits the same session — the
// predecessor's marker is still FRESH, but a known-dead instance must not
// raise an alarm
const w = createServedMarkerWriter(SELF, dir, (level, msg) => logs.push([level, msg]));
w.noteServed("sess-a");
assert.equal(logs.length, 0, "a gracefully-stopped predecessor is not a concurrent writer");
w.dispose();
});

test("stoppedAt skips even when the peer pid is alive", () => {
const dir = writerMarkerDir(freshDir("bili-3923-stopped-pid-"));
fs.mkdirSync(dir, { recursive: true });
fs.writeFileSync(path.join(dir, "peer-1.json"), JSON.stringify({
v: 1, ...PEER, servedAt: { "sess-x": Date.now() - 1_000 }, stoppedAt: Date.now() - 2_000,
}));
assert.deepEqual(findContestedWriters(dir, SELF.instanceId, "sess-x", Date.now()), [], "stoppedAt outranks liveness — a recorded stop is positively-known death");
});

test("malformed or foreign-shape marker files are skipped, never fatal", () => {
const dir = writerMarkerDir(freshDir("bili-3923-malformed-"));
fs.mkdirSync(dir, { recursive: true });
Expand Down
Loading