dsh-harness-kit 0.1.2 → 0.1.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 +2 -2
- package/README.zh-CN.md +2 -2
- package/kernel/commands.js +27 -1
- package/kernel/panel.js +14 -2
- package/kernel/worktree.js +140 -32
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -234,7 +234,7 @@ go only to the provider you configure.
|
|
|
234
234
|
**Plugins → Add plugin**, then enter:
|
|
235
235
|
|
|
236
236
|
```
|
|
237
|
-
dsh-harness-kit@0.1.
|
|
237
|
+
dsh-harness-kit@0.1.3
|
|
238
238
|
```
|
|
239
239
|
|
|
240
240
|
Enable the bundle after installation.
|
|
@@ -242,7 +242,7 @@ Enable the bundle after installation.
|
|
|
242
242
|
### Command line
|
|
243
243
|
|
|
244
244
|
```sh
|
|
245
|
-
dsh plugin --profile desktop add dsh-harness-kit@0.1.
|
|
245
|
+
dsh plugin --profile desktop add dsh-harness-kit@0.1.3
|
|
246
246
|
```
|
|
247
247
|
|
|
248
248
|
Quit DSH Desktop first; replace `desktop` with your profile name for other profiles.
|
package/README.zh-CN.md
CHANGED
|
@@ -200,7 +200,7 @@ AI 写得越快,需要看的越多。固定角色让 CR/TE 各自只做一件
|
|
|
200
200
|
**Plugins → Add plugin**,输入:
|
|
201
201
|
|
|
202
202
|
```
|
|
203
|
-
dsh-harness-kit@0.1.
|
|
203
|
+
dsh-harness-kit@0.1.3
|
|
204
204
|
```
|
|
205
205
|
|
|
206
206
|
安装后启用 bundle。
|
|
@@ -208,7 +208,7 @@ dsh-harness-kit@0.1.2
|
|
|
208
208
|
### 命令行
|
|
209
209
|
|
|
210
210
|
```sh
|
|
211
|
-
dsh plugin --profile desktop add dsh-harness-kit@0.1.
|
|
211
|
+
dsh plugin --profile desktop add dsh-harness-kit@0.1.3
|
|
212
212
|
```
|
|
213
213
|
|
|
214
214
|
需要先完全退出 DSH Desktop;其他 profile 把 `desktop` 换成实际名称。
|
package/kernel/commands.js
CHANGED
|
@@ -13,7 +13,7 @@ import { activeTasks, taskIsPlanning } from './state.js';
|
|
|
13
13
|
import { assetsLayout, syncAssets } from './sync.js';
|
|
14
14
|
import { claimTask } from './panel.js';
|
|
15
15
|
import { clearAdvanceMarks } from './advance.js';
|
|
16
|
-
import { ensureTaskWorkspaces, releaseTaskWorkspaces, clearTaskWorkspaces, renderWorkspaceNotice, ensureBaselineMirrors, renderAnalysisNotice, ensureTaskAnalysisWorktrees, removeTaskAnalysisWorktrees, parseBaseSpec, describeMainWorktree, recordDecision, clearDecision, readWorkspaces, mergeTaskBranches } from './worktree.js';
|
|
16
|
+
import { ensureTaskWorkspaces, releaseTaskWorkspaces, clearTaskWorkspaces, renderWorkspaceNotice, ensureBaselineMirrors, renderAnalysisNotice, ensureTaskAnalysisWorktrees, removeTaskAnalysisWorktrees, parseBaseSpec, describeMainWorktree, recordDecision, clearDecision, readWorkspaces, mergeTaskBranches, reconcileArchivedWorktrees } from './worktree.js';
|
|
17
17
|
import { acquireTestEnv, releaseTestEnv, describeTestEnv } from './te.js';
|
|
18
18
|
import { recordTaskSession } from './bindings.js';
|
|
19
19
|
import { addSource, runInit, formatInitReport, guessRole, boardTemplate } from './setup.js';
|
|
@@ -32,6 +32,11 @@ function bindCurrentSession(ws, task, agent) {
|
|
|
32
32
|
try { recordTaskSession(ws, task, sid); } catch { /* 绑定失败不阻断命令 */ }
|
|
33
33
|
}
|
|
34
34
|
|
|
35
|
+
/** 归档台账对账失败不阻断命令;下一次命令/doctor 会再试。 */
|
|
36
|
+
async function reconcileArchivedQuiet(ws, kit) {
|
|
37
|
+
try { return await reconcileArchivedWorktrees(ws, kit); } catch { return null; }
|
|
38
|
+
}
|
|
39
|
+
|
|
35
40
|
function parseArgs(raw) {
|
|
36
41
|
const tokens = raw.trim().split(/\s+/).filter(Boolean);
|
|
37
42
|
const flags = {};
|
|
@@ -248,6 +253,7 @@ async function hkFix({ agent, rawInput }) {
|
|
|
248
253
|
const ws = wsRoot(agent);
|
|
249
254
|
const kit = readKit(ws);
|
|
250
255
|
if (!kit) return err('尚未初始化:请先运行 `/hk-init`。');
|
|
256
|
+
await reconcileArchivedQuiet(ws, kit);
|
|
251
257
|
const { flags, positional } = parseArgs(rawInput);
|
|
252
258
|
// parseArgs 会把 --auto 后首个词吞为旗标值;先还原完整词序再解构
|
|
253
259
|
const words = typeof flags.auto === 'string' ? [flags.auto, ...positional] : positional;
|
|
@@ -341,6 +347,7 @@ async function hkNew({ agent, rawInput }) {
|
|
|
341
347
|
const ws = wsRoot(agent);
|
|
342
348
|
const kit = readKit(ws);
|
|
343
349
|
if (!kit) return err('尚未初始化:请先运行 `/hk-init`。');
|
|
350
|
+
await reconcileArchivedQuiet(ws, kit);
|
|
344
351
|
const { flags, positional } = parseArgs(rawInput);
|
|
345
352
|
// parseArgs 会把 --auto 后首个词吞为旗标值;先还原完整词序再解构
|
|
346
353
|
const words = typeof flags.auto === 'string' ? [flags.auto, ...positional] : positional;
|
|
@@ -494,6 +501,7 @@ async function hkApply({ agent, rawInput }) {
|
|
|
494
501
|
const ws = wsRoot(agent);
|
|
495
502
|
const kit = readKit(ws);
|
|
496
503
|
if (!kit) return err('尚未初始化:请先运行 `/hk-init`。');
|
|
504
|
+
await reconcileArchivedQuiet(ws, kit);
|
|
497
505
|
const { flags, positional } = parseArgs(rawInput);
|
|
498
506
|
const inferred = inferTask(ws, positional, '用法:/hk-apply [任务名] [反馈] [--slot](省略任务名时要求唯一活跃任务;--slot=主树有未处理改动时强制隔离到 slot 开发)');
|
|
499
507
|
if (inferred.error) return err(inferred.error);
|
|
@@ -588,6 +596,9 @@ async function hkArchive({ agent, rawInput }) {
|
|
|
588
596
|
const mergeOverrides = mergeAsked && typeof flags.merge === 'string' ? parseBaseSpec(flags.merge) : {};
|
|
589
597
|
|
|
590
598
|
const taskDir = path.join(harnessDir(ws), 'deliverables', task);
|
|
599
|
+
// 活跃任务归档前先清理其他已归档残留;残留收尾(taskDir 不存在)不能先清理,
|
|
600
|
+
// 否则 releaseTaskWorkspaces 的 ledger 入口会被提前删掉。
|
|
601
|
+
if (fs.existsSync(taskDir)) await reconcileArchivedQuiet(ws, kit);
|
|
591
602
|
if (!fs.existsSync(taskDir)) {
|
|
592
603
|
// 已归档任务的残留收尾(2026-11-17 新增):文档已归档但工作区 slot 因分支未合入而保留
|
|
593
604
|
// (stale-unmerged),注意力条提示「远端 MR 合入后重跑 /hk-archive 释放槽位」——
|
|
@@ -803,6 +814,7 @@ async function hkSync({ agent }) {
|
|
|
803
814
|
const ws = wsRoot(agent);
|
|
804
815
|
const kit = readKit(ws);
|
|
805
816
|
if (!kit) return err('尚未初始化:请先运行 `/hk-init`。');
|
|
817
|
+
await reconcileArchivedQuiet(ws, kit);
|
|
806
818
|
return syncAssets(ws, kit);
|
|
807
819
|
}
|
|
808
820
|
|
|
@@ -818,6 +830,20 @@ async function hkDoctor({ agent }) {
|
|
|
818
830
|
lines.push('- kit.json:❌ 不存在 → 运行 `/hk-init`');
|
|
819
831
|
return ok(lines.join('\n'));
|
|
820
832
|
}
|
|
833
|
+
const reconcile = await reconcileArchivedQuiet(ws, kit);
|
|
834
|
+
if (reconcile) {
|
|
835
|
+
const released = reconcile.released.length;
|
|
836
|
+
const stale = reconcile.stale.length;
|
|
837
|
+
lines.push(
|
|
838
|
+
`- 归档工作区台账:${
|
|
839
|
+
released === 0 && stale === 0
|
|
840
|
+
? '✅ 无残留'
|
|
841
|
+
: `${released > 0 ? `已释放 ${released} 项` : ''}${released > 0 && stale > 0 ? ',' : ''}${stale > 0 ? `保留 ${stale} 项待合入` : ''}`
|
|
842
|
+
}${reconcile.tasks.length > 0 ? `(任务:${reconcile.tasks.map((t) => `\`${t}\``).join('、')})` : ''}`,
|
|
843
|
+
);
|
|
844
|
+
} else {
|
|
845
|
+
lines.push('- 归档工作区台账:⚠️ 对账失败(下一次命令或重跑 /hk-doctor 再试)');
|
|
846
|
+
}
|
|
821
847
|
lines.push(`- kit.json:✅(pack: ${kit.pack ?? 'ai-coding'},sources: ${kit.sources.length} 个)`);
|
|
822
848
|
for (const s of kit.sources) {
|
|
823
849
|
lines.push(` - ${s.name} → \`${s.path}\` ${fs.existsSync(path.join(ws, s.path)) ? '✅' : '❌ 路径缺失'}`);
|
package/kernel/panel.js
CHANGED
|
@@ -225,7 +225,7 @@ export function initGaps(ws, kit) {
|
|
|
225
225
|
* 「需要你」注意力项(M4b):审批/待归档/同步阻塞·落后/初始化缺口。
|
|
226
226
|
* 返回 [{level: block|warn, kind, task?, text, line?, jump?}],block 在前。
|
|
227
227
|
*/
|
|
228
|
-
export function attentionItems(tasks, sync, gaps = [], staleSlots = [], teEnv = null, decisions = {}) {
|
|
228
|
+
export function attentionItems(tasks, sync, gaps = [], staleSlots = [], teEnv = null, decisions = {}, archivedLedger = []) {
|
|
229
229
|
const items = [];
|
|
230
230
|
for (const t of tasks) {
|
|
231
231
|
if (t.status === 'DONE') continue;
|
|
@@ -248,6 +248,14 @@ export function attentionItems(tasks, sync, gaps = [], staleSlots = [], teEnv =
|
|
|
248
248
|
items.push({ level: 'warn', kind: 'archive', task: t.task, text: `${t.task} · 已完成待归档`, line: `/hk-archive ${t.task}` });
|
|
249
249
|
}
|
|
250
250
|
}
|
|
251
|
+
for (const a of archivedLedger) {
|
|
252
|
+
const reps = a.repos?.length ? a.repos.join('、') : '无仓记录';
|
|
253
|
+
items.push({
|
|
254
|
+
level: 'warn', kind: 'worktree-archived', task: a.task,
|
|
255
|
+
text: `${a.task} · 已归档,但工作区台账仍绑定(${reps});点处理或运行 /hk-archive ${a.task} 释放`,
|
|
256
|
+
line: `/hk-archive ${a.task}`,
|
|
257
|
+
});
|
|
258
|
+
}
|
|
251
259
|
for (const t of tasks) {
|
|
252
260
|
if (t.status !== 'DONE' && t.progress?.outOfOrder) {
|
|
253
261
|
items.push({ level: 'warn', kind: 'chain-out-of-order', task: t.task, text: `${t.task} · 看板链越序:当前阶段之前还有未完成阶段(应补 ✅ 或 —)`, jump: true });
|
|
@@ -376,6 +384,10 @@ export function workspaceState(ws, { sync = null } = {}) {
|
|
|
376
384
|
const slots = Object.fromEntries(Object.entries(ledger.slots).map(([repo, m]) => [repo,
|
|
377
385
|
Object.entries(m).map(([slot, b]) => ({ slot, task: b.task, branch: b.branch, state: b.state ?? 'bound' }))]));
|
|
378
386
|
const staleSlots = Object.entries(slots).flatMap(([repo, arr]) => arr.filter((s) => s.state === 'stale-unmerged').map((s) => ({ repo, ...s })));
|
|
387
|
+
// 已归档任务仍占着主工作树台账(典型:归档后才合入并切分支;没有后续归档触发释放)
|
|
388
|
+
const archivedLedger = Object.entries(ledger.tasks ?? {})
|
|
389
|
+
.filter(([task]) => !fs.existsSync(path.join(harnessDir(ws), 'deliverables', task)))
|
|
390
|
+
.map(([task, entry]) => ({ task, repos: Object.keys(entry?.repos ?? {}) }));
|
|
379
391
|
return {
|
|
380
392
|
path: ws,
|
|
381
393
|
board,
|
|
@@ -385,7 +397,7 @@ export function workspaceState(ws, { sync = null } = {}) {
|
|
|
385
397
|
slots,
|
|
386
398
|
te: ledgerTe,
|
|
387
399
|
attention: (() => {
|
|
388
|
-
const items = attentionItems(tasks, sync, initGaps(ws, kit), staleSlots, ledgerTe, readDecisions(ws));
|
|
400
|
+
const items = attentionItems(tasks, sync, initGaps(ws, kit), staleSlots, ledgerTe, readDecisions(ws), archivedLedger);
|
|
389
401
|
// 初始化失败 → block 级常驻提示(页面重开仍可见;成功后自动消失)
|
|
390
402
|
const initJob = initProgress.get(ws);
|
|
391
403
|
if (initJob?.done && initJob.error) {
|
package/kernel/worktree.js
CHANGED
|
@@ -148,7 +148,49 @@ async function isDirty(dir) {
|
|
|
148
148
|
/** 本地合入判定。 */
|
|
149
149
|
async function mergedLocally(repoDir, branch, base) {
|
|
150
150
|
const r = await runGit(['branch', '--merged', base, '--list', branch], { cwd: repoDir });
|
|
151
|
-
|
|
151
|
+
if (r.code !== 0) return false;
|
|
152
|
+
return r.stdout
|
|
153
|
+
.split('\n')
|
|
154
|
+
.map((line) => line.replace(/^[*+ ]+/, '').trim())
|
|
155
|
+
.filter(Boolean)
|
|
156
|
+
.includes(branch);
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
/** 本地分支是否存在(不 fetch)。 */
|
|
160
|
+
async function localBranchExists(repoDir, branch) {
|
|
161
|
+
return (await runGit(['rev-parse', '--verify', '--quiet', `refs/heads/${branch}`], { cwd: repoDir })).code === 0;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/** 任意 ref 是否存在(本地分支或 origin/<branch>)。 */
|
|
165
|
+
async function refExists(repoDir, ref) {
|
|
166
|
+
return (await runGit(['rev-parse', '--verify', '--quiet', ref], { cwd: repoDir })).code === 0;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
/** 归档对账的候选基线:任务创建时基线、当前注册基线、当前分支和常见主线。 */
|
|
170
|
+
function candidateBases(info, source, current) {
|
|
171
|
+
const seen = new Set();
|
|
172
|
+
for (const base of [info?.base, source?.branch, current, 'dev', 'test', 'main', 'master']) {
|
|
173
|
+
if (typeof base === 'string' && base.trim() && base !== 'HEAD') seen.add(base.trim());
|
|
174
|
+
}
|
|
175
|
+
return [...seen];
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/**
|
|
179
|
+
* 任务分支是否已合入任一候选基线。先查本地(快),再对真正可能是远端的
|
|
180
|
+
* 基线做一次 fetch 复查(合入常发生在 GitLab MR,本地主线可能滞后)。
|
|
181
|
+
* 返回命中的基线名,未合入返回 null。
|
|
182
|
+
*/
|
|
183
|
+
async function mergedIntoAny(repoDir, branch, bases) {
|
|
184
|
+
for (const base of bases) {
|
|
185
|
+
if (await mergedLocally(repoDir, branch, base)) return base;
|
|
186
|
+
}
|
|
187
|
+
// 本地主线可能滞后:一次 fetch 后复查 origin/<base>,避免每个候选基线各 fetch 一次。
|
|
188
|
+
await runGit(['fetch', 'origin'], { cwd: repoDir, timeoutMs: 30_000 });
|
|
189
|
+
for (const base of bases) {
|
|
190
|
+
const target = base.startsWith('origin/') ? base : `origin/${base}`;
|
|
191
|
+
if (await refExists(repoDir, target) && await mergedLocally(repoDir, branch, target)) return base;
|
|
192
|
+
}
|
|
193
|
+
return null;
|
|
152
194
|
}
|
|
153
195
|
|
|
154
196
|
/**
|
|
@@ -586,48 +628,68 @@ export async function ensureTaskWorkspaces(ws, kit, task, { branchPrefix = 'feat
|
|
|
586
628
|
}
|
|
587
629
|
|
|
588
630
|
/**
|
|
589
|
-
*
|
|
590
|
-
*
|
|
631
|
+
* 释放一个任务台账条目(不写盘,由调用方统一写)。
|
|
632
|
+
* 关键:主工作树不在任务分支时,也要检查任务分支是否已合入候选基线——
|
|
633
|
+
* 人合并后切到 dev/test 是常态,不能因此把台账永久留在“占用”状态。
|
|
591
634
|
*/
|
|
592
|
-
|
|
593
|
-
const out = { released: [], stale: []
|
|
594
|
-
const ledger = readWorkspaces(ws);
|
|
595
|
-
const entry = ledger.tasks[task];
|
|
596
|
-
if (!entry) { out.missing = true; return out; }
|
|
635
|
+
async function releaseEntry(ws, kit, task, entry, ledger) {
|
|
636
|
+
const out = { released: [], stale: [] };
|
|
597
637
|
const remaining = {};
|
|
598
638
|
for (const [name, info] of Object.entries(entry.repos ?? {})) {
|
|
599
639
|
const source = (kit?.sources ?? []).find((s) => s.name === name);
|
|
600
640
|
const repoDir = source ? path.join(ws, source.path) : null;
|
|
601
641
|
if (info.placement === 'main') {
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
642
|
+
if (!info.branch) {
|
|
643
|
+
out.released.push({ source: name, placement: 'main', note: '无 git 分支记录,释放台账' });
|
|
644
|
+
continue;
|
|
645
|
+
}
|
|
646
|
+
if (!repoDir || !fs.existsSync(repoDir) || !(await isGitRepo(repoDir))) {
|
|
647
|
+
out.released.push({ source: name, placement: 'main', note: '仓不可用,释放台账' });
|
|
648
|
+
continue;
|
|
649
|
+
}
|
|
650
|
+
const cur = await currentBranch(repoDir);
|
|
651
|
+
if (!(await localBranchExists(repoDir, info.branch))) {
|
|
652
|
+
out.released.push({ source: name, placement: 'main', note: `任务分支 ${info.branch} 已不存在,释放台账` });
|
|
653
|
+
continue;
|
|
654
|
+
}
|
|
655
|
+
const bases = candidateBases(info, source, cur).filter((b) => b !== info.branch);
|
|
656
|
+
const mergedBase = await mergedIntoAny(repoDir, info.branch, bases);
|
|
657
|
+
if (!mergedBase) {
|
|
658
|
+
out.stale.push({
|
|
659
|
+
source: name,
|
|
660
|
+
reason: cur === info.branch
|
|
661
|
+
? `分支 ${info.branch} 未合入 ${info.base ?? '候选基线'}:主工作树保持占用(保护性),人确认合入后重跑 /hk-archive 释放`
|
|
662
|
+
: `主工作树当前在 ${cur || '(detached)'},任务分支 ${info.branch} 未合入候选基线:台账保留,合入后重跑 /hk-archive 释放`,
|
|
663
|
+
});
|
|
664
|
+
remaining[name] = info;
|
|
665
|
+
continue;
|
|
666
|
+
}
|
|
667
|
+
if (cur === info.branch) {
|
|
668
|
+
if (await isDirty(repoDir)) {
|
|
669
|
+
out.stale.push({ source: name, reason: `主工作树分支 ${info.branch} 已合入但有未提交改动,未切回基线(请人工处理)` });
|
|
670
|
+
remaining[name] = info;
|
|
625
671
|
continue;
|
|
626
672
|
}
|
|
673
|
+
const co = await checkoutBaseBranch(repoDir, mergedBase);
|
|
674
|
+
if (co.code !== 0) {
|
|
675
|
+
out.stale.push({ source: name, reason: `主工作树切回基线失败:${(co.stderr || '').trim().split('\n')[0]}` });
|
|
676
|
+
remaining[name] = info;
|
|
677
|
+
continue;
|
|
678
|
+
}
|
|
679
|
+
await runGit(['branch', '-d', info.branch], { cwd: repoDir });
|
|
680
|
+
out.released.push({ source: name, placement: 'main', note: `主工作树已切回 ${mergedBase} 并删已合入分支` });
|
|
681
|
+
} else {
|
|
682
|
+
// 当前在别的分支:只释放台账,不改用户当前分支,也不删分支——
|
|
683
|
+
// 分支清理交给人在确认后处理,避免自动对账产生额外副作用。
|
|
684
|
+
out.released.push({
|
|
685
|
+
source: name,
|
|
686
|
+
placement: 'main',
|
|
687
|
+
note: `主工作树当前在 ${cur || '(detached)'};任务分支已合入 ${mergedBase},仅释放台账`,
|
|
688
|
+
});
|
|
627
689
|
}
|
|
628
|
-
out.released.push({ source: name, placement: 'main', note: '主工作树(无内核动作)' });
|
|
629
690
|
continue;
|
|
630
691
|
}
|
|
692
|
+
|
|
631
693
|
const dir = path.join(worktreeRoot(ws, name), info.placement);
|
|
632
694
|
ledger.slots[name] ??= {};
|
|
633
695
|
if (!repoDir || !fs.existsSync(repoDir) || !(await isGitRepo(repoDir))) {
|
|
@@ -647,9 +709,55 @@ export async function releaseTaskWorkspaces(ws, kit, task) {
|
|
|
647
709
|
remaining[name] = info;
|
|
648
710
|
}
|
|
649
711
|
}
|
|
712
|
+
return { ...out, remaining };
|
|
713
|
+
}
|
|
714
|
+
|
|
715
|
+
/**
|
|
716
|
+
* 归档释放:main 不在任务分支时也检查合入;slot 已合入 → 切回基线释放;
|
|
717
|
+
* 未合入 → stale 标记保留。返回 { released, stale: [{source, reason}], missing }。
|
|
718
|
+
*/
|
|
719
|
+
export async function releaseTaskWorkspaces(ws, kit, task) {
|
|
720
|
+
const ledger = readWorkspaces(ws);
|
|
721
|
+
const entry = ledger.tasks[task];
|
|
722
|
+
if (!entry) return { released: [], stale: [], missing: true };
|
|
723
|
+
const { released, stale, remaining } = await releaseEntry(ws, kit, task, entry, ledger);
|
|
650
724
|
if (Object.keys(remaining).length === 0) delete ledger.tasks[task];
|
|
651
725
|
else ledger.tasks[task] = { ...entry, repos: remaining };
|
|
652
726
|
writeWorkspaces(ws, ledger);
|
|
727
|
+
return { released, stale, missing: false };
|
|
728
|
+
}
|
|
729
|
+
|
|
730
|
+
/**
|
|
731
|
+
* 已归档任务的工作区台账对账(幂等,可反复执行)。
|
|
732
|
+
*
|
|
733
|
+
* 台账是缓存、git 是事实源:任务文档已进入 `_archive` 且活目录不存在时,
|
|
734
|
+
* 若任务分支已合入(本地或 origin)或分支已删除,就释放台账;未合入则保留
|
|
735
|
+
* 并标记 stale,等下一次命令/归档再对账。这样合并在归档之后发生也不会留下
|
|
736
|
+
* 永久占用。
|
|
737
|
+
*
|
|
738
|
+
* 返回 { tasks, released, stale }。只改本机 worktrees.json:不合并代码、不推送;
|
|
739
|
+
* 当前不在任务分支时不切换分支、不删分支;任务分支被检出时按既有释放逻辑切回基线。
|
|
740
|
+
*/
|
|
741
|
+
export async function reconcileArchivedWorktrees(ws, kit) {
|
|
742
|
+
const ledger = readWorkspaces(ws);
|
|
743
|
+
const deliverables = path.join(harnessDir(ws), 'deliverables');
|
|
744
|
+
const archiveRoot = path.join(deliverables, '_archive');
|
|
745
|
+
const out = { tasks: [], released: [], stale: [] };
|
|
746
|
+
let changed = false;
|
|
747
|
+
for (const [task, entry] of Object.entries(ledger.tasks ?? {})) {
|
|
748
|
+
// 活目录还在:任务可能已重开,不能按“已归档”清理。
|
|
749
|
+
if (fs.existsSync(path.join(deliverables, task))) continue;
|
|
750
|
+
// 没有归档记录:可能是手工删除,保留台账让人判断,不静默清理。
|
|
751
|
+
if (!fs.existsSync(path.join(archiveRoot, task))) continue;
|
|
752
|
+
const r = await releaseEntry(ws, kit, task, entry, ledger);
|
|
753
|
+
out.tasks.push(task);
|
|
754
|
+
out.released.push(...r.released.map((x) => ({ ...x, task })));
|
|
755
|
+
out.stale.push(...r.stale.map((x) => ({ ...x, task })));
|
|
756
|
+
if (Object.keys(r.remaining).length === 0) delete ledger.tasks[task];
|
|
757
|
+
else ledger.tasks[task] = { ...entry, repos: r.remaining };
|
|
758
|
+
changed = true;
|
|
759
|
+
}
|
|
760
|
+
if (changed) writeWorkspaces(ws, ledger);
|
|
653
761
|
return out;
|
|
654
762
|
}
|
|
655
763
|
|