Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9a4887a677 | ||
|
|
5a48fdd590 | ||
|
|
36a50b95ed | ||
|
|
9e699f3b4e | ||
|
|
d689107eea | ||
|
|
027ed1ade9 | ||
|
|
e4212b9c90 | ||
|
|
a2baf55fce | ||
|
|
1f6806ff99 |
@@ -17,25 +17,45 @@ teai 是 Gitea 的命令列(CLI)工具,以更完整、更可靠的方式
|
||||
- **git**
|
||||
- Gitea 帳號的 **API token**(設定階段使用;在 Gitea「設定 → 應用程式」產生)
|
||||
|
||||
### 從原始碼建置
|
||||
### 以 go install 安裝(建議)
|
||||
|
||||
自 v0.1.0 起 module 已發佈 tag,可直接以版本安裝(二元檔裝進 `GOBIN`,預設 `~/go/bin`):
|
||||
|
||||
```sh
|
||||
go install gitea.alterminal.com/alterminal/teai/cmd/teai@latest # 最新 tag(亦可 @v<版本> 指定)
|
||||
teai version # 驗證:顯示安裝的 tag 版本(見下方說明)
|
||||
```
|
||||
|
||||
本 module 為公開倉庫,預設 `GOPROXY`/`GOSUMDB` 即可解析(已於乾淨環境驗證)。
|
||||
若所在網路環境無法經公用 proxy 抓取,可改設 `GOPRIVATE=gitea.alterminal.com`
|
||||
(略過 proxy 與 checksum database,直接從 Gitea 抓取)。
|
||||
|
||||
`teai version` 顯示建入的 module 版本,即安裝指定的 tag(如 `v0.1.1`)。
|
||||
注意:讀 build info 顯示安裝版本的支援,自包含該變更的 tag 起(v0.1.1)才生效——
|
||||
v0.1.0 早於此變更,以 `@v0.1.0` 安裝(或此變更前的 `@latest`)仍顯示舊行為 `0.1.0-dev`。
|
||||
|
||||
### 從原始碼建置(開發用)
|
||||
|
||||
開發、離線或想鎖定特定 commit 時,clone 後自行建置:
|
||||
|
||||
```sh
|
||||
git clone https://gitea.alterminal.com/alterminal/teai.git
|
||||
cd teai
|
||||
go build -o teai ./cmd/teai
|
||||
install -Dm755 teai ~/.local/bin/teai # 或複製到任何 PATH 內目錄
|
||||
teai version # 驗證:teai version 0.1.0-dev
|
||||
teai version # 驗證:teai version v0.1.1-0.<時間戳>-<commit>(見下方說明)
|
||||
```
|
||||
|
||||
也可以直接裝進 `GOBIN`(預設 `~/go/bin`;該目錄已在 PATH 時最省事):
|
||||
也可以在 clone 目錄內直接裝進 `GOBIN`:
|
||||
|
||||
```sh
|
||||
go install ./cmd/teai
|
||||
```
|
||||
|
||||
> **注意:** `go install gitea.alterminal.com/alterminal/teai/cmd/teai@latest` 目前**不可用**——
|
||||
> module 尚未發佈任何 tag,`@latest` 會解析到任意中繼 commit(且 #21 修復前 main 建置失敗)。
|
||||
> 請在 clone 目錄內以版本控制的方式建置;發佈 tag 後再提供 `teai@<version>` 安裝路徑。
|
||||
clone 建置時 Go 會把 VCS 狀態寫進 build info:位於 tag 上顯示該 tag、
|
||||
其後的 commit 顯示 pseudo-version(如 `v0.1.1-0.20260912160956-5a48fdd590b2`)、
|
||||
工作樹有修改再附加 `+dirty`;無 VCS 資訊(如從 tarball 解壓建置)時
|
||||
`Main.Version` 為 `(devel)`,此時退回開發版本號 `0.1.0-dev`。
|
||||
|
||||
### 登入設定(首次使用)
|
||||
|
||||
@@ -299,7 +319,7 @@ teai whoami # 目前帳號(讀 tea 組態)
|
||||
|
||||
| 碼 | 意義 |
|
||||
| --- | --- |
|
||||
| 0 | 成功(含「沒有工作」→ 輸出 `null`/`[]`) |
|
||||
| 0 | 成功(含「沒有結果」→ 清單類命令輸出 `[]`、`next` 輸出 `null`;#37 判決) |
|
||||
| 2 | 用法錯誤(未知命令/參數) |
|
||||
| 3 | API 錯誤(連線失敗、401、403、5xx) |
|
||||
|
||||
@@ -318,8 +338,12 @@ teai whoami # 目前帳號(讀 tea 組態)
|
||||
已知輸出差異(刻意保留,機器可讀優先):
|
||||
|
||||
- **空清單**:`gitea.py` 的 `_dump` 對空清單**不輸出任何內容**;teai 的清單類命令
|
||||
(`mine`/`pulls`/`milestones` 總覽)空清單輸出 `[]`。對 JSON 消費者來說 `[]` 比「無輸出」更明確,
|
||||
交叉驗證時以此差異為準。`next` 兩者語義相同(無工作 → `null`/「沒有未完成的工作」)。
|
||||
(`mine`/`pulls`/`stalled`/`milestones` 總覽)空清單一律輸出 `[]`(exit 0)。對 JSON
|
||||
消費者來說 `[]` 比「無輸出」更明確(可區分「沒有結果」與「查詢失敗無輸出」),交叉驗證時
|
||||
以此差異為準。`next` 兩者語義相同:無工作時 teai 輸出 `null`(exit 0)、`gitea.py` 印
|
||||
「沒有未完成的工作」。**判決 #37:維持 teai 現行 JSON 一致性(方向 2)**——消費端
|
||||
(agents 倉庫巡邏提示與觸發腳本)應以「輸出 `[]`/`null` 且 exit 0」為「沒有」判據,
|
||||
不得以「無輸出」判斷;`members [--has-work]` 維持逐行帳號、空時無輸出(兩者一致,不受影響)。
|
||||
- **清單欄位集(`mine`/`pulls`)**:`gitea.py` 直接傾倒完整 Gitea API 物件
|
||||
(`_dump` 的副作用,欄位集隨 Gitea 版本浮動);teai 輸出策展摘要欄位
|
||||
(`mine`:repo/number/title/url;`pulls`:number/title/state/author/
|
||||
|
||||
@@ -165,6 +165,14 @@ func (s *apiSource) IssueComments(owner, repo string, number int64) ([]workflow.
|
||||
return comments, nil
|
||||
}
|
||||
|
||||
func (s *apiSource) IssueTimeline(owner, repo string, number int64) ([]workflow.TimelineEvent, error) {
|
||||
var events []workflow.TimelineEvent
|
||||
if err := s.listAll(fmt.Sprintf("repos/%s/%s/issues/%d/timeline", owner, repo, number), nil, &events); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return events, nil
|
||||
}
|
||||
|
||||
func (s *apiSource) TryGetIssue(owner, repo string, number int64) (workflow.Issue, bool, error) {
|
||||
var issue workflow.Issue
|
||||
body, code, err := s.get(fmt.Sprintf("repos/%s/%s/issues/%d", owner, repo, number), nil)
|
||||
|
||||
+18
-1
@@ -15,6 +15,7 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"runtime/debug"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -23,8 +24,24 @@ import (
|
||||
)
|
||||
|
||||
// Version 是目前開發中的版本號。採用語意化版本;正式發佈前以 0 開頭。
|
||||
// 僅作為 fallback:以 `go install module@version` 或納入其他 module 建置時,
|
||||
// buildVersion 會改用 build info 內的 module 版本(見 runVersion)。
|
||||
var Version = "0.1.0-dev"
|
||||
|
||||
// buildVersion 回傳應顯示的版本字串。go install pkg@tag 建置的二元檔
|
||||
// 會在 Main.Version 帶入 tag(如 v0.1.0);clone 目錄內本機建置則帶
|
||||
// pseudo-version(如 v0.1.1-0.<時間戳>-<commit>,工作樹有修改時再附加
|
||||
// "+dirty"),同樣直接顯示。Main.Version 為 "(devel)" 或空(go test 環境、
|
||||
// 無 VCS 資訊的 tarball 建置)時,才退回開發版本號 Version。
|
||||
func buildVersion() string {
|
||||
if info, ok := debug.ReadBuildInfo(); ok {
|
||||
if v := info.Main.Version; v != "" && v != "(devel)" {
|
||||
return v
|
||||
}
|
||||
}
|
||||
return Version
|
||||
}
|
||||
|
||||
// ExitCode 是 Run 回傳的行程結束碼。
|
||||
type ExitCode int
|
||||
|
||||
@@ -437,7 +454,7 @@ func runVersion(env *Env, args []string) error {
|
||||
if len(args) > 0 {
|
||||
return &ErrUsage{Msg: "version 不接受參數"}
|
||||
}
|
||||
fmt.Fprintf(env.Out, "teai version %s\n", Version)
|
||||
fmt.Fprintf(env.Out, "teai version %s\n", buildVersion())
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -220,6 +220,52 @@ func TestLabelsMilestonesReleasesList(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestStateAllSendsExplicitParam 是 #33 的回歸測試:issues/milestones
|
||||
// 端點省略 state 時 API 預設 open,closed 項目會漏列,因此 --state all
|
||||
// 必須明確帶 state=all;pulls 端點雖省略時也回全部,同樣明確帶上。
|
||||
func TestStateAllSendsExplicitParam(t *testing.T) {
|
||||
cases := []struct {
|
||||
args []string
|
||||
resp string
|
||||
wantOut string
|
||||
}{
|
||||
{
|
||||
args: []string{"issues", "list", "--repo", "a/b", "--state", "all"},
|
||||
resp: `[{"number":30,"title":"open","state":"open","user":{"login":"ceo"},"updated_at":"t"},{"number":12,"title":"closed","state":"closed","user":{"login":"ceo"},"updated_at":"t"}]`,
|
||||
wantOut: `"title":"closed"`,
|
||||
},
|
||||
{
|
||||
args: []string{"pulls", "list", "--repo", "a/b", "--state", "all"},
|
||||
resp: `[{"number":5,"title":"open PR","state":"open","user":{"login":"ceo"},"head":{"ref":"f"},"base":{"ref":"main"},"updated_at":"t"},{"number":2,"title":"closed PR","state":"closed","user":{"login":"ceo"},"head":{"ref":"f2"},"base":{"ref":"main"},"updated_at":"t"}]`,
|
||||
wantOut: `"title":"closed PR"`,
|
||||
},
|
||||
{
|
||||
args: []string{"milestones", "list", "--repo", "a/b", "--state", "all"},
|
||||
resp: `[{"title":"v2","state":"open","description":"","due_on":""},{"title":"v1","state":"closed","description":"","due_on":""}]`,
|
||||
wantOut: `"title":"v1"`,
|
||||
},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(strings.Join(tc.args, " "), func(t *testing.T) {
|
||||
var gotQuery string
|
||||
run := opsTestServer(t, func(w http.ResponseWriter, r *http.Request) {
|
||||
gotQuery = r.URL.RawQuery
|
||||
fmt.Fprint(w, tc.resp)
|
||||
})
|
||||
stdout, _, code := run(tc.args...)
|
||||
if code != 0 {
|
||||
t.Fatalf("%v 應回 0,得到 %d", tc.args, code)
|
||||
}
|
||||
if !strings.Contains(gotQuery, "state=all") {
|
||||
t.Errorf("%v 應明確帶 state=all(省略時 issues/milestones 端點預設 open),得到查詢 %q", tc.args, gotQuery)
|
||||
}
|
||||
if !strings.Contains(stdout, tc.wantOut) {
|
||||
t.Errorf("%v 輸出應含 closed 項目 %s,得到:%s", tc.args, tc.wantOut, stdout)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestAPIDirectPassthrough 驗證 teai api 原樣輸出、GET 免 --yes、
|
||||
// POST 未帶 --yes 被擋。
|
||||
func TestAPIDirectPassthrough(t *testing.T) {
|
||||
|
||||
@@ -46,6 +46,9 @@ func (s *stubStalledSource) TryGetIssue(owner, repo string, number int64) (workf
|
||||
i, ok := s.issues[owner+"/"+repo][number]
|
||||
return i, ok, nil
|
||||
}
|
||||
func (s *stubStalledSource) IssueTimeline(owner, repo string, number int64) ([]workflow.TimelineEvent, error) {
|
||||
return nil, nil
|
||||
}
|
||||
func (s *stubStalledSource) GetIssue(owner, repo string, number int64) (workflow.Issue, error) {
|
||||
if s.getErr != nil {
|
||||
return workflow.Issue{}, s.getErr
|
||||
@@ -114,6 +117,24 @@ func TestWiringStalled(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestWiringStalledEmpty 驗證 stalled 無任何條目時輸出 []、exit 0(#37)。
|
||||
func TestWiringStalledEmpty(t *testing.T) {
|
||||
newStubStalledEnv(t, &stubStalledSource{
|
||||
username: "ceo",
|
||||
orgs: []string{"alterminal"},
|
||||
repos: map[string][]workflow.Repo{"alterminal": {}},
|
||||
issues: map[string]map[int64]workflow.Issue{},
|
||||
comments: map[string][]workflow.Comment{},
|
||||
}, time.Date(2026, 9, 10, 8, 0, 0, 0, time.UTC))
|
||||
stdout, _, code := run("stalled")
|
||||
if code != 0 {
|
||||
t.Fatalf("stalled 空情境應回 0,得到 %d(stdout=%q)", code, stdout)
|
||||
}
|
||||
if strings.TrimSpace(stdout) != "[]" {
|
||||
t.Fatalf("stalled 無條目應輸出 [],得到 %q", stdout)
|
||||
}
|
||||
}
|
||||
|
||||
// TestWiringStalledHoursFlag 驗證 --hours 覆寫門檻與非正數被攔。
|
||||
func TestWiringStalledHoursFlag(t *testing.T) {
|
||||
freeze := time.Date(2026, 9, 10, 8, 0, 0, 0, time.UTC)
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
// version_test.go 驗證版本字串解析:go test 環境 Main.Version 為 "(devel)"
|
||||
// 時應退回開發版本號;tag 與 pseudo-version 行為由建置驗證涵蓋
|
||||
// (go install pkg@tag 顯示 tag;clone 建置顯示 pseudo-version)。
|
||||
package cli
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestBuildVersionFallsBackToDev 確認本地測試環境(Main.Version == "(devel)")
|
||||
// 退回 Version;同時確保輸出是可讀版本字串(非空、無括號)。
|
||||
func TestBuildVersionFallsBackToDev(t *testing.T) {
|
||||
v := buildVersion()
|
||||
if v == "" {
|
||||
t.Fatalf("buildVersion 不應為空")
|
||||
}
|
||||
if strings.ContainsAny(v, "()") {
|
||||
t.Errorf("buildVersion 不應含內部佔位(括號),得到:%q", v)
|
||||
}
|
||||
}
|
||||
|
||||
// TestRunVersionUsesBuildVersion 確認 version 命令輸出 buildVersion 的結果。
|
||||
func TestRunVersionUsesBuildVersion(t *testing.T) {
|
||||
stdout, _, code := run("version")
|
||||
if code != 0 {
|
||||
t.Fatalf("version 應回 0,得到 %d", code)
|
||||
}
|
||||
want := "teai version " + buildVersion()
|
||||
if !strings.Contains(stdout, want) {
|
||||
t.Errorf("version 輸出應含 %q,得到:%q", want, stdout)
|
||||
}
|
||||
}
|
||||
@@ -170,10 +170,10 @@ func (o *Ops) ListIssues(ctx context.Context, owner, repo, state string) ([]Issu
|
||||
if state == "" {
|
||||
state = "open"
|
||||
}
|
||||
// state 一律明確傳給 API:issues/milestones 端點省略 state 時預設
|
||||
// open(#33),closed 項目會漏列;all 也不能省略。
|
||||
extra := url.Values{}
|
||||
if state != "all" {
|
||||
extra.Set("state", state)
|
||||
}
|
||||
// type=issues:排除 PR(PR 在此端點帶 pull_request 欄位)。
|
||||
extra.Set("type", "issues")
|
||||
var issues []Issue
|
||||
@@ -246,10 +246,10 @@ func (o *Ops) ListPulls(ctx context.Context, owner, repo, state string) ([]Pull,
|
||||
if state == "" {
|
||||
state = "open"
|
||||
}
|
||||
// state 一律明確傳給 API:pulls 端點省略 state 時雖回全部,仍明確
|
||||
// 帶上,避免依賴端點預設值(#33)。
|
||||
extra := url.Values{}
|
||||
if state != "all" {
|
||||
extra.Set("state", state)
|
||||
}
|
||||
var pulls []Pull
|
||||
if err := o.Client.ListAll(ctx, repoPath(owner, repo)+"/pulls", gitea.ListOptions{Extra: extra}, &pulls); err != nil {
|
||||
return nil, err
|
||||
@@ -320,10 +320,10 @@ func (o *Ops) ListMilestones(ctx context.Context, owner, repo, state string) ([]
|
||||
if state == "" {
|
||||
state = "open"
|
||||
}
|
||||
// state 一律明確傳給 API:milestones 端點省略 state 時預設 open
|
||||
// (#33),closed 項目會漏列。
|
||||
extra := url.Values{}
|
||||
if state != "all" {
|
||||
extra.Set("state", state)
|
||||
}
|
||||
var ms []Milestone
|
||||
if err := o.Client.ListAll(ctx, repoPath(owner, repo)+"/milestones", gitea.ListOptions{Extra: extra}, &ms); err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -150,6 +150,19 @@ func (a *APIClient) TryGetIssue(owner, repo string, number int64) (Issue, bool,
|
||||
return issue, true, nil
|
||||
}
|
||||
|
||||
// IssueTimeline 回傳 issue 的 timeline 事件(Source 面向;對應 gitea.py
|
||||
// _direct_last_activity 拉取的 repos/{o}/{r}/issues/{n}/timeline)。
|
||||
// 分頁由 ListAll 處理(與 gitea.py api_get_list 的 limit=50 逐頁一致)。
|
||||
func (a *APIClient) IssueTimeline(owner, repo string, number int64) ([]TimelineEvent, error) {
|
||||
var events []TimelineEvent
|
||||
path := "/repos/" + url.PathEscape(owner) + "/" + url.PathEscape(repo) +
|
||||
"/issues/" + strconv.FormatInt(number, 10) + "/timeline"
|
||||
if err := a.Client.ListAll(context.Background(), path, gitea.ListOptions{}, &events); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return events, nil
|
||||
}
|
||||
|
||||
// MyOrganizations 委派 ListOrgs(Source 面向)。
|
||||
func (a *APIClient) MyOrganizations() ([]string, error) { return a.ListOrgs() }
|
||||
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
package workflow
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -14,10 +16,22 @@ type fakeStalledSource struct {
|
||||
username string
|
||||
// getIssueErr 模擬 GetIssue 失敗(xrefs 的 404 路徑)。
|
||||
getIssueErr error
|
||||
// timeline[owner/repo/number]:issue timeline 事件(無則回空清單,
|
||||
// 模擬 API 成功但無事件;timelineErr 模擬拉取失敗)。
|
||||
timeline map[string][]TimelineEvent
|
||||
timelineErr map[string]error
|
||||
}
|
||||
|
||||
func (f *fakeStalledSource) CurrentUser() (string, error) { return f.username, nil }
|
||||
|
||||
func (f *fakeStalledSource) IssueTimeline(owner, repo string, number int64) ([]TimelineEvent, error) {
|
||||
key := fmt.Sprintf("%s/%s/%d", owner, repo, number)
|
||||
if err := f.timelineErr[key]; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return f.timeline[key], nil
|
||||
}
|
||||
|
||||
func (f *fakeStalledSource) GetIssue(owner, repo string, number int64) (Issue, error) {
|
||||
if f.getIssueErr != nil {
|
||||
return Issue{}, f.getIssueErr
|
||||
@@ -229,3 +243,92 @@ func TestResolveIssueXrefsEmptyBody(t *testing.T) {
|
||||
}
|
||||
_ = time.Now // time 僅供 iso/at 使用;保留 import。
|
||||
}
|
||||
|
||||
// TestRunStalledChildXrefRefresh 回歸測試(agents #38、teai #34):
|
||||
// 子項 updated_at 被跨 issue 引用(comment_ref)刷新時,子項有效活動
|
||||
// 應經 directLastActivity 排除引用事件後採計,父追蹤項的停滯時鐘
|
||||
// 不被虛假刷新。
|
||||
func TestRunStalledChildXrefRefresh(t *testing.T) {
|
||||
src := newStalledFixture()
|
||||
// 子項 teai#2:直接活動為 created(-500) 與留言(-90),
|
||||
// updated_at 卻是 -10(他處留言提及刷新)。
|
||||
issue := src.issues["alterminal/teai"][2]
|
||||
issue.UpdatedAt = iso(-10)
|
||||
src.issues["alterminal/teai"][2] = issue
|
||||
// timeline:-10 的刷新是 comment_ref(引用事件,排除),
|
||||
// -90 有直接事件(label)可對應 → 有效活動 -90。
|
||||
src.timeline = map[string][]TimelineEvent{
|
||||
"alterminal/teai/2": {
|
||||
{Type: "label", CreatedAt: iso(-90)},
|
||||
{Type: "comment_ref", CreatedAt: iso(-10)},
|
||||
},
|
||||
}
|
||||
// 門檻 1 小時:父項 last_activity 取子項有效活動 -90 → 停滯 1.5h 列入;
|
||||
// 若誤採被刷新的 -10,父項與子項都不會列入。
|
||||
items, err := RunStalled(src, 1, at(0))
|
||||
if err != nil {
|
||||
t.Fatalf("RunStalled: %v", err)
|
||||
}
|
||||
if len(items) != 2 {
|
||||
t.Fatalf("應有兩筆(父追蹤項+子項),得到 %d:%+v", len(items), items)
|
||||
}
|
||||
var parent *Item
|
||||
for i := range items {
|
||||
if items[i].Repo == "alterminal/agents" && items[i].Number == 1 {
|
||||
parent = &items[i]
|
||||
}
|
||||
}
|
||||
if parent == nil {
|
||||
t.Fatalf("找不到 agents#1:%+v", items)
|
||||
}
|
||||
if parent.Reason != "parent-tracking" {
|
||||
t.Fatalf("agents#1 應為 parent-tracking,得到 %s", parent.Reason)
|
||||
}
|
||||
if parent.StalledHours != 1.5 {
|
||||
t.Fatalf("父項停滯應以子項有效活動(-90m → 1.5h)計,得到 %.1f", parent.StalledHours)
|
||||
}
|
||||
}
|
||||
|
||||
// TestRunStalledTimelineAllXrefFallback 回歸測試(agents #40、teai #34):
|
||||
// issue 自身 updated_at 晚於全部已知直接活動、且 timeline 全為引用事件時,
|
||||
// 回退已知直接活動的最晚時刻(不高估活動、不低估停滯);
|
||||
// timeline 拉取失敗則保守沿用 updated_at。
|
||||
func TestRunStalledTimelineAllXrefFallback(t *testing.T) {
|
||||
src := newStalledFixture()
|
||||
setIssueBody(src, "alterminal", "agents", 1, "") // 移除父項引用,teai#2 獨立判定
|
||||
delete(src.comments, "alterminal/teai/2")
|
||||
// agents#1 給一則近期留言,避免本身停滯(10h)干擾本測試的斷言。
|
||||
src.comments["alterminal/agents/1"] = []Comment{
|
||||
{CreatedAt: iso(-10), User: &User{UserName: "alex"}},
|
||||
}
|
||||
// teai#2:僅有 created(-500) 此一已知直接活動,
|
||||
// updated_at -10 完全由他處提及刷新。
|
||||
issue := src.issues["alterminal/teai"][2]
|
||||
issue.UpdatedAt = iso(-10)
|
||||
src.issues["alterminal/teai"][2] = issue
|
||||
// 情境一:timeline 全為引用事件 → 回退 knownMax(created -500)
|
||||
// → 停滯 8.3h,超過預設門檻 4h,列入。
|
||||
src.timeline = map[string][]TimelineEvent{
|
||||
"alterminal/teai/2": {{Type: "issue_ref", CreatedAt: iso(-10)}},
|
||||
}
|
||||
items, err := RunStalled(src, 0, at(0))
|
||||
if err != nil {
|
||||
t.Fatalf("RunStalled: %v", err)
|
||||
}
|
||||
if len(items) != 1 || items[0].Number != 2 {
|
||||
t.Fatalf("全引用事件應回退直接活動 → teai#2 停滯 8.3h 列入,得到 %+v", items)
|
||||
}
|
||||
if items[0].StalledHours != 8.3 {
|
||||
t.Fatalf("回退 created(-500) → 停滯應 8.3h,得到 %.1f", items[0].StalledHours)
|
||||
}
|
||||
// 情境二:timeline 拉取失敗 → 保守沿用 updated_at(-10) → 0.2h 未達門檻,不列入。
|
||||
src.timeline = nil
|
||||
src.timelineErr = map[string]error{"alterminal/teai/2": errors.New("boom")}
|
||||
items, err = RunStalled(src, 0, at(0))
|
||||
if err != nil {
|
||||
t.Fatalf("RunStalled: %v", err)
|
||||
}
|
||||
if len(items) != 0 {
|
||||
t.Fatalf("timeline 失敗應保守沿用 updated_at → 不列入,得到 %+v", items)
|
||||
}
|
||||
}
|
||||
|
||||
+115
-16
@@ -30,6 +30,11 @@ const (
|
||||
NudgeCooldownHours = 24.0
|
||||
)
|
||||
|
||||
// xrefTimelineTypes 對應 gitea.py 的 XREF_TIMELINE_TYPES:他處留言/issue
|
||||
// 提及本編號時產生的 timeline 引用事件。這類事件會刷新 updated_at,但不是
|
||||
// 本 issue 的直接活動,directLastActivity 會予以排除(agents issue #34)。
|
||||
var xrefTimelineTypes = map[string]bool{"comment_ref": true, "issue_ref": true}
|
||||
|
||||
// xrefPattern 對應 gitea.py 的 XREF_PATTERN:#N、repo#N、owner/repo#N。
|
||||
//
|
||||
// 前面不得是文數字/底線/斜線(避免切進 alterminal/bear#47 的後半段);
|
||||
@@ -149,6 +154,9 @@ type Source interface {
|
||||
IssueComments(owner, repo string, number int64) ([]Comment, error)
|
||||
// TryGetIssue 寬容版單一 issue 查詢:失敗(含 404)回 (零值, false, nil)。
|
||||
TryGetIssue(owner, repo string, number int64) (Issue, bool, error)
|
||||
// IssueTimeline 回傳 issue 的 timeline 事件(GET /repos/{o}/{r}/issues/{n}/timeline,
|
||||
// 分頁)。directLastActivity 用來排除跨 issue 引用事件(agents issue #34)。
|
||||
IssueTimeline(owner, repo string, number int64) ([]TimelineEvent, error)
|
||||
}
|
||||
|
||||
// iterXrefs 產出文字中的 (prefix, number) 配對(對應 _iter_issue_xrefs)。
|
||||
@@ -268,8 +276,11 @@ func childActivity(src Source, org, repo string, parent Issue, comments []Commen
|
||||
if pcOK && ccOK && !childCreated.After(parentCreated) {
|
||||
continue // 上行引用(父項回指更早或同時的 issue);時間未知則不排除
|
||||
}
|
||||
// 子項的直接活動:created_at、state 變更(closed_at)、留言(agents #32)。
|
||||
// 原始 updated_at 不放入已知活動,另經 directLastActivity 核對後採計
|
||||
//(與 considerIssue/considerPull 對本 issue 自身的處理同構)。
|
||||
var ms []time.Time
|
||||
if m, ok := parseMoment(child.UpdatedAt); ok {
|
||||
if m, ok := parseMoment(child.CreatedAt); ok {
|
||||
ms = append(ms, m)
|
||||
}
|
||||
if m, ok := parseMoment(child.ClosedAt); ok {
|
||||
@@ -282,6 +293,14 @@ func childActivity(src Source, org, repo string, parent Issue, comments []Commen
|
||||
}
|
||||
}
|
||||
}
|
||||
if childUpdated, ok := parseMoment(child.UpdatedAt); ok {
|
||||
// 子項 updated_at 可能被 comment_ref/issue_ref 引用事件刷新
|
||||
//(agents #38):走與本 issue 自身相同的 directLastActivity 排除
|
||||
// 邏輯(同源判定,不漂移);timeline 失敗時保守沿用 updated_at。
|
||||
if d, ok := directLastActivity(src, t.Owner, t.Repo, t.Number, childUpdated, true, ms); ok {
|
||||
ms = append(ms, d)
|
||||
}
|
||||
}
|
||||
var last *string
|
||||
if len(ms) > 0 {
|
||||
latest := maxTime(ms)
|
||||
@@ -302,6 +321,71 @@ func childActivity(src Source, org, repo string, parent Issue, comments []Commen
|
||||
return moments, children
|
||||
}
|
||||
|
||||
// TimelineEvent 是 issue timeline 的單一事件(僅取判斷所需欄位;
|
||||
// 對應 gitea.py _direct_last_activity 讀取的 timeline 物件)。
|
||||
type TimelineEvent struct {
|
||||
Type string `json:"type"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
}
|
||||
|
||||
// directLastActivity 排除跨 issue 引用事件後,本 issue 的最後直接活動時刻
|
||||
// (對應 gitea.py 的 _direct_last_activity;agents issues #34/#38/#40)。
|
||||
//
|
||||
// 他處留言/issue 提及本編號(comment_ref/issue_ref)也會刷新 updated_at,
|
||||
// 直接採用會虛假刷新停滯時鐘(false negative)並低估 stalled_hours。
|
||||
// updated_at 不晚於已知直接活動(留言、created_at、#32 納入的子項活動)時,
|
||||
// updated_at 本身可信,不必多打一次 timeline API;只有 updated_at 晚於全部
|
||||
// 已知活動時才拉 timeline 核對:排除引用類事件後取最晚事件時刻;若最晚的
|
||||
// 都是引用事件(本 issue 無直接活動可對應 updated_at),則回退已知直接活動
|
||||
// 的最晚時刻(agents #40)。timeline 拉取失敗時沿用 updated_at(不中斷掃描、
|
||||
// 寧可少報不誤報缺失活動)。
|
||||
func directLastActivity(src Source, org, repo string, number int64, updatedAt time.Time, hasUpdated bool, known []time.Time) (time.Time, bool) {
|
||||
if !hasUpdated {
|
||||
return time.Time{}, false
|
||||
}
|
||||
var knownMax *time.Time
|
||||
for i := range known {
|
||||
if known[i].IsZero() {
|
||||
continue
|
||||
}
|
||||
if knownMax == nil || known[i].After(*knownMax) {
|
||||
m := known[i]
|
||||
knownMax = &m
|
||||
}
|
||||
}
|
||||
if knownMax == nil || !updatedAt.After(*knownMax) {
|
||||
return updatedAt, true
|
||||
}
|
||||
timeline, err := src.IssueTimeline(org, repo, number)
|
||||
if err != nil {
|
||||
return updatedAt, true
|
||||
}
|
||||
var moments []time.Time
|
||||
for _, e := range timeline {
|
||||
if xrefTimelineTypes[e.Type] {
|
||||
continue
|
||||
}
|
||||
if m, ok := parseMoment(e.CreatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
}
|
||||
}
|
||||
if len(moments) == 0 {
|
||||
// timeline 全為引用事件:updated_at 完全由他處提及刷新,本 issue 沒有
|
||||
// 可對應的直接活動。回退已知直接活動的最晚時刻,避免把被刷新的
|
||||
// updated_at 當活動、低估停滯時數(agents #40);連已知活動都沒有時才
|
||||
// 保守沿用 updated_at(不中斷掃描、寧可少報不誤報缺失活動)。
|
||||
if knownMax != nil {
|
||||
return *knownMax, true
|
||||
}
|
||||
return updatedAt, true
|
||||
}
|
||||
latest := maxTime(moments)
|
||||
if latest.Before(updatedAt) {
|
||||
return latest, true
|
||||
}
|
||||
return updatedAt, true
|
||||
}
|
||||
|
||||
func maxTime(ts []time.Time) time.Time {
|
||||
best := ts[0]
|
||||
for _, t := range ts[1:] {
|
||||
@@ -382,7 +466,7 @@ func ScanStalled(src Source, username string, threshold float64, now time.Time)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
if item, ok := considerPull(pr, comments, username, threshold, now); ok {
|
||||
if item, ok := considerPull(src, org, r.Name, pr, comments, username, threshold, now); ok {
|
||||
items = append(items, item)
|
||||
}
|
||||
}
|
||||
@@ -398,19 +482,27 @@ func ScanStalled(src Source, username string, threshold float64, now time.Time)
|
||||
func considerIssue(src Source, org, repo string, issue Issue, comments []Comment, username string, threshold float64, now time.Time, myOrgs map[string]bool, orgRepos func(string) ([]string, error)) (Item, bool) {
|
||||
childMoments, children := childActivity(src, org, repo, issue, comments, myOrgs, orgRepos)
|
||||
assignees := AssigneeNames(&issue)
|
||||
var moments []time.Time
|
||||
if m, ok := parseMoment(issue.UpdatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
}
|
||||
// 已知直接活動:留言、created_at、#32 納入的子項活動。
|
||||
var known []time.Time
|
||||
if m, ok := parseMoment(issue.CreatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
known = append(known, m)
|
||||
}
|
||||
for _, c := range comments {
|
||||
if m, ok := parseMoment(c.CreatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
known = append(known, m)
|
||||
}
|
||||
}
|
||||
moments = append(moments, childMoments...)
|
||||
known = append(known, childMoments...)
|
||||
// 跨 issue 引用(comment_ref/issue_ref)也會刷新 updated_at(agents #34):
|
||||
// updated_at 晚於全部已知直接活動時,先排除引用事件核對後才採用,
|
||||
// 避免停滯時鐘被虛假刷新或低估 stalled_hours。
|
||||
var moments []time.Time
|
||||
if m, ok := parseMoment(issue.UpdatedAt); ok {
|
||||
if d, ok2 := directLastActivity(src, org, repo, issue.issueNumber(), m, ok, known); ok2 {
|
||||
moments = append(moments, d)
|
||||
}
|
||||
}
|
||||
moments = append(moments, known...)
|
||||
if len(moments) == 0 {
|
||||
return Item{}, false
|
||||
}
|
||||
@@ -455,21 +547,28 @@ func considerIssue(src Source, org, repo string, issue Issue, comments []Comment
|
||||
}
|
||||
|
||||
// considerPull 對單一 PR 套用停滯判定(對應 _consider 的 pull 分支)。
|
||||
func considerPull(pr PullRequest, comments []Comment, username string, threshold float64, now time.Time) (Item, bool) {
|
||||
func considerPull(src Source, org, repo string, pr PullRequest, comments []Comment, username string, threshold float64, now time.Time) (Item, bool) {
|
||||
reviewers := ReviewerNames(&pr)
|
||||
author := pr.Author()
|
||||
var moments []time.Time
|
||||
if m, ok := parseMoment(pr.UpdatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
}
|
||||
// 已知直接活動:留言、created_at。
|
||||
var known []time.Time
|
||||
if m, ok := parseMoment(pr.CreatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
known = append(known, m)
|
||||
}
|
||||
for _, c := range comments {
|
||||
if m, ok := parseMoment(c.CreatedAt); ok {
|
||||
moments = append(moments, m)
|
||||
known = append(known, m)
|
||||
}
|
||||
}
|
||||
// 跨 issue 引用也會刷新 PR 的 updated_at(agents #34):與 issue 同一道
|
||||
// directLastActivity 排除邏輯(同源判定,不漂移)。
|
||||
var moments []time.Time
|
||||
if m, ok := parseMoment(pr.UpdatedAt); ok {
|
||||
if d, ok2 := directLastActivity(src, org, repo, pr.Number, m, ok, known); ok2 {
|
||||
moments = append(moments, d)
|
||||
}
|
||||
}
|
||||
moments = append(moments, known...)
|
||||
if len(moments) == 0 {
|
||||
return Item{}, false
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sort"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
@@ -28,6 +29,8 @@ type fakeSource struct {
|
||||
pulls map[string][]PullRequest
|
||||
// comments[owner/repo/number]
|
||||
comments map[string][]Comment
|
||||
// timelines[owner/repo/number]:issue timeline 事件(nil → 空 timeline)。
|
||||
timelines map[string][]TimelineEvent
|
||||
}
|
||||
|
||||
func (f *fakeSource) MyOrganizations() ([]string, error) { return f.orgs, nil }
|
||||
@@ -41,6 +44,8 @@ func (f *fakeSource) OpenIssues(owner, repo string) ([]Issue, error) {
|
||||
for _, i := range f.issues[owner+"/"+repo] {
|
||||
out = append(out, i)
|
||||
}
|
||||
// 對齊真實 API:issues 依 id(=number)遞增回傳,消除 map 迭代隨機性。
|
||||
sort.Slice(out, func(a, b int) bool { return out[a].Number < out[b].Number })
|
||||
return out, nil
|
||||
}
|
||||
|
||||
@@ -52,6 +57,10 @@ func (f *fakeSource) IssueComments(owner, repo string, number int64) ([]Comment,
|
||||
return f.comments[fmt.Sprintf("%s/%s/%d", owner, repo, number)], nil
|
||||
}
|
||||
|
||||
func (f *fakeSource) IssueTimeline(owner, repo string, number int64) ([]TimelineEvent, error) {
|
||||
return f.timelines[fmt.Sprintf("%s/%s/%d", owner, repo, number)], nil
|
||||
}
|
||||
|
||||
func (f *fakeSource) TryGetIssue(owner, repo string, number int64) (Issue, bool, error) {
|
||||
i, ok := f.issues[owner+"/"+repo][number]
|
||||
if !ok {
|
||||
@@ -314,6 +323,13 @@ func TestScanStalledParentTrackingNotChild(t *testing.T) {
|
||||
},
|
||||
},
|
||||
}
|
||||
// timeline:#47 的 updated_at 對應直接事件(assignees)、#39 對應 label
|
||||
//(agents #34 後 updated_at 需經 timeline 核對才採計;直接事件可對應 → 採用)。
|
||||
// 必須在 ScanStalled 之前設定——掃描當下讀不到的事後修改無效。
|
||||
src.timelines = map[string][]TimelineEvent{
|
||||
"alterminal/teai/47": {{Type: "assignees", CreatedAt: iso(-600)}},
|
||||
"alterminal/teai/39": {{Type: "label", CreatedAt: iso(-60)}},
|
||||
}
|
||||
got, err := ScanStalled(src, "admin", 4.0, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ScanStalled: %v", err)
|
||||
@@ -515,6 +531,9 @@ func (e errSource) IssueComments(string, string, int64) ([]Comment, error) {
|
||||
func (e errSource) TryGetIssue(string, string, int64) (Issue, bool, error) {
|
||||
return Issue{}, false, errors.New("boom")
|
||||
}
|
||||
func (e errSource) IssueTimeline(string, string, int64) ([]TimelineEvent, error) {
|
||||
return nil, errors.New("boom")
|
||||
}
|
||||
|
||||
// TestRound1 round1 十進位舍入到一位小數(與 Python round(x,1) 半偶數一致)。
|
||||
func TestRound1(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user