Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(scripts): report unknown upstream status conservatively

Zhao Dengfeng2a3bd44500b4
diff --git a/scripts/__tests__/repo-worktrees.test.mjs b/scripts/__tests__/repo-worktrees.test.mjs
index 4792fc0a9f..5b61392848 100644
--- a/scripts/__tests__/repo-worktrees.test.mjs
+++ b/scripts/__tests__/repo-worktrees.test.mjs
@@ -49,11 +49,40 @@ test('an open PR remains active even when its current HEAD is in base', () => {
assert.equal(classifyWorktree({ ...cleanTask, pr: { state: 'OPEN' } }), 'active PR');
});
+test('an open PR remains active when upstream status is unknown', () => {
+ assert.equal(classifyWorktree({
+ ...cleanTask,
+ inBase: false,
+ upstream: 'origin/feature-current-task',
+ aheadOfUpstream: null,
+ pr: { state: 'OPEN' },
+ }), 'active PR');
+});
+
test('unreadable status is not reported as clean', () => {
assert.equal(classifyWorktree({ ...cleanTask, ...parseWorktreeStatus(null) }), 'status unavailable');
assert.equal(classifyWorktree({ ...cleanTask, ...parseWorktreeStatus('') }), 'clean HEAD in base');
});
+test('a feature branch with unknown upstream status is not reported as clean', () => {
+ assert.equal(classifyWorktree({
+ ...cleanTask,
+ inBase: false,
+ upstream: 'origin/feature-current-task',
+ aheadOfUpstream: null,
+ }), 'status unavailable');
+});
+
+test('main with unknown upstream status is not reported as clean', () => {
+ assert.equal(classifyWorktree({
+ ...cleanTask,
+ branch: 'main',
+ inBase: false,
+ upstream: 'origin/main',
+ aheadOfUpstream: null,
+ }), 'status unavailable');
+});
+
test('existing dirty and unpushed work remain visible', () => {
for (const [patch, expected] of [
[{ detached: true, dirty: 1 }, 'detached dirty danger'],
diff --git a/scripts/repo-worktrees.mjs b/scripts/repo-worktrees.mjs
index a50011f07c..4b6763ec28 100644
--- a/scripts/repo-worktrees.mjs
+++ b/scripts/repo-worktrees.mjs
@@ -173,12 +173,14 @@ export function classifyWorktree(row) {
// detached + 干净 = 临时检出(review-pr --detach 等),没有分支可推送/删除,
// 不据此判断临时检出或个人构建是否仍有使用者。
if (row.detached) return 'detached clean';
+ // 已有开放 PR 的在途分支仍优先展示为 active PR,upstream 读取失败不能掩盖它。
+ if (row.branch !== 'main' && row.pr?.state === 'OPEN') return 'active PR';
+ if (!row.inBase && row.upstream !== 'none' && row.aheadOfUpstream === null) return 'status unavailable';
// main 本地领先 upstream(有未 push 的 commit)时不是干净基线,同样按未推送
// 的活处理,不能藏进最低风险的 main clean。
if (row.branch === 'main') {
return (row.aheadOfUpstream ?? 0) > 0 ? 'local unpushed feature' : 'main clean';
}
- if (row.pr?.state === 'OPEN') return 'active PR';
// 新任务的初始 HEAD 同样在基线里,祖先关系不能证明 owning session 已结束。
if (row.inBase) return 'clean HEAD in base';
if (row.pr) return `PR ${row.pr.state.toLowerCase()}`;