dfaab11959
* feat(backend): full GitLab parity — store, service, poller, WS, presets Add the watcher/poll/write-action surface on top of the existing GitLab client + service skeleton: * 5 new SQLite tables (mr_watches, review_watches, review_mr_tasks, issue_watches, issue_watch_tasks, action_presets) + CRUD * Client + Service: MergeMR, GetProjectMergeMethods, GetProtectedBranch, ListUserProjects, SearchProjects, SetMRLabels, SetMRAssignees * Service: review/issue/MR watch CRUD + Check/Trigger, GetStats, CleanupAllReview/IssueTasks (cleanup-policy aware), TriggerMRSync, action-presets CRUD with defaults * Background poller (MR / review / issue loops) wired from main.go * ~35 GitLab WS action constants + handlers.go registrations * Mock controller for E2E seeding (MRs, issues, pipelines, discussions, approvals, branches) * eventBus + taskDeleter + taskSessionChecker plumbed through Service * Event types: GitLabMRFeedback / NewReviewMR / NewIssue / TaskMRUpdated * feat(web): GitLab frontend parity — types, API, store slice, domain hooks Extend the frontend GitLab integration on top of the new backend surface: * HTTP API client expansion (gitlab-api.ts): full CRUD for review/issue/MR watches, MR write actions (merge/approve/labels/assignees), MR files/commits/feedback, action presets, projects autocomplete, stats * Store slice expansion: review/issue/MR watches lists, action presets by workspace, stats + status with loading flags. Properties prefixed with gitlab to avoid collision with GitHub slice * Domain hooks: use-gitlab-status, use-gitlab-stats, use-gitlab-review-watches, use-gitlab-issue-watches, use-gitlab-action-presets — mirror github hook shapes * Type model: ReviewWatch, IssueWatch, MRWatch, ActionPresets, Stats, ProjectMergeMethods, MRApproval, Pipeline, MRFeedback, etc. * Backend controller HTTP routes for watches/presets/write-actions/ projects/stats so the frontend HTTP API client has endpoints to hit All passes: backend (build + vet + lint + tests), web (typecheck + lint + 2400 tests). * fix(gitlab): wire orchestrator event handlers, fix label-filter drop, add tests Address Claude review blockers on the parity PR: 1. Wire orchestrator subscriptions for GitLab review/issue watch events. Add event_handlers_gitlab.go with handleGitLabNewReviewMR / handleGitLabNewIssue, dedup reservation handshake, and task-creator interfaces (mirrors event_handlers_github.go). main.go now calls orchestratorSvc.SetGitLabService so the dedup APIs are usable 2. Fix silent label-filter drop: when a custom_query is set on an issue watch, labels were being appended to the unused filter arg. Fold labels into customQuery (or default filter) so they actually reach GitLab; extracted appendLabelsToQuery helper with explicit handling of pre-existing labels= clauses 3. Switch event payloads to pointer types (mirrors GitHub) so handlers can type-assert pointer events 4. Backend tests: store_watches_test.go (CRUD + reserve/assign for all 4 new tables + presets), service_watches_test.go (label-filter helper, cleanup policy, project normalisation), action_presets_test.go 5. Frontend slice tests: review/issue watch CRUD round-trips, action presets + stats reducer coverage All green: backend (build+vet+lint+tests), web (typecheck+lint+2403 tests). * fix(gitlab): address remaining blockers — cleanup wiring, safe defaults, nil guards Address the second round of Claude review blockers: 1. main.go: wire SetTaskDeleter + SetTaskSessionChecker on services.GitLab (mirrors GitHub). Without these, manual cleanup sweeps would always error with "task deleter not configured" 2. service_cleanup.go: default cleanup policy on transient DB error is now CleanupPolicyNever (preserve tasks) instead of CleanupPolicyAuto (silently delete). Genuine "watch was deleted" path also falls under the safe-side default; user can manually delete the orphan tasks 3. service_watches.go: add nil guards on requireStore() so the 6 MR-watch list/get/delete methods return an errStoreUnavailable error instead of panicking when the SQLite store failed to construct at boot 4. use-gitlab-status.ts + use-gitlab-stats.ts: add per-mount attemptedRef so an unreachable GitLab doesn't trigger an infinite re-fetch loop — the previous useEffect re-ran every render because the failure path left status null, satisfying the !status guard * fix(gitlab): propagate session-check errors, clamp poll interval on update Address remaining Claude blockers: * service_cleanup.go: HasUserAuthoredMessage transient errors are now preserved (return false → skip delete) instead of silently ignored; the alternative was occasionally deleting tasks a user had touched * service_watches.go: extract clampPollInterval helper applying the same bounds (0 → default, <60 → 60) as the create path; both applyReviewWatchPatch and applyIssueWatchPatch use it so user-supplied zero or tiny values via UpdateXxxWatchRequest no longer hammer GitLab * fix(gitlab): clear dupl lint, fix preset retry loop + per-workspace watch cache * service_watches.go: applyReviewWatchPatch / applyIssueWatchPatch get nolint:dupl markers — they share shape but per-domain field validation lives in the create paths, so deduplicating via generics would obscure the contract. Restores backend lint to 0 issues * use-gitlab-action-presets.ts: per-workspace attemptedRef set so a failing preset fetch doesn't retry on every render * use-gitlab-review-watches.ts + use-gitlab-issue-watches.ts: track lastFetchedRef per consumer so a workspace switch triggers a refetch. The slice-level loaded flag is shared across instances and can't double as a per-workspace cache key * fix(gitlab): add nil-store guards across review/issue watch + cleanup paths Round-3 Claude finding: ReviewWatch / IssueWatch / preset / reservation methods still called s.requireStore().X() directly. If NewStore fails at boot (table migration error), the service struct's store is nil and every list/get/update/create/reserve method panics on first request. Apply the same store-nil → errStoreUnavailable pattern from f95a929 to every remaining method: * CreateReviewWatch / CreateIssueWatch * GetReviewWatch / ListReviewWatches / ListAllReviewWatches / UpdateReviewWatch / TriggerReviewWatchAll * GetIssueWatch / ListIssueWatches / ListAllIssueWatches / UpdateIssueWatch / TriggerIssueWatchAll * ReserveReviewMRTask / AssignReviewMRTaskID / ReleaseReviewMRTask * ReserveIssueWatchTask / AssignIssueWatchTaskID / ReleaseIssueWatchTask * lookupReviewPolicy / lookupIssuePolicy (return CleanupPolicyNever) * fix(gitlab): nil-store guards on CheckXxxWatch + DeleteXxxWatch + cleanup paths Round-4 Claude finding: 4 remaining panic sites the previous nil-guard pass missed — these run from the background poller (every 5 min) and the manual delete/cleanup flows, so a boot-time NewStore failure would crash the orchestrator process on first tick. * service_watches.go: add store-nil guards to DeleteReviewWatch / DeleteIssueWatch / CheckReviewWatch / CheckIssueWatch * service_cleanup.go: guard CleanupAllReviewTasks / CleanupAllIssueTasks entry points; wrap the trailing DeleteReviewMRTask / DeleteIssueWatchTask calls in `if store := s.requireStore(); store != nil` blocks so the cleanup succeeds even when the dedup-row delete is unreachable * refactor(gitlab): split service_watches.go to stay under 800-line revive limit CI's --new-from-rev lint caught service_watches.go at 808 lines (limit 800). Split into three focused files: * service_events.go (94 LOC) — publish helpers for MR feedback / new review MR / new issue / watch lifecycle events * service_issue_watches.go (302 LOC) — Issue watch CRUD + Check + Trigger + fetch + helpers * service_reservations.go (59 LOC) — Reserve/Assign/Release dedup handles used by the orchestrator event handlers service_watches.go is now 505 lines and contains MR watch + Review watch only. No behavioral change. * fix(gitlab): address inline code-review feedback Address actionable inline comments from Claude/CodeRabbit/cubic/Greptile: * appendLabelsToQuery: use url.ParseQuery for exact key match instead of strings.Contains; previously false-matched keys like mylabels= and silently dropped the watch's labels (test added) * fetchReviewMRs: drop dead `filter = watch.CustomQuery` assignment — SearchMRs's buildMRSearchQuery returns customQuery verbatim and ignores filter when customQuery is non-empty * store.go: add workspace_id indexes on gitlab_review_watches and gitlab_issue_watches (the 5-min poller and HTTP list endpoints did full table scans) * mock_client.SearchProjects: switch from == to case-insensitive Contains so partial-query autocomplete returns the seeded project, matching the doc comment * Poller: add sync.Mutex to guard `started` field; Start/Stop are now safe to call concurrently (go test -race would have flagged the previous read/write race) * Add ErrWatchNotFound sentinel; controller_watches.go maps it to HTTP 404 via httpRespondError helper. Update/Trigger handlers previously returned 500 for missing watches, hiding the distinction from real server faults * service_events.go: log Publish errors on watch lifecycle events instead of swallowing them silently * handlers.go: reject malformed JSON payloads in list-style WS handlers rather than silently falling through to broader list/search behavior * event_handlers_gitlab.go: remove dead gitlabRepoSlug helper + blank-identifier suppression * ci: re-trigger to clear flaky E2E shard 3 * fix(gitlab): address final review round — nil guards, store merge, logs, body validation - CheckMRWatch, UpdateReviewWatch, UpdateIssueWatch: nil guards for store/req - handlers: wsNewDiscussionNote rejects empty body - action_presets: Update reads raw stored row (no default freezing); Reset validates workspace_id - service_search.GetStats: log Warn per sub-call failure before zero - event_handlers_gitlab: log Release* dedup-row errors with context - web/store.ts: post-slice merge restores every GitLab sub-state field; extract buildStateOverrides helper - web/default-state.ts: add GitLab fields to defaultState + mergeInitialState via mergeGitLabFields helper - web/gitlab-api.ts: UpdateXxxWatchRequest now Omit workspace_id Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
221 lines
7.2 KiB
TypeScript
221 lines
7.2 KiB
TypeScript
import { describe, it, expect } from "vitest";
|
|
import { create } from "zustand";
|
|
import { immer } from "zustand/middleware/immer";
|
|
import { createGitLabSlice } from "./gitlab-slice";
|
|
import type { GitLabSlice } from "./types";
|
|
import type { TaskMR } from "@/lib/types/gitlab";
|
|
|
|
function makeMR(overrides: Partial<TaskMR> = {}): TaskMR {
|
|
return {
|
|
id: "id",
|
|
task_id: "task-1",
|
|
host: "https://gitlab.com",
|
|
project_path: "acme/api",
|
|
mr_iid: 1,
|
|
mr_url: "https://gitlab.com/acme/api/-/merge_requests/1",
|
|
mr_title: "Test MR",
|
|
head_branch: "feat",
|
|
base_branch: "main",
|
|
author_username: "alice",
|
|
state: "open",
|
|
approval_state: "",
|
|
pipeline_state: "",
|
|
merge_status: "",
|
|
draft: false,
|
|
approval_count: 0,
|
|
required_approvals: 0,
|
|
pipeline_jobs_total: 0,
|
|
pipeline_jobs_pass: 0,
|
|
created_at: "",
|
|
updated_at: "",
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function makeStore() {
|
|
return create<GitLabSlice>()(immer((...a) => createGitLabSlice(...a)));
|
|
}
|
|
|
|
describe("setTaskMRs", () => {
|
|
it("replaces byTaskId wholesale", () => {
|
|
const store = makeStore();
|
|
const mrA = makeMR({ id: "a" });
|
|
store.getState().setTaskMRs({ "task-1": [mrA] });
|
|
expect(store.getState().taskMRs.byTaskId["task-1"]).toEqual([mrA]);
|
|
|
|
store.getState().setTaskMRs({ "task-2": [makeMR({ id: "b" })] });
|
|
expect(store.getState().taskMRs.byTaskId).not.toHaveProperty("task-1");
|
|
expect(store.getState().taskMRs.byTaskId["task-2"]).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
describe("setTaskMR", () => {
|
|
it("appends an MR when the task has no rows yet", () => {
|
|
const store = makeStore();
|
|
const mr = makeMR({ repository_id: "repo-a" });
|
|
|
|
store.getState().setTaskMR("task-1", mr);
|
|
|
|
expect(store.getState().taskMRs.byTaskId["task-1"]).toEqual([mr]);
|
|
});
|
|
|
|
it("upserts the same (repo, project, iid) key in place", () => {
|
|
const store = makeStore();
|
|
const original = makeMR({ id: "a", repository_id: "repo-a", mr_iid: 5 });
|
|
const updated = makeMR({
|
|
id: "a",
|
|
repository_id: "repo-a",
|
|
mr_iid: 5,
|
|
mr_title: "renamed",
|
|
});
|
|
|
|
store.getState().setTaskMR("task-1", original);
|
|
store.getState().setTaskMR("task-1", updated);
|
|
|
|
const list = store.getState().taskMRs.byTaskId["task-1"];
|
|
expect(list).toHaveLength(1);
|
|
expect(list[0]!.mr_title).toBe("renamed");
|
|
});
|
|
|
|
it("keeps multi-repo MRs distinct on (repository_id, project_path, mr_iid)", () => {
|
|
const store = makeStore();
|
|
// Same project + iid, different repositories — must coexist.
|
|
const repoA = makeMR({ id: "a", repository_id: "repo-a", mr_iid: 1 });
|
|
const repoB = makeMR({ id: "b", repository_id: "repo-b", mr_iid: 1 });
|
|
// Same repo, different project — must also coexist.
|
|
const repoAOtherProject = makeMR({
|
|
id: "c",
|
|
repository_id: "repo-a",
|
|
project_path: "acme/web",
|
|
mr_iid: 1,
|
|
});
|
|
// Same repo + project, different iid — must coexist (multiple open MRs).
|
|
const repoASecondMR = makeMR({ id: "d", repository_id: "repo-a", mr_iid: 99 });
|
|
|
|
store.getState().setTaskMR("task-1", repoA);
|
|
store.getState().setTaskMR("task-1", repoB);
|
|
store.getState().setTaskMR("task-1", repoAOtherProject);
|
|
store.getState().setTaskMR("task-1", repoASecondMR);
|
|
|
|
const list = store.getState().taskMRs.byTaskId["task-1"];
|
|
expect(list).toHaveLength(4);
|
|
expect(list.map((m) => m.id).sort()).toEqual(["a", "b", "c", "d"]);
|
|
});
|
|
|
|
it("treats missing repository_id as the empty key (single-repo tasks)", () => {
|
|
// A multi-repo MR with repository_id and a single-repo MR with the same
|
|
// (project_path, mr_iid) but no repository_id must still coexist — the
|
|
// empty repo key is its own slot.
|
|
const store = makeStore();
|
|
const noRepo = makeMR({ id: "x", mr_iid: 1 });
|
|
const withRepo = makeMR({ id: "y", repository_id: "repo-a", mr_iid: 1 });
|
|
|
|
store.getState().setTaskMR("task-1", noRepo);
|
|
store.getState().setTaskMR("task-1", withRepo);
|
|
|
|
const list = store.getState().taskMRs.byTaskId["task-1"];
|
|
expect(list).toHaveLength(2);
|
|
expect(list.map((m) => m.id).sort()).toEqual(["x", "y"]);
|
|
});
|
|
});
|
|
|
|
describe("resetTaskMRs", () => {
|
|
it("clears byTaskId so a workspace switch doesn't leak previous MRs", () => {
|
|
const store = makeStore();
|
|
store.getState().setTaskMR("task-1", makeMR({ id: "a" }));
|
|
expect(store.getState().taskMRs.byTaskId["task-1"]).toHaveLength(1);
|
|
|
|
store.getState().resetTaskMRs();
|
|
|
|
expect(store.getState().taskMRs.byTaskId).toEqual({});
|
|
});
|
|
});
|
|
|
|
describe("review watches", () => {
|
|
it("set + add + update + remove round-trip", () => {
|
|
const store = makeStore();
|
|
const watch = {
|
|
id: "w-1",
|
|
workspace_id: "ws-1",
|
|
workflow_id: "",
|
|
workflow_step_id: "",
|
|
projects: [{ path: "group/proj" }],
|
|
agent_profile_id: "",
|
|
executor_profile_id: "",
|
|
prompt: "",
|
|
review_scope: "user",
|
|
custom_query: "",
|
|
enabled: true,
|
|
poll_interval_seconds: 300,
|
|
cleanup_policy: "auto",
|
|
created_at: "",
|
|
updated_at: "",
|
|
};
|
|
store.getState().setGitLabReviewWatches([watch]);
|
|
expect(store.getState().gitlabReviewWatches.items).toHaveLength(1);
|
|
expect(store.getState().gitlabReviewWatches.loaded).toBe(true);
|
|
|
|
const watch2 = { ...watch, id: "w-2" };
|
|
store.getState().addGitLabReviewWatch(watch2);
|
|
expect(store.getState().gitlabReviewWatches.items).toHaveLength(2);
|
|
|
|
store.getState().updateGitLabReviewWatchInStore({ ...watch, prompt: "updated" });
|
|
expect(store.getState().gitlabReviewWatches.items.find((w) => w.id === "w-1")?.prompt).toBe(
|
|
"updated",
|
|
);
|
|
|
|
store.getState().removeGitLabReviewWatch("w-1");
|
|
expect(store.getState().gitlabReviewWatches.items).toHaveLength(1);
|
|
expect(store.getState().gitlabReviewWatches.items[0].id).toBe("w-2");
|
|
});
|
|
});
|
|
|
|
describe("issue watches", () => {
|
|
it("set + add + remove round-trip", () => {
|
|
const store = makeStore();
|
|
const watch = {
|
|
id: "iw-1",
|
|
workspace_id: "ws-1",
|
|
workflow_id: "",
|
|
workflow_step_id: "",
|
|
projects: [],
|
|
agent_profile_id: "",
|
|
executor_profile_id: "",
|
|
prompt: "",
|
|
labels: ["bug"],
|
|
custom_query: "",
|
|
enabled: true,
|
|
poll_interval_seconds: 300,
|
|
cleanup_policy: "auto",
|
|
created_at: "",
|
|
updated_at: "",
|
|
};
|
|
store.getState().setGitLabIssueWatches([watch]);
|
|
expect(store.getState().gitlabIssueWatches.items).toHaveLength(1);
|
|
|
|
store.getState().removeGitLabIssueWatch("iw-1");
|
|
expect(store.getState().gitlabIssueWatches.items).toHaveLength(0);
|
|
});
|
|
});
|
|
|
|
describe("action presets + stats", () => {
|
|
it("upserts presets by workspace and stores stats with loadedAt timestamp", () => {
|
|
const store = makeStore();
|
|
const presets = {
|
|
workspace_id: "ws-1",
|
|
mr: [{ id: "x", label: "x", hint: "", icon: "", prompt_template: "" }],
|
|
issue: [],
|
|
};
|
|
store.getState().setGitLabActionPresets("ws-1", presets);
|
|
expect(store.getState().gitlabActionPresets.byWorkspaceId["ws-1"]).toEqual(presets);
|
|
|
|
store.getState().setGitLabStats({
|
|
open_mrs: 5,
|
|
mrs_awaiting_my_review: 2,
|
|
open_issues_assigned_me: 3,
|
|
});
|
|
expect(store.getState().gitlabStats.data?.open_mrs).toBe(5);
|
|
expect(store.getState().gitlabStats.loadedAt).not.toBeNull();
|
|
});
|
|
});
|