Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/mcp/admin_mcp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
# |---|---|---|
# | Read | admin_summary, find_people, get_person, find_projects, get_project, find_ships, get_ship, list_orders, list_extensions, metrics, nudges, public_stats | Tools::Overview, People, Projects, Ships, Orders, Extensions, Numbers |
# | Analytics | describe_schema, query_sql, funnel, audit_log | Tools::Analytics, Tools::Audit |
# | Write | save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, decide_extension, set_ship_until | The same model methods the admin pages call (Nudge::ChangesNeeded and Nudge::Rejected for send_verdict_dm, Order#ordered!, Order#cancel!, Extension#decide!) |
# | Write | save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, reopen_order, decide_extension, set_ship_until | The same model methods the admin pages call (Nudge::ChangesNeeded and Nudge::Rejected for send_verdict_dm, Order#ordered!, Order#cancel!, Order#reopen!, Extension#decide!) |
#
# Before a tool runs, AdminMcp::Tool writes an AdminAuditEvent. A tool whose audit row fails does not run.
module AdminMcp
INSTRUCTIONS = <<~TEXT.squish.freeze
Save Point admin tools. Most people in this data are teenagers: share only what the task needs.
Start with describe_schema, or a typed finder (find_people, find_projects, find_ships) before query_sql.
Every call is written to the admin log, with the tool and the IDs it names.
Write tools (save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, decide_extension, set_ship_until)
Write tools (save_review_draft, set_lapse_coding, set_reviewer_ai, set_checklist_item, set_hours_start, edit_snapshot, edit_review_text, send_verdict_dm, mark_order_ordered, cancel_order, reopen_order, decide_extension, set_ship_until)
change real data, and ordering, deciding an extension or send_verdict_dm sends the participant a Slack DM: confirm each with the human first.
Everything on the ship review page saves through a tool except the verdict and the screenshots:
set_lapse_coding and set_reviewer_ai change the limits at once. No tool gives a verdict (D-136): the reviewer presses it on the page.
Expand All @@ -33,7 +33,7 @@ def self.tools
Tools::Ships::FindShips, Tools::Ships::GetShip, Tools::Ships::SaveReviewDraft,
Tools::Ships::SetLapseCoding, Tools::Ships::SetReviewerAi, Tools::Ships::SetChecklistItem, Tools::Ships::SetHoursStart, Tools::Ships::EditSnapshot, Tools::Ships::EditReviewText,
Tools::Ships::SendVerdictDm,
Tools::Orders::ListOrders, Tools::Orders::MarkOrderOrdered, Tools::Orders::CancelOrder,
Tools::Orders::ListOrders, Tools::Orders::MarkOrderOrdered, Tools::Orders::CancelOrder, Tools::Orders::ReopenOrder,
Tools::Extensions::ListExtensions, Tools::Extensions::DecideExtension,
Tools::Numbers::Metrics, Tools::Numbers::Nudges, Tools::Numbers::PublicStats,
Tools::Analytics::DescribeSchema, Tools::Analytics::QuerySql, Tools::Analytics::Funnel,
Expand Down
26 changes: 26 additions & 0 deletions app/mcp/admin_mcp/tools/orders.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,30 @@ def self.run(args, _caller)
{ order_id: order.id, status: order.status, project_id: project.id, hours_to_spend: project.hours_to_spend }
end
end

# An ordered order the shop cancelled goes back to waiting, to be bought again. Hours stay spent. No DM.
class ReopenOrder < AdminMcp::Tool
writes "reopen_order", "Put an ordered order back to waiting",
"Puts an ordered prize order back to waiting, for when the shop cancelled it after it was marked ordered, so it shows on the Orders page to buy again. " \
"Clears who ordered it, when, and its Theseus letter ID. The hours stay spent (it is not cancelled). " \
"Only an ordered order can be reopened: a waiting or cancelled one is refused and nothing changes. A reason is required and goes in the admin log. " \
"Sends no DM and posts nothing. Answers { order_id, status, project_id, prize_key }.",
{ order_id: { type: "integer", description: "The order ID, from list_orders." },
reason: { type: "string", description: "Why, in a sentence. Saved in the admin log." } },
required: %w[order_id reason]

def self.audit_extra(args)
{ "reason" => args[:reason].to_s.strip.first(500) }
end

def self.run(args, _caller)
reason = args[:reason].to_s.strip
raise AdminMcp::Refused, "Send a reason." if reason.blank?

order = Order.find(args[:order_id])
raise AdminMcp::Refused, "Order #{order.id} is #{order.status}, so it can't be reopened. Only an ordered order can be." unless order.reopen!

