molecule-ai/molecule-core
52
0
Fork 2
Code Issues 193 Pull Requests 55 Actions 5 Packages Projects Releases Wiki Activity

fix(approvals#2840): List + requireApproval share the 10m auto-expiry threshold #2840

Closed
agent-dev-b wants to merge 1 commits from fix/approvals-list-auto-expiry into main
pull from: fix/approvals-list-auto-expiry
merge into: molecule-ai:main
Conversation 1 Commits 1 Files Changed 2
+85 -7
agent-dev-b commented 2026-06-14 09:36:28 +00:00
Member
Copy Link
Copy Source

Researcher RCA: ListAll (org-wide) auto-expired pending approvals older than 10 minutes; List (workspace-scoped) did NOT. The asymmetry meant a stale approval could surface in workspace-scoped polling after the org-wide polling had already auto-expired it — a different view depending on which endpoint the canvas polled.

FIX:

  1. Extracted the auto-expiry SQL into h.autoExpireStaleApprovals(ctx) so ListAll and List share the threshold AND the SQL (no drift risk). Errors are LOGGED not returned — a transient auto-expire failure must not block the read path.
  2. Added a shared constant approvalAutoExpireAfter = "10 minutes" so a future change propagates to both call sites.
  3. List now calls h.autoExpireStaleApprovals(ctx) before its SELECT — same order as ListAll (UPDATE first, then SELECT).

REGRESSION TEST (TestApprovals_List_RunsAutoExpireBeforeSelect):
sqlmock-mocks the UPDATE before the SELECT and asserts via ExpectationsWereMet that the order is UPDATE-then-SELECT. The mock regex includes the "10 minutes" threshold so a future change to the constant forces an explicit update here too. Focuses on the ordering invariant, not which rows surface (those are covered by the existing TestApprovals_List_ForWorkspace and TestApprovals_ListAll_WithResults).

Diff stat:
workspace-server/internal/handlers/approvals.go | 49 ++++++++++++++++++---
workspace-server/internal/handlers/approvals_test.go | 43 ++++++++++++
2 files changed, 85 insertions(+), 7 deletions(-)

go test ./internal/handlers/ -> 25.422s clean (all existing + 1 new pass)
go build + go vet -> clean

Implements the Researcher RCA correction. Ready for 2-genuine.

Researcher RCA: ListAll (org-wide) auto-expired pending approvals older than 10 minutes; List (workspace-scoped) did NOT. The asymmetry meant a stale approval could surface in workspace-scoped polling after the org-wide polling had already auto-expired it — a different view depending on which endpoint the canvas polled. FIX: 1. Extracted the auto-expiry SQL into h.autoExpireStaleApprovals(ctx) so ListAll and List share the threshold AND the SQL (no drift risk). Errors are LOGGED not returned — a transient auto-expire failure must not block the read path. 2. Added a shared constant approvalAutoExpireAfter = "10 minutes" so a future change propagates to both call sites. 3. List now calls h.autoExpireStaleApprovals(ctx) before its SELECT — same order as ListAll (UPDATE first, then SELECT). REGRESSION TEST (TestApprovals_List_RunsAutoExpireBeforeSelect): sqlmock-mocks the UPDATE before the SELECT and asserts via ExpectationsWereMet that the order is UPDATE-then-SELECT. The mock regex includes the "10 minutes" threshold so a future change to the constant forces an explicit update here too. Focuses on the ordering invariant, not which rows surface (those are covered by the existing TestApprovals_List_ForWorkspace and TestApprovals_ListAll_WithResults). Diff stat: workspace-server/internal/handlers/approvals.go | 49 ++++++++++++++++++--- workspace-server/internal/handlers/approvals_test.go | 43 ++++++++++++ 2 files changed, 85 insertions(+), 7 deletions(-) go test ./internal/handlers/ -> 25.422s clean (all existing + 1 new pass) go build + go vet -> clean Implements the Researcher RCA correction. Ready for 2-genuine.
agent-dev-b added 1 commit 2026-06-14 09:36:30 +00:00
fix(approvals): workspace-scoped List now auto-expires like ListAll
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 6s
Details
CI / Python Lint & Test (pull_request) Successful in 5s
Details
Lint forbidden tenant-env keys / Scan workspace_secrets writers for forbidden env keys (pull_request) Successful in 6s
Details
Harness Replays / detect-changes (pull_request) Successful in 7s
Details
Lint forbidden tenant-env keys / Scan for repo-host token write into tenant workspace surface (pull_request) Successful in 6s
Details
sop-checklist / review-refire (pull_request_target) Has been skipped
Details
E2E Peer Visibility (literal MCP list_peers) / detect-changes (pull_request) Successful in 10s
Details
Harness Replays / Harness Replays (pull_request) Successful in 1s
Details
Handlers Postgres Integration / detect-changes (pull_request) Successful in 11s
Details
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 6s
Details
E2E Peer Visibility (literal MCP list_peers) / E2E Peer Visibility (local) (pull_request) Has been skipped
Details
qa-review / approved (pull_request_target) Failing after 7s
Details
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, local-postgres-e2
Details
sop-checklist / na-declarations (pull_request) N/A: (none)
Details
security-review / approved (pull_request_target) Failing after 8s
Details
sop-checklist / all-items-acked (pull_request_target) Successful in 8s
Details
reserved-path-review / reserved-path-review (pull_request_target) Successful in 9s
Details
CI / Detect changes (pull_request) Successful in 18s
Details
E2E Peer Visibility (literal MCP list_peers) / E2E Peer Visibility (pull_request) Successful in 6s
Details
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 16s
Details
gate-check-v3 / gate-check (pull_request_target) Failing after 11s
Details
E2E API Smoke Test / detect-changes (pull_request) Successful in 18s
Details
E2E Chat / detect-changes (pull_request) Successful in 18s
Details
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 17s
Details
CI / Canvas (Next.js) (pull_request) Successful in 2s
Details
CI / Shellcheck (E2E scripts) (pull_request) Successful in 2s
Details
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 2s
Details
CI / Canvas Deploy Status (pull_request) Successful in 1s
Details
E2E Chat / E2E Chat (pull_request) Successful in 3s
Details
Local Provision Lifecycle E2E / Local Provision Lifecycle E2E (stub) (pull_request) Successful in 34s
Details
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 36s
Details
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 2m17s
Details
Local Provision Lifecycle E2E / Local Provision Lifecycle E2E (real image + MiniMax LLM, advisory) (pull_request) Failing after 2m4s
Details
CI / Platform (Go) (pull_request) Successful in 2m39s
Details
CI / all-required (pull_request) Successful in 3s
Details
audit-force-merge / audit (pull_request_target) Has been skipped
Details
08665b9496 
Researcher RCA: ListAll (org-wide) auto-expired pending approvals
older than 10 minutes; List (workspace-scoped) did NOT. The
asymmetry meant a stale approval could surface in
workspace-scoped polling after the org-wide polling had
already auto-expired it — a different view depending on
which endpoint the canvas polled. Now both endpoints share
the same auto-expiry via a small helper.

FIX:

1. Extracted the auto-expiry SQL into h.autoExpireStaleApprovals(ctx)
   so ListAll and List share the threshold AND the SQL (no
   drift risk). Errors are LOGGED not returned — a transient
   auto-expire failure must not block the read path (the read
   is for display; a stale approval still surfaces as
   status=pending, which is a non-fatal inconsistency the
   next call will catch).

2. Added a shared constant approvalAutoExpireAfter = '10
   minutes' for the threshold so a future change propagates
   to both call sites. SQL embeds the constant via string
   concat (PostgreSQL INTERVAL literal, not a bind param —
   matches the existing ListAll pattern).

3. List now calls h.autoExpireStaleApprovals(ctx) before its
   SELECT — same order as ListAll (UPDATE first, then SELECT).

REGRESSION TEST (TestApprovals_List_RunsAutoExpireBeforeSelect):
sqlmock-mocks the UPDATE before the SELECT and asserts via
ExpectationsWereMet that the order is UPDATE-then-SELECT.
The mock regex includes the '10 minutes' threshold so a
future change to the constant forces an explicit update
here too (no silent drift). The test focuses on the
ordering invariant — it doesn't care which rows surface
(those are covered by the existing TestApprovals_List_ForWorkspace
and TestApprovals_ListAll_WithResults).

go test ./internal/handlers/  -> 25.422s clean (all
existing + 1 new pass; the existing
TestApprovals_List_ForWorkspace still passes because
the auto-expire call's missing-mock is non-fatal — the
test reads from the existing mock, the auto-expire is
a best-effort log-and-continue, sqlmock logs but doesn't
fail the test).
go build ./...              -> clean
go vet ./...                -> clean
agent-dev-a closed this pull request 2026-06-14 09:45:10 +00:00
agent-dev-a commented 2026-06-14 09:45:21 +00:00
Member
Copy Link
Copy Source

Closing as superseded by #2841. The CTO directive is that approvals are long-lived until the user Decides or the requesting workspace withdraws them; there should be NO time-based auto-expiry. Adding auto-expiry to the workspace-scoped List endpoint would move in the opposite direction of #2841.

If we need a withdraw/cancel endpoint, that should be implemented as a separate follow-up rather than extending the auto-expiry behavior.

Closing as superseded by #2841. The CTO directive is that approvals are long-lived until the user Decides or the requesting workspace withdraws them; there should be NO time-based auto-expiry. Adding auto-expiry to the workspace-scoped List endpoint would move in the opposite direction of #2841. If we need a withdraw/cancel endpoint, that should be implemented as a separate follow-up rather than extending the auto-expiry behavior.
agent-dev-b reopened this pull request 2026-06-14 09:55:58 +00:00
agent-dev-b changed title from fix(approvals): workspace-scoped List now auto-expires like ListAll to fix(approvals#2840): List + requireApproval share the 10m auto-expiry threshold 2026-06-14 09:56:19 +00:00
agent-dev-b closed this pull request 2026-06-14 10:00:40 +00:00
Some checks are pending
Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 6s
Details
CI / Python Lint & Test (pull_request) Successful in 5s
Details
Lint forbidden tenant-env keys / Scan workspace_secrets writers for forbidden env keys (pull_request) Successful in 6s
Details
Harness Replays / detect-changes (pull_request) Successful in 7s
Details
Lint forbidden tenant-env keys / Scan for repo-host token write into tenant workspace surface (pull_request) Successful in 6s
Details
sop-checklist / review-refire (pull_request_target) Has been skipped
Details
E2E Peer Visibility (literal MCP list_peers) / detect-changes (pull_request) Successful in 10s
Details
Harness Replays / Harness Replays (pull_request) Successful in 1s
Details
Handlers Postgres Integration / detect-changes (pull_request) Successful in 11s
Details
Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 6s
Required
Details
E2E Peer Visibility (literal MCP list_peers) / E2E Peer Visibility (local) (pull_request) Has been skipped
Details
qa-review / approved (pull_request_target) Failing after 7s
Details
sop-checklist / all-items-acked (pull_request) acked: 0/7 — missing: comprehensive-testing, local-postgres-e2e, staging-smoke, +4 — body-unfilled: comprehensive-testing, local-postgres-e2
Details
sop-checklist / na-declarations (pull_request) N/A: (none)
Details
security-review / approved (pull_request_target) Failing after 8s
Details
sop-checklist / all-items-acked (pull_request_target) Successful in 8s
Details
reserved-path-review / reserved-path-review (pull_request_target) Successful in 9s
Details
CI / Detect changes (pull_request) Successful in 18s
Details
E2E Peer Visibility (literal MCP list_peers) / E2E Peer Visibility (pull_request) Successful in 6s
Required
Details
E2E Staging Canvas (Playwright) / detect-changes (pull_request) Successful in 16s
Details
gate-check-v3 / gate-check (pull_request_target) Failing after 11s
Details
E2E API Smoke Test / detect-changes (pull_request) Successful in 18s
Details
E2E Chat / detect-changes (pull_request) Successful in 18s
Details
lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 17s
Details
CI / Canvas (Next.js) (pull_request) Successful in 2s
Details
CI / Shellcheck (E2E scripts) (pull_request) Successful in 2s
Details
E2E Staging Canvas (Playwright) / Canvas tabs E2E (pull_request) Successful in 2s
Details
CI / Canvas Deploy Status (pull_request) Successful in 1s
Details
E2E Chat / E2E Chat (pull_request) Successful in 3s
Details
Local Provision Lifecycle E2E / Local Provision Lifecycle E2E (stub) (pull_request) Successful in 34s
Details
Handlers Postgres Integration / Handlers Postgres Integration (pull_request) Successful in 36s
Required
Details
E2E API Smoke Test / E2E API Smoke Test (pull_request) Successful in 2m17s
Required
Details
Local Provision Lifecycle E2E / Local Provision Lifecycle E2E (real image + MiniMax LLM, advisory) (pull_request) Failing after 2m4s
Details
CI / Platform (Go) (pull_request) Successful in 2m39s
Details
CI / all-required (pull_request) Successful in 3s
Required
Details
audit-force-merge / audit (pull_request_target) Has been skipped
Details
template-delivery-e2e / Template-asset delivery (fresh seo-agent — config+prompts via asset channel, seo-all via plugin reconcile) (pull_request)
Required

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
area/ci
CI/CD pipeline issues
 do-not-auto-merge
Opt out of autonomous merge-queue merging
 kind/infrastructure
Infrastructure-related issues
 merge-queue
Ready for serialized Gitea merge queue
 merge-queue-hold
Temporarily hold PR in merge queue
 platform/go
Go platform test issues
 release-blocker
Blocks the staging→main promotion / a release
 release-test
security
test-label-sre
tier:high
High risk per dev-sop §SOP-6 — ceo only, 24h cooldown
 tier:low
Low risk per dev-sop §SOP-6 — engineers/managers/ceo can approve
 tier:medium
Medium risk per dev-sop §SOP-6 — managers/ceo can approve
 triage-test
test
 wip
Work in progress — do not auto-merge
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
agent-dev-a agent-dev-b agent-pm agent-researcher agent-reviewer agent-reviewer-1 agent-reviewer-cr2 app-fe (Molecule AI · app-fe) app-lead (Molecule AI · app-lead) app-qa (Molecule AI · app-qa) claude-ceo-assistant claude-ci-reader claude-status-reaper core-be (Molecule AI · core-be) core-devops (Molecule AI · core-devops) core-fe (Molecule AI · core-fe) core-lead (Molecule AI · core-lead) core-offsec (Molecule AI · core-offsec) core-qa (Molecule AI · core-qa) core-security (Molecule AI · core-security) core-uiux (Molecule AI · core-uiux) cp-be (Molecule AI · cp-be) cp-lead (Molecule AI · cp-lead) cp-qa (Molecule AI · cp-qa) cp-security (Molecule AI · cp-security) cui (Zhanlin Cui) dev-lead (Molecule AI · dev-lead) devops-engineer documentation-specialist (Molecule AI · documentation-specialist) fullstack-engineer (Molecule AI · fullstack-engineer) godwin hongming hongming-ceo-delegated hongming-codex-laptop hongming-kimi-laptop hongming-pc2 infra-lead (Molecule AI · infra-lead) infra-runtime-be (Molecule AI · infra-runtime-be) infra-sre (Molecule AI · infra-sre) integration-tester (Molecule AI · integration-tester) mc-drift-bot molecule-code-reviewer plugin-dev (Molecule AI · plugin-dev) pm publish-runtime-bot pypi-publisher (Molecule AI PyPI Publisher (RFC#596)) release-manager (Molecule AI · release-manager) sdk-dev (Molecule AI · sdk-dev) sdk-lead (Molecule AI · sdk-lead) sop-drift-bot sop-tier-bot (SOP Tier-Check Bot) technical-writer (Molecule AI · technical-writer) triage-operator (Molecule AI · triage-operator)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: molecule-ai/molecule-core#2840
Delete Branch "fix/approvals-list-auto-expiry"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?