fix(ups): formalize subjects

.claude/skills/git-spice-merge-my-stack/SKILL.md

@@ -0,0 +1,60 @@
+---
+name: git-spice-merge-my-stack
+description: Merge a stacked git-spice branch chain with gh by retargeting each PR to main and merging bottom to top, including conflict recovery via rebase.
+license: MIT
+compatibility: Requires GitHub CLI (gh), git, and push access.
+metadata:
+  author: rivet
+  version: "1.0"
+---
+
+Merge a stacked PR chain.
+
+**Input**: A target branch in the stack (usually the top branch to merge through).
+
+**Goal**: Merge all PRs from the bottom of that stack up to the target branch.
+
+## Steps
+
+1. **Resolve the target PR**
+   - Find PR for the provided branch:
+     - `gh pr list --state open --head "<target-branch>" --json number,headRefName,baseRefName,url`
+   - If no open PR exists, stop and report.
+
+2. **Build the stack chain down to main**
+   - Start at target PR.
+   - Repeatedly find the PR whose `headRefName` equals the current PR `baseRefName`.
+   - Continue until base is `main` or no parent PR exists.
+   - If chain is ambiguous, stop and ask the user which branch to follow.
+
+3. **Determine merge order**
+   - Merge from **bottom to top**.
+   - Example: `[bottom, ..., target]`.
+
+4. **For each PR in order**
+   - Retarget to `main` before merge:
+     - `gh pr edit <pr-number> --base main`
+   - Merge with repository-compatible strategy:
+     - Try `gh pr merge <pr-number> --squash --delete-branch=false`
+   - If merge fails due conflicts:
+     - `gh pr checkout <pr-number>`
+     - `git fetch origin main`
+     - `git rebase origin/main`
+     - Resolve conflicts. If replaying already-upstream commits from lower stack layers, prefer `git rebase --skip`.
+     - Continue with `GIT_EDITOR=true git rebase --continue` when needed.
+     - `git push --force-with-lease origin <head-branch>`
+     - Retry `gh pr merge ... --squash`.
+
+5. **Verify completion**
+   - Confirm each PR in chain is merged:
+     - `gh pr view <pr-number> --json state,mergedAt,url`
+   - Report final ordered merge list with PR numbers and timestamps.
+
+## Guardrails
+
+- Always merge in bottom-to-top order.
+- Do not use merge commits if the repo disallows them.
+- Do not delete remote branches unless explicitly requested.
+- If a conflict cannot be safely resolved, stop and ask the user.
+- If force-push is required, use `--force-with-lease`, never `--force`.
+- After finishing, return to the user's original branch unless they asked otherwise.

README.md

@@ -270,4 +270,4 @@ Serverless, containers, or your own servers — Rivet Actors work with your exis
 
 ## License
 
-[Apache 2.0](LICENSE)
+[Apache 2.0](LICENSE)

engine/packages/api-peer/src/actors/delete.rs

@@ -18,28 +18,36 @@ use rivet_util::Id;
 )]
 #[tracing::instrument(skip_all)]
 pub async fn delete(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<DeleteResponse> {
-	// Get the actor first to verify it exists
-	let actors_res = ctx
-		.op(pegboard::ops::actor::get::Input {
+	// Subscribe before fetching actor data
+	let mut destroy_sub = ctx
+		.subscribe::<pegboard::workflows::actor::DestroyComplete>(("actor_id", path.actor_id))
+		.await?;
+
+	let (actors_res, namespace_res) = tokio::try_join!(
+		// Get the actor to verify it exists
+		ctx.op(pegboard::ops::actor::get::Input {
 			actor_ids: vec![path.actor_id],
 			fetch_error: false,
-		})
-		.await?;
+		}),
+		ctx.op(namespace::ops::resolve_for_name_global::Input {
+			name: query.namespace,
+		}),
+	)?;
 
 	let actor = actors_res
 		.actors
 		.into_iter()
 		.next()
 		.ok_or_else(|| pegboard::errors::Actor::NotFound.build())?;
 
-	// Verify the actor belongs to the specified namespace
-	let namespace = ctx
-		.op(namespace::ops::resolve_for_name_global::Input {
-			name: query.namespace,
-		})
-		.await?
-		.ok_or_else(|| namespace::errors::Namespace::NotFound.build())?;
+	// Already destroyed
+	if actor.destroy_ts.is_some() {
+		return Err(pegboard::errors::Actor::NotFound.build());
+	}
 
+	let namespace = namespace_res.ok_or_else(|| namespace::errors::Namespace::NotFound.build())?;
+
+	// Verify the actor belongs to the specified namespace
 	if actor.namespace_id != namespace.namespace_id {
 		return Err(pegboard::errors::Actor::NotFound.build());
 	}
@@ -56,6 +64,8 @@ pub async fn delete(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result
 			actor_id=?path.actor_id,
 			"actor workflow not found, likely already stopped"
 		);
+	} else {
+		destroy_sub.next().await?;
 	}
 
 	Ok(DeleteResponse {})

engine/packages/config/src/config/mod.rs

@@ -204,7 +204,7 @@ impl Root {
 		}
 
 		// Validate force_shutdown_duration is greater than worker and guard shutdown durations
-		let worker = self.runtime.worker.shutdown_duration();
+		let worker = self.runtime.worker_shutdown_duration();
 		let guard = self.runtime.guard_shutdown_duration();
 		let force = self.runtime.force_shutdown_duration();
 		let max_graceful = worker.max(guard);