{ order_id: order.id, status: order.status, project_id: order.project_id, prize_key: order.prize_key }
end
end
end
12 changes: 12 additions & 0 deletions app/models/order.rb
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ def cancel!
end
end

# An ordered order goes back to waiting, for when the shop cancelled it after it was marked ordered. It still counts as
# spent, so the hours stay. When it was ordered, who ordered it and the Theseus letter are cleared. Under the row lock.
# Answers false, changing nothing, when it is not ordered.
def reopen!
with_lock do
next false unless ordered?

update!(status: "waiting", ordered_at: nil, ordered_by: nil, theseus_letter_id: nil)
true
end
end

# A banned person's waiting order is cancelled with the ban (User#ban!, D-148).
def cancel_for_ban!
cancel!
Expand Down
41 changes: 39 additions & 2 deletions test/controllers/admin/mcp_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class Admin::McpControllerTest < ActionDispatch::IntegrationTest
tools = response.parsed_body.dig("result", "tools").index_by { it["name"] }

assert_equal %w[admin_summary audit_log cancel_order credit_shop_hours decide_extension describe_schema edit_review_text edit_snapshot find_people find_projects find_ships funnel get_person get_project get_ship
list_extensions list_orders mark_order_ordered metrics nudges public_stats query_sql save_review_draft send_verdict_dm set_checklist_item set_hours_start set_lapse_coding set_reviewer_ai set_ship_until set_shop_until], tools.keys.sort
writes = %w[save_review_draft set_lapse_coding set_reviewer_ai set_checklist_item set_hours_start edit_snapshot edit_review_text send_verdict_dm mark_order_ordered cancel_order decide_extension set_ship_until credit_shop_hours set_shop_until]
list_extensions list_orders mark_order_ordered metrics nudges public_stats query_sql reopen_order save_review_draft send_verdict_dm set_checklist_item set_hours_start set_lapse_coding set_reviewer_ai set_ship_until set_shop_until], tools.keys.sort
writes = %w[save_review_draft set_lapse_coding set_reviewer_ai set_checklist_item set_hours_start edit_snapshot edit_review_text send_verdict_dm mark_order_ordered cancel_order reopen_order decide_extension set_ship_until credit_shop_hours set_shop_until]
writes.each do |name|
assert tools[name]["description"].start_with?("Changes real data: confirm with the human first."), name
assert_equal false, tools[name].dig("annotations", "readOnlyHint")
Expand Down Expand Up @@ -841,6 +841,43 @@ class Admin::McpControllerTest < ActionDispatch::IntegrationTest
assert_equal 0, projects(:ana).reload.hours_to_spend
end

test "reopen_order puts an ordered order back to waiting, clears who ordered it, and keeps the hours spent" do
travel_to Time.utc(2026, 11, 9, 12)
project = projects(:ana)
order = make_order("micro", "ordered")
order.update!(ordered_at: Time.current, ordered_by: users(:orpheus), theseus_letter_id: "ltr_x")
spent = project.reload.hours_to_spend

assert_no_enqueued_jobs only: SlackMessageJob do
mcp_tool(@token, "reopen_order", { order_id: order.id })
assert mcp_error?, "a reason is needed"
assert order.reload.ordered?

result = mcp_tool(@token, "reopen_order", { order_id: order.id, reason: "Roblox cancelled it" })
assert_equal({ "order_id" => order.id, "status" => "waiting", "project_id" => project.id, "prize_key" => order.prize_key }, result)
end
order.reload
assert order.waiting?
assert_nil order.ordered_at
assert_nil order.ordered_by_id
assert_nil order.theseus_letter_id
assert_equal spent, project.reload.hours_to_spend
assert_equal({ "order_id" => order.id, "reason" => "Roblox cancelled it" }, AdminAuditEvent.where(tool: "reopen_order").last.ids)
end

test "reopen_order refuses waiting and cancelled orders and changes nothing" do
travel_to Time.utc(2026, 11, 9, 12)
waiting = make_order("micro", "waiting")
mcp_tool(@token, "reopen_order", { order_id: waiting.id, reason: "x" })
assert mcp_error?
assert waiting.reload.waiting?

waiting.cancel!
mcp_tool(@token, "reopen_order", { order_id: waiting.id, reason: "x" })
assert mcp_error?
assert waiting.reload.cancelled?
end

test "decide_extension decides once, and the bot DMs them" do
extension = projects(:ana).create_extension!(reason: "exams")
result = mcp_tool(@token, "decide_extension", { extension_id: extension.id, decision: "approved" })
Expand Down
Loading