baxian 2.0.1 → 2.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -7
- package/README.zh-CN.md +5 -7
- package/dist/agent/bootstrap.d.ts.map +1 -1
- package/dist/agent/bootstrap.js +2 -4
- package/dist/agent/bootstrap.js.map +1 -1
- package/dist/agent/branch.d.ts +0 -12
- package/dist/agent/branch.d.ts.map +1 -1
- package/dist/agent/branch.js +1 -78
- package/dist/agent/branch.js.map +1 -1
- package/dist/agent/detect/region.d.ts.map +1 -1
- package/dist/agent/detect/region.js +0 -3
- package/dist/agent/detect/region.js.map +1 -1
- package/dist/agent/dispatch-reconciler.d.ts.map +1 -1
- package/dist/agent/dispatch-reconciler.js +8 -59
- package/dist/agent/dispatch-reconciler.js.map +1 -1
- package/dist/agent/lineage.d.ts.map +1 -1
- package/dist/agent/lineage.js +0 -9
- package/dist/agent/lineage.js.map +1 -1
- package/dist/agent/manager.d.ts +66 -142
- package/dist/agent/manager.d.ts.map +1 -1
- package/dist/agent/manager.js +936 -2738
- package/dist/agent/manager.js.map +1 -1
- package/dist/agent/net-exec.d.ts.map +1 -1
- package/dist/agent/net-exec.js +0 -5
- package/dist/agent/net-exec.js.map +1 -1
- package/dist/agent/pane-streamer-manager.d.ts.map +1 -1
- package/dist/agent/pane-streamer-manager.js +0 -36
- package/dist/agent/pane-streamer-manager.js.map +1 -1
- package/dist/agent/pane-streamer.d.ts +10 -1
- package/dist/agent/pane-streamer.d.ts.map +1 -1
- package/dist/agent/pane-streamer.js +142 -79
- package/dist/agent/pane-streamer.js.map +1 -1
- package/dist/agent/phase-signal-watcher.d.ts +2 -11
- package/dist/agent/phase-signal-watcher.d.ts.map +1 -1
- package/dist/agent/phase-signal-watcher.js +36 -160
- package/dist/agent/phase-signal-watcher.js.map +1 -1
- package/dist/agent/phase-signal.d.ts +13 -40
- package/dist/agent/phase-signal.d.ts.map +1 -1
- package/dist/agent/phase-signal.js +38 -98
- package/dist/agent/phase-signal.js.map +1 -1
- package/dist/agent/preflight.d.ts +0 -1
- package/dist/agent/preflight.d.ts.map +1 -1
- package/dist/agent/preflight.js +6 -31
- package/dist/agent/preflight.js.map +1 -1
- package/dist/agent/prompt.d.ts +1 -30
- package/dist/agent/prompt.d.ts.map +1 -1
- package/dist/agent/prompt.js +20 -148
- package/dist/agent/prompt.js.map +1 -1
- package/dist/agent/repo-store.d.ts.map +1 -1
- package/dist/agent/repo-store.js +0 -42
- package/dist/agent/repo-store.js.map +1 -1
- package/dist/agent/runner.d.ts.map +1 -1
- package/dist/agent/runner.js +0 -2
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/tmux-install.js +0 -1
- package/dist/agent/tmux-install.js.map +1 -1
- package/dist/agent/tmux-probe-poller.d.ts.map +1 -1
- package/dist/agent/tmux-probe-poller.js +0 -7
- package/dist/agent/tmux-probe-poller.js.map +1 -1
- package/dist/agent/tmux.d.ts.map +1 -1
- package/dist/agent/tmux.js +0 -86
- package/dist/agent/tmux.js.map +1 -1
- package/dist/agent/vt-visible-text.d.ts +87 -0
- package/dist/agent/vt-visible-text.d.ts.map +1 -0
- package/dist/agent/vt-visible-text.js +1058 -0
- package/dist/agent/vt-visible-text.js.map +1 -0
- package/dist/api/agents.d.ts.map +1 -1
- package/dist/api/agents.js +1 -42
- package/dist/api/agents.js.map +1 -1
- package/dist/api/config.d.ts.map +1 -1
- package/dist/api/config.js +8 -53
- package/dist/api/config.js.map +1 -1
- package/dist/api/hosts.d.ts.map +1 -1
- package/dist/api/hosts.js +2 -57
- package/dist/api/hosts.js.map +1 -1
- package/dist/api/platform-guard.d.ts.map +1 -1
- package/dist/api/platform-guard.js +2 -3
- package/dist/api/platform-guard.js.map +1 -1
- package/dist/api/probe.d.ts.map +1 -1
- package/dist/api/probe.js +0 -1
- package/dist/api/probe.js.map +1 -1
- package/dist/api/projects.d.ts.map +1 -1
- package/dist/api/projects.js +599 -332
- package/dist/api/projects.js.map +1 -1
- package/dist/api/tasks.d.ts.map +1 -1
- package/dist/api/tasks.js +15 -40
- package/dist/api/tasks.js.map +1 -1
- package/dist/app.d.ts +0 -2
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +0 -6
- package/dist/app.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +4 -29
- package/dist/cli.js.map +1 -1
- package/dist/config/hot-reload.d.ts.map +1 -1
- package/dist/config/hot-reload.js +0 -4
- package/dist/config/hot-reload.js.map +1 -1
- package/dist/config/loader.d.ts +5 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +36 -47
- package/dist/config/loader.js.map +1 -1
- package/dist/config/normalizer.d.ts.map +1 -1
- package/dist/config/normalizer.js +0 -19
- package/dist/config/normalizer.js.map +1 -1
- package/dist/config/validator.d.ts +7 -4
- package/dist/config/validator.d.ts.map +1 -1
- package/dist/config/validator.js +56 -270
- package/dist/config/validator.js.map +1 -1
- package/dist/event/handlers.d.ts.map +1 -1
- package/dist/event/handlers.js +356 -234
- package/dist/event/handlers.js.map +1 -1
- package/dist/event/log.js +0 -2
- package/dist/event/log.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +0 -50
- package/dist/index.js.map +1 -1
- package/dist/platform/body-digest.d.ts.map +1 -1
- package/dist/platform/body-digest.js +0 -4
- package/dist/platform/body-digest.js.map +1 -1
- package/dist/platform/command-renderer.d.ts +6 -0
- package/dist/platform/command-renderer.d.ts.map +1 -1
- package/dist/platform/command-renderer.js +20 -3
- package/dist/platform/command-renderer.js.map +1 -1
- package/dist/platform/comment-cursor.d.ts.map +1 -1
- package/dist/platform/comment-cursor.js +0 -21
- package/dist/platform/comment-cursor.js.map +1 -1
- package/dist/platform/driver-host.d.ts.map +1 -1
- package/dist/platform/driver-host.js +3 -1
- package/dist/platform/driver-host.js.map +1 -1
- package/dist/platform/driver-spec.d.ts.map +1 -1
- package/dist/platform/driver-spec.js +33 -46
- package/dist/platform/driver-spec.js.map +1 -1
- package/dist/platform/field-mapper.d.ts.map +1 -1
- package/dist/platform/field-mapper.js +3 -11
- package/dist/platform/field-mapper.js.map +1 -1
- package/dist/platform/git-driver.d.ts +2 -0
- package/dist/platform/git-driver.d.ts.map +1 -1
- package/dist/platform/git-driver.js +9 -23
- package/dist/platform/git-driver.js.map +1 -1
- package/dist/platform/manifest.d.ts.map +1 -1
- package/dist/platform/manifest.js +0 -3
- package/dist/platform/manifest.js.map +1 -1
- package/dist/platform/markers.d.ts.map +1 -1
- package/dist/platform/markers.js +0 -19
- package/dist/platform/markers.js.map +1 -1
- package/dist/platform/platform-poller.d.ts +0 -1
- package/dist/platform/platform-poller.d.ts.map +1 -1
- package/dist/platform/platform-poller.js +0 -49
- package/dist/platform/platform-poller.js.map +1 -1
- package/dist/platform/plugin-registry.d.ts.map +1 -1
- package/dist/platform/plugin-registry.js +1 -12
- package/dist/platform/plugin-registry.js.map +1 -1
- package/dist/platform/plugins/github/driver.json +5 -0
- package/dist/platform/plugins/github/skills/baxian-cli-gh/SKILL.md +20 -14
- package/dist/platform/pr-conversation-cache.d.ts.map +1 -1
- package/dist/platform/pr-conversation-cache.js +0 -17
- package/dist/platform/pr-conversation-cache.js.map +1 -1
- package/dist/platform/preflight-exec.d.ts.map +1 -1
- package/dist/platform/preflight-exec.js +0 -9
- package/dist/platform/preflight-exec.js.map +1 -1
- package/dist/platform/response-parser.d.ts.map +1 -1
- package/dist/platform/response-parser.js +0 -4
- package/dist/platform/response-parser.js.map +1 -1
- package/dist/platform/review-timeline.d.ts.map +1 -1
- package/dist/platform/review-timeline.js +0 -22
- package/dist/platform/review-timeline.js.map +1 -1
- package/dist/platform/row-schema.d.ts.map +1 -1
- package/dist/platform/row-schema.js +0 -11
- package/dist/platform/row-schema.js.map +1 -1
- package/dist/platform/startup.d.ts.map +1 -1
- package/dist/platform/startup.js +6 -17
- package/dist/platform/startup.js.map +1 -1
- package/dist/platform/types.d.ts +1 -0
- package/dist/platform/types.d.ts.map +1 -1
- package/dist/platform/types.js +3 -8
- package/dist/platform/types.js.map +1 -1
- package/dist/platform/verdict-engine.d.ts.map +1 -1
- package/dist/platform/verdict-engine.js +0 -15
- package/dist/platform/verdict-engine.js.map +1 -1
- package/dist/shared/concurrency.d.ts.map +1 -1
- package/dist/shared/concurrency.js +0 -2
- package/dist/shared/concurrency.js.map +1 -1
- package/dist/shared/constants.d.ts +1 -8
- package/dist/shared/constants.d.ts.map +1 -1
- package/dist/shared/constants.js +2 -32
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/git-url.d.ts.map +1 -1
- package/dist/shared/git-url.js +0 -9
- package/dist/shared/git-url.js.map +1 -1
- package/dist/shared/types.d.ts +28 -135
- package/dist/shared/types.d.ts.map +1 -1
- package/dist/shared/types.js +7 -6
- package/dist/shared/types.js.map +1 -1
- package/dist/skill/registry.d.ts.map +1 -1
- package/dist/skill/registry.js +0 -5
- package/dist/skill/registry.js.map +1 -1
- package/dist/skills/baxian-pr-feedback/SKILL.md +5 -3
- package/dist/skills/baxian-pr-recheck/SKILL.md +4 -0
- package/dist/skills/baxian-pr-review/SKILL.md +4 -0
- package/dist/skills/baxian-signals/SKILL.md +15 -38
- package/dist/skills/baxian-task-check/SKILL.md +13 -14
- package/dist/state/agent-store.d.ts.map +1 -1
- package/dist/state/agent-store.js +0 -6
- package/dist/state/agent-store.js.map +1 -1
- package/dist/state/error-record-store.d.ts.map +1 -1
- package/dist/state/error-record-store.js +0 -5
- package/dist/state/error-record-store.js.map +1 -1
- package/dist/state/init.d.ts.map +1 -1
- package/dist/state/init.js +0 -1
- package/dist/state/init.js.map +1 -1
- package/dist/state/lock.d.ts.map +1 -1
- package/dist/state/lock.js +0 -1
- package/dist/state/lock.js.map +1 -1
- package/dist/state/snapshot.d.ts.map +1 -1
- package/dist/state/snapshot.js +5 -2
- package/dist/state/snapshot.js.map +1 -1
- package/dist/state/task-store.d.ts.map +1 -1
- package/dist/state/task-store.js +56 -143
- package/dist/state/task-store.js.map +1 -1
- package/dist/terminal/attach.d.ts.map +1 -1
- package/dist/terminal/attach.js +0 -4
- package/dist/terminal/attach.js.map +1 -1
- package/dist/terminal/stream-ws.js +0 -5
- package/dist/terminal/stream-ws.js.map +1 -1
- package/dist/web/assets/index-CiAnjs1_.js +15 -0
- package/dist/web/assets/index-yqxawAPJ.css +1 -0
- package/dist/web/index.html +2 -2
- package/package.json +1 -1
- package/dist/agent/review-transport.d.ts +0 -92
- package/dist/agent/review-transport.d.ts.map +0 -1
- package/dist/agent/review-transport.js +0 -512
- package/dist/agent/review-transport.js.map +0 -1
- package/dist/agent/root-agent-runtime.d.ts +0 -80
- package/dist/agent/root-agent-runtime.d.ts.map +0 -1
- package/dist/agent/root-agent-runtime.js +0 -635
- package/dist/agent/root-agent-runtime.js.map +0 -1
- package/dist/agent/root-recovery-coordinator.d.ts +0 -125
- package/dist/agent/root-recovery-coordinator.d.ts.map +0 -1
- package/dist/agent/root-recovery-coordinator.js +0 -1579
- package/dist/agent/root-recovery-coordinator.js.map +0 -1
- package/dist/event/server-handlers.d.ts +0 -4
- package/dist/event/server-handlers.d.ts.map +0 -1
- package/dist/event/server-handlers.js +0 -1294
- package/dist/event/server-handlers.js.map +0 -1
- package/dist/skills/baxian-research/SKILL.md +0 -28
- package/dist/skills/baxian-server-feedback/SKILL.md +0 -40
- package/dist/skills/baxian-server-feedback/agents/openai.yaml +0 -2
- package/dist/skills/baxian-server-review/SKILL.md +0 -58
- package/dist/skills/baxian-server-review/agents/openai.yaml +0 -2
- package/dist/state/review-store.d.ts +0 -33
- package/dist/state/review-store.d.ts.map +0 -1
- package/dist/state/review-store.js +0 -272
- package/dist/state/review-store.js.map +0 -1
- package/dist/state/root-recovery-store.d.ts +0 -107
- package/dist/state/root-recovery-store.d.ts.map +0 -1
- package/dist/state/root-recovery-store.js +0 -400
- package/dist/state/root-recovery-store.js.map +0 -1
- package/dist/web/assets/index-BPv6vv3U.css +0 -1
- package/dist/web/assets/index-BXfgaFNm.js +0 -18
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { taskReviewRound } from '../shared/index.js';
|
|
2
2
|
import { PeriodicTaskRunner } from '../timing/periodic-task-runner.js';
|
|
3
3
|
import { isBenignDispatchConflict, } from './manager.js';
|
|
4
|
-
// 绑定丢失可能只是一次在途派发的 release→acquire 缝隙,驻留两周期再动手。
|
|
5
4
|
const UNBOUND_DWELL_CYCLES = 2;
|
|
6
|
-
// 派发级对账兜底(#558 M2 B3):消费 TmuxProbePoller 的观察结果 + manager 的 pending 登记,
|
|
7
|
-
// 把「QA 忙碌延后的 recheck / dev 忙碌延后的 fix / 可恢复 hold / 静默失联的 review pass」
|
|
8
|
-
// 经 M1 加固的标准入口补派。所有动作带次数上限与忙碌预算,超限一次性升级 intervention。
|
|
9
|
-
// 计轮意图读取持久化的 task.reviewRoundPending,进程重启后依然精确。
|
|
10
5
|
export class DispatchReconciler {
|
|
11
6
|
periodicRunner;
|
|
12
7
|
opts;
|
|
13
8
|
attempts = new Map();
|
|
14
|
-
// 驻留计数绑定 pass 世系:外部换代后新 pass 的 release→acquire 缝隙必须重新驻留,
|
|
15
|
-
// 不得继承旧 pass 的观察周期(同一 pass 内换绑仍是同一次在途派发,token 不变)
|
|
16
9
|
unboundSeen = new Map();
|
|
17
10
|
constructor(options) {
|
|
18
11
|
this.opts = options;
|
|
@@ -42,8 +35,6 @@ export class DispatchReconciler {
|
|
|
42
35
|
}
|
|
43
36
|
async reconcile() {
|
|
44
37
|
const tasks = await this.opts.taskStore.list({});
|
|
45
|
-
// 保护集只按状态划定:git/server 模式的登记不归本 poller 消费(git dev-fix 归本 poller、
|
|
46
|
-
// git QA 归 retryPendingGitReviewDispatches),但都不得被当成孤儿清掉
|
|
47
38
|
const protectedIds = new Set();
|
|
48
39
|
for (const task of tasks) {
|
|
49
40
|
if (task.status === 'review' || task.status === 'fixing')
|
|
@@ -51,13 +42,11 @@ export class DispatchReconciler {
|
|
|
51
42
|
}
|
|
52
43
|
await this.pruneTrackers(protectedIds);
|
|
53
44
|
for (const task of tasks) {
|
|
54
|
-
if (isSpecStagePhase(task.phase))
|
|
55
|
-
continue;
|
|
56
45
|
try {
|
|
57
|
-
if (task.status === 'review'
|
|
46
|
+
if (task.status === 'review') {
|
|
58
47
|
await this.reconcileReview(task);
|
|
59
48
|
}
|
|
60
|
-
else if (task.status === 'fixing'
|
|
49
|
+
else if (task.status === 'fixing') {
|
|
61
50
|
await this.reconcileFix(task);
|
|
62
51
|
}
|
|
63
52
|
}
|
|
@@ -66,7 +55,6 @@ export class DispatchReconciler {
|
|
|
66
55
|
}
|
|
67
56
|
}
|
|
68
57
|
}
|
|
69
|
-
// 删除跟踪状态前用新鲜单读复核;list() 在 readdir/单文件故障下会缺行,快照缺席不能当不活跃。
|
|
70
58
|
async pruneTrackers(protectedIds) {
|
|
71
59
|
const tracked = new Set([
|
|
72
60
|
...this.attempts.keys(),
|
|
@@ -85,7 +73,6 @@ export class DispatchReconciler {
|
|
|
85
73
|
console.warn(`[dispatch-reconciler] prune skipped for ${taskId} (task read failed):`, err);
|
|
86
74
|
continue;
|
|
87
75
|
}
|
|
88
|
-
// get() 的 null 是确定的 ENOENT(任务已删除),按孤儿清理;读取异常才 fail closed 保留
|
|
89
76
|
if (fresh && (fresh.status === 'review' || fresh.status === 'fixing'))
|
|
90
77
|
continue;
|
|
91
78
|
this.attempts.delete(taskId);
|
|
@@ -99,21 +86,19 @@ export class DispatchReconciler {
|
|
|
99
86
|
}
|
|
100
87
|
}
|
|
101
88
|
async reconcileReview(task) {
|
|
89
|
+
if (!task.qaAgentId) {
|
|
90
|
+
throw new Error(`review task ${task.id} has no QA participant`);
|
|
91
|
+
}
|
|
102
92
|
const qaId = task.qaAgentId;
|
|
103
|
-
if (!
|
|
93
|
+
if (!task.prNumber)
|
|
104
94
|
return;
|
|
105
95
|
const anchor = task.reviewHeadAnchorSha?.toLowerCase();
|
|
106
96
|
const head = task.latestHeadSha?.toLowerCase();
|
|
107
|
-
// 明确的 anchor≠head 才让位 push 事件路径;任一缺失时 push 路径可能永不触发(poller 的
|
|
108
|
-
// push 判定要求 latestHeadSha 在场),pending/hold 这类「确定欠一次派发」的分支须自行补齐
|
|
109
97
|
if (anchor !== undefined && head !== undefined && anchor !== head)
|
|
110
98
|
return;
|
|
111
99
|
const qaState = await this.opts.agentStore.get(qaId);
|
|
112
100
|
const entry = this.opts.manager.getPendingDispatchRetry(task.id);
|
|
113
101
|
const observation = this.opts.statusStore.get(qaId);
|
|
114
|
-
// git 模式的 hold 恢复归 sweep(durable pending 在场,60s 重试);绑定丢失与送达后
|
|
115
|
-
// 静默失联没有 durable 凭据(成功路径已清 pending),必须由对账兜底,否则永久停在 review。
|
|
116
|
-
// anchor 缺失时补派内的平台 driver 会重新锚定并 fail loud。
|
|
117
102
|
if (qaState?.taskId !== task.id) {
|
|
118
103
|
const prev = this.unboundSeen.get(task.id);
|
|
119
104
|
const seen = prev !== undefined && prev.passToken === task.signalToken ? prev.seen + 1 : 1;
|
|
@@ -135,10 +120,6 @@ export class DispatchReconciler {
|
|
|
135
120
|
});
|
|
136
121
|
return;
|
|
137
122
|
}
|
|
138
|
-
// 一条规则:pending 每周期要么被消费,要么计入等待预算——任何不可消费的原因
|
|
139
|
-
// (不可注入/探测失败/正等人回答/观测未更新)都不得让 dispatchBusyWaitBudgetMs 失去消费点。
|
|
140
|
-
// needInput.at 在场说明该回合正等人回答(不落 awaiting_human 且静止后探测可注入),
|
|
141
|
-
// 重投 review prompt 会覆盖问题——与无登记兜底同一门禁
|
|
142
123
|
const awaitingAnswer = qaState.needInput?.at !== undefined;
|
|
143
124
|
if (awaitingAnswer || !canInjectObservation(observation) || !this.observationDrivesRetry(task, observation, entry.since)) {
|
|
144
125
|
await this.alertIfBudgetExhausted(task, entry, observation, qaId, awaitingAnswer);
|
|
@@ -150,8 +131,6 @@ export class DispatchReconciler {
|
|
|
150
131
|
});
|
|
151
132
|
return;
|
|
152
133
|
}
|
|
153
|
-
// 无登记兜底(含进程重启丢内存登记):PENDING_IDLE 必须晚于本 pass 的派发时刻,
|
|
154
|
-
// 否则 QA 换绑后残留的上一任务空闲观测会把刚启动的 review 当成卡住
|
|
155
134
|
if (observation.tmuxSessionStatus === 'present'
|
|
156
135
|
&& observation.reason === 'PENDING_IDLE'
|
|
157
136
|
&& canInjectObservation(observation)
|
|
@@ -174,19 +153,14 @@ export class DispatchReconciler {
|
|
|
174
153
|
});
|
|
175
154
|
return;
|
|
176
155
|
}
|
|
177
|
-
// 登记后 dev 可能进入 hold/换绑:pending 只证明欠一次投递,投递前仍要确认 pane 可安全承接
|
|
178
156
|
const devState = await this.opts.agentStore.get(devId);
|
|
179
157
|
if (devState?.taskId !== task.id) {
|
|
180
|
-
// 绑定丢失/改派后 continueSession 无从投递,而 fixing 任务受 prune 保护:
|
|
181
|
-
// 不能静默留着一笔无人可送的 fix,按有界升级交人工(重新绑定属操作员决定,不自动改派)
|
|
182
158
|
if (await this.consumeAttempt(task, devId, 'dev-fix-unbound'))
|
|
183
159
|
this.recordAttempt(task, task.signalToken);
|
|
184
160
|
return;
|
|
185
161
|
}
|
|
186
|
-
// hold 本身在 UI 可见,无需再升级
|
|
187
162
|
if (devState.status === 'awaiting_human')
|
|
188
163
|
return;
|
|
189
|
-
// 与 review 侧同一条规则:不可消费即计入预算(不注入但有界升级)
|
|
190
164
|
const awaitingAnswer = devState.needInput?.at !== undefined;
|
|
191
165
|
if (awaitingAnswer || !canInjectObservation(observation) || !this.observationDrivesRetry(task, observation, entry.since)) {
|
|
192
166
|
await this.alertIfBudgetExhausted(task, entry, observation, devId, awaitingAnswer);
|
|
@@ -195,8 +169,6 @@ export class DispatchReconciler {
|
|
|
195
169
|
await this.recontinueFix(task, devId, 'dev-fix-pending', entry.signalToken);
|
|
196
170
|
return;
|
|
197
171
|
}
|
|
198
|
-
// 'waiting' 是派生视图态不落盘;兜底以「绑定 + 非 hold + 未在等用户输入 + 观察到持续静止」判定,
|
|
199
|
-
// needInput.at 在场说明 dev 正等人回答,重投 fix prompt 会覆盖问题
|
|
200
172
|
const devState = await this.opts.agentStore.get(devId);
|
|
201
173
|
if (devState?.taskId === task.id
|
|
202
174
|
&& devState.status !== 'awaiting_human'
|
|
@@ -209,8 +181,6 @@ export class DispatchReconciler {
|
|
|
209
181
|
await this.recontinueFix(task, devId, 'dev-fix-stalled-idle', task.signalToken);
|
|
210
182
|
}
|
|
211
183
|
}
|
|
212
|
-
// 阻塞态(working/STUCK_BUSY/PENDING_HUMAN/error 探测失败/非 runtime 前台)不可注入;
|
|
213
|
-
// 阻塞超预算发一次性 intervention,事件成功落盘才按登记代 CAS 锁存告警标志。
|
|
214
184
|
async alertIfBudgetExhausted(task, entry, observation, agentId, awaitingAnswer = false) {
|
|
215
185
|
if (entry.budgetAlerted || Date.now() - entry.since <= this.opts.busyWaitBudgetMs)
|
|
216
186
|
return;
|
|
@@ -233,8 +203,6 @@ export class DispatchReconciler {
|
|
|
233
203
|
});
|
|
234
204
|
}
|
|
235
205
|
}
|
|
236
|
-
// 尝试计数绑定当前 pass 世系:reconciler 自己的补派把新 token 记入 passToken 延续计数;
|
|
237
|
-
// 任何外部换代(push / 新一轮 fix / 手工重派 / legacy 无 token → 真实 token)都重置预算。
|
|
238
206
|
attemptsFor(task) {
|
|
239
207
|
const rec = this.attempts.get(task.id);
|
|
240
208
|
if (!rec)
|
|
@@ -276,16 +244,12 @@ export class DispatchReconciler {
|
|
|
276
244
|
...(passToken !== undefined ? { passToken } : {}),
|
|
277
245
|
});
|
|
278
246
|
}
|
|
279
|
-
// 同一份空闲观测只驱动一次补派:补派自身的 stable-idle/pre-inject 判定比探测精细,
|
|
280
|
-
// 判忙重排后必须等到更新的观测再动手,否则每周期空转 release/acquire/token 轮换
|
|
281
247
|
observationDrivesRetry(task, observation, sinceMs) {
|
|
282
248
|
if (!freshObservation(observation, sinceMs))
|
|
283
249
|
return false;
|
|
284
250
|
const lastDispatchAtMs = this.attemptsFor(task).lastDispatchAtMs;
|
|
285
251
|
return lastDispatchAtMs === undefined || freshObservation(observation, lastDispatchAtMs);
|
|
286
252
|
}
|
|
287
|
-
// 水位线必须与本次 pass 同代落库:attemptsFor 见 passToken 不符即整条重置,
|
|
288
|
-
// 不带世系的记录会在下一次读取时连同水位线一起被当成外部换代抹掉
|
|
289
253
|
markDispatchAttempted(task) {
|
|
290
254
|
const rec = this.attemptsFor(task);
|
|
291
255
|
this.attempts.set(task.id, {
|
|
@@ -313,9 +277,7 @@ export class DispatchReconciler {
|
|
|
313
277
|
return;
|
|
314
278
|
this.markDispatchAttempted(task);
|
|
315
279
|
const tokenAtDecision = task.signalToken;
|
|
316
|
-
|
|
317
|
-
// 计轮:读持久化的 reviewRoundPending(该轮尚未入账),补派恰好补计一次,重启后依然成立
|
|
318
|
-
const qaPhase = entryAtDecision?.qaPhase ?? (task.reviewRound === 0 ? 'review' : undefined);
|
|
280
|
+
const qaPhase = entryAtDecision?.qaPhase ?? (taskReviewRound(task) === 0 ? 'review' : undefined);
|
|
319
281
|
let result;
|
|
320
282
|
let armedToken;
|
|
321
283
|
try {
|
|
@@ -342,23 +304,18 @@ export class DispatchReconciler {
|
|
|
342
304
|
console.warn(`[dispatch-reconciler] redispatch ${task.id} (${action}) superseded by a concurrent pass: ${err.message}`);
|
|
343
305
|
return;
|
|
344
306
|
}
|
|
345
|
-
// 失败前 dispatch 可能已自轮换 armed pass(如 handled hold 保持新 pass):世系必须记到
|
|
346
|
-
// 失败后的实际 token,否则下周期 attemptsFor 会当外部换代重置预算,持久 hold 永不达上限
|
|
347
307
|
this.recordAttempt(task, await this.livePassToken(task.id, tokenAtDecision));
|
|
348
308
|
console.warn(`[dispatch-reconciler] redispatch ${task.id} (${action}) failed:`, err);
|
|
349
309
|
return;
|
|
350
310
|
}
|
|
351
311
|
const after = this.opts.manager.getPendingDispatchRetry(task.id);
|
|
352
312
|
if (after?.kind === 'qa-recheck' && after.signalToken === tokenAtDecision) {
|
|
353
|
-
// 只剩本次决策时的旧登记(未被 startSession 消费/换代),按已消费清理
|
|
354
313
|
this.opts.manager.clearPendingDispatchRetryIfMatches(task.id, {
|
|
355
314
|
agentId: after.agentId,
|
|
356
315
|
signalToken: after.signalToken,
|
|
357
316
|
});
|
|
358
317
|
}
|
|
359
318
|
else if (after?.kind === 'qa-recheck') {
|
|
360
|
-
// 补派再次遇忙的内部重排:预算已随 armedToken fence 在登记时注入(since 保持原值),
|
|
361
|
-
// 借这一点区分外部 successor——它的登记必然是新鲜 since,绝不等于原登记的旧时刻
|
|
362
319
|
const internalRequeue = pendingBudget !== undefined
|
|
363
320
|
&& after.agentId === (entryAtDecision?.agentId ?? after.agentId)
|
|
364
321
|
&& after.since === pendingBudget.since;
|
|
@@ -371,9 +328,6 @@ export class DispatchReconciler {
|
|
|
371
328
|
}
|
|
372
329
|
return;
|
|
373
330
|
}
|
|
374
|
-
// 返回值未必仍属本次 armed pass:await 窗口内 verdict/push 可接管(REQUEST_CHANGES 还会
|
|
375
|
-
// 切 fixing 并登记 dev-fix pending)。世系只延续到可证明是本次铸造的 pass 上,
|
|
376
|
-
// 否则连同预算一并作废——否则 review 补派的次数会挡住 successor(甚至另一 kind)的补投
|
|
377
331
|
if (result.signalToken !== undefined && result.signalToken === armedToken) {
|
|
378
332
|
this.recordAttempt(task, result.signalToken);
|
|
379
333
|
}
|
|
@@ -390,8 +344,6 @@ export class DispatchReconciler {
|
|
|
390
344
|
this.markDispatchAttempted(task);
|
|
391
345
|
let resumed = false;
|
|
392
346
|
try {
|
|
393
|
-
// fence 延伸到最终 paste:continueSession 的多个 await 之后 pass 仍可能换代,
|
|
394
|
-
// guardBeforeInject 在 composer/paste/Enter 各点复核,漂移即放弃投递
|
|
395
347
|
resumed = await this.opts.manager.continueSession(task.id, devId, 'fix', {
|
|
396
348
|
signalToken: expectedToken,
|
|
397
349
|
guardBeforeInject: async () => {
|
|
@@ -406,7 +358,6 @@ export class DispatchReconciler {
|
|
|
406
358
|
return;
|
|
407
359
|
}
|
|
408
360
|
if (!resumed) {
|
|
409
|
-
// 门禁拒绝(绑定/状态/Workdir/fence)同样消耗额度:持久性拒绝必须走有界升级而非每周期无限重试
|
|
410
361
|
this.recordAttempt(task, expectedToken);
|
|
411
362
|
console.warn(`[dispatch-reconciler] fix re-continue ${task.id} (${action}) skipped by dispatch gates`);
|
|
412
363
|
return;
|
|
@@ -451,8 +402,6 @@ export class DispatchReconciler {
|
|
|
451
402
|
}
|
|
452
403
|
}
|
|
453
404
|
}
|
|
454
|
-
// 只有明确的 live-runtime 空闲观测(含设计认可的 PENDING_IDLE)可以解除欠投递;
|
|
455
|
-
// 探测失败(error/PANE_PROBE_FAILED)、非 runtime 前台、菜单/冻结忙碌一律 fail closed。
|
|
456
405
|
function canInjectObservation(observation) {
|
|
457
406
|
if (observation.tmuxSessionStatus !== 'present')
|
|
458
407
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-reconciler.js","sourceRoot":"","sources":["../../src/agent/dispatch-reconciler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAItD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAEvE,OAAO,EAGL,wBAAwB,GACzB,MAAM,cAAc,CAAC;AA4BtB,+CAA+C;AAC/C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAE/B,uEAAuE;AACvE,qEAAqE;AACrE,sDAAsD;AACtD,gDAAgD;AAChD,MAAM,OAAO,kBAAkB;IACZ,cAAc,CAAqB;IAC5C,IAAI,CAA4B;IAChC,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IACpD,yDAAyD;IACzD,kDAAkD;IAC1C,WAAW,GAAG,IAAI,GAAG,EAAgD,CAAC;IAE9E,YAAY,OAAkC;QAC5C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,IAAI,kBAAkB,CAAC;YAC3C,IAAI,EAAE,qBAAqB;YAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,qCAAqC,EAAE,GAAG,CAAC;SACzE,CAAC,CAAC;IACL,CAAC;IAED,aAAa,CAAC,SAAuB;QACnC,IAAI,CAAC,IAAI,GAAG;YACV,GAAG,IAAI,CAAC,IAAI;YACZ,gBAAgB,EAAE,SAAS,CAAC,MAAM,CAAC,wBAAwB;YAC3D,WAAW,EAAE,SAAS,CAAC,MAAM,CAAC,4BAA4B;SAC3D,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK;QACH,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI;QACF,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjD,iEAAiE;QACjE,wDAAwD;QACxD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ;gBAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtF,CAAC;QACD,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC3C,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;oBAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBACnC,CAAC;qBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;oBACjE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC;IACH,CAAC;IAED,wDAAwD;IAChD,KAAK,CAAC,aAAa,CAAC,YAAyB;QACnD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS;YAC9B,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YACvB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;YAC1B,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC,IAAI,EAAE;SACzD,CAAC,CAAC;QACH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;gBAAE,SAAS;YACvC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,KAAuB,CAAC;YAC5B,IAAI,CAAC;gBACH,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,MAAM,sBAAsB,EAAE,GAAG,CAAC,CAAC;gBAC3F,SAAS;YACX,CAAC;YACD,6DAA6D;YAC7D,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;gBAAE,SAAS;YAChF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,MAAM,EAAE;oBAC3D,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,WAAW,EAAE,aAAa,CAAC,WAAW;iBACvC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,IAAe;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;QAC5B,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,EAAE,WAAW,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,CAAC;QAC/C,6DAA6D;QAC7D,+DAA+D;QAC/D,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO;QAC1E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,6DAA6D;QAC7D,2DAA2D;QAC3D,4CAA4C;QAE5C,IAAI,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3C,MAAM,IAAI,GAAG,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;YACrE,IAAI,IAAI,GAAG,oBAAoB;gBAAE,OAAO;YACxC,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjC,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;YACxC,OAAO;QACT,CAAC;QAED,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;YACjC,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC5D,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,WAAW,EAAE,KAAK,CAAC,WAAW;iBAC/B,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,4CAA4C;YAC5C,8DAA8D;YAC9D,0DAA0D;YAC1D,qCAAqC;YACrC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,SAAS,CAAC;YAC3D,IAAI,cAAc,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzH,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;gBAClF,OAAO;YACT,CAAC;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE;gBACrE,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,GAAG,CAAC,KAAK,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACjE,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,mDAAmD;QACnD,yCAAyC;QACzC,IACE,WAAW,CAAC,iBAAiB,KAAK,SAAS;eACxC,WAAW,CAAC,MAAM,KAAK,cAAc;eACrC,oBAAoB,CAAC,WAAW,CAAC;eACjC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC;eACnD,OAAO,CAAC,SAAS,EAAE,EAAE,KAAK,SAAS,EACtC,CAAC;YACD,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,IAAe;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErD,IAAI,KAAK,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC5D,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,WAAW,EAAE,KAAK,CAAC,WAAW;iBAC/B,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,2DAA2D;YAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvD,IAAI,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;gBACjC,uDAAuD;gBACvD,+CAA+C;gBAC/C,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,CAAC;oBAAE,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC1G,OAAO;YACT,CAAC;YACD,uBAAuB;YACvB,IAAI,QAAQ,CAAC,MAAM,KAAK,gBAAgB;gBAAE,OAAO;YACjD,sCAAsC;YACtC,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,EAAE,EAAE,KAAK,SAAS,CAAC;YAC5D,IAAI,cAAc,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzH,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;gBACnF,OAAO;YACT,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YAC5E,OAAO;QACT,CAAC;QAED,8DAA8D;QAC9D,kDAAkD;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvD,IACE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE;eACzB,QAAQ,CAAC,MAAM,KAAK,gBAAgB;eACpC,QAAQ,CAAC,SAAS,EAAE,EAAE,KAAK,SAAS;eACpC,WAAW,CAAC,iBAAiB,KAAK,SAAS;eAC3C,WAAW,CAAC,MAAM,KAAK,cAAc;eACrC,oBAAoB,CAAC,WAAW,CAAC;eACjC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC;eAChD,IAAI,CAAC,WAAW,KAAK,SAAS,EACjC,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAClF,CAAC;IACH,CAAC;IAED,qEAAqE;IACrE,iDAAiD;IACzC,KAAK,CAAC,sBAAsB,CAClC,IAAe,EACf,KAA2B,EAC3B,WAAmC,EACnC,OAAe,EACf,cAAc,GAAG,KAAK;QAEtB,IAAI,KAAK,CAAC,aAAa,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,gBAAgB;YAAE,OAAO;QAC1F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE;YACzD,KAAK,EAAE,gCAAgC;YACvC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,WAAW,EAAE,KAAK,CAAC,KAAK;YACxB,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACtF,GAAG,CAAC,WAAW,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,WAAW,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1G,IAAI,EAAE,SAAS,OAAO,mFAAmF,KAAK,CAAC,IAAI,iBAAiB;gBAClI,gHAAgH;gBAChH,oCAAoC;SACvC,CAAC,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,qCAAqC,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC/D,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,+DAA+D;IAC/D,kEAAkE;IAC1D,WAAW,CAAC,IAAe;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,GAAG;YAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC9C,IAAI,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,IAAe,EAAE,OAAe,EAAE,MAAuB;QACpF,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,QAAQ,GAAG,MAAM,KAAK,iBAAiB;oBAC3C,CAAC,CAAC,yHAAyH,IAAI,CAAC,EAAE,oHAAoH;oBACtP,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;wBAC5B,CAAC,CAAC,4OAA4O;wBAC9O,CAAC,CAAC,4FAA4F,CAAC;gBACnG,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE;oBACzD,KAAK,EAAE,uCAAuC;oBAC9C,MAAM;oBACN,QAAQ,EAAE,GAAG,CAAC,KAAK;oBACnB,IAAI,EAAE,iCAAiC,IAAI,CAAC,EAAE,kBAAkB,GAAG,CAAC,KAAK,uCAAuC,QAAQ,EAAE;iBAC3H,CAAC,CAAC;gBACH,IAAI,OAAO;oBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CAAC,IAAe,EAAE,SAA6B;QAClE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YACzB,GAAG,GAAG;YACN,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;YACpB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;IAED,uDAAuD;IACvD,qDAAqD;IAC7C,sBAAsB,CAAC,IAAe,EAAE,WAAmC,EAAE,OAAe;QAClG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC;QACjE,OAAO,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;IAC3F,CAAC;IAED,sDAAsD;IACtD,kCAAkC;IAC1B,qBAAqB,CAAC,IAAe;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;YACzB,GAAG,GAAG;YACN,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,gBAAgB,EAAE,IAAI,CAAC,GAAG,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;IAEO,iBAAiB,CAAC,IAAe,EAAE,SAA6B;QACtE,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5F,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAAc,EAAE,QAA4B;QACtE,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACpD,OAAO,KAAK,EAAE,WAAW,IAAI,QAAQ,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,4CAA4C,MAAM,yCAAyC,EAAE,GAAG,CAAC,CAAC;YAC/G,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,IAAe,EACf,IAAY,EACZ,MAAuB,EACvB,eAAsC,EACtC,aAA0D;QAE1D,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YAAE,OAAO;QAC7D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC;QACzC,gEAAgE;QAChE,uDAAuD;QACvD,MAAM,OAAO,GAAG,eAAe,EAAE,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5F,IAAI,MAAiB,CAAC;QACtB,IAAI,UAA8B,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC3D,SAAS,EAAE,IAAI,CAAC,kBAAkB,KAAK,IAAI;gBAC3C,UAAU,EAAE,CAAC,QAAQ,CAAC;gBACtB,WAAW,EAAE,IAAI,CAAC,KAAK;gBACvB,iBAAiB,EAAE,eAAe;gBAClC,YAAY,EAAE;oBACZ,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,WAAW,EAAE,IAAI,CAAC,WAAW;oBAC7B,eAAe,EAAE,IAAI,CAAC,eAAe;iBACtC;gBACD,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,GAAG,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC;aAChD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,wBAAwB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,KAAK,MAAM,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACxH,OAAO;YACT,CAAC;YACD,iEAAiE;YACjE,0DAA0D;YAC1D,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,KAAK,MAAM,WAAW,EAAE,GAAG,CAAC,CAAC;YACrF,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,WAAW,KAAK,eAAe,EAAE,CAAC;YAC1E,4CAA4C;YAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE;gBAC5D,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;YACxC,wDAAwD;YACxD,kDAAkD;YAClD,MAAM,eAAe,GAAG,aAAa,KAAK,SAAS;mBAC9C,KAAK,CAAC,OAAO,KAAK,CAAC,eAAe,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;mBAC7D,KAAK,CAAC,KAAK,KAAK,aAAa,CAAC,KAAK,CAAC;YACzC,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;gBAChD,OAAO,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,KAAK,MAAM,0BAA0B,CAAC,CAAC;YACjG,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,oCAAoC,IAAI,CAAC,EAAE,KAAK,MAAM,iEAAiE,CAAC,CAAC;YACxI,CAAC;YACD,OAAO;QACT,CAAC;QACD,qEAAqE;QACrE,wDAAwD;QACxD,yDAAyD;QACzD,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YAC1E,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CACV,oCAAoC,IAAI,CAAC,EAAE,KAAK,MAAM,0CAA0C;gBAChG,WAAW,MAAM,CAAC,MAAM,0BAA0B,CACnD,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,IAAe,EACf,KAAa,EACb,MAAuB,EACvB,aAAqB;QAErB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YAAE,OAAO;QAC9D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC;YACH,6DAA6D;YAC7D,wDAAwD;YACxD,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;gBACvE,WAAW,EAAE,aAAa;gBAC1B,iBAAiB,EAAE,KAAK,IAAI,EAAE;oBAC5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACrD,OAAO,KAAK,EAAE,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,WAAW,KAAK,aAAa,CAAC;gBAC3E,CAAC;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,yCAAyC,IAAI,CAAC,EAAE,KAAK,MAAM,WAAW,EAAE,GAAG,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,wDAAwD;YACxD,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,yCAAyC,IAAI,CAAC,EAAE,KAAK,MAAM,6BAA6B,CAAC,CAAC;YACvG,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;QAC9G,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACxC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,IAAe,EAAE,OAAe,EAAE,MAAuB;QAC3E,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,CAAC,EAAE,KAAK,MAAM,2CAA2C,OAAO,GAAG,CAAC,CAAC;QACnH,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC5B,EAAE,EAAE,EAAE;gBACN,IAAI,EAAE,iBAAiB;gBACvB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO;gBACP,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,IAAI,EAAE,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE;aAChD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,+CAA+C,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,IAAe,EAAE,OAAe,EAAE,IAA6B;QAC5F,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC5B,EAAE,EAAE,EAAE;gBACN,IAAI,EAAE,oBAAoB;gBAC1B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO;gBACP,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,IAAI;aACL,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,sDAAsD,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACpF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAED,uDAAuD;AACvD,oEAAoE;AACpE,SAAS,oBAAoB,CAAC,WAAmC;IAC/D,IAAI,WAAW,CAAC,iBAAiB,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC9D,IAAI,WAAW,CAAC,SAAS,KAAK,SAAS,IAAI,WAAW,CAAC,SAAS,KAAK,cAAc;QAAE,OAAO,KAAK,CAAC;IAClG,IAAI,WAAW,CAAC,iBAAiB,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC7D,OAAO,WAAW,CAAC,iBAAiB,KAAK,SAAS,IAAI,WAAW,CAAC,MAAM,KAAK,cAAc,CAAC;AAC9F,CAAC;AAED,SAAS,gBAAgB,CAAC,WAAmC,EAAE,OAAe;IAC5E,IAAI,WAAW,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,OAAO,CAAC;AAC7D,CAAC;AAED,SAAS,aAAa,CAAC,WAAmC,EAAE,SAA6B;IACvF,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,OAAO,gBAAgB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC"}
|
|
1
|
+
{"version":3,"file":"dispatch-reconciler.js","sourceRoot":"","sources":["../../src/agent/dispatch-reconciler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineage.d.ts","sourceRoot":"","sources":["../../src/agent/lineage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,gBAAgB,EAAE,GAC7B,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"lineage.d.ts","sourceRoot":"","sources":["../../src/agent/lineage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAE1D,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,KAAK,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;AAEjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,gBAAgB,EAAE,GAC7B,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAiClC"}
|
package/dist/agent/lineage.js
CHANGED
|
@@ -8,11 +8,6 @@ export async function findForeignTaskTip(exec, workdir, baseSha, candidates) {
|
|
|
8
8
|
if (exclusive.size === 0)
|
|
9
9
|
return null;
|
|
10
10
|
for (const candidate of candidates) {
|
|
11
|
-
// Compare against the candidate's whole base..tip chain, not just its tip:
|
|
12
|
-
// after contaminating us the foreign branch may advance further, moving its
|
|
13
|
-
// tip out of our history while the shared commits remain embedded.
|
|
14
|
-
// Both refs are probed independently: the local branch may hold unpushed
|
|
15
|
-
// work, while the remote-tracking ref may contain commits fetched later.
|
|
16
11
|
const refs = [
|
|
17
12
|
`refs/heads/${candidate.branch}`,
|
|
18
13
|
`refs/remotes/origin/${candidate.branch}`,
|
|
@@ -27,10 +22,6 @@ export async function findForeignTaskTip(exec, workdir, baseSha, candidates) {
|
|
|
27
22
|
.find(line => line !== '' && exclusive.has(line));
|
|
28
23
|
if (!sha)
|
|
29
24
|
continue;
|
|
30
|
-
// Shared commits with a candidate that forked FROM this branch are this
|
|
31
|
-
// branch's own work carried downstream, not foreign work embedded here —
|
|
32
|
-
// the contamination victim must stay publishable. Diverged shapes
|
|
33
|
-
// (neither contains the other) stay flagged: ownership is undecidable.
|
|
34
25
|
const downstream = await exec(`git -C ${shellQuote(workdir)} merge-base --is-ancestor HEAD ${shellQuote(ref)}`);
|
|
35
26
|
if (downstream.exitCode === 0)
|
|
36
27
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lineage.js","sourceRoot":"","sources":["../../src/agent/lineage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAmB,MAAM,aAAa,CAAC;AAe1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAU,EACV,OAAe,EACf,OAAe,EACf,UAA8B;IAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CACrB,UAAU,UAAU,CAAC,OAAO,CAAC,aAAa,UAAU,CAAC,GAAG,OAAO,QAAQ,CAAC,EAAE,CAC3E,CAAC;IACF,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,
|
|
1
|
+
{"version":3,"file":"lineage.js","sourceRoot":"","sources":["../../src/agent/lineage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAmB,MAAM,aAAa,CAAC;AAe1D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAU,EACV,OAAe,EACf,OAAe,EACf,UAA8B;IAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CACrB,UAAU,UAAU,CAAC,OAAO,CAAC,aAAa,UAAU,CAAC,GAAG,OAAO,QAAQ,CAAC,EAAE,CAC3E,CAAC;IACF,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,8BAA8B,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEtC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG;YACX,cAAc,SAAS,CAAC,MAAM,EAAE;YAChC,uBAAuB,SAAS,CAAC,MAAM,EAAE;SAC1C,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,MAAM,IAAI,CACxB,UAAU,UAAU,CAAC,OAAO,CAAC,aAAa,UAAU,CAAC,GAAG,OAAO,KAAK,GAAG,EAAE,CAAC,EAAE,CAC7E,CAAC;YACF,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC;gBAAE,SAAS;YACrC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM;iBACvB,KAAK,CAAC,IAAI,CAAC;iBACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;iBACxB,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,IAAI,CAAC,GAAG;gBAAE,SAAS;YACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAC3B,UAAU,UAAU,CAAC,OAAO,CAAC,kCAAkC,UAAU,CAAC,GAAG,CAAC,EAAE,CACjF,CAAC;YACF,IAAI,UAAU,CAAC,QAAQ,KAAK,CAAC;gBAAE,SAAS;YACxC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACrE,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